summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Roper <matthew.d.roper@intel.com>2015-01-21 16:35:40 -0800
committerDave Airlie <airlied@redhat.com>2015-01-27 18:48:53 +1000
commit1da30627fc511a57c9bd23a02c97f0576379f761 (patch)
tree42511d2b9201e96a58e675bb1cdc14d558b1a9f2
parent9e26220286dc79eeeef25de138b144fde3d41a85 (diff)
downloadlinux-1da30627fc511a57c9bd23a02c97f0576379f761.tar.bz2
drm: Add rotation value to plane state
The rotation property is shared by multiple drivers, so it makes sense to store the rotation value (for atomic-converted drivers) in the common plane state so that core code can eventually access it as well. Cc: dri-devel@lists.freedesktop.org Suggested-by: Daniel Vetter <daniel@ffwll.ch> Reviewed-by: Thierry Reding <treding@nvidia.com> Signed-off-by: Matt Roper <matthew.d.roper@intel.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--drivers/gpu/drm/drm_atomic.c2
-rw-r--r--include/drm/drm_crtc.h3
2 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
index af3f3dfdb49f..4c5c9c3899e0 100644
--- a/drivers/gpu/drm/drm_atomic.c
+++ b/drivers/gpu/drm/drm_atomic.c
@@ -387,6 +387,8 @@ int drm_atomic_plane_set_property(struct drm_plane *plane,
state->src_w = val;
} else if (property == config->prop_src_h) {
state->src_h = val;
+ } else if (property == config->rotation_property) {
+ state->rotation = val;
} else if (plane->funcs->atomic_set_property) {
return plane->funcs->atomic_set_property(plane, state,
property, val);
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index ac55ab0dc88b..0ebd9286b332 100644
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -764,6 +764,9 @@ struct drm_plane_state {
uint32_t src_x, src_y;
uint32_t src_h, src_w;
+ /* Plane rotation */
+ unsigned int rotation;
+
struct drm_atomic_state *state;
};