diff options
author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2014-07-08 01:01:51 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-07-11 17:42:45 -0400 |
commit | 06596961966bfeb128bc07f250b68fb9c5f177ef (patch) | |
tree | bd0f499deec68ef3aaed56babd2a132bbbb994e9 | |
parent | 7707df4ad6c73e005098c4b4db2f86494e9d404d (diff) |
drm: Move DRM_ROTATE bits out of omapdrm into drm_crtc.h
The rotation property stuff should be standardized among all drivers.
Move the bits to drm_crtc.h from omap_drv.h.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Imre Deak <imre.deak@intel.com>
Acked-by: Dave Airlie <airlied@linux.ie>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r-- | drivers/gpu/drm/omapdrm/omap_drv.h | 7 | ||||
-rw-r--r-- | include/drm/drm_crtc.h | 8 |
2 files changed, 8 insertions, 7 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.h b/drivers/gpu/drm/omapdrm/omap_drv.h index 284b80fc3c54..b08a450d1b5d 100644 --- a/drivers/gpu/drm/omapdrm/omap_drv.h +++ b/drivers/gpu/drm/omapdrm/omap_drv.h | |||
@@ -119,13 +119,6 @@ struct omap_drm_private { | |||
119 | struct omap_drm_irq error_handler; | 119 | struct omap_drm_irq error_handler; |
120 | }; | 120 | }; |
121 | 121 | ||
122 | /* this should probably be in drm-core to standardize amongst drivers */ | ||
123 | #define DRM_ROTATE_0 0 | ||
124 | #define DRM_ROTATE_90 1 | ||
125 | #define DRM_ROTATE_180 2 | ||
126 | #define DRM_ROTATE_270 3 | ||
127 | #define DRM_REFLECT_X 4 | ||
128 | #define DRM_REFLECT_Y 5 | ||
129 | 122 | ||
130 | #ifdef CONFIG_DEBUG_FS | 123 | #ifdef CONFIG_DEBUG_FS |
131 | int omap_debugfs_init(struct drm_minor *minor); | 124 | int omap_debugfs_init(struct drm_minor *minor); |
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index 4ee7e26a012f..bfc7235a9c0e 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h | |||
@@ -75,6 +75,14 @@ static inline uint64_t I642U64(int64_t val) | |||
75 | return (uint64_t)*((uint64_t *)&val); | 75 | return (uint64_t)*((uint64_t *)&val); |
76 | } | 76 | } |
77 | 77 | ||
78 | /* rotation property bits */ | ||
79 | #define DRM_ROTATE_0 0 | ||
80 | #define DRM_ROTATE_90 1 | ||
81 | #define DRM_ROTATE_180 2 | ||
82 | #define DRM_ROTATE_270 3 | ||
83 | #define DRM_REFLECT_X 4 | ||
84 | #define DRM_REFLECT_Y 5 | ||
85 | |||
78 | enum drm_connector_force { | 86 | enum drm_connector_force { |
79 | DRM_FORCE_UNSPECIFIED, | 87 | DRM_FORCE_UNSPECIFIED, |
80 | DRM_FORCE_OFF, | 88 | DRM_FORCE_OFF, |