Skip to content

Commit

Permalink
drm/atomic_helper: Make it clear that commit_planes gets the old state
Browse files Browse the repository at this point in the history
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>
Signed-off-by: Dave Airlie <airlied@redhat.com>
  • Loading branch information
Daniel Vetter authored and Dave Airlie committed Nov 20, 2014
1 parent 3758b34 commit b0fcfc8
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions drivers/gpu/drm/drm_atomic_helper.c
Original file line number Diff line number Diff line change
Expand Up @@ -976,26 +976,26 @@ 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;
int i;

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;
Expand All @@ -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;
Expand All @@ -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;
Expand Down

0 comments on commit b0fcfc8

Please sign in to comment.