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/drm_atomic.c | |
| parent | dfd2e9ab6a7db56a5f5bb55f71485a92613c8e11 (diff) | |
| parent | 2fc4d838aaf2607216eda5ce9dba18fa14422a31 (diff) | |
| download | linux-586efded6b8beb932e9a356f351b0c681503358f.tar.gz linux-586efded6b8beb932e9a356f351b0c681503358f.tar.xz | |
Merge branch 'generic-zpos-v8' of http://git.linaro.org/people/benjamin.gaignard/kernel into drm-next
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/drm_atomic.c')
| -rw-r--r-- | drivers/gpu/drm/drm_atomic.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index 8d2f111fa113..fa3930757972 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c @@ -711,6 +711,8 @@ int drm_atomic_plane_set_property(struct drm_plane *plane, state->src_h = val; } else if (property == config->rotation_property) { state->rotation = val; + } else if (property == plane->zpos_property) { + state->zpos = val; } else if (plane->funcs->atomic_set_property) { return plane->funcs->atomic_set_property(plane, state, property, val); @@ -767,6 +769,8 @@ drm_atomic_plane_get_property(struct drm_plane *plane, *val = state->src_h; } else if (property == config->rotation_property) { *val = state->rotation; + } else if (property == plane->zpos_property) { + *val = state->zpos; } else if (plane->funcs->atomic_get_property) { return plane->funcs->atomic_get_property(plane, state, property, val); } else { |