aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/drm/omapdrm/omap_crtc.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omapdrm/omap_crtc.c
index 3667ff1d8474..263f4b7a5789 100644
--- a/drivers/gpu/drm/omapdrm/omap_crtc.c
+++ b/drivers/gpu/drm/omapdrm/omap_crtc.c
@@ -102,8 +102,6 @@ static struct omap_dss_device *omap_crtc_output[8];
102static int omap_crtc_dss_connect(enum omap_channel channel, 102static int omap_crtc_dss_connect(enum omap_channel channel,
103 struct omap_dss_device *dst) 103 struct omap_dss_device *dst)
104{ 104{
105 struct omap_overlay_manager *mgr = omap_dss_get_overlay_manager(channel);
106
107 if (omap_crtc_output[channel]) 105 if (omap_crtc_output[channel])
108 return -EINVAL; 106 return -EINVAL;
109 107
@@ -113,22 +111,14 @@ static int omap_crtc_dss_connect(enum omap_channel channel,
113 omap_crtc_output[channel] = dst; 111 omap_crtc_output[channel] = dst;
114 dst->dispc_channel_connected = true; 112 dst->dispc_channel_connected = true;
115 113
116 dst->manager = mgr;
117 mgr->output = dst;
118
119 return 0; 114 return 0;
120} 115}
121 116
122static void omap_crtc_dss_disconnect(enum omap_channel channel, 117static void omap_crtc_dss_disconnect(enum omap_channel channel,
123 struct omap_dss_device *dst) 118 struct omap_dss_device *dst)
124{ 119{
125 struct omap_overlay_manager *mgr = omap_dss_get_overlay_manager(channel);
126
127 omap_crtc_output[channel] = NULL; 120 omap_crtc_output[channel] = NULL;
128 dst->dispc_channel_connected = false; 121 dst->dispc_channel_connected = false;
129
130 mgr->output->manager = NULL;
131 mgr->output = NULL;
132} 122}
133 123
134static void omap_crtc_dss_start_update(enum omap_channel channel) 124static void omap_crtc_dss_start_update(enum omap_channel channel)