Support for 180 degree HW rotation
Subsystems (4)
cover Support for 180 degree HW rotation
From: Sonika Jindal <[email protected]>
Enables 180 degree rotation for sprite and primary planes. Updated the primary plane rotation support as per the new universal plane design.
Most of these patches were already reviewed in intel-gfx in February 2014 thats why there is version history in few of them.
Testcase: kms_rotation_crc
This igt can be extended for clipped rotation cases. Right it only tests 180 degree rotation for sprite and primary plane with crc check.
Sonika Jindal (1):
drm/i915: Add 180 degree primary plane rotation support
Ville Syrjälä (9):
drm: Move DRM_ROTATE bits out of omapdrm into drm_crtc.h
drm: Add support_bits parameter to drm_property_create_bitmask()
drm: Add drm_mode_create_rotation_property()
drm/omap: Switch omapdrm over to drm_mode_create_rotation_property()
drm: Add drm_rect rotation functions
drm: Add drm_rotation_simplify()
drm/i915: Add 180 degree sprite rotation support drm/i915: Make intel_plane_restore() return an error drm/i915: Add rotation property for sprites
drivers/gpu/drm/drm_crtc.c | 66 +++++++++++++++- drivers/gpu/drm/drm_rect.c | 140 ++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/i915_dma.c | 17 +++++ drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/i915_reg.h | 4 + drivers/gpu/drm/i915/intel_display.c | 91 +++++++++++++++++++++- drivers/gpu/drm/i915/intel_drv.h | 3 +- drivers/gpu/drm/i915/intel_pm.c | 8 ++ drivers/gpu/drm/i915/intel_sprite.c | 93 ++++++++++++++++++++-- drivers/gpu/drm/omapdrm/omap_drv.h | 7 -- drivers/gpu/drm/omapdrm/omap_plane.c | 17 ++--- include/drm/drm_crtc.h | 15 +++- include/drm/drm_rect.h | 6 ++ 13 files changed, 433 insertions(+), 35 deletions(-)
Signature · 6 lines
1.7.10.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/10 drm: Move DRM_ROTATE bits out of omapdrm into drm_crtc.h
From: Ville Syrjälä <ville.syrjala at linux.intel.com>
The rotation property stuff should be standardized among all drivers. Move the bits to drm_crtc.h from omap_drv.h.
--- drivers/gpu/drm/omapdrm/omap_drv.h | 7 ------- include/drm/drm_crtc.h | 8 ++++++++ 2 files changed, 8 insertions(+), 7 deletions(-)
drivers/gpu/drm/omapdrm/omap_drv.h +0 -7
@@ -119,13 +119,6 @@ struct omap_drm_private {struct omap_drm_irq error_handler; }; -/* this should probably be in drm-core to standardize amongst drivers */ -#define DRM_ROTATE_0 0 -#define DRM_ROTATE_90 1 -#define DRM_ROTATE_180 2 -#define DRM_ROTATE_270 3 -#define DRM_REFLECT_X 4 -#define DRM_REFLECT_Y 5#ifdef CONFIG_DEBUG_FS int omap_debugfs_init (struct drm_minor *minor);
include/drm/drm_crtc.h +8 -0
@@ -75,6 +75,14 @@ static inline uint64_t I642U64(int64_t val)return (uint64_t )*((uint64_t *)&val); } +/* rotation property bits */ +#define DRM_ROTATE_0 0 +#define DRM_ROTATE_90 1 +#define DRM_ROTATE_180 2 +#define DRM_ROTATE_270 3 +#define DRM_REFLECT_X 4 +#define DRM_REFLECT_Y 5 +enum drm_connector_force {DRM_FORCE_UNSPECIFIED ,DRM_FORCE_OFF ,
Signature · 6 lines
1.7.10.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/10 drm: Add support_bits parameter to drm_property_create_bitmask()
In reply to [email protected]From: Ville Syrjälä <ville.syrjala at linux.intel.com>
Make drm_property_create_bitmask() a bit more generic by allowing the caller to specify which bits are in fact supported. This allows multiple callers to use the same enum list, but still create different versions of the same property with different list of supported bits.
v2: Populate values[] array as non-sparse
Make supported_bits 64bit
Fix up omapdrm call site (Rob)
--- drivers/gpu/drm/drm_crtc.c | 17 +++++++++++++---- drivers/gpu/drm/omapdrm/omap_plane.c | 5 ++++- include/drm/drm_crtc.h | 3 ++- 3 files changed, 19 insertions(+), 6 deletions(-)
drivers/gpu/drm/drm_crtc.c +13 -4
@@ -3395,19 +3395,28 @@ EXPORT_SYMBOL(drm_property_create_enum);struct drm_property *drm_property_create_bitmask (struct drm_device *dev,int flags,const char *name,const struct drm_prop_enum_list *props, -int num_values) +int num_props, +uint64_t supported_bits) {struct drm_property *property; -int i, ret; +int i, ret, index =0 ; +int num_values =hweight64 (supported_bits); flags |=DRM_MODE_PROP_BITMASK ; property =drm_property_create (dev, flags, name, num_values);if (!property)return NULL ; +for (i =0 ; i < num_props; i++) { +if (!(supported_bits & (1ULL << props[i].type))) +continue ; -for (i =0 ; i < num_values; i++) { - ret =drm_property_add_enum (property, i, +if (WARN_ON (index >= num_values)) { +drm_property_destroy (dev, property); +return NULL ; + } + + ret =drm_property_add_enum (property, index++, props[i].type, props[i].name);if (ret) {
drivers/gpu/drm/omapdrm/omap_plane.c +4 -1
@@ -317,7 +317,10 @@ void omap_plane_install_properties(struct drm_plane *plane, { DRM_REFLECT_Y, "reflect-y" }, }; prop =drm_property_create_bitmask (dev,0 ,"rotation" , - props,ARRAY_SIZE (props)); + props,ARRAY_SIZE (props), +BIT (DRM_ROTATE_0 ) |BIT (DRM_ROTATE_90 ) | +BIT (DRM_ROTATE_180 ) |BIT (DRM_ROTATE_270 ) | +BIT (DRM_REFLECT_X ) |BIT (DRM_REFLECT_Y ));if (prop ==NULL )return ; priv->rotation_prop = prop;
include/drm/drm_crtc.h +2 -1
@@ -1006,7 +1006,8 @@ extern struct drm_property *drm_property_create_enum(struct drm_device *dev, intstruct drm_property *drm_property_create_bitmask (struct drm_device *dev,int flags,const char *name,const struct drm_prop_enum_list *props, -int num_values); +int num_props, +uint64_t supported_bits);struct drm_property *drm_property_create_range (struct drm_device *dev,int flags,const char *name,uint64_t min,uint64_t max);
Signature · 6 lines
1.7.10.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/10 drm: Add drm_mode_create_rotation_property()
In reply to [email protected]From: Ville Syrjälä <ville.syrjala at linux.intel.com>
Add a function to create a standards compliant rotation property.
--- drivers/gpu/drm/drm_crtc.c | 18 ++++++++++++++++++ include/drm/drm_crtc.h | 2 ++ 2 files changed, 20 insertions(+)
drivers/gpu/drm/drm_crtc.c +18 -0
@@ -4959,3 +4959,21 @@ void drm_mode_config_cleanup(struct drm_device *dev)drm_modeset_lock_fini (&dev->mode_config.connection_mutex); }EXPORT_SYMBOL (drm_mode_config_cleanup); + +struct drm_property *drm_mode_create_rotation_property (struct drm_device *dev, +unsigned int supported_rotations) +{ +static const struct drm_prop_enum_list props[] = { + {DRM_ROTATE_0 ,"rotate-0" }, + {DRM_ROTATE_90 ,"rotate-90" }, + {DRM_ROTATE_180 ,"rotate-180" }, + {DRM_ROTATE_270 ,"rotate-270" }, + {DRM_REFLECT_X ,"reflect-x" }, + {DRM_REFLECT_Y ,"reflect-y" }, + }; + +return drm_property_create_bitmask (dev,0 ,"rotation" , + props,ARRAY_SIZE (props), + supported_rotations); +} +EXPORT_SYMBOL (drm_mode_create_rotation_property);
include/drm/drm_crtc.h +2 -0
@@ -1113,6 +1113,8 @@ extern int drm_format_plane_cpp(uint32_t format, int plane);extern int drm_format_horz_chroma_subsampling (uint32_t format);extern int drm_format_vert_chroma_subsampling (uint32_t format);extern const char *drm_get_format_name (uint32_t format); +extern struct drm_property *drm_mode_create_rotation_property (struct drm_device *dev, +unsigned int supported_rotations);/* Helpers */
Signature · 6 lines
1.7.10.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 4/10 drm/omap: Switch omapdrm over to drm_mode_create_rotation_property()
In reply to [email protected]From: Ville Syrjälä <ville.syrjala at linux.intel.com>
Use the new drm_mode_create_rotation_property() in omapdrm.
--- drivers/gpu/drm/omapdrm/omap_plane.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-)
drivers/gpu/drm/omapdrm/omap_plane.c +7 -13
@@ -308,19 +308,13 @@ void omap_plane_install_properties(struct drm_plane *plane,if (priv->has_dmm) { prop = priv->rotation_prop;if (!prop) { -const struct drm_prop_enum_list props[] = { - {DRM_ROTATE_0 ,"rotate-0" }, - {DRM_ROTATE_90 ,"rotate-90" }, - {DRM_ROTATE_180 ,"rotate-180" }, - {DRM_ROTATE_270 ,"rotate-270" }, - {DRM_REFLECT_X ,"reflect-x" }, - {DRM_REFLECT_Y ,"reflect-y" }, - }; - prop =drm_property_create_bitmask (dev,0 ,"rotation" , - props,ARRAY_SIZE (props), -BIT (DRM_ROTATE_0 ) |BIT (DRM_ROTATE_90 ) | -BIT (DRM_ROTATE_180 ) |BIT (DRM_ROTATE_270 ) | -BIT (DRM_REFLECT_X ) |BIT (DRM_REFLECT_Y )); + prop =drm_mode_create_rotation_property (dev, +BIT (DRM_ROTATE_0 ) | +BIT (DRM_ROTATE_90 ) | +BIT (DRM_ROTATE_180 ) | +BIT (DRM_ROTATE_270 ) | +BIT (DRM_REFLECT_X ) | +BIT (DRM_REFLECT_Y ));if (prop ==NULL )return ; priv->rotation_prop = prop;
Signature · 6 lines
1.7.10.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 5/10 drm: Add drm_rect rotation functions
In reply to [email protected]From: Ville Syrjälä <ville.syrjala at linux.intel.com>
Add some helper functions to move drm_rects between different rotated coordinate spaces. One function does the forward transform and another does the inverse.
--- drivers/gpu/drm/drm_rect.c | 140 ++++++++++++++++++++++++++++++++++++++++++++ include/drm/drm_rect.h | 6 ++ 2 files changed, 146 insertions(+)
drivers/gpu/drm/drm_rect.c +140 -0
@@ -293,3 +293,143 @@ void drm_rect_debug_print(const struct drm_rect *r, bool fixed_point)DRM_DEBUG_KMS ("%dx%d%+d%+d\n" , w, h, r->x1, r->y1); }EXPORT_SYMBOL (drm_rect_debug_print); + +/** +* drm_rect_rotate - Rotate the rectangle +* @r: rectangle to be rotated +* @width: Width of the coordinate space +* @height: Height of the coordinate space +* @rotation: Transformation to be applied +* +* Apply @rotation to the coordinates of rectangle @r. +* +* @width and @height combined with @rotation define +* the location of the new origin. +* +* @width correcsponds to the horizontal and @height +* to the vertical axis of the untransformed coordinate +* space. +*/ +void drm_rect_rotate (struct drm_rect *r, +int width,int height, +unsigned int rotation) +{ +struct drm_rect tmp; + +if (rotation & (BIT (DRM_REFLECT_X ) |BIT (DRM_REFLECT_Y ))) { + tmp = *r; + +if (rotation &BIT (DRM_REFLECT_X )) { + r->x1 = width - tmp.x2; + r->x2 = width - tmp.x1; + } + +if (rotation &BIT (DRM_REFLECT_Y )) { + r->y1 = height - tmp.y2; + r->y2 = height - tmp.y1; + } + } + +switch (rotation &0xf ) { +case BIT (DRM_ROTATE_0 ): +break ; +case BIT (DRM_ROTATE_90 ): + tmp = *r; + r->x1 = tmp.y1; + r->x2 = tmp.y2; + r->y1 = width - tmp.x2; + r->y2 = width - tmp.x1; +break ; +case BIT (DRM_ROTATE_180 ): + tmp = *r; + r->x1 = width - tmp.x2; + r->x2 = width - tmp.x1; + r->y1 = height - tmp.y2; + r->y2 = height - tmp.y1; +break ; +case BIT (DRM_ROTATE_270 ): + tmp = *r; + r->x1 = height - tmp.y2; + r->x2 = height - tmp.y1; + r->y1 = tmp.x1; + r->y2 = tmp.x2; +break ; +default : +break ; + } +} +EXPORT_SYMBOL (drm_rect_rotate); + +/** +* drm_rect_rotate_inv - Inverse rotate the rectangle +* @r: rectangle to be rotated +* @width: Width of the coordinate space +* @height: Height of the coordinate space +* @rotation: Transformation whose inverse is to be applied +* +* Apply the inverse of @rotation to the coordinates +* of rectangle @r. +* +* @width and @height combined with @rotation define +* the location of the new origin. +* +* @width correcsponds to the horizontal and @height +* to the vertical axis of the original untransformed +* coordinate space, so that you never have to flip +* them when doing a rotatation and its inverse. +* That is, if you do: +* +* drm_rotate(&r, width, height, rotation); +* drm_rotate_inv(&r, width, height, rotation); +* +* you will always get back the original rectangle. +*/ +void drm_rect_rotate_inv (struct drm_rect *r, +int width,int height, +unsigned int rotation) +{ +struct drm_rect tmp; + +switch (rotation &0xf ) { +case BIT (DRM_ROTATE_0 ): +break ; +case BIT (DRM_ROTATE_90 ): + tmp = *r; + r->x1 = width - tmp.y2; + r->x2 = width - tmp.y1; + r->y1 = tmp.x1; + r->y2 = tmp.x2; +break ; +case BIT (DRM_ROTATE_180 ): + tmp = *r; + r->x1 = width - tmp.x2; + r->x2 = width - tmp.x1; + r->y1 = height - tmp.y2; + r->y2 = height - tmp.y1; +break ; +case BIT (DRM_ROTATE_270 ): + tmp = *r; + r->x1 = tmp.y1; + r->x2 = tmp.y2; + r->y1 = height - tmp.x2; + r->y2 = height - tmp.x1; +break ; +default : +break ; + } + +if (rotation & (BIT (DRM_REFLECT_X ) |BIT (DRM_REFLECT_Y ))) { + tmp = *r; + +if (rotation &BIT (DRM_REFLECT_X )) { + r->x1 = width - tmp.x2; + r->x2 = width - tmp.x1; + } + +if (rotation &BIT (DRM_REFLECT_Y )) { + r->y1 = height - tmp.y2; + r->y2 = height - tmp.y1; + } + } +} +EXPORT_SYMBOL (drm_rect_rotate_inv);
include/drm/drm_rect.h +6 -0
@@ -163,5 +163,11 @@ int drm_rect_calc_vscale_relaxed(struct drm_rect *src,struct drm_rect *dst, int min_vscale, int max_vscale);void drm_rect_debug_print (const struct drm_rect *r,bool fixed_point); +void drm_rect_rotate (struct drm_rect *r, +int width,int height, +unsigned int rotation); +void drm_rect_rotate_inv (struct drm_rect *r, +int width,int height, +unsigned int rotation);#endif
Signature · 6 lines
1.7.10.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 6/10 drm: Add drm_rotation_simplify()
In reply to [email protected]From: Ville Syrjälä <ville.syrjala at linux.intel.com>
drm_rotation_simplify() can be used to eliminate unsupported rotation flags. It will check if any unsupported flags are present, and if so it will modify the rotation to an alternate form by adding 180 degrees to rotation angle, and flipping the reflect x and y bits. The hope is that this identity transform will eliminate the unsupported flags.
Of course that might not result in any more supported rotation, so the caller is still responsible for checking the result afterwards.
--- drivers/gpu/drm/drm_crtc.c | 30 ++++++++++++++++++++++++++++++ include/drm/drm_crtc.h | 2 ++ 2 files changed, 32 insertions(+)
drivers/gpu/drm/drm_crtc.c +30 -0
@@ -4842,6 +4842,36 @@ int drm_format_vert_chroma_subsampling(uint32_t format)EXPORT_SYMBOL (drm_format_vert_chroma_subsampling);/** +* drm_rotation_simplify() - Try to simplify the rotation +* @rotation: Rotation to be simplified +* @supported_rotations: Supported rotations +* +* Attempt to simplify the rotation to a form that is supported. +* Eg. if the hardware supports everything except DRM_REFLECT_X +* one could call this function like this: +* +* drm_rotation_simplify(rotation, BIT(DRM_ROTATE_0) | +* BIT(DRM_ROTATE_90) | BIT(DRM_ROTATE_180) | +* BIT(DRM_ROTATE_270) | BIT(DRM_REFLECT_Y)); +* +* to eliminate the DRM_ROTATE_X flag. Depending on what kind of +* transforms the hardware supports, this function may not +* be able to produce a supported transform, so the caller should +* check the result afterwards. +*/ +unsigned int drm_rotation_simplify (unsigned int rotation, +unsigned int supported_rotations) +{ +if (rotation & ~supported_rotations) { + rotation ^=BIT (DRM_REFLECT_X ) |BIT (DRM_REFLECT_Y ); + rotation = (rotation & ~0xf ) |BIT ((ffs (rotation &0xf ) +1 ) %4 ); + } + +return rotation; +} +EXPORT_SYMBOL (drm_rotation_simplify); + +/** * drm_mode_config_init - initialize DRM mode_configuration structure * @dev: DRM device *
include/drm/drm_crtc.h +2 -0
@@ -1115,6 +1115,8 @@ extern int drm_format_vert_chroma_subsampling(uint32_t format);extern const char *drm_get_format_name (uint32_t format);extern struct drm_property *drm_mode_create_rotation_property (struct drm_device *dev,unsigned int supported_rotations); +extern unsigned int drm_rotation_simplify (unsigned int rotation, +unsigned int supported_rotations);/* Helpers */
Signature · 6 lines
1.7.10.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 7/10 drm/i915: Add 180 degree sprite rotation support
In reply to [email protected]From: Ville Syrjälä <ville.syrjala at linux.intel.com>
The sprite planes (in fact all display planes starting from gen4) support 180 degree rotation. Add the relevant low level bits to the sprite code to make use of that feature.
The upper layers are not yet plugged in.
v2: HSW handles the rotated buffer offset automagically
v3: BDW also handles the rotated buffer offset automagically
Testcase: igt/kms_rotation_crc
--- drivers/gpu/drm/i915/i915_reg.h | 3 +++ drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_sprite.c | 37 +++++++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +3 -0
@@ -4171,6 +4171,7 @@ enum punit_power_well {#define DVS_YUV_ORDER_UYVY (1<<16)#define DVS_YUV_ORDER_YVYU (2<<16)#define DVS_YUV_ORDER_VYUY (3<<16) +#define DVS_ROTATE_180 (1<<15)#define DVS_DEST_KEY (1<<2)#define DVS_TRICKLE_FEED_DISABLE (1<<14)#define DVS_TILED (1<<10)
@@ -4241,6 +4242,7 @@ enum punit_power_well {#define SPRITE_YUV_ORDER_UYVY (1<<16)#define SPRITE_YUV_ORDER_YVYU (2<<16)#define SPRITE_YUV_ORDER_VYUY (3<<16) +#define SPRITE_ROTATE_180 (1<<15)#define SPRITE_TRICKLE_FEED_DISABLE (1<<14)#define SPRITE_INT_GAMMA_ENABLE (1<<13)#define SPRITE_TILED (1<<10)
@@ -4314,6 +4316,7 @@ enum punit_power_well {#define SP_YUV_ORDER_UYVY (1<<16)#define SP_YUV_ORDER_YVYU (2<<16)#define SP_YUV_ORDER_VYUY (3<<16) +#define SP_ROTATE_180 (1<<15)#define SP_TILED (1<<10)#define _SPALINOFF (VLV_DISPLAY_BASE + 0x72184)#define _SPASTRIDE (VLV_DISPLAY_BASE + 0x72188)
drivers/gpu/drm/i915/intel_drv.h +1 -0
@@ -437,6 +437,7 @@ struct intel_plane {unsigned int crtc_w, crtc_h;uint32_t src_x, src_y;uint32_t src_w, src_h; +unsigned int rotation;/* Since we need to change the watermarks before/after * enabling/disabling the planes, we need to store the parameters here
drivers/gpu/drm/i915/intel_sprite.c +37 -0
@@ -163,6 +163,7 @@ vlv_update_plane(struct drm_plane *dplane, struct drm_crtc *crtc, sprctl &= ~SP_PIXFORMAT_MASK ; sprctl &= ~SP_YUV_BYTE_ORDER_MASK ; sprctl &= ~SP_TILED ; + sprctl &= ~SP_ROTATE_180 ;switch (fb->pixel_format) {case DRM_FORMAT_YUYV :
@@ -234,6 +235,14 @@ vlv_update_plane(struct drm_plane *dplane, struct drm_crtc *crtc, fb->pitches[0]); linear_offset -= sprsurf_offset; +if (intel_plane->rotation ==BIT (DRM_ROTATE_180 )) { + sprctl |=SP_ROTATE_180 ; + + x += src_w; + y += src_h; + linear_offset += src_h * fb->pitches[0 ] + src_w * pixel_size; + } + atomic_update =intel_pipe_update_start (intel_crtc, &start_vbl_count);intel_update_primary_plane (intel_crtc);
@@ -363,6 +372,7 @@ ivb_update_plane(struct drm_plane *plane, struct drm_crtc *crtc, sprctl &= ~SPRITE_RGB_ORDER_RGBX ; sprctl &= ~SPRITE_YUV_BYTE_ORDER_MASK ; sprctl &= ~SPRITE_TILED ; + sprctl &= ~SPRITE_ROTATE_180 ;switch (fb->pixel_format) {case DRM_FORMAT_XBGR8888 :
@@ -424,6 +434,17 @@ ivb_update_plane(struct drm_plane *plane, struct drm_crtc *crtc, pixel_size, fb->pitches[0]); linear_offset -= sprsurf_offset; +if (intel_plane->rotation ==BIT (DRM_ROTATE_180 )) { + sprctl |=SPRITE_ROTATE_180 ; + +/* HSW and BDW does this automagically in hardware */ +if (!IS_HASWELL (dev) && !IS_BROADWELL (dev)) { + x += src_w; + y += src_h; + linear_offset += src_h * fb->pitches[0 ] + src_w * pixel_size; + } + } + atomic_update =intel_pipe_update_start (intel_crtc, &start_vbl_count);intel_update_primary_plane (intel_crtc);
@@ -569,6 +590,7 @@ ilk_update_plane(struct drm_plane *plane, struct drm_crtc *crtc, dvscntr &= ~DVS_RGB_ORDER_XBGR ; dvscntr &= ~DVS_YUV_BYTE_ORDER_MASK ; dvscntr &= ~DVS_TILED ; + dvscntr &= ~DVS_ROTATE_180 ;switch (fb->pixel_format) {case DRM_FORMAT_XBGR8888 :
@@ -625,6 +647,14 @@ ilk_update_plane(struct drm_plane *plane, struct drm_crtc *crtc, pixel_size, fb->pitches[0]); linear_offset -= dvssurf_offset; +if (intel_plane->rotation ==BIT (DRM_ROTATE_180 )) { + dvscntr |=DVS_ROTATE_180 ; + + x += src_w; + y += src_h; + linear_offset += src_h * fb->pitches[0 ] + src_w * pixel_size; + } + atomic_update =intel_pipe_update_start (intel_crtc, &start_vbl_count);intel_update_primary_plane (intel_crtc);
@@ -883,6 +913,9 @@ intel_update_plane(struct drm_plane *plane, struct drm_crtc *crtc, max_scale = intel_plane->max_downscale <<16 ; min_scale = intel_plane->can_scale ?1 : (1 <<16 ); +drm_rect_rotate (&src, fb->width <<16 , fb->height <<16 , + intel_plane->rotation); + hscale =drm_rect_calc_hscale_relaxed (&src, &dst, min_scale, max_scale);BUG_ON (hscale <0 );
@@ -921,6 +954,9 @@ intel_update_plane(struct drm_plane *plane, struct drm_crtc *crtc,drm_rect_width (&dst) * hscale -drm_rect_width (&src), drm_rect_height(&dst) * vscale - drm_rect_height(&src)); +drm_rect_rotate_inv (&src, fb->width <<16 , fb->height <<16 , + intel_plane->rotation); +/* sanity check to make sure the src viewport wasn't enlarged */ WARN_ON(src.x1 < (int) src_x || src.y1 < (int) src_y ||
@@ -1296,6 +1332,7 @@ intel_plane_init(struct drm_device *dev, enum pipe pipe, int plane) intel_plane->pipe = pipe; intel_plane->plane = plane; + intel_plane->rotation =BIT (DRM_ROTATE_0 ); possible_crtcs = (1 << pipe); ret = drm_plane_init(dev, &intel_plane->base, possible_crtcs, &intel_plane_funcs,
Signature · 6 lines
1.7.10.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 8/10 drm/i915: Make intel_plane_restore() return an error
In reply to [email protected]From: Ville Syrjälä <ville.syrjala at linux.intel.com>
Propagate the error from intel_update_plane() up through intel_plane_restore() to the caller. This will be used for rollback purposes when setting properties fails.
--- drivers/gpu/drm/i915/intel_drv.h | 2 +- drivers/gpu/drm/i915/intel_sprite.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/intel_drv.h +1 -1
@@ -993,7 +993,7 @@ bool intel_sdvo_init(struct drm_device *dev, uint32_t sdvo_reg, bool is_sdvob);int intel_plane_init (struct drm_device *dev,enum pipe pipe,int plane);void intel_flush_primary_plane (struct drm_i915_private *dev_priv,enum plane plane); -void intel_plane_restore (struct drm_plane *plane); +int intel_plane_restore (struct drm_plane *plane);void intel_plane_disable (struct drm_plane *plane);int intel_sprite_set_colorkey (struct drm_device *dev,void *data,struct drm_file *file_priv);
drivers/gpu/drm/i915/intel_sprite.c +7 -7
@@ -1202,18 +1202,18 @@ out_unlock:return ret; } -void intel_plane_restore (struct drm_plane *plane) +int intel_plane_restore (struct drm_plane *plane) {struct intel_plane *intel_plane =to_intel_plane (plane);if (!plane->crtc || !plane->fb) -return ; +return 0 ; -intel_update_plane (plane, plane->crtc, plane->fb, - intel_plane->crtc_x, intel_plane->crtc_y, - intel_plane->crtc_w, intel_plane->crtc_h, - intel_plane->src_x, intel_plane->src_y, - intel_plane->src_w, intel_plane->src_h); +return intel_update_plane (plane, plane->crtc, plane->fb, + intel_plane->crtc_x, intel_plane->crtc_y, + intel_plane->crtc_w, intel_plane->crtc_h, + intel_plane->src_x, intel_plane->src_y, + intel_plane->src_w, intel_plane->src_h); }void intel_plane_disable (struct drm_plane *plane)
Signature · 6 lines
1.7.10.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 9/10 drm/i915: Add rotation property for sprites
In reply to [email protected]From: Ville Syrjälä <ville.syrjala at linux.intel.com>
Sprite planes support 180 degree rotation. The lower layers are now in place, so hook in the standard rotation property to expose the feature to the users.
--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_sprite.c | 42 ++++++++++++++++++++++++++++++++++- 2 files changed, 42 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -1514,6 +1514,7 @@ struct drm_i915_private {struct drm_property *broadcast_rgb_property;struct drm_property *force_audio_property; +struct drm_property *rotation_property;uint32_t hw_context_size;struct list_head context_list;
drivers/gpu/drm/i915/intel_sprite.c +41 -1
67 lines not on this page · raw message
Signature · 6 lines
1.7.10.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 10/10 drm/i915: Add 180 degree primary plane rotation support
In reply to [email protected]From: Sonika Jindal <[email protected]>
Primary planes support 180 degree rotation. Expose the feature through rotation drm property.
v2: Calculating linear/tiled offsets based on pipe source width and height. Added 180 degree rotation support in ironlake_update_plane.
v3: Checking if CRTC is active before issueing update_plane. Added wait for vblank to make sure we dont overtake page flips. Disabling FBC since it does not work with rotated planes.
v4: Updated rotation checks for pending flips, fbc disable. Creating rotation property only for Gen4 onwards. Property resetting as part of lastclose.
v5: Resetting property in i915_driver_lastclose properly for planes and crtcs. Fixed linear offset calculation that was off by 1 w.r.t width in i9xx_update_plane and ironlake_update_plane. Removed tab based indentation and unnecessary braces in intel_crtc_set_property and intel_update_fbc. FBC and flip related checks should be done only for valid crtcs.
v6: Minor nits in FBC disable checks for comments in intel_crtc_set_property and positioning the disable code in intel_update_fbc.
v7: In case rotation property on inactive crtc is updated, we return successfully printing debug log as crtc is inactive and only property change is preserved.
v8: update_plane is changed to update_primary_plane, crtc->fb is changed to crtc->primary->fb and return value of update_primary_plane is ignored.
v9: added rotation property to primary plane instead of crtc.
Testcase: igt/kms_rotation_crc
--- drivers/gpu/drm/i915/i915_dma.c | 17 +++++++ drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/intel_display.c | 91 ++++++++++++++++++++++++++++++++-- drivers/gpu/drm/i915/intel_pm.c | 8 +++ 4 files changed, 113 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/i915_dma.c +17 -0
@@ -1939,6 +1939,8 @@ int i915_driver_open(struct drm_device *dev, struct drm_file *file)void i915_driver_lastclose (struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private; +struct intel_crtc *crtc; +struct intel_plane *plane;/* On gen6+ we refuse to init without kms enabled, but then the drm core * goes right around and calls lastclose. Check for this and don't clean
@@ -1946,6 +1948,21 @@ void i915_driver_lastclose(struct drm_device *dev)if (!dev_priv)return ; +if (dev_priv->rotation_property) { +list_for_each_entry (crtc, &dev->mode_config.crtc_list, base.head) { +to_intel_plane (crtc->base.primary)->rotation =BIT (DRM_ROTATE_0 ); +drm_object_property_set_value (&crtc->base.base, + dev_priv->rotation_property, +to_intel_plane (crtc->base.primary)->rotation); + } +list_for_each_entry (plane, &dev->mode_config.plane_list, base.head) { + plane->rotation =BIT (DRM_ROTATE_0 ); +drm_object_property_set_value (&plane->base.base, + dev_priv->rotation_property, + plane->rotation); + } + } +if (drm_core_check_feature (dev,DRIVER_MODESET )) {intel_fbdev_restore_mode (dev);vga_switcheroo_process_delayed_switch ();
drivers/gpu/drm/i915/i915_reg.h +1 -0
@@ -4087,6 +4087,7 @@ enum punit_power_well {#define DISPPLANE_NO_LINE_DOUBLE 0#define DISPPLANE_STEREO_POLARITY_FIRST 0#define DISPPLANE_STEREO_POLARITY_SECOND (1<<18) +#define DISPPLANE_ROTATE_180 (1<<15)#define DISPPLANE_TRICKLE_FEED_DISABLE (1<<14)/* Ironlake */ #define DISPPLANE_TILED (1<<10)#define _DSPAADDR 0x70184
drivers/gpu/drm/i915/intel_display.c +87 -4
169 lines not on this page · raw message
drivers/gpu/drm/i915/intel_pm.c +8 -0
@@ -562,6 +562,14 @@ void intel_update_fbc(struct drm_device *dev) goto out_disable; } +if (INTEL_INFO (dev)->gen <=4 && !IS_G4X (dev) && +to_intel_plane (crtc->primary)->rotation !=BIT (DRM_ROTATE_0 )) { +if (set_no_fbc_reason (dev_priv,FBC_UNSUPPORTED_MODE )) +DRM_DEBUG_KMS ("mode incompatible with compression, " +"disabling\n" ); + goto out_disable; + } +/* If the kernel debugger is active, always disable compression */ if (in_dbg_master ()) goto out_disable;
Signature · 6 lines
1.7.10.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 16 lines · On Wed, Jun 18, 2014 at 05:14:49PM +0530, [email protected] wrote:
From: Sonika Jindal <[email protected]>
Enables 180 degree rotation for sprite and primary planes. Updated the primary plane rotation support as per the new universal plane design.
Most of these patches were already reviewed in intel-gfx in February 2014 thats why there is version history in few of them.
Testcase:
kms_rotation_crc
This igt can be extended for clipped rotation cases. Right it only tests 180 degree rotation for sprite and primary plane with crc check.Sonika Jindal (1):
drm/i915: Add 180 degree primary plane rotation support
Quoted 10 lines
Ville Syrjälä (9):
drm: MoveDRM_ROTATEbits out of omapdrm intodrm_crtc.h
drm: Addsupport_bitsparameter todrm_property_create_bitmask()
drm: Adddrm_mode_create_rotation_property()
drm/omap: Switch omapdrm over todrm_mode_create_rotation_property()
drm: Adddrm_rectrotation functions
drm: Adddrm_rotation_simplify()
drm/i915: Add 180 degree sprite rotation support drm/i915: Makeintel_plane_restore()return an error drm/i915: Add rotation property for sprites
Pleas don't repost entire patch series on the same day without a changelog in the cover letter explaining what's going on and what changed.
If you just need to repost a few patches that changed due to review, please do that with an in-reply-to directly to the relevant discussion.
If everyone reposts their big patch series a few times a day we'll have utter chaos.
-Daniel
Quoted 23 lines
drivers/gpu/drm/drm_crtc.c | 66 +++++++++++++++- drivers/gpu/drm/drm_rect.c | 140 ++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/i915_dma.c | 17 +++++ drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/i915_reg.h | 4 + drivers/gpu/drm/i915/intel_display.c | 91 +++++++++++++++++++++- drivers/gpu/drm/i915/intel_drv.h | 3 +- drivers/gpu/drm/i915/intel_pm.c | 8 ++ drivers/gpu/drm/i915/intel_sprite.c | 93 ++++++++++++++++++++-- drivers/gpu/drm/omapdrm/omap_drv.h | 7 -- drivers/gpu/drm/omapdrm/omap_plane.c | 17 ++--- include/drm/drm_crtc.h | 15 +++- include/drm/drm_rect.h | 6 ++ 13 files changed, 433 insertions(+), 35 deletions(-)Signature · 6 lines
1.7.10.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
Quoted 31 lines · Daniel Vetter
Quoted 16 lines · On Wed, Jun 18, 2014 at 05:14:49PM +0530, [email protected] wrote:
From: Sonika Jindal <[email protected]>
Enables 180 degree rotation for sprite and primary planes. Updated the primary plane rotation support as per the new universal plane design.
Most of these patches were already reviewed in intel-gfx in February 2014 thats why there is version history in few of them.
Testcase:
kms_rotation_crc
This igt can be extended for clipped rotation cases. Right it only tests 180 degree rotation for sprite and primary plane with crc check.Sonika Jindal (1):
drm/i915: Add 180 degree primary plane rotation supportQuoted 10 lines
Ville Syrjälä (9):
drm: MoveDRM_ROTATEbits out of omapdrm intodrm_crtc.h
drm: Addsupport_bitsparameter todrm_property_create_bitmask()
drm: Adddrm_mode_create_rotation_property()
drm/omap: Switch omapdrm over todrm_mode_create_rotation_property()
drm: Adddrm_rectrotation functions
drm: Adddrm_rotation_simplify()
drm/i915: Add 180 degree sprite rotation support drm/i915: Makeintel_plane_restore()return an error drm/i915: Add rotation property for spritesPleas don't repost entire patch series on the same day without a changelog in the cover letter explaining what's going on and what changed.
Quoted 6 lines
If you just need to repost a few patches that changed due to review, please do that with an in-reply-to directly to the relevant discussion.
If everyone reposts their big patch series a few times a day we'll have utter chaos.
-Daniel
I am sorry for this. I thought creating a new patchset should be good, missed updating it in cover letter. I will keep this in mind.
Quoted 25 lines
Quoted 24 lines
drivers/gpu/drm/drm_crtc.c | 66 +++++++++++++++- drivers/gpu/drm/drm_rect.c | 140 ++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/i915_dma.c | 17 +++++ drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/i915_reg.h | 4 + drivers/gpu/drm/i915/intel_display.c | 91 +++++++++++++++++++++- drivers/gpu/drm/i915/intel_drv.h | 3 +- drivers/gpu/drm/i915/intel_pm.c | 8 ++ drivers/gpu/drm/i915/intel_sprite.c | 93 ++++++++++++++++++++-- drivers/gpu/drm/omapdrm/omap_drv.h | 7 -- drivers/gpu/drm/omapdrm/omap_plane.c | 17 ++--- include/drm/drm_crtc.h | 15 +++- include/drm/drm_rect.h | 6 ++ 13 files changed, 433 insertions(+), 35 deletions(-)--
1.7.10.4_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 37 lines · Sonika
Quoted 34 lines · Daniel Vetter
Quoted 16 lines · On Wed, Jun 18, 2014 at 05:14:49PM +0530, [email protected] wrote:
From: Sonika Jindal <[email protected]>
Enables 180 degree rotation for sprite and primary planes. Updated the primary plane rotation support as per the new universal plane design.
Most of these patches were already reviewed in intel-gfx in February 2014 thats why there is version history in few of them.
Testcase:
kms_rotation_crc
This igt can be extended for clipped rotation cases. Right it only tests 180 degree rotation for sprite and primary plane with crc check.Sonika Jindal (1):
drm/i915: Add 180 degree primary plane rotation supportQuoted 10 lines
Ville Syrjälä (9):
drm: MoveDRM_ROTATEbits out of omapdrm intodrm_crtc.h
drm: Addsupport_bitsparameter todrm_property_create_bitmask()
drm: Adddrm_mode_create_rotation_property()
drm/omap: Switch omapdrm over todrm_mode_create_rotation_property()
drm: Adddrm_rectrotation functions
drm: Adddrm_rotation_simplify()
drm/i915: Add 180 degree sprite rotation support drm/i915: Makeintel_plane_restore()return an error drm/i915: Add rotation property for spritesPleas don't repost entire patch series on the same day without a changelog in the cover letter explaining what's going on and what changed.
If you just need to repost a few patches that changed due to review, please do that with an in-reply-to directly to the relevant discussion.
Quoted 7 lines
Quoted 3 lines
If everyone reposts their big patch series a few times a day we'll have utter chaos.
-DanielI am sorry for this. I thought creating a new patchset should be good, missed updating it in cover letter.
I will keep this in mind.
It's always a balancing act - if the threads nest too deeply eventually in-reply-to becomes a mess, too. But a rule of thumb is that you should only resend when the patch series changed completely or once review has settled down (so only after a few days) and the review thread has become too deeply nested.
But resending the entire series on the same day before review has concluded is definitely too early. Our team is global so without a full day not everyone even had a chance to look at it - us west coast is still fast asleep ;-)
-Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
Quoted 6 lines · On Wed, Jun 18, 2014 at 05:14:49PM +0530, [email protected] wrote:
From: Sonika Jindal <[email protected]>
Enables 180 degree rotation for sprite and primary planes. Updated the primary plane rotation support as per the new universal plane design.
Quoted 6 lines
Most of these patches were already reviewed in intel-gfx in February 2014 thats why there is version history in few of them.
Testcase:
kms_rotation_crc
This igt can be extended for clipped rotation cases. Right it only tests 180 degree rotation for sprite and primary plane with crc check.
* All the Signed-off-by/Cc tags have mangled e-mail addresses, (blah at foo) so:
- The Cc: fields of your emails are empty.
- checkpatch.pl complains about invalid s-o-b tags.
* Please remove the Cc: to the LKML, no need to add more chaos there.
Signature · 1 line
Damien