| Message ID | 20170712081344.25495-14-maarten.lankhorst@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Jul 12, 2017 at 10:13:41AM +0200, Maarten Lankhorst wrote: > for_each_obj_in_state is about to be removed, so use the new atomic > iterator macros. > > Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > Cc: CK Hu <ck.hu@mediatek.com> > Cc: Philipp Zabel <p.zabel@pengutronix.de> > Cc: Matthias Brugger <matthias.bgg@gmail.com> > Cc: linux-arm-kernel@lists.infradead.org > Cc: linux-mediatek@lists.infradead.org > --- > drivers/gpu/drm/mediatek/mtk_drm_drv.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c > index 56f802d0a51c..be0741638f94 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c > +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c > @@ -48,11 +48,11 @@ static void mtk_atomic_schedule(struct mtk_drm_private *private, > static void mtk_atomic_wait_for_fences(struct drm_atomic_state *state) > { > struct drm_plane *plane; > - struct drm_plane_state *plane_state; > + struct drm_plane_state *new_plane_state; > int i; > > - for_each_plane_in_state(state, plane, plane_state, i) > - mtk_fb_wait(plane->state->fb); > + for_each_new_plane_in_state(state, plane, new_plane_state, i) > + mtk_fb_wait(new_plane_state->fb); > } I think a variant of drm_atomic_set_fence_for_plane, which takes a reservation obj (or a dma-buf and then derefs dma_buf->resv itself) would be nice, so that drivers don't have to hand-roll sub-par fence waiting code like this (it's e.g. not interruptible for blocking commits). Anyway, patch itself looks good. Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> > > static void mtk_atomic_complete(struct mtk_drm_private *private, > -- > 2.11.0 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
On Wed, 2017-07-12 at 10:13 +0200, Maarten Lankhorst wrote: > for_each_obj_in_state is about to be removed, so use the new atomic > iterator macros. > > Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > Cc: CK Hu <ck.hu@mediatek.com> > Cc: Philipp Zabel <p.zabel@pengutronix.de> > Cc: Matthias Brugger <matthias.bgg@gmail.com> > Cc: linux-arm-kernel@lists.infradead.org > Cc: linux-mediatek@lists.infradead.org > --- > drivers/gpu/drm/mediatek/mtk_drm_drv.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c > index 56f802d0a51c..be0741638f94 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c > +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c > @@ -48,11 +48,11 @@ static void mtk_atomic_schedule(struct mtk_drm_private *private, > static void mtk_atomic_wait_for_fences(struct drm_atomic_state *state) > { > struct drm_plane *plane; > - struct drm_plane_state *plane_state; > + struct drm_plane_state *new_plane_state; > int i; > > - for_each_plane_in_state(state, plane, plane_state, i) > - mtk_fb_wait(plane->state->fb); > + for_each_new_plane_in_state(state, plane, new_plane_state, i) > + mtk_fb_wait(new_plane_state->fb); > } > > static void mtk_atomic_complete(struct mtk_drm_private *private, Acked-by: Philipp Zabel <p.zabel@pengutronix.de>
Op 12-07-17 om 11:45 schreef Daniel Vetter: > On Wed, Jul 12, 2017 at 10:13:41AM +0200, Maarten Lankhorst wrote: >> for_each_obj_in_state is about to be removed, so use the new atomic >> iterator macros. >> >> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> >> Cc: CK Hu <ck.hu@mediatek.com> >> Cc: Philipp Zabel <p.zabel@pengutronix.de> >> Cc: Matthias Brugger <matthias.bgg@gmail.com> >> Cc: linux-arm-kernel@lists.infradead.org >> Cc: linux-mediatek@lists.infradead.org >> --- >> drivers/gpu/drm/mediatek/mtk_drm_drv.c | 6 +++--- >> 1 file changed, 3 insertions(+), 3 deletions(-) >> >> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c >> index 56f802d0a51c..be0741638f94 100644 >> --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c >> +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c >> @@ -48,11 +48,11 @@ static void mtk_atomic_schedule(struct mtk_drm_private *private, >> static void mtk_atomic_wait_for_fences(struct drm_atomic_state *state) >> { >> struct drm_plane *plane; >> - struct drm_plane_state *plane_state; >> + struct drm_plane_state *new_plane_state; >> int i; >> >> - for_each_plane_in_state(state, plane, plane_state, i) >> - mtk_fb_wait(plane->state->fb); >> + for_each_new_plane_in_state(state, plane, new_plane_state, i) >> + mtk_fb_wait(new_plane_state->fb); >> } > I think a variant of drm_atomic_set_fence_for_plane, which takes a > reservation obj (or a dma-buf and then derefs dma_buf->resv itself) would > be nice, so that drivers don't have to hand-roll sub-par fence waiting > code like this (it's e.g. not interruptible for blocking commits). > > Anyway, patch itself looks good. > > Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> > Thanks. Pushed patch 1-3, 4 (first hunk only), 5 (with static fix), 6, 8, 9, 11-13. Still hoping for ack from driver maintainers on patch 7 (v2), 10, 14 (v2) and 15 (with the fix daniel spotted).
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c index 56f802d0a51c..be0741638f94 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c @@ -48,11 +48,11 @@ static void mtk_atomic_schedule(struct mtk_drm_private *private, static void mtk_atomic_wait_for_fences(struct drm_atomic_state *state) { struct drm_plane *plane; - struct drm_plane_state *plane_state; + struct drm_plane_state *new_plane_state; int i; - for_each_plane_in_state(state, plane, plane_state, i) - mtk_fb_wait(plane->state->fb); + for_each_new_plane_in_state(state, plane, new_plane_state, i) + mtk_fb_wait(new_plane_state->fb); } static void mtk_atomic_complete(struct mtk_drm_private *private,
for_each_obj_in_state is about to be removed, so use the new atomic iterator macros. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Cc: CK Hu <ck.hu@mediatek.com> Cc: Philipp Zabel <p.zabel@pengutronix.de> Cc: Matthias Brugger <matthias.bgg@gmail.com> Cc: linux-arm-kernel@lists.infradead.org Cc: linux-mediatek@lists.infradead.org --- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)