| Message ID | 1464818821-5736-7-git-send-email-daniel.vetter@ffwll.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Op 02-06-16 om 00:06 schreef Daniel Vetter: > We want to hide drm_atomic_stat internals a bit better. > > Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > Cc: Tomi Valkeinen <tomi.valkeinen@ti.com> > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > --- > drivers/gpu/drm/omapdrm/omap_drv.c | 11 +++++------ > 1 file changed, 5 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c > index d86f5479345b..4798ba43ff5b 100644 > --- a/drivers/gpu/drm/omapdrm/omap_drv.c > +++ b/drivers/gpu/drm/omapdrm/omap_drv.c > @@ -142,8 +142,9 @@ static int omap_atomic_commit(struct drm_device *dev, > { > struct omap_drm_private *priv = dev->dev_private; > struct omap_atomic_state_commit *commit; > - unsigned int i; > - int ret; > + struct drm_crtc *crtc; > + struct drm_crtc_state *crtc_state; > + int i, ret; > > ret = drm_atomic_helper_prepare_planes(dev, state); > if (ret) > @@ -163,10 +164,8 @@ static int omap_atomic_commit(struct drm_device *dev, > /* Wait until all affected CRTCs have completed previous commits and > * mark them as pending. > */ > - for (i = 0; i < dev->mode_config.num_crtc; ++i) { > - if (state->crtcs[i]) > - commit->crtcs |= 1 << drm_crtc_index(state->crtcs[i]); > - } > + for_each_crtc_in_state(state, crtc, crtc_state, i) > + commit->crtcs |= 1 << drm_crtc_index(crtc); > > wait_event(priv->commit.wait, !omap_atomic_is_pending(priv, commit)); > (again 1 << index -> crtc_mask) Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
On Thu, Jun 02, 2016 at 03:23:18PM +0200, Maarten Lankhorst wrote: > Op 02-06-16 om 00:06 schreef Daniel Vetter: > > We want to hide drm_atomic_stat internals a bit better. > > > > Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > > Cc: Tomi Valkeinen <tomi.valkeinen@ti.com> > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > > --- > > drivers/gpu/drm/omapdrm/omap_drv.c | 11 +++++------ > > 1 file changed, 5 insertions(+), 6 deletions(-) > > > > diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c > > index d86f5479345b..4798ba43ff5b 100644 > > --- a/drivers/gpu/drm/omapdrm/omap_drv.c > > +++ b/drivers/gpu/drm/omapdrm/omap_drv.c > > @@ -142,8 +142,9 @@ static int omap_atomic_commit(struct drm_device *dev, > > { > > struct omap_drm_private *priv = dev->dev_private; > > struct omap_atomic_state_commit *commit; > > - unsigned int i; > > - int ret; > > + struct drm_crtc *crtc; > > + struct drm_crtc_state *crtc_state; > > + int i, ret; > > > > ret = drm_atomic_helper_prepare_planes(dev, state); > > if (ret) > > @@ -163,10 +164,8 @@ static int omap_atomic_commit(struct drm_device *dev, > > /* Wait until all affected CRTCs have completed previous commits and > > * mark them as pending. > > */ > > - for (i = 0; i < dev->mode_config.num_crtc; ++i) { > > - if (state->crtcs[i]) > > - commit->crtcs |= 1 << drm_crtc_index(state->crtcs[i]); > > - } > > + for_each_crtc_in_state(state, crtc, crtc_state, i) > > + commit->crtcs |= 1 << drm_crtc_index(crtc); > > > > wait_event(priv->commit.wait, !omap_atomic_is_pending(priv, commit)); > > > > (again 1 << index -> crtc_mask) > > Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Again fixed up&applied, thanks for the review. -Daniel
Hi Daniel, Thank you for the patch. On Thursday 02 Jun 2016 00:06:29 Daniel Vetter wrote: > We want to hide drm_atomic_stat internals a bit better. > > Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > Cc: Tomi Valkeinen <tomi.valkeinen@ti.com> > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > drivers/gpu/drm/omapdrm/omap_drv.c | 11 +++++------ > 1 file changed, 5 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c > b/drivers/gpu/drm/omapdrm/omap_drv.c index d86f5479345b..4798ba43ff5b > 100644 > --- a/drivers/gpu/drm/omapdrm/omap_drv.c > +++ b/drivers/gpu/drm/omapdrm/omap_drv.c > @@ -142,8 +142,9 @@ static int omap_atomic_commit(struct drm_device *dev, > { > struct omap_drm_private *priv = dev->dev_private; > struct omap_atomic_state_commit *commit; > - unsigned int i; > - int ret; > + struct drm_crtc *crtc; > + struct drm_crtc_state *crtc_state; > + int i, ret; > > ret = drm_atomic_helper_prepare_planes(dev, state); > if (ret) > @@ -163,10 +164,8 @@ static int omap_atomic_commit(struct drm_device *dev, > /* Wait until all affected CRTCs have completed previous commits and > * mark them as pending. > */ > - for (i = 0; i < dev->mode_config.num_crtc; ++i) { > - if (state->crtcs[i]) > - commit->crtcs |= 1 << drm_crtc_index(state->crtcs[i]); > - } > + for_each_crtc_in_state(state, crtc, crtc_state, i) > + commit->crtcs |= 1 << drm_crtc_index(crtc); > > wait_event(priv->commit.wait, !omap_atomic_is_pending(priv, commit));
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c index d86f5479345b..4798ba43ff5b 100644 --- a/drivers/gpu/drm/omapdrm/omap_drv.c +++ b/drivers/gpu/drm/omapdrm/omap_drv.c @@ -142,8 +142,9 @@ static int omap_atomic_commit(struct drm_device *dev, { struct omap_drm_private *priv = dev->dev_private; struct omap_atomic_state_commit *commit; - unsigned int i; - int ret; + struct drm_crtc *crtc; + struct drm_crtc_state *crtc_state; + int i, ret; ret = drm_atomic_helper_prepare_planes(dev, state); if (ret) @@ -163,10 +164,8 @@ static int omap_atomic_commit(struct drm_device *dev, /* Wait until all affected CRTCs have completed previous commits and * mark them as pending. */ - for (i = 0; i < dev->mode_config.num_crtc; ++i) { - if (state->crtcs[i]) - commit->crtcs |= 1 << drm_crtc_index(state->crtcs[i]); - } + for_each_crtc_in_state(state, crtc, crtc_state, i) + commit->crtcs |= 1 << drm_crtc_index(crtc); wait_event(priv->commit.wait, !omap_atomic_is_pending(priv, commit));
We want to hide drm_atomic_stat internals a bit better. Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Cc: Tomi Valkeinen <tomi.valkeinen@ti.com> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> --- drivers/gpu/drm/omapdrm/omap_drv.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)