| Message ID | 5100ee37c9bbb53f8227bd38f1d3160e507c489d.1475740611.git-series.maxime.ripard@free-electrons.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Oct 6, 2016 at 3:57 AM, Maxime Ripard <maxime.ripard@free-electrons.com> wrote: > 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> > --- > drivers/gpu/drm/sun4i/sun4i_rgb.c | 6 ------ > 1 file 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) > if (!IS_ERR(tcon->panel)) > drm_panel_prepare(tcon->panel); > > - /* encoder->bridge can be NULL; drm_bridge_enable checks for it */ > - drm_bridge_enable(encoder->bridge); > - > sun4i_tcon_channel_enable(tcon, 0); > > if (!IS_ERR(tcon->panel)) > @@ -177,9 +174,6 @@ static void sun4i_rgb_encoder_disable(struct drm_encoder *encoder) > > sun4i_tcon_channel_disable(tcon, 0); > > - /* encoder->bridge can be NULL; drm_bridge_disable checks for it */ > - drm_bridge_disable(encoder->bridge); > - > if (!IS_ERR(tcon->panel)) > drm_panel_unprepare(tcon->panel); > } > -- > git-series 0.8.10 > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
On Thu, Oct 06, 2016 at 03:43:21PM -0400, Sean Paul wrote: > On Thu, Oct 6, 2016 at 3:57 AM, Maxime Ripard > <maxime.ripard@free-electrons.com> wrote: > > 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> Thanks, I just queued it in my fixes for 4.9. Maxime
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) if (!IS_ERR(tcon->panel)) drm_panel_prepare(tcon->panel); - /* encoder->bridge can be NULL; drm_bridge_enable checks for it */ - drm_bridge_enable(encoder->bridge); - sun4i_tcon_channel_enable(tcon, 0); if (!IS_ERR(tcon->panel)) @@ -177,9 +174,6 @@ static void sun4i_rgb_encoder_disable(struct drm_encoder *encoder) sun4i_tcon_channel_disable(tcon, 0); - /* encoder->bridge can be NULL; drm_bridge_disable checks for it */ - drm_bridge_disable(encoder->bridge); - if (!IS_ERR(tcon->panel)) drm_panel_unprepare(tcon->panel); }
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> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> --- drivers/gpu/drm/sun4i/sun4i_rgb.c | 6 ------ 1 file changed, 0 insertions(+), 6 deletions(-)