diff options
author | Maxime Ripard <maxime.ripard@free-electrons.com> | 2016-09-29 08:05:05 -0400 |
---|---|---|
committer | Maxime Ripard <maxime.ripard@free-electrons.com> | 2016-10-16 08:32:23 -0400 |
commit | 0df03b43035afd0a64916fe4e5bca978562ffa5a (patch) | |
tree | e93981caca6a6586e29b53da09840af8736aa2e7 | |
parent | 5647b25c3335a25ba32d73e61850a374a708788a (diff) |
drm/sun4i: rgb: Remove the bridge enable/disable functions
The atomic helpers already call the drm_bridge_enable on our behalf,
there's no need to do it a second time.
Reported-by: Sean Paul <seanpaul@chromium.org>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
-rw-r--r-- | drivers/gpu/drm/sun4i/sun4i_rgb.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/gpu/drm/sun4i/sun4i_rgb.c b/drivers/gpu/drm/sun4i/sun4i_rgb.c index 4e4bea6f395c..d198ad7e5323 100644 --- a/drivers/gpu/drm/sun4i/sun4i_rgb.c +++ b/drivers/gpu/drm/sun4i/sun4i_rgb.c | |||
@@ -155,9 +155,6 @@ static void sun4i_rgb_encoder_enable(struct drm_encoder *encoder) | |||
155 | if (!IS_ERR(tcon->panel)) | 155 | if (!IS_ERR(tcon->panel)) |
156 | drm_panel_prepare(tcon->panel); | 156 | drm_panel_prepare(tcon->panel); |
157 | 157 | ||
158 | /* encoder->bridge can be NULL; drm_bridge_enable checks for it */ | ||
159 | drm_bridge_enable(encoder->bridge); | ||
160 | |||
161 | sun4i_tcon_channel_enable(tcon, 0); | 158 | sun4i_tcon_channel_enable(tcon, 0); |
162 | 159 | ||
163 | if (!IS_ERR(tcon->panel)) | 160 | if (!IS_ERR(tcon->panel)) |
@@ -177,9 +174,6 @@ static void sun4i_rgb_encoder_disable(struct drm_encoder *encoder) | |||
177 | 174 | ||
178 | sun4i_tcon_channel_disable(tcon, 0); | 175 | sun4i_tcon_channel_disable(tcon, 0); |
179 | 176 | ||
180 | /* encoder->bridge can be NULL; drm_bridge_disable checks for it */ | ||
181 | drm_bridge_disable(encoder->bridge); | ||
182 | |||
183 | if (!IS_ERR(tcon->panel)) | 177 | if (!IS_ERR(tcon->panel)) |
184 | drm_panel_unprepare(tcon->panel); | 178 | drm_panel_unprepare(tcon->panel); |
185 | } | 179 | } |