aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTvrtko Ursulin <tvrtko.ursulin@intel.com>2015-02-26 08:49:18 -0500
committerDaniel Vetter <daniel.vetter@ffwll.ch>2015-03-10 04:59:33 -0400
commitaaed1aa540acc6dde7dbba3307c98e697763ec1a (patch)
treeb6a0706ceb2fe5909f53c62ce93f05617deac5d6
parent4cda09ca5978f58866d41866bb9a92a7b631b782 (diff)
drm/i915: Rotation property is now handled in DRM core
So no need to have code which never gets called in the driver. Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Cc: Matt Roper <matthew.d.roper@intel.com> Cc: dri-devel@lists.freedesktop.org Reviewed-by: Matt Roper <matthew.d.roper@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--drivers/gpu/drm/i915/intel_atomic_plane.c24
1 files changed, 4 insertions, 20 deletions
diff --git a/drivers/gpu/drm/i915/intel_atomic_plane.c b/drivers/gpu/drm/i915/intel_atomic_plane.c
index 9e6f727dfd19..976b89156570 100644
--- a/drivers/gpu/drm/i915/intel_atomic_plane.c
+++ b/drivers/gpu/drm/i915/intel_atomic_plane.c
@@ -203,16 +203,8 @@ intel_plane_atomic_get_property(struct drm_plane *plane,
203 struct drm_property *property, 203 struct drm_property *property,
204 uint64_t *val) 204 uint64_t *val)
205{ 205{
206 struct drm_mode_config *config = &plane->dev->mode_config; 206 DRM_DEBUG_KMS("Unknown plane property '%s'\n", property->name);
207 207 return -EINVAL;
208 if (property == config->rotation_property) {
209 *val = state->rotation;
210 } else {
211 DRM_DEBUG_KMS("Unknown plane property '%s'\n", property->name);
212 return -EINVAL;
213 }
214
215 return 0;
216} 208}
217 209
218/** 210/**
@@ -233,14 +225,6 @@ intel_plane_atomic_set_property(struct drm_plane *plane,
233 struct drm_property *property, 225 struct drm_property *property,
234 uint64_t val) 226 uint64_t val)
235{ 227{
236 struct drm_mode_config *config = &plane->dev->mode_config; 228 DRM_DEBUG_KMS("Unknown plane property '%s'\n", property->name);
237 229 return -EINVAL;
238 if (property == config->rotation_property) {
239 state->rotation = val;
240 } else {
241 DRM_DEBUG_KMS("Unknown plane property '%s'\n", property->name);
242 return -EINVAL;
243 }
244
245 return 0;
246} 230}