Support for 180 degree HW rotation
Subsystems (5)
v3 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.
v2: Moved rotation_property to drm_plane. Added updation of FBC when rotation is again set to 0.
v3: Adding documentation patches in the series + adding reviewed-by tags to patches + adding mutex locks to update_fbc in "Add 180 degree primary plane rotation support"
Sagar Kamble (2):
Documentation: drm: Removing placeholders for generic drm properties
description
Documentation: drm: describing rotation property for i915
Sonika Jindal (2):
drm/i915: Add 180 degree primary plane rotation support
drm: Resetting rotation property
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
Documentation/DocBook/drm.tmpl | 64 ++++------------ drivers/gpu/drm/drm_crtc.c | 65 +++++++++++++++- drivers/gpu/drm/drm_fb_helper.c | 16 +++- drivers/gpu/drm/drm_rect.c | 140 ++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/i915_reg.h | 4 + drivers/gpu/drm/i915/intel_display.c | 109 ++++++++++++++++++++++++-- drivers/gpu/drm/i915/intel_drv.h | 3 +- drivers/gpu/drm/i915/intel_pm.c | 7 ++ drivers/gpu/drm/i915/intel_sprite.c | 91 ++++++++++++++++++++-- drivers/gpu/drm/omapdrm/omap_drv.h | 7 -- drivers/gpu/drm/omapdrm/omap_plane.c | 17 ++--- include/drm/drm_crtc.h | 16 +++- include/drm/drm_rect.h | 6 ++ 13 files changed, 458 insertions(+), 87 deletions(-)
Signature · 6 lines
1.7.10.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 1/13 drm: Move DRM_ROTATE bits out of omapdrm into drm_crtc.h
From: Ville Syrjälä <[email protected]>
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 v3 2/13 drm: Add support_bits parameter to drm_property_create_bitmask()
In reply to [email protected]From: Ville Syrjälä <[email protected]>
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 v3 3/13 drm: Add drm_mode_create_rotation_property()
In reply to [email protected]From: Ville Syrjälä <[email protected]>
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 v3 4/13 drm/omap: Switch omapdrm over to drm_mode_create_rotation_property()
In reply to [email protected]From: Ville Syrjälä <[email protected]>
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 v3 5/13 drm: Add drm_rect rotation functions
In reply to [email protected]From: Ville Syrjälä <[email protected]>
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 v3 6/13 drm: Add drm_rotation_simplify()
In reply to [email protected]From: Ville Syrjälä <[email protected]>
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 v3 7/13 drm/i915: Add 180 degree sprite rotation support
In reply to [email protected]From: Ville Syrjälä <[email protected]>
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 v3 8/13 drm/i915: Make intel_plane_restore() return an error
In reply to [email protected]From: Ville Syrjälä <[email protected]>
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 v3 9/13 drm/i915: Add rotation property for sprites
In reply to [email protected]From: Ville Syrjälä <[email protected]>
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.
v2: Moving rotation_property to drm_plane
--- drivers/gpu/drm/i915/intel_sprite.c | 40 ++++++++++++++++++++++++++++++++++- include/drm/drm_crtc.h | 1 + 2 files changed, 40 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_sprite.c +39 -1
@@ -1202,6 +1202,29 @@ out_unlock:return ret; } +static int intel_plane_set_property (struct drm_plane *plane, +struct drm_property *prop, +uint64_t val) +{ +struct intel_plane *intel_plane =to_intel_plane (plane); +uint64_t old_val; +int ret = -ENOENT ; + +if (prop == plane->rotation_property) { +/* exactly one rotation angle please */ +if (hweight32 (val &0xf ) !=1 ) +return -EINVAL ; + + old_val = intel_plane->rotation; + intel_plane->rotation = val; + ret =intel_plane_restore (plane); +if (ret) + intel_plane->rotation = old_val; + } + +return ret; +} +int intel_plane_restore (struct drm_plane *plane) {struct intel_plane *intel_plane =to_intel_plane (plane);
@@ -1228,6 +1251,7 @@ static const struct drm_plane_funcs intel_plane_funcs = { .update_plane = intel_update_plane, .disable_plane = intel_disable_plane, .destroy = intel_destroy_plane, + .set_property = intel_plane_set_property, };static uint32_t ilk_plane_formats[] = {
@@ -1338,8 +1362,22 @@ intel_plane_init(struct drm_device *dev, enum pipe pipe, int plane) &intel_plane_funcs, plane_formats, num_plane_formats, false); -if (ret) +if (ret) {kfree (intel_plane); + goto out; + } + +if (!intel_plane->base.rotation_property) + intel_plane->base.rotation_property = +drm_mode_create_rotation_property (dev, +BIT (DRM_ROTATE_0 ) | +BIT (DRM_ROTATE_180 )); + +if (intel_plane->base.rotation_property) +drm_object_attach_property (&intel_plane->base.base, + intel_plane->base.rotation_property, + intel_plane->rotation); + out:return ret; }
include/drm/drm_crtc.h +1 -0
@@ -615,6 +615,7 @@ struct drm_plane {const struct drm_plane_funcs *funcs; +struct drm_property *rotation_property;struct drm_object_properties properties;enum drm_plane_type type;
Signature · 6 lines
1.7.10.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [v3 09/13] drm/i915: Add rotation property for sprites
Quoted 7 lines · On Tue, Jul 08, 2014 at 10:31:59AM +0530, [email protected] wrote:
From: Ville Syrjälä <[email protected]>
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.
v2: Moving
rotation_propertytodrm_plane
This change is wrong and I haven't figured out who suggested it. The actual property is global (i.e. we should only have 1), but then it can be attached to different pieces.
So here's what we need to do instead:
- Add the rotation property to dev->mode_config.
- Convert omapdrm to also store it there by moving it out of the omap driver private structure.
- Probably better to just unconditionally set it up, but not sure.
- Adjust the fb helper code accordingly.
- Rip the omap restore rotation code in lastclose since the fb helper will now take care of this.
I've merged the drm core parts for now but dropped the i915 implementation and the fb helper patch again.
Thanks, Daniel
Quoted 95 lines
Signed-off-by Ville Syrjälä <[email protected]>Signed-off-by Sonika Jindal <[email protected]>Reviewed-by Imre Deak <[email protected]>--- drivers/gpu/drm/i915/intel_sprite.c | 40 ++++++++++++++++++++++++++++++++++- include/drm/drm_crtc.h | 1 + 2 files changed, 40 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/intel_sprite.c +39
-1@@ -1202,6 +1202,29 @@ out_unlock:return ret; } +static int intel_plane_set_property (struct drm_plane *plane, +struct drm_property *prop, +uint64_t val) +{ +struct intel_plane *intel_plane =to_intel_plane (plane); +uint64_t old_val; +int ret = -ENOENT ; + +if (prop == plane->rotation_property) { +/* exactly one rotation angle please */ +if (hweight32 (val &0xf ) !=1 ) +return -EINVAL ; + + old_val = intel_plane->rotation; + intel_plane->rotation = val; + ret =intel_plane_restore (plane); +if (ret) + intel_plane->rotation = old_val; + } + +return ret; +} +int intel_plane_restore (struct drm_plane *plane) {struct intel_plane *intel_plane =to_intel_plane (plane);@@ -1228,6 +1251,7 @@ static const struct drm_plane_funcs intel_plane_funcs = { .update_plane = intel_update_plane, .disable_plane = intel_disable_plane, .destroy = intel_destroy_plane, + .set_property = intel_plane_set_property, };static uint32_t ilk_plane_formats[] = {@@ -1338,8 +1362,22 @@ intel_plane_init(struct drm_device *dev, enum pipe pipe, int plane) &intel_plane_funcs, plane_formats, num_plane_formats, false); -if (ret) +if (ret) {kfree (intel_plane); + goto out; + } + +if (!intel_plane->base.rotation_property) + intel_plane->base.rotation_property = +drm_mode_create_rotation_property (dev, +BIT (DRM_ROTATE_0 ) | +BIT (DRM_ROTATE_180 )); + +if (intel_plane->base.rotation_property) +drm_object_attach_property (&intel_plane->base.base, + intel_plane->base.rotation_property, + intel_plane->rotation); + out:return ret; }include/drm/drm_crtc.h +1
-0@@ -615,6 +615,7 @@ struct drm_plane {const struct drm_plane_funcs *funcs; +struct drm_property *rotation_property;struct drm_object_properties properties;enum drm_plane_type type;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
Re: [v3 09/13] drm/i915: Add rotation property for sprites
Quoted 13 lines · Daniel Vetter
Quoted 7 lines · On Tue, Jul 08, 2014 at 10:31:59AM +0530, [email protected] wrote:
From: Ville Syrjälä <[email protected]>
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.
v2: Moving
rotation_propertytodrm_planeThis change is wrong and I haven't figured out who suggested it. The actual property is global (i.e. we should only have 1), but then it can be attached to different pieces.
Quoted 9 lines
So here's what we need to do instead:
- Add the rotation property todev->mode_config.
- Convert omapdrm to also store it there by moving it out of the omap driver private structure.
- Probably better to just unconditionally set it up, but not sure.
- Adjust the fb helper code accordingly.
- Rip the omap restore rotation code in lastclose since the fb helper will now take care of this.
Ok, I will make this property a part of mode_config and will attach that to drm_plane, and will post the remaining patches. -Sonika
Quoted 101 lines
I've merged the drm core parts for now but dropped the i915 implementation and the fb helper patch again.
Thanks, Daniel
Quoted 95 lines
Signed-off-by Ville Syrjälä <[email protected]>Signed-off-by Sonika Jindal <[email protected]>Reviewed-by Imre Deak <[email protected]>--- drivers/gpu/drm/i915/intel_sprite.c | 40 ++++++++++++++++++++++++++++++++++- include/drm/drm_crtc.h | 1 + 2 files changed, 40 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/intel_sprite.c +39
-1@@ -1202,6 +1202,29 @@ out_unlock:return ret; } +static int intel_plane_set_property (struct drm_plane *plane, +struct drm_property *prop, +uint64_t val) +{ +struct intel_plane *intel_plane =to_intel_plane (plane); +uint64_t old_val; +int ret = -ENOENT ; + +if (prop == plane->rotation_property) { +/* exactly one rotation angle please */ +if (hweight32 (val &0xf ) !=1 ) +return -EINVAL ; + + old_val = intel_plane->rotation; + intel_plane->rotation = val; + ret =intel_plane_restore (plane); +if (ret) + intel_plane->rotation = old_val; + } + +return ret; +} +int intel_plane_restore (struct drm_plane *plane) {struct intel_plane *intel_plane =to_intel_plane (plane);@@ -1228,6 +1251,7 @@ static const struct drm_plane_funcs intel_plane_funcs = { .update_plane = intel_update_plane, .disable_plane = intel_disable_plane, .destroy = intel_destroy_plane, + .set_property = intel_plane_set_property, };static uint32_t ilk_plane_formats[] = {@@ -1338,8 +1362,22 @@ intel_plane_init(struct drm_device *dev, enum pipe pipe, int plane) &intel_plane_funcs, plane_formats, num_plane_formats, false); -if (ret) +if (ret) {kfree (intel_plane); + goto out; + } + +if (!intel_plane->base.rotation_property) + intel_plane->base.rotation_property = +drm_mode_create_rotation_property (dev, +BIT (DRM_ROTATE_0 ) | +BIT (DRM_ROTATE_180 )); + +if (intel_plane->base.rotation_property) +drm_object_attach_property (&intel_plane->base.base, + intel_plane->base.rotation_property, + intel_plane->rotation); + out:return ret; }include/drm/drm_crtc.h +1
-1@@ -615,6 +615,7 @@ struct drm_plane {const struct drm_plane_funcs *funcs; +struct drm_property *rotation_property;struct drm_object_properties properties;enum drm_plane_type type; --1.7.10.4
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [v3 09/13] drm/i915: Add rotation property for sprites
In reply to [email protected]Quoted 6 lines · On Tue, Jul 08, 2014 at 10:31:59AM +0530, [email protected] wrote:
From: Ville Syrjälä <[email protected]>
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.
Quoted 6 lines
v2: Moving
rotation_propertytodrm_planeSigned-off-by Ville Syrjälä <[email protected]>Signed-off-by Sonika Jindal <[email protected]>Reviewed-by Imre Deak <[email protected]>
Also this r-b tag was for v1 (which was ok), not for v2. If you carry over such a review-by tag and make functional changes not discussed with the reviewer you _must_ at least mark the r-b with a (v1) or if it's a big change, drop the tag completely.
-Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
Re: [v3 09/13] drm/i915: Add rotation property for sprites
In reply to [email protected]Quoted 8 lines · On Tue, Jul 08, 2014 at 10:31:59AM +0530, [email protected] wrote:
From: Ville Syrjälä <[email protected]>
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.
v2: Moving
rotation_propertytodrm_plane
Quoted 7 lines
Signed-off-by Ville Syrjälä <[email protected]>Signed-off-by Sonika Jindal <[email protected]>Reviewed-by Imre Deak <[email protected]>--- drivers/gpu/drm/i915/intel_sprite.c | 40 ++++++++++++++++++++++++++++++++++- include/drm/drm_crtc.h | 1 +
One more: A patch titled with "drm/i915: ..." really shouldn't touch anything outside of drm/i915 directories and so shouldn't introduce any changes to core drm code. Such changes always need to be split out into a separate drm patch. Exceptions (like refactoring function interfaces) obviously apply.
-Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
PATCH v3 10/13 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. Removing reset of rotation property from lastclose. rotation_property is moved to drm_plane,so drm layer will take care of resetting.
v10: adding updation of fbc when rotation is set to 0.
v11: adding mutex locks for update_fbc. Allowing rotation only if value is different than old one. Other minor cleanups.
Testcase: igt/kms_rotation_crc
--- drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/intel_display.c | 109 ++++++++++++++++++++++++++++++++-- drivers/gpu/drm/i915/intel_pm.c | 7 +++ 3 files changed, 112 insertions(+), 5 deletions(-)
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 +104 -5
187 lines not on this page · raw message
drivers/gpu/drm/i915/intel_pm.c +7 -0
@@ -562,6 +562,13 @@ 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 ("Rotation unsupported, 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
PATCH v3 11/13 drm: Resetting rotation property
In reply to [email protected]From: Sonika Jindal <[email protected]>
Reset rotation property to 0 wherever applicable
v2: Also calling set_property of the plane to set the rotation in the plane structure.
--- drivers/gpu/drm/drm_fb_helper.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)
drivers/gpu/drm/drm_fb_helper.c +15 -1
@@ -282,9 +282,23 @@ static bool restore_fbdev_mode(struct drm_fb_helper *fb_helper)drm_warn_on_modeset_not_all_locked (dev); -list_for_each_entry (plane, &dev->mode_config.plane_list, head) +list_for_each_entry (plane, &dev->mode_config.plane_list, head) { + +if (plane->rotation_property) { +int ret =0 ; +if (plane->funcs->set_property) + ret = plane->funcs->set_property (plane, + plane->rotation_property, +BIT (DRM_ROTATE_0 )); +if (!ret) +drm_object_property_set_value (&plane->base, + plane->rotation_property, +BIT (DRM_ROTATE_0 )); + } +if (plane->type !=DRM_PLANE_TYPE_PRIMARY )drm_plane_force_disable (plane); + }for (i =0 ; i < fb_helper->crtc_count; i++) {struct drm_mode_set *mode_set = &fb_helper->crtc_info[i].mode_set;
Signature · 1 line
1.7.10.4
PATCH v3 12/13 Documentation: drm: Removing placeholders for generic drm properties description
In reply to [email protected]From: Sagar Kamble <[email protected]>
These property descriptions were kept as placeholder. Removing them for simplicity.
--- Documentation/DocBook/drm.tmpl | 64 +++++++--------------------------------- 1 file changed, 10 insertions(+), 54 deletions(-)
Documentation/DocBook/drm.tmpl +10 -54
@@ -2648,8 +2648,8 @@ void intel_crt_init(struct drm_device *dev) <td valign="top" >TBD</td> </tr> <tr> - <td rowspan="21" valign="top" >i915</td> - <td rowspan="3" valign="top" >Generic</td> + <td rowspan="20" valign="top" >i915</td> + <td rowspan="2" valign="top" >Generic</td> <td valign="top" >"Broadcast RGB"</td> <td valign="top" >ENUM</td> <td valign="top" >{ "Automatic", "Full", "Limited 16:235" }</td>
@@ -2664,13 +2664,6 @@ void intel_crt_init(struct drm_device *dev) <td valign="top" >TBD</td> </tr> <tr> - <td valign="top" >Standard name as in DRM</td> - <td valign="top" >Standard type as in DRM</td> - <td valign="top" >Standard value as in DRM</td> - <td valign="top" >Standard Object as in DRM</td> - <td valign="top" >TBD</td> - </tr> - <tr> <td rowspan="17" valign="top" >SDVO-TV</td> <td valign="top" >“mode”</td> <td valign="top" >ENUM</td>
@@ -2799,8 +2792,8 @@ void intel_crt_init(struct drm_device *dev) <td valign="top" >TBD</td> </tr> <tr> - <td rowspan="3" valign="top" >CDV gma-500</td> - <td rowspan="3" valign="top" >Generic</td> + <td rowspan="2" valign="top" >CDV gma-500</td> + <td rowspan="2" valign="top" >Generic</td> <td valign="top" >"Broadcast RGB"</td> <td valign="top" >ENUM</td> <td valign="top" >{ “Full”, “Limited 16:235” }</td>
@@ -2815,15 +2808,8 @@ void intel_crt_init(struct drm_device *dev) <td valign="top" >TBD</td> </tr> <tr> - <td valign="top" >Standard name as in DRM</td> - <td valign="top" >Standard type as in DRM</td> - <td valign="top" >Standard value as in DRM</td> - <td valign="top" >Standard Object as in DRM</td> - <td valign="top" >TBD</td> - </tr> - <tr> - <td rowspan="20" valign="top" >Poulsbo</td> - <td rowspan="2" valign="top" >Generic</td> + <td rowspan="19" valign="top" >Poulsbo</td> + <td rowspan="1" valign="top" >Generic</td> <td valign="top" >“backlight”</td> <td valign="top" >RANGE</td> <td valign="top" >Min=0, Max=100</td>
@@ -2831,13 +2817,6 @@ void intel_crt_init(struct drm_device *dev) <td valign="top" >TBD</td> </tr> <tr> - <td valign="top" >Standard name as in DRM</td> - <td valign="top" >Standard type as in DRM</td> - <td valign="top" >Standard value as in DRM</td> - <td valign="top" >Standard Object as in DRM</td> - <td valign="top" >TBD</td> - </tr> - <tr> <td rowspan="17" valign="top" >SDVO-TV</td> <td valign="top" >“mode”</td> <td valign="top" >ENUM</td>
@@ -3064,7 +3043,7 @@ void intel_crt_init(struct drm_device *dev) <td valign="top" >TBD</td> </tr> <tr> - <td rowspan="3" valign="top" >i2c/ch7006_drv</td> + <td rowspan="2" valign="top" >i2c/ch7006_drv</td> <td valign="top" >Generic</td> <td valign="top" >“scale”</td> <td valign="top" >RANGE</td>
@@ -3073,14 +3052,7 @@ void intel_crt_init(struct drm_device *dev) <td valign="top" >TBD</td> </tr> <tr> - <td rowspan="2" valign="top" >TV</td> - <td valign="top" >Standard names as in DRM</td> - <td valign="top" >Standard types as in DRM</td> - <td valign="top" >Standard Values as in DRM</td> - <td valign="top" >Standard object as in DRM</td> - <td valign="top" >TBD</td> - </tr> - <tr> + <td rowspan="1" valign="top" >TV</td> <td valign="top" >“mode”</td> <td valign="top" >ENUM</td> <td valign="top" >{ "PAL", "PAL-M","PAL-N"}, ”PAL-Nc"
@@ -3089,7 +3061,7 @@ void intel_crt_init(struct drm_device *dev) <td valign="top" >TBD</td> </tr> <tr> - <td rowspan="16" valign="top" >nouveau</td> + <td rowspan="15" valign="top" >nouveau</td> <td rowspan="6" valign="top" >NV10 Overlay</td> <td valign="top" >"colorkey"</td> <td valign="top" >RANGE</td>
@@ -3198,14 +3170,6 @@ void intel_crt_init(struct drm_device *dev) <td valign="top" >TBD</td> </tr> <tr> - <td valign="top" >Generic</td> - <td valign="top" >Standard name as in DRM</td> - <td valign="top" >Standard type as in DRM</td> - <td valign="top" >Standard value as in DRM</td> - <td valign="top" >Standard Object as in DRM</td> - <td valign="top" >TBD</td> - </tr> - <tr> <td rowspan="2" valign="top" >omap</td> <td rowspan="2" valign="top" >Generic</td> <td valign="top" >“rotation”</td>
@@ -3236,7 +3200,7 @@ void intel_crt_init(struct drm_device *dev) <td valign="top" >TBD</td> </tr> <tr> - <td rowspan="10" valign="top" >radeon</td> + <td rowspan="9" valign="top" >radeon</td> <td valign="top" >DVI-I</td> <td valign="top" >“coherent”</td> <td valign="top" >RANGE</td>
@@ -3308,14 +3272,6 @@ void intel_crt_init(struct drm_device *dev) <td valign="top" >TBD</td> </tr> <tr> - <td valign="top" >Generic</td> - <td valign="top" >Standard name as in DRM</td> - <td valign="top" >Standard type as in DRM</td> - <td valign="top" >Standard value as in DRM</td> - <td valign="top" >Standard Object as in DRM</td> - <td valign="top" >TBD</td> - </tr> - <tr> <td rowspan="3" valign="top" >rcar-du</td> <td rowspan="3" valign="top" >Generic</td> <td valign="top" >"alpha"</td>
Signature · 6 lines
1.7.10.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 13/13 Documentation: drm: describing rotation property for i915
In reply to [email protected]From: Sagar Kamble <[email protected]>
--- Documentation/DocBook/drm.tmpl | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
Documentation/DocBook/drm.tmpl +9 -1
@@ -2648,7 +2648,7 @@ void intel_crt_init(struct drm_device *dev) <td valign="top" >TBD</td> </tr> <tr> - <td rowspan="20" valign="top" >i915</td> + <td rowspan="21" valign="top" >i915</td> <td rowspan="2" valign="top" >Generic</td> <td valign="top" >"Broadcast RGB"</td> <td valign="top" >ENUM</td>
@@ -2664,6 +2664,14 @@ void intel_crt_init(struct drm_device *dev) <td valign="top" >TBD</td> </tr> <tr> + <td rowspan="1" valign="top" >Plane</td> + <td valign="top" >“rotation”</td> + <td valign="top" >BITMASK</td> + <td valign="top" >{ 0, "rotate-0" }, { 2, "rotate-180" }</td> + <td valign="top" >Plane</td> + <td valign="top" >TBD</td> + </tr> + <tr> <td rowspan="17" valign="top" >SDVO-TV</td> <td valign="top" >“mode”</td> <td valign="top" >ENUM</td>
Signature · 6 lines
1.7.10.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx