diff options
| author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2015-02-23 06:22:44 -0500 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2015-03-03 09:16:02 -0500 |
| commit | 8b37c3264788a13861f318a8bfc7d73f0d0986ce (patch) | |
| tree | f40b5cff40f669cababe07c06e56f4639d1f5cfd | |
| parent | df78222d78f0f985ffb7917df4a058113e227561 (diff) | |
drm: rcar-du: Don't set connector->encoder at init time
The drm_connector encoder field points to the encoder driving the
connector. No such association exists at init time, as all pipelines are
disabled. Don't set the field.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
| -rw-r--r-- | drivers/gpu/drm/rcar-du/rcar_du_hdmicon.c | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/rcar-du/rcar_du_vgacon.c | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_hdmicon.c b/drivers/gpu/drm/rcar-du/rcar_du_hdmicon.c index ca94b029ac80..3896cb20ad51 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_hdmicon.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_hdmicon.c | |||
| @@ -116,7 +116,6 @@ int rcar_du_hdmi_connector_init(struct rcar_du_device *rcdu, | |||
| 116 | if (ret < 0) | 116 | if (ret < 0) |
| 117 | return ret; | 117 | return ret; |
| 118 | 118 | ||
| 119 | connector->encoder = encoder; | ||
| 120 | rcon->encoder = renc; | 119 | rcon->encoder = renc; |
| 121 | 120 | ||
| 122 | return 0; | 121 | return 0; |
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c b/drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c index 6d9811c052c4..7c0b08fe0774 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c | |||
| @@ -125,7 +125,6 @@ int rcar_du_lvds_connector_init(struct rcar_du_device *rcdu, | |||
| 125 | if (ret < 0) | 125 | if (ret < 0) |
| 126 | return ret; | 126 | return ret; |
| 127 | 127 | ||
| 128 | connector->encoder = encoder; | ||
| 129 | lvdscon->connector.encoder = renc; | 128 | lvdscon->connector.encoder = renc; |
| 130 | 129 | ||
| 131 | return 0; | 130 | return 0; |
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_vgacon.c b/drivers/gpu/drm/rcar-du/rcar_du_vgacon.c index 9d4879921cc7..ae8b304e6fea 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_vgacon.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_vgacon.c | |||
| @@ -84,7 +84,6 @@ int rcar_du_vga_connector_init(struct rcar_du_device *rcdu, | |||
| 84 | if (ret < 0) | 84 | if (ret < 0) |
| 85 | return ret; | 85 | return ret; |
| 86 | 86 | ||
| 87 | connector->encoder = encoder; | ||
| 88 | rcon->encoder = renc; | 87 | rcon->encoder = renc; |
| 89 | 88 | ||
| 90 | return 0; | 89 | return 0; |