openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Dave Airlie <airlied@redhat.com>
From: Thomas Hellstrom <thellstrom@vmware.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181213130848.3080-1-thellstrom@vmware.com
This commit is contained in:
Dave Airlie 2018-12-14 04:57:39 +10:00
parent d675ba4b9e 0660d8cd83
commit 2a3c83f5fe
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/drm_damage_helper.c
View File

@ -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

2
drivers/gpu/drm/selftests/test-drm_damage_helper.c
View File

@ -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;
} }