Skip to content

Commit

Permalink
drm: Clarify the role of plane_state argument to drm_simple update().
Browse files Browse the repository at this point in the history
Like the atomic update hook it's wrapping, the plane_state is the old
one, and the new one is in plane->state.  Both msxfb and tinydrm use
it correctly, but I mistook it for the new state in pl111 due to its
naming.

Signed-off-by: Eric Anholt <eric@anholt.net>
Link: http://patchwork.freedesktop.org/patch/msgid/20170320233615.5242-3-eric@anholt.net
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  • Loading branch information
Eric Anholt committed Mar 30, 2017
1 parent 031e589 commit bcd2ba0
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions drivers/gpu/drm/drm_simple_kms_helper.c
Original file line number Diff line number Diff line change
Expand Up @@ -114,15 +114,15 @@ static int drm_simple_kms_plane_atomic_check(struct drm_plane *plane,
}

static void drm_simple_kms_plane_atomic_update(struct drm_plane *plane,
struct drm_plane_state *pstate)
struct drm_plane_state *old_pstate)
{
struct drm_simple_display_pipe *pipe;

pipe = container_of(plane, struct drm_simple_display_pipe, plane);
if (!pipe->funcs || !pipe->funcs->update)
return;

pipe->funcs->update(pipe, pstate);
pipe->funcs->update(pipe, old_pstate);
}

static int drm_simple_kms_plane_prepare_fb(struct drm_plane *plane,
Expand Down
2 changes: 1 addition & 1 deletion include/drm/drm_simple_kms_helper.h
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ struct drm_simple_display_pipe_funcs {
* the hardware lacks vblank support entirely.
*/
void (*update)(struct drm_simple_display_pipe *pipe,
struct drm_plane_state *plane_state);
struct drm_plane_state *old_plane_state);

/**
* @prepare_fb:
Expand Down

0 comments on commit bcd2ba0

Please sign in to comment.