summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/imx
diff options
context:
space:
mode:
authorPhilipp Zabel2016-08-08 15:56:39 +0200
committerPhilipp Zabel2016-11-07 15:17:46 +0100
commitcdda2df7e05d84fee0a8298076941928af036c73 (patch)
treead5142aa79599893dd7178497f3d8c0c4c4d5852 /drivers/gpu/drm/imx
parentgpu: ipu-v3: initially clear all interrupts (diff)
downloadkernel-qcow2-linux-cdda2df7e05d84fee0a8298076941928af036c73.tar.gz
kernel-qcow2-linux-cdda2df7e05d84fee0a8298076941928af036c73.tar.xz
kernel-qcow2-linux-cdda2df7e05d84fee0a8298076941928af036c73.zip
drm/imx: imx-ldb: remove unnecessary double disable check
Since the atomic modeset conversion, this should not be an issue anymore. Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Diffstat (limited to 'drivers/gpu/drm/imx')
-rw-r--r--drivers/gpu/drm/imx/imx-ldb.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/gpu/drm/imx/imx-ldb.c b/drivers/gpu/drm/imx/imx-ldb.c
index 3ce391c239b0..b300998dce7d 100644
--- a/drivers/gpu/drm/imx/imx-ldb.c
+++ b/drivers/gpu/drm/imx/imx-ldb.c
@@ -319,18 +319,6 @@ static void imx_ldb_encoder_disable(struct drm_encoder *encoder)
struct imx_ldb *ldb = imx_ldb_ch->ldb;
int mux, ret;
- /*
- * imx_ldb_encoder_disable is called by
- * drm_helper_disable_unused_functions without
- * the encoder being enabled before.
- */
- if (imx_ldb_ch == &ldb->channel[0] &&
- (ldb->ldb_ctrl & LDB_CH0_MODE_EN_MASK) == 0)
- return;
- else if (imx_ldb_ch == &ldb->channel[1] &&
- (ldb->ldb_ctrl & LDB_CH1_MODE_EN_MASK) == 0)
- return;
-
drm_panel_disable(imx_ldb_ch->panel);
if (imx_ldb_ch == &ldb->channel[0])