imx-drm: imx-drm-core: sanitise imx_drm_encoder_get_mux_id()

Address the following issues:
- imx_drm_encoder_get_mux_id() searches the CRTC list for the matching
  CRTC, and returns the position within this list as the MUX programming
  value for encoders.  This is sub-optimal for two reasons:
  1. It relies upon the CRTC list not changing during the lifetime of
     the driver.
  2. It is dependent on the initialisation order of the CRTCs.

  We address (1) in this patch, leaving (2) until a better solution can
  be found, as (2) requires larger changes.

- imx_drm_encoder is unused.  Instead, pass the drm_encoder which is
  slightly more useful; all callers pass encoder->crtc as the required
  crtc, so move this inside the function.

Acked-by: Philipp Zabel <p.zabel@pengutronix.de>
Acked-by: Shawn Guo <shawn.guo@linaro.org>
Reviewed-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/drivers/staging/imx-drm/imx-drm-core.c b/drivers/staging/imx-drm/imx-drm-core.c
index 236ed66f116a29fda3af7fc6764b506cacbef16a..92fde89f58ac946cf7909939a0a35dea904817af 100644 (file)
--- a/drivers/staging/imx-drm/imx-drm-core.c
+++ b/drivers/staging/imx-drm/imx-drm-core.c
@@ -53,6 +53,7 @@ struct imx_drm_crtc {
        struct imx_drm_crtc_helper_funcs        imx_drm_helper_funcs;
        struct module                           *owner;
        struct crtc_cookie                      cookie;
+       int                                     mux_id;
 };
 
 struct imx_drm_encoder {
@@ -503,7 +504,7 @@ int imx_drm_add_crtc(struct drm_crtc *crtc,
        imx_drm_crtc->pipe = imxdrm->pipes++;
        imx_drm_crtc->cookie.cookie = cookie;
        imx_drm_crtc->cookie.id = id;
-
+       imx_drm_crtc->mux_id = imx_drm_crtc->pipe;
        imx_drm_crtc->crtc = crtc;
        imx_drm_crtc->imxdrm = imxdrm;
 
@@ -657,22 +658,16 @@ int imx_drm_encoder_add_possible_crtcs(
 }
 EXPORT_SYMBOL_GPL(imx_drm_encoder_add_possible_crtcs);
 
-int imx_drm_encoder_get_mux_id(struct imx_drm_encoder *imx_drm_encoder,
-               struct drm_crtc *crtc)
+int imx_drm_encoder_get_mux_id(struct drm_encoder *encoder)
 {
        struct imx_drm_device *imxdrm = __imx_drm_device();
        struct imx_drm_crtc *imx_crtc;
-       int i = 0;
 
-       list_for_each_entry(imx_crtc, &imxdrm->crtc_list, list) {
-               if (imx_crtc->crtc == crtc)
-                       goto found;
-               i++;
-       }
+       list_for_each_entry(imx_crtc, &imxdrm->crtc_list, list)
+               if (imx_crtc->crtc == encoder->crtc)
+                       return imx_crtc->mux_id;
 
        return -EINVAL;
-found:
-       return i;
 }
 EXPORT_SYMBOL_GPL(imx_drm_encoder_get_mux_id);
 

diff --git a/drivers/staging/imx-drm/imx-drm.h b/drivers/staging/imx-drm/imx-drm.h
index ae90c9c15312c2ca57fb1884b622a8bf0469cf0e..5649f180dc44e143b77fd74d1a534e9a754269c4 100644 (file)
--- a/drivers/staging/imx-drm/imx-drm.h
+++ b/drivers/staging/imx-drm/imx-drm.h
@@ -64,8 +64,7 @@ void imx_drm_fb_helper_set(struct drm_fbdev_cma *fbdev_helper);
 
 struct device_node;
 
-int imx_drm_encoder_get_mux_id(struct imx_drm_encoder *imx_drm_encoder,
-               struct drm_crtc *crtc);
+int imx_drm_encoder_get_mux_id(struct drm_encoder *encoder);
 int imx_drm_encoder_add_possible_crtcs(struct imx_drm_encoder *imx_drm_encoder,
                struct device_node *np);
 

diff --git a/drivers/staging/imx-drm/imx-hdmi.c b/drivers/staging/imx-drm/imx-hdmi.c
index 05cf8a07b4568f1667ee8f2fe8d5f20722841d41..a90f08d52ee790058f3e74f82b689b526acd55ac 100644 (file)
--- a/drivers/staging/imx-drm/imx-hdmi.c
+++ b/drivers/staging/imx-drm/imx-hdmi.c
@@ -1467,8 +1467,7 @@ static void imx_hdmi_encoder_prepare(struct drm_encoder *encoder)
 static void imx_hdmi_encoder_commit(struct drm_encoder *encoder)
 {
        struct imx_hdmi *hdmi = container_of(encoder, struct imx_hdmi, encoder);
-       int mux = imx_drm_encoder_get_mux_id(hdmi->imx_drm_encoder,
-                                            encoder->crtc);
+       int mux = imx_drm_encoder_get_mux_id(encoder);
 
        imx_hdmi_set_ipu_di_mux(hdmi, mux);
 

diff --git a/drivers/staging/imx-drm/imx-ldb.c b/drivers/staging/imx-drm/imx-ldb.c
index 7e593296ac47287f4929b91270ff79d34752fd56..4aa47ae2a3cafe32941062b783a6767da38636d2 100644 (file)
--- a/drivers/staging/imx-drm/imx-ldb.c
+++ b/drivers/staging/imx-drm/imx-ldb.c
@@ -179,8 +179,7 @@ static void imx_ldb_encoder_prepare(struct drm_encoder *encoder)
        u32 pixel_fmt;
        unsigned long serial_clk;
        unsigned long di_clk = mode->clock * 1000;
-       int mux = imx_drm_encoder_get_mux_id(imx_ldb_ch->imx_drm_encoder,
-                                            encoder->crtc);
+       int mux = imx_drm_encoder_get_mux_id(encoder);
 
        if (ldb->ldb_ctrl & LDB_SPLIT_MODE_EN) {
                /* dual channel LVDS mode */
@@ -216,8 +215,7 @@ static void imx_ldb_encoder_commit(struct drm_encoder *encoder)
        struct imx_ldb_channel *imx_ldb_ch = enc_to_imx_ldb_ch(encoder);
        struct imx_ldb *ldb = imx_ldb_ch->ldb;
        int dual = ldb->ldb_ctrl & LDB_SPLIT_MODE_EN;
-       int mux = imx_drm_encoder_get_mux_id(imx_ldb_ch->imx_drm_encoder,
-                                            encoder->crtc);
+       int mux = imx_drm_encoder_get_mux_id(encoder);
 
        if (dual) {
                clk_prepare_enable(ldb->clk[0]);