diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-12-14 04:57:39 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-12-14 04:57:45 +1000 |
| commit | 2a3c83f5fe0770d13bbb71b23674886ff4111f44 (patch) | |
| tree | 0f8fa8be16325d4acfbbe9e92e77c797a65581e2 | |
| parent | d675ba4b9e6ccd782e4db9109cbab708a85b8ff8 (diff) | |
| parent | 0660d8cd83938ef5cc91582fe6f951e8935f2d0f (diff) | |
Merge tag 'vmwgfx-next-2018-12-13' of git://people.freedesktop.org/~thomash/linux into drm-nextdrm-next-2018-12-14
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
| -rw-r--r-- | drivers/gpu/drm/drm_damage_helper.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/selftests/test-drm_damage_helper.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_damage_helper.c b/drivers/gpu/drm/drm_damage_helper.c index 05c8e7267165..d2a1c7372f36 100644 --- a/drivers/gpu/drm/drm_damage_helper.c +++ b/drivers/gpu/drm/drm_damage_helper.c @@ -250,7 +250,7 @@ EXPORT_SYMBOL(drm_atomic_helper_dirtyfb); * drm_atomic_helper_damage_iter_init - Initialize the damage iterator. * @iter: The iterator to initialize. * @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 * &drm_plane_state.fb_damage_clips to plane &drm_plane_state.src. This iterator diff --git a/drivers/gpu/drm/selftests/test-drm_damage_helper.c b/drivers/gpu/drm/selftests/test-drm_damage_helper.c index a2f753205a3e..9d2bcdf8bc29 100644 --- a/drivers/gpu/drm/selftests/test-drm_damage_helper.c +++ b/drivers/gpu/drm/selftests/test-drm_damage_helper.c @@ -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); 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; } |