summaryrefslogtreecommitdiffstats
path: root/drivers/staging/imx-drm/imx-drm.h
diff options
context:
space:
mode:
authorRussell King2013-11-24 14:02:52 +0100
committerRussell King2014-02-24 13:04:00 +0100
commite76171b046e95e45266f3a4f4b900a5647e80d70 (patch)
tree5be58ff4ff51bb58120710b2e87ca7df48ea6da8 /drivers/staging/imx-drm/imx-drm.h
parentimx-drm: update and fix imx6 DT descriptions for v3 HDMI driver (diff)
downloadkernel-qcow2-linux-e76171b046e95e45266f3a4f4b900a5647e80d70.tar.gz
kernel-qcow2-linux-e76171b046e95e45266f3a4f4b900a5647e80d70.tar.xz
kernel-qcow2-linux-e76171b046e95e45266f3a4f4b900a5647e80d70.zip
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>
Diffstat (limited to 'drivers/staging/imx-drm/imx-drm.h')
-rw-r--r--drivers/staging/imx-drm/imx-drm.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/staging/imx-drm/imx-drm.h b/drivers/staging/imx-drm/imx-drm.h
index ae90c9c15312..5649f180dc44 100644
--- 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);