drm: Do not set connector->encoder in drivers
authorThierry Reding <treding@nvidia.com>
Mon, 16 Nov 2015 17:19:53 +0000 (18:19 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 13 Jan 2016 12:30:53 +0000 (13:30 +0100)
An encoder is associated with a connector by the DRM core as a result of
setting up a configuration. Drivers using the atomic or legacy helpers
should never set up this link, even if it is a static one.

While at it, try to catch this kind of error in the future by adding a
WARN_ON() in drm_mode_connector_attach_encoder(). Note that this doesn't
cover all the cases, since drivers could set this up after attaching.
Drivers that use the atomic helpers will get a warning later on, though,
so hopefully the two combined cover enough to help people avoid this in
the future.

Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Liviu Dudau <Liviu.Dudau@arm.com>
Cc: Mark yao <mark.yao@rock-chips.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1447694393-24700-1-git-send-email-thierry.reding@gmail.com
drivers/gpu/drm/bridge/dw_hdmi.c
drivers/gpu/drm/drm_crtc.c
drivers/gpu/drm/i2c/tda998x_drv.c
drivers/gpu/drm/imx/parallel-display.c
drivers/gpu/drm/shmobile/shmob_drm_crtc.c

index 210d8df0e5f497b473ef907031f255ab509f2791..f2249450491273a889879620975738080ae7e7a5 100644 (file)
@@ -1648,8 +1648,6 @@ static int dw_hdmi_register(struct drm_device *drm, struct dw_hdmi *hdmi)
        drm_connector_init(drm, &hdmi->connector, &dw_hdmi_connector_funcs,
                           DRM_MODE_CONNECTOR_HDMIA);
 
-       hdmi->connector.encoder = encoder;
-
        drm_mode_connector_attach_encoder(&hdmi->connector, encoder);
 
        return 0;
index 62fa95fa547118f2d47fbb6b62ab811412e6e67b..d40bab29747edb0ea989afd81b0e5b5102dfb555 100644 (file)
@@ -5054,6 +5054,20 @@ int drm_mode_connector_attach_encoder(struct drm_connector *connector,
 {
        int i;
 
+       /*
+        * In the past, drivers have attempted to model the static association
+        * of connector to encoder in simple connector/encoder devices using a
+        * direct assignment of connector->encoder = encoder. This connection
+        * is a logical one and the responsibility of the core, so drivers are
+        * expected not to mess with this.
+        *
+        * Note that the error return should've been enough here, but a large
+        * majority of drivers ignores the return value, so add in a big WARN
+        * to get people's attention.
+        */
+       if (WARN_ON(connector->encoder))
+               return -EINVAL;
+
        for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++) {
                if (connector->encoder_ids[i] == 0) {
                        connector->encoder_ids[i] = encoder->base.id;
index a46248f0c9c30d9a97787f4e94bb739d330f46b6..7885859b6386a4a1929172194378155b80ffe726 100644 (file)
@@ -1439,7 +1439,6 @@ static int tda998x_bind(struct device *dev, struct device *master, void *data)
        if (ret)
                goto err_sysfs;
 
-       priv->connector.encoder = &priv->encoder;
        drm_mode_connector_attach_encoder(&priv->connector, &priv->encoder);
 
        return 0;
index b74bf8e334f5f34acde05f83d411e26e5b4c14a4..0ffef172afb472fc0de254552e6b2bcaaae92db5 100644 (file)
@@ -204,8 +204,6 @@ static int imx_pd_register(struct drm_device *drm,
 
        drm_mode_connector_attach_encoder(&imxpd->connector, &imxpd->encoder);
 
-       imxpd->connector.encoder = &imxpd->encoder;
-
        return 0;
 }
 
index b80802f551436bb959ee79b08aa003dd16891383..db0763794edcb62de69a9f45c825a0b79b631820 100644 (file)
@@ -739,8 +739,6 @@ int shmob_drm_connector_create(struct shmob_drm_device *sdev,
        if (ret < 0)
                goto err_backlight;
 
-       connector->encoder = encoder;
-
        drm_helper_connector_dpms(connector, DRM_MODE_DPMS_OFF);
        drm_object_property_set_value(&connector->base,
                sdev->ddev->mode_config.dpms_property, DRM_MODE_DPMS_OFF);