diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-08-03 08:40:24 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-08-03 08:40:24 +1000 |
| commit | 586efded6b8beb932e9a356f351b0c681503358f (patch) | |
| tree | 1c9af56fa0d2c70bf93cf5a02429f4b5b7d11007 /drivers/gpu/drm/sti/sti_cursor.c | |
| parent | dfd2e9ab6a7db56a5f5bb55f71485a92613c8e11 (diff) | |
| parent | 2fc4d838aaf2607216eda5ce9dba18fa14422a31 (diff) | |
Merge branch 'generic-zpos-v8' of http://git.linaro.org/people/benjamin.gaignard/kernel into drm-nextdrm-for-v4.8-zpos
Merge generic ZPOS property support, this was backed up behind some other
changes I didn't have a stable branch point for. Now they are merged to Linus
tree this pull is just drm patches.
* 'generic-zpos-v8' of http://git.linaro.org/people/benjamin.gaignard/kernel:
drm: rcar: use generic code for managing zpos plane property
drm/exynos: use generic code for managing zpos plane property
drm: sti: use generic zpos for plane
drm: add generic zpos property
Diffstat (limited to 'drivers/gpu/drm/sti/sti_cursor.c')
| -rw-r--r-- | drivers/gpu/drm/sti/sti_cursor.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/sti/sti_cursor.c b/drivers/gpu/drm/sti/sti_cursor.c index a263bbba4119..3b53f7f2e3fc 100644 --- a/drivers/gpu/drm/sti/sti_cursor.c +++ b/drivers/gpu/drm/sti/sti_cursor.c @@ -349,8 +349,8 @@ struct drm_plane_funcs sti_cursor_plane_helpers_funcs = { .update_plane = drm_atomic_helper_update_plane, .disable_plane = drm_atomic_helper_disable_plane, .destroy = sti_cursor_destroy, - .set_property = sti_plane_set_property, - .reset = drm_atomic_helper_plane_reset, + .set_property = drm_atomic_helper_plane_set_property, + .reset = sti_plane_reset, .atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state, .atomic_destroy_state = drm_atomic_helper_plane_destroy_state, .late_register = sti_cursor_late_register, |