OSDN Git Service

drm/imx: imx-ldb: remove unnecessary double disable check
authorPhilipp Zabel <p.zabel@pengutronix.de>
Mon, 8 Aug 2016 13:56:39 +0000 (15:56 +0200)
committerPhilipp Zabel <p.zabel@pengutronix.de>
Mon, 7 Nov 2016 14:17:46 +0000 (15:17 +0100)
Since the atomic modeset conversion, this should not be an issue
anymore.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
drivers/gpu/drm/imx/imx-ldb.c

index 3ce391c..b300998 100644 (file)
@@ -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])