| Message ID | 1416418691-24747-6-git-send-email-daniel.vetter@ffwll.ch (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Wed, Nov 19, 2014 at 12:38 PM, Daniel Vetter <daniel.vetter@ffwll.ch> wrote: > Oversight from my kerneldoc cleanup when doing the original atomic > helper series - I've only applied this clarification to the modeset > related helpers, and not the plane update code. Remedy this asap. > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Reviewed-by: Rob Clark <robdclark@gmail.com> > --- > drivers/gpu/drm/drm_atomic_helper.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c > index 99095ef147ef..690360038dc1 100644 > --- a/drivers/gpu/drm/drm_atomic_helper.c > +++ b/drivers/gpu/drm/drm_atomic_helper.c > @@ -976,18 +976,18 @@ EXPORT_SYMBOL(drm_atomic_helper_prepare_planes); > /** > * drm_atomic_helper_commit_planes - commit plane state > * @dev: DRM device > - * @state: atomic state > + * @old_state: atomic state object with old state structures > * > * This function commits the new plane state using the plane and atomic helper > * functions for planes and crtcs. It assumes that the atomic state has already > * been pushed into the relevant object state pointers, since this step can no > * longer fail. > * > - * It still requires the global state object @state to know which planes and > + * It still requires the global state object @old_state to know which planes and > * crtcs need to be updated though. > */ > void drm_atomic_helper_commit_planes(struct drm_device *dev, > - struct drm_atomic_state *state) > + struct drm_atomic_state *old_state) > { > int nplanes = dev->mode_config.num_total_plane; > int ncrtcs = dev->mode_config.num_crtc; > @@ -995,7 +995,7 @@ void drm_atomic_helper_commit_planes(struct drm_device *dev, > > for (i = 0; i < ncrtcs; i++) { > struct drm_crtc_helper_funcs *funcs; > - struct drm_crtc *crtc = state->crtcs[i]; > + struct drm_crtc *crtc = old_state->crtcs[i]; > > if (!crtc) > continue; > @@ -1010,7 +1010,7 @@ void drm_atomic_helper_commit_planes(struct drm_device *dev, > > for (i = 0; i < nplanes; i++) { > struct drm_plane_helper_funcs *funcs; > - struct drm_plane *plane = state->planes[i]; > + struct drm_plane *plane = old_state->planes[i]; > > if (!plane) > continue; > @@ -1025,7 +1025,7 @@ void drm_atomic_helper_commit_planes(struct drm_device *dev, > > for (i = 0; i < ncrtcs; i++) { > struct drm_crtc_helper_funcs *funcs; > - struct drm_crtc *crtc = state->crtcs[i]; > + struct drm_crtc *crtc = old_state->crtcs[i]; > > if (!crtc) > continue; > -- > 2.1.1 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel
On Wed, Nov 19, 2014 at 03:29:30PM -0500, Rob Clark wrote: > On Wed, Nov 19, 2014 at 12:38 PM, Daniel Vetter <daniel.vetter@ffwll.ch> wrote: > > Oversight from my kerneldoc cleanup when doing the original atomic > > helper series - I've only applied this clarification to the modeset > > related helpers, and not the plane update code. Remedy this asap. > > > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > > Reviewed-by: Rob Clark <robdclark@gmail.com> Thanks for the review. I've pulled them into my drm patch pile branch and will send a pull request to Dave in a few days. Cheers, Daniel
diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index 99095ef147ef..690360038dc1 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -976,18 +976,18 @@ EXPORT_SYMBOL(drm_atomic_helper_prepare_planes); /** * drm_atomic_helper_commit_planes - commit plane state * @dev: DRM device - * @state: atomic state + * @old_state: atomic state object with old state structures * * This function commits the new plane state using the plane and atomic helper * functions for planes and crtcs. It assumes that the atomic state has already * been pushed into the relevant object state pointers, since this step can no * longer fail. * - * It still requires the global state object @state to know which planes and + * It still requires the global state object @old_state to know which planes and * crtcs need to be updated though. */ void drm_atomic_helper_commit_planes(struct drm_device *dev, - struct drm_atomic_state *state) + struct drm_atomic_state *old_state) { int nplanes = dev->mode_config.num_total_plane; int ncrtcs = dev->mode_config.num_crtc; @@ -995,7 +995,7 @@ void drm_atomic_helper_commit_planes(struct drm_device *dev, for (i = 0; i < ncrtcs; i++) { struct drm_crtc_helper_funcs *funcs; - struct drm_crtc *crtc = state->crtcs[i]; + struct drm_crtc *crtc = old_state->crtcs[i]; if (!crtc) continue; @@ -1010,7 +1010,7 @@ void drm_atomic_helper_commit_planes(struct drm_device *dev, for (i = 0; i < nplanes; i++) { struct drm_plane_helper_funcs *funcs; - struct drm_plane *plane = state->planes[i]; + struct drm_plane *plane = old_state->planes[i]; if (!plane) continue; @@ -1025,7 +1025,7 @@ void drm_atomic_helper_commit_planes(struct drm_device *dev, for (i = 0; i < ncrtcs; i++) { struct drm_crtc_helper_funcs *funcs; - struct drm_crtc *crtc = state->crtcs[i]; + struct drm_crtc *crtc = old_state->crtcs[i]; if (!crtc) continue;
Oversight from my kerneldoc cleanup when doing the original atomic helper series - I've only applied this clarification to the modeset related helpers, and not the plane update code. Remedy this asap. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> --- drivers/gpu/drm/drm_atomic_helper.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)