Commit 2a3c83f5 authored by Dave Airlie's avatar Dave Airlie

Merge tag 'vmwgfx-next-2018-12-13' of git://people.freedesktop.org/~thomash/linux into drm-next

Pull request of 2018-12-13

Two minor fixes for next pull.
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Thomas Hellstrom <thellstrom@vmware.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181213130848.3080-1-thellstrom@vmware.com
parents d675ba4b 0660d8cd
...@@ -250,7 +250,7 @@ EXPORT_SYMBOL(drm_atomic_helper_dirtyfb); ...@@ -250,7 +250,7 @@ EXPORT_SYMBOL(drm_atomic_helper_dirtyfb);
* drm_atomic_helper_damage_iter_init - Initialize the damage iterator. * drm_atomic_helper_damage_iter_init - Initialize the damage iterator.
* @iter: The iterator to initialize. * @iter: The iterator to initialize.
* @old_state: Old plane state for validation. * @old_state: Old plane state for validation.
* @new_state: Plane state from which to iterate the damage clips. * @state: Plane state from which to iterate the damage clips.
* *
* Initialize an iterator, which clips plane damage * Initialize an iterator, which clips plane damage
* &drm_plane_state.fb_damage_clips to plane &drm_plane_state.src. This iterator * &drm_plane_state.fb_damage_clips to plane &drm_plane_state.src. This iterator
......
...@@ -53,7 +53,7 @@ static bool check_damage_clip(struct drm_plane_state *state, struct drm_rect *r, ...@@ -53,7 +53,7 @@ static bool check_damage_clip(struct drm_plane_state *state, struct drm_rect *r,
int src_y2 = (state->src.y2 >> 16) + !!(state->src.y2 & 0xFFFF); int src_y2 = (state->src.y2 >> 16) + !!(state->src.y2 & 0xFFFF);
if (x1 >= x2 || y1 >= y2) { if (x1 >= x2 || y1 >= y2) {
pr_err("Cannot have damage clip with no dimention.\n"); pr_err("Cannot have damage clip with no dimension.\n");
return false; return false;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment