diff options
| author | Zhenyu Wang <[email protected]> | 2020-10-30 11:48:17 +0800 |
|---|---|---|
| committer | Zhenyu Wang <[email protected]> | 2020-10-30 11:48:17 +0800 |
| commit | 4a95857a875e887cc958c92fe9d2cde6184d2ec0 (patch) | |
| tree | 8d67b681d582ba7ee11a359be7af82ed77bd6620 /drivers/gpu/drm/imx/imx-ldb.c | |
| parent | baec997285e63ad3e03d8b8d45e14776cd737f62 (diff) | |
| parent | 61334ed227a5852100115180f5535b1396ed5227 (diff) | |
Merge tag 'drm-intel-fixes-2020-10-29' into gvt-fixes
Backmerge for 5.10-rc1 to apply one extra APL fix.
Signed-off-by: Zhenyu Wang <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/imx/imx-ldb.c')
| -rw-r--r-- | drivers/gpu/drm/imx/imx-ldb.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/gpu/drm/imx/imx-ldb.c b/drivers/gpu/drm/imx/imx-ldb.c index 8791d60be92e..af757d1e21fe 100644 --- a/drivers/gpu/drm/imx/imx-ldb.c +++ b/drivers/gpu/drm/imx/imx-ldb.c @@ -455,13 +455,6 @@ static int imx_ldb_register(struct drm_device *drm, drm_connector_attach_encoder(&imx_ldb_ch->connector, encoder); } - if (imx_ldb_ch->panel) { - ret = drm_panel_attach(imx_ldb_ch->panel, - &imx_ldb_ch->connector); - if (ret) - return ret; - } - return 0; } @@ -702,9 +695,6 @@ static void imx_ldb_unbind(struct device *dev, struct device *master, for (i = 0; i < 2; i++) { struct imx_ldb_channel *channel = &imx_ldb->channel[i]; - if (channel->panel) - drm_panel_detach(channel->panel); - kfree(channel->edid); i2c_put_adapter(channel->ddc); } |