From: Philipp Zabel Date: Mon, 8 Aug 2016 13:56:39 +0000 (+0200) Subject: drm/imx: imx-ldb: remove unnecessary double disable check X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=cdda2df7e05d84fee0a8298076941928af036c73;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git 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 --- 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])