| Message ID | 20180322174003.5654-1-ville.syrjala@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Mar 22, 2018 at 07:40:03PM +0200, Ville Syrjala wrote: > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > We want to get rid of plane->fb on atomic drivers. Stop looking at it. Would it be more precise to use "plane->crtc" in both subject and commit log? Other than that: Acked-by: Shawn Guo <shawnguo@kernel.org> > > v2: Use old_state->crtc (Maarten) > > Cc: Shawn Guo <shawnguo@kernel.org> > Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > --- > drivers/gpu/drm/zte/zx_plane.c | 2 +- > drivers/gpu/drm/zte/zx_vou.c | 5 +++-- > drivers/gpu/drm/zte/zx_vou.h | 3 ++- > 3 files changed, 6 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/zte/zx_plane.c b/drivers/gpu/drm/zte/zx_plane.c > index 94545adac50d..d1931f5ea0b2 100644 > --- a/drivers/gpu/drm/zte/zx_plane.c > +++ b/drivers/gpu/drm/zte/zx_plane.c > @@ -268,7 +268,7 @@ static void zx_plane_atomic_disable(struct drm_plane *plane, > struct zx_plane *zplane = to_zx_plane(plane); > void __iomem *hbsc = zplane->hbsc; > > - zx_vou_layer_disable(plane); > + zx_vou_layer_disable(plane, old_state); > > /* Disable HBSC block */ > zx_writel_mask(hbsc + HBSC_CTRL0, HBSC_CTRL_EN, 0); > diff --git a/drivers/gpu/drm/zte/zx_vou.c b/drivers/gpu/drm/zte/zx_vou.c > index 7491813131f3..442311d31110 100644 > --- a/drivers/gpu/drm/zte/zx_vou.c > +++ b/drivers/gpu/drm/zte/zx_vou.c > @@ -627,9 +627,10 @@ void zx_vou_layer_enable(struct drm_plane *plane) > zx_writel_mask(vou->osd + OSD_CTRL0, bits->enable, bits->enable); > } > > -void zx_vou_layer_disable(struct drm_plane *plane) > +void zx_vou_layer_disable(struct drm_plane *plane, > + struct drm_plane_state *old_state) > { > - struct zx_crtc *zcrtc = to_zx_crtc(plane->crtc); > + struct zx_crtc *zcrtc = to_zx_crtc(old_state->crtc); > struct zx_vou_hw *vou = zcrtc->vou; > struct zx_plane *zplane = to_zx_plane(plane); > const struct vou_layer_bits *bits = zplane->bits; > diff --git a/drivers/gpu/drm/zte/zx_vou.h b/drivers/gpu/drm/zte/zx_vou.h > index 97d72bfce982..5b7f84fbb112 100644 > --- a/drivers/gpu/drm/zte/zx_vou.h > +++ b/drivers/gpu/drm/zte/zx_vou.h > @@ -62,6 +62,7 @@ void zx_vou_config_dividers(struct drm_crtc *crtc, > struct vou_div_config *configs, int num); > > void zx_vou_layer_enable(struct drm_plane *plane); > -void zx_vou_layer_disable(struct drm_plane *plane); > +void zx_vou_layer_disable(struct drm_plane *plane, > + struct drm_plane_state *old_state); > > #endif /* __ZX_VOU_H__ */ > -- > 2.16.1 >
diff --git a/drivers/gpu/drm/zte/zx_plane.c b/drivers/gpu/drm/zte/zx_plane.c index 94545adac50d..d1931f5ea0b2 100644 --- a/drivers/gpu/drm/zte/zx_plane.c +++ b/drivers/gpu/drm/zte/zx_plane.c @@ -268,7 +268,7 @@ static void zx_plane_atomic_disable(struct drm_plane *plane, struct zx_plane *zplane = to_zx_plane(plane); void __iomem *hbsc = zplane->hbsc; - zx_vou_layer_disable(plane); + zx_vou_layer_disable(plane, old_state); /* Disable HBSC block */ zx_writel_mask(hbsc + HBSC_CTRL0, HBSC_CTRL_EN, 0); diff --git a/drivers/gpu/drm/zte/zx_vou.c b/drivers/gpu/drm/zte/zx_vou.c index 7491813131f3..442311d31110 100644 --- a/drivers/gpu/drm/zte/zx_vou.c +++ b/drivers/gpu/drm/zte/zx_vou.c @@ -627,9 +627,10 @@ void zx_vou_layer_enable(struct drm_plane *plane) zx_writel_mask(vou->osd + OSD_CTRL0, bits->enable, bits->enable); } -void zx_vou_layer_disable(struct drm_plane *plane) +void zx_vou_layer_disable(struct drm_plane *plane, + struct drm_plane_state *old_state) { - struct zx_crtc *zcrtc = to_zx_crtc(plane->crtc); + struct zx_crtc *zcrtc = to_zx_crtc(old_state->crtc); struct zx_vou_hw *vou = zcrtc->vou; struct zx_plane *zplane = to_zx_plane(plane); const struct vou_layer_bits *bits = zplane->bits; diff --git a/drivers/gpu/drm/zte/zx_vou.h b/drivers/gpu/drm/zte/zx_vou.h index 97d72bfce982..5b7f84fbb112 100644 --- a/drivers/gpu/drm/zte/zx_vou.h +++ b/drivers/gpu/drm/zte/zx_vou.h @@ -62,6 +62,7 @@ void zx_vou_config_dividers(struct drm_crtc *crtc, struct vou_div_config *configs, int num); void zx_vou_layer_enable(struct drm_plane *plane); -void zx_vou_layer_disable(struct drm_plane *plane); +void zx_vou_layer_disable(struct drm_plane *plane, + struct drm_plane_state *old_state); #endif /* __ZX_VOU_H__ */