Add NV12 90/270 support for skl planes
Subsystems (2)
cover Add NV12 90/270 support for skl planes
First attempt to enabling 90/270 rotation for NV12 format using Tvrtko's recent rotated mapping for NV12.
Calling intel_plane_obj_offset(plane, obj, 1) is causing kernel NULL pointer reference. Sending early out early for Tvrtko to work on the issue.
Very first NV12 flip with 90/270 rotation giving rotated image but UV isn't there because of above issue. Also subsequent flips are causing crashes and lockups.
Pending work:
* few changes are need to DDB calcuations for NV12 90/270.
Chandra Konduru (2):
drm/i915: call intel_tile_height with correct parameter drm/i915: Add 90/270 rotation for NV12 format.
drivers/gpu/drm/i915/intel_display.c | 25 +++++++++++++++++-------- drivers/gpu/drm/i915/intel_sprite.c | 34 ++++++++++++++++++++++++++-------- 2 files changed, 43 insertions(+), 16 deletions(-)
Signature · 6 lines
1.7.9.5 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/2 drm/i915: call intel_tile_height with correct parameter
In skylake update plane functions, intel_tile_height() is called with bits_per_pixel instead of pixel_format. Correcting it.
--- drivers/gpu/drm/i915/intel_display.c | 2 +- drivers/gpu/drm/i915/intel_sprite.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_display.c +1 -1
@@ -3157,7 +3157,7 @@ static void skylake_update_primary_plane(struct drm_crtc *crtc,if (intel_rotation_90_or_270 (rotation)) {/* stride = Surface height in tiles */ - tile_height =intel_tile_height (dev, fb->bits_per_pixel, + tile_height =intel_tile_height (dev, fb->pixel_format, fb->modifier[0 ],0 ); stride =DIV_ROUND_UP (fb->height, tile_height); x_offset = stride * tile_height - y - src_h;
drivers/gpu/drm/i915/intel_sprite.c +1 -1
@@ -232,7 +232,7 @@ skl_update_plane(struct drm_plane *drm_plane, struct drm_crtc *crtc,if (intel_rotation_90_or_270 (rotation)) {/* stride: Surface height in tiles */ - tile_height =intel_tile_height (dev, fb->bits_per_pixel, + tile_height =intel_tile_height (dev, fb->pixel_format, fb->modifier[0 ],0 ); stride =DIV_ROUND_UP (fb->height, tile_height); plane_size = (src_w <<16 ) | src_h;
Signature · 6 lines
1.7.9.5 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 1/2] drm/i915: call intel_tile_height with correct parameter
Quoted 8 lines · Chandra Konduru
In skylake update plane functions,
intel_tile_height()is called withbits_per_pixelinstead ofpixel_format. Correcting it.Signed-off-by Chandra Konduru <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 2 +- drivers/gpu/drm/i915/intel_sprite.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
This BTW fixes a bug in:
commit 3b7a5119b5d2def1161226a4c6a643db537dff7e
Author: Sonika Jindal <[email protected]> Date: Fri Apr 10 14:37:29 2015 +0530
drm/i915/skl: Support for 90/270 rotation
I've also posted last week "drm/i915: Remove duplicated intel_tile_height declaration" which fixes one part of the fallout, but didn't notice this as well.
So I think both of these fixes can be merged early.
A bit intriguing is how passing in bits per pixel instead of pixel format and things still worked. Don't see at the moment how tile height could have been correct for 90/270 as exercised from kms_rotation_crc.
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Daniel Vetter
AppliedRe: [PATCH 1/2] drm/i915: call intel_tile_height with correct parameter
In reply to Chandra KonduruQuoted 4 lines · Chandra Konduru
In skylake update plane functions,
intel_tile_height()is called withbits_per_pixelinstead ofpixel_format. Correcting it.Signed-off-by Chandra Konduru <[email protected]>
Queued for -next, thanks for the patch.
Quoted 23 lines
--- drivers/gpu/drm/i915/intel_display.c | 2 +- drivers/gpu/drm/i915/intel_sprite.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/intel_display.c +1
-1@@ -3157,7 +3157,7 @@ static void skylake_update_primary_plane(struct drm_crtc *crtc,if (intel_rotation_90_or_270 (rotation)) {/* stride = Surface height in tiles */ - tile_height =intel_tile_height (dev, fb->bits_per_pixel, + tile_height =intel_tile_height (dev, fb->pixel_format, fb->modifier[0 ],0 ); stride =DIV_ROUND_UP (fb->height, tile_height); x_offset = stride * tile_height - y - src_h;drivers/gpu/drm/i915/intel_sprite.c +0
-0
drivers/gpu/drm/i915/intel_sprite.c skl_update_plane(struct drm_plane *drm_plane, struct drm_crtc *crtc, · line 236
Quoted 6 lines
drivers/gpu/drm/i915/intel_sprite.c +1
-1@@ -232,7 +232,7 @@ skl_update_plane(struct drm_plane *drm_plane, struct drm_crtc *crtc,if (intel_rotation_90_or_270 (rotation)) {/* stride: Surface height in tiles */ - tile_height =intel_tile_height (dev, fb->bits_per_pixel, + tile_height =intel_tile_height (dev, fb->pixel_format, fb->modifier[0 ],0 );
Alignment isn't properly patched up here, continuatino should line up with the opening (. I've fixed this while applying.
-Daniel
Quoted 9 lines
drivers/gpu/drm/i915/intel_sprite.c +0
-0stride =DIV_ROUND_UP (fb->height, tile_height); plane_size = (src_w <<16 ) | src_h;Signature · 6 lines
1.7.9.5 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/2 drm/i915: Add 90/270 rotation for NV12 format.
In reply to Chandra KonduruAdding NV12 90/270 rotation support for primary and sprite planes.
--- drivers/gpu/drm/i915/intel_display.c | 23 ++++++++++++++++------- drivers/gpu/drm/i915/intel_sprite.c | 32 +++++++++++++++++++++++++------- 2 files changed, 41 insertions(+), 14 deletions(-)
drivers/gpu/drm/i915/intel_display.c +16 -7
@@ -3105,7 +3105,8 @@ static void skylake_update_primary_plane(struct drm_crtc *crtc,int src_x =0 , src_y =0 , src_w =0 , src_h =0 ;int dst_x =0 , dst_y =0 , dst_w =0 , dst_h =0 ;int scaler_id =-1 ; -u32 aux_dist =0 , aux_x_offset =0 , aux_y_offset =0 , aux_stride =0 ; +unsigned long aux_dist =0 ; +u32 aux_x_offset =0 , aux_y_offset =0 , aux_stride =0 ;u32 tile_row_adjustment =0 ; plane_state =to_intel_plane_state (plane->state);
@@ -3163,12 +3164,16 @@ static void skylake_update_primary_plane(struct drm_crtc *crtc, x_offset = stride * tile_height - y - src_h; y_offset = x; plane_size = (src_w -1 ) <<16 | (src_h -1 ); -/* -* TBD: For NV12 90/270 rotation, Y and UV subplanes should -* be treated as separate surfaces and GTT remapping for -* rotation should be done separately for each subplane. -* Enable support once seperate remappings are available. -*/ + +if (fb->pixel_format ==DRM_FORMAT_NV12 ) { +u32 uv_tile_height =intel_tile_height (dev, fb->pixel_format, + fb->modifier[0 ],1 ); + aux_stride =DIV_ROUND_UP (fb->height /2 , uv_tile_height); + aux_dist =intel_plane_obj_offset (to_intel_plane (plane), obj,1 ) - + surf_addr; + aux_x_offset = aux_stride * uv_tile_height - y /2 - fb->height /2 ; + aux_y_offset = x /2 ; + } }else { stride = fb->pitches[0 ] / stride_div; x_offset = x;
@@ -13144,6 +13149,10 @@ intel_check_primary_plane(struct drm_plane *plane,if (fb &&format_is_yuv (fb->pixel_format)) { src->x1 &= ~0x10000 ; src->x2 &= ~0x10000 ; +if (intel_rotation_90_or_270 (state->base.rotation)) { + src->y1 &= ~0x10000 ; + src->y2 &= ~0x10000 ; + } }if (INTEL_INFO (dev)->gen >=9 ) {
drivers/gpu/drm/i915/intel_sprite.c +25 -7
@@ -190,7 +190,8 @@ skl_update_plane(struct drm_plane *drm_plane, struct drm_crtc *crtc,int x_offset, y_offset;struct intel_crtc_state *crtc_state =to_intel_crtc (crtc)->config;int scaler_id; -u32 aux_dist =0 , aux_x_offset =0 , aux_y_offset =0 , aux_stride =0 ; +unsigned long aux_dist =0 ; +u32 aux_x_offset =0 , aux_y_offset =0 , aux_stride =0 ;u32 tile_row_adjustment =0 ; plane_ctl = PLANE_CTL_ENABLE |
@@ -239,12 +240,14 @@ skl_update_plane(struct drm_plane *drm_plane, struct drm_crtc *crtc, x_offset = stride * tile_height - y - (src_h +1 ); y_offset = x; -/* -* TBD: For NV12 90/270 rotation, Y and UV subplanes should -* be treated as separate surfaces and GTT remapping for -* rotation should be done separately for each subplane. -* Enable support once seperate remappings are available. -*/ +if (fb->pixel_format ==DRM_FORMAT_NV12 ) { +u32 uv_tile_height =intel_tile_height (dev, fb->pixel_format, + fb->modifier[0 ],1 ); + aux_stride =DIV_ROUND_UP (fb->height /2 , uv_tile_height); + aux_dist =intel_plane_obj_offset (intel_plane, obj,1 ) - surf_addr; + aux_x_offset = aux_stride * uv_tile_height - y /2 - fb->height /2 ; + aux_y_offset = x /2 ; + } }else { stride = fb->pitches[0 ] / stride_div; plane_size = (src_h <<16 ) | src_w;
@@ -909,6 +912,21 @@ intel_check_sprite_plane(struct drm_plane *plane,if (crtc_w ==0 ) state->visible = false; + +if (intel_rotation_90_or_270 (state->base.rotation)) { + src_y &= ~1 ; + src_h &= ~1 ; + +/* +* Must keep src and dst the +* same if we can't scale. +*/ +if (!intel_plane->can_scale) + crtc_h &= ~1 ; + +if (crtc_h ==0 ) + state->visible = false; + } } }
Signature · 6 lines
1.7.9.5 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/2] drm/i915: Add 90/270 rotation for NV12 format.
Quoted 46 lines · Chandra Konduru
Adding NV12 90/270 rotation support for primary and sprite planes.
Signed-off-by Chandra Konduru <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 23 ++++++++++++++++------- drivers/gpu/drm/i915/intel_sprite.c | 32 +++++++++++++++++++++++++------- 2 files changed, 41 insertions(+), 14 deletions(-)drivers/gpu/drm/i915/intel_display.c +12
-7@@ -3105,7 +3105,8 @@ static void skylake_update_primary_plane(struct drm_crtc *crtc,int src_x =0 , src_y =0 , src_w =0 , src_h =0 ;int dst_x =0 , dst_y =0 , dst_w =0 , dst_h =0 ;int scaler_id =-1 ; -u32 aux_dist =0 , aux_x_offset =0 , aux_y_offset =0 , aux_stride =0 ; +unsigned long aux_dist =0 ; +u32 aux_x_offset =0 , aux_y_offset =0 , aux_stride =0 ;u32 tile_row_adjustment =0 ; plane_state =to_intel_plane_state (plane->state);@@ -3163,12 +3164,16 @@ static void skylake_update_primary_plane(struct drm_crtc *crtc, x_offset = stride * tile_height - y - src_h; y_offset = x; plane_size = (src_w -1 ) <<16 | (src_h -1 ); -/* -* TBD: For NV12 90/270 rotation, Y and UV subplanes should -* be treated as separate surfaces and GTT remapping for -* rotation should be done separately for each subplane. -* Enable support once seperate remappings are available. -*/ + +if (fb->pixel_format ==DRM_FORMAT_NV12 ) { +u32 uv_tile_height =intel_tile_height (dev, fb->pixel_format, + fb->modifier[0 ],1 ); + aux_stride =DIV_ROUND_UP (fb->height /2 , uv_tile_height); + aux_dist =intel_plane_obj_offset (to_intel_plane (plane), obj,1 ) - + surf_addr; + aux_x_offset = aux_stride * uv_tile_height - y /2 - fb->height /2 ; + aux_y_offset = x /2 ; + } }else { stride = fb->pitches[0 ] / stride_div; x_offset = x;
drivers/gpu/drm/i915/intel_display.c intel_check_primary_plane(struct drm_plane *plane, · line 13155
Quoted 7 lines
drivers/gpu/drm/i915/intel_display.c +4
-0@@ -13144,6 +13149,10 @@ intel_check_primary_plane(struct drm_plane *plane,if (fb &&format_is_yuv (fb->pixel_format)) { src->x1 &= ~0x10000 ; src->x2 &= ~0x10000 ; +if (intel_rotation_90_or_270 (state->base.rotation)) { + src->y1 &= ~0x10000 ; + src->y2 &= ~0x10000 ; + }
This feels fishy. Why do we need to make the Y coordinates even? The reson for making the X coordinates even is to make them macropixel aligned, but there are no macropixels in the Y direction so this doesn't make much sense to me.
Quoted 47 lines
drivers/gpu/drm/i915/intel_display.c +0
-0}if (INTEL_INFO (dev)->gen >=9 ) {drivers/gpu/drm/i915/intel_sprite.c +15
-7@@ -190,7 +190,8 @@ skl_update_plane(struct drm_plane *drm_plane, struct drm_crtc *crtc,int x_offset, y_offset;struct intel_crtc_state *crtc_state =to_intel_crtc (crtc)->config;int scaler_id; -u32 aux_dist =0 , aux_x_offset =0 , aux_y_offset =0 , aux_stride =0 ; +unsigned long aux_dist =0 ; +u32 aux_x_offset =0 , aux_y_offset =0 , aux_stride =0 ;u32 tile_row_adjustment =0 ; plane_ctl = PLANE_CTL_ENABLE |@@ -239,12 +240,14 @@ skl_update_plane(struct drm_plane *drm_plane, struct drm_crtc *crtc, x_offset = stride * tile_height - y - (src_h +1 ); y_offset = x; -/* -* TBD: For NV12 90/270 rotation, Y and UV subplanes should -* be treated as separate surfaces and GTT remapping for -* rotation should be done separately for each subplane. -* Enable support once seperate remappings are available. -*/ +if (fb->pixel_format ==DRM_FORMAT_NV12 ) { +u32 uv_tile_height =intel_tile_height (dev, fb->pixel_format, + fb->modifier[0 ],1 ); + aux_stride =DIV_ROUND_UP (fb->height /2 , uv_tile_height); + aux_dist =intel_plane_obj_offset (intel_plane, obj,1 ) - surf_addr; + aux_x_offset = aux_stride * uv_tile_height - y /2 - fb->height /2 ; + aux_y_offset = x /2 ; + } }else { stride = fb->pitches[0 ] / stride_div; plane_size = (src_h <<16 ) | src_w;@@ -909,6 +912,21 @@ intel_check_sprite_plane(struct drm_plane *plane,if (crtc_w ==0 ) state->visible = false; + +if (intel_rotation_90_or_270 (state->base.rotation)) { + src_y &= ~1 ; + src_h &= ~1 ; +
drivers/gpu/drm/i915/intel_sprite.c intel_check_sprite_plane(struct drm_plane *plane, · line 929
Quoted 10 lines
drivers/gpu/drm/i915/intel_sprite.c +10
-0+/* +* Must keep src and dst the +* same if we can't scale. +*/ +if (!intel_plane->can_scale) + crtc_h &= ~1 ; + +if (crtc_h ==0 ) + state->visible = false; + }
Same here.
Quoted 10 lines
drivers/gpu/drm/i915/intel_sprite.c +0
-0} }Signature · 6 lines
1.7.9.5 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/2] drm/i915: Add 90/270 rotation for NV12 format.
Quoted 65 lines
-----Original Message-----
From: Ville Syrjälä [mailto:[email protected]]
Sent: Monday, May 11, 2015 5:03 AM
To: Konduru, Chandra
Cc: [email protected]; Vetter, Daniel; Syrjala, Ville
Subject: Re: [Intel-gfx] [PATCH 2/2] drm/i915: Add 90/270 rotation for NV12 format.Quoted 6 lines · Chandra Konduru
Adding NV12 90/270 rotation support for primary and sprite planes.
Signed-off-by Chandra Konduru <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 23 ++++++++++++++++------- drivers/gpu/drm/i915/intel_sprite.c | 32 +++++++++++++++++++++++++-------
Review
Quoted 3 lines
2 files changed, 41 insertions(+), 14 deletions(-)(quoted diff) +0
-0
b/drivers/gpu/drm/i915/intel_display.cdrivers/gpu/drm/i915/intel_display.c static void skylake_update_primary_plane(struct
Quoted 4 lines
index c385a3b..77d7f69 100644
drivers/gpu/drm/i915/intel_display.c +0
-0@@ -3105,7 +3105,8 @@ static void skylake_update_primary_plane(struct
drm_crtc*crtc,drivers/gpu/drm/i915/intel_display.c static void skylake_update_primary_plane(struct
Quoted 10 lines
drivers/gpu/drm/i915/intel_display.c +2
-1int src_x =0 , src_y =0 , src_w =0 , src_h =0 ;int dst_x =0 , dst_y =0 , dst_w =0 , dst_h =0 ;int scaler_id =-1 ; -u32 aux_dist =0 , aux_x_offset =0 , aux_y_offset =0 , aux_stride =0 ; +unsigned long aux_dist =0 ; +u32 aux_x_offset =0 , aux_y_offset =0 , aux_stride =0 ;u32 tile_row_adjustment =0 ; plane_state =to_intel_plane_state (plane->state);@@ -3163,12 +3164,16 @@ static void skylake_update_primary_plane(struct
drm_crtc*crtc,Quoted 5 lines
drivers/gpu/drm/i915/intel_display.c +0
-2x_offset = stride * tile_height - y - src_h; y_offset = x; plane_size = (src_w -1 ) <<16 | (src_h -1 ); -/* -* TBD: For NV12 90/270 rotation, Y and UV subplanes should drivers/gpu/drm/i915/intel_display.c static void skylake_update_primary_plane(struct drm_crtc *crtc,
Quoted 10 lines
drivers/gpu/drm/i915/intel_display.c +5
-4-* be treated as separate surfaces and GTT remapping for -* rotation should be done separately for each subplane. -* Enable support once seperate remappings are available. -*/ + +if (fb->pixel_format ==DRM_FORMAT_NV12 ) { +u32 uv_tile_height =intel_tile_height (dev, fb- pixel_format, + fb->modifier[0 ],1 ); + aux_stride = DIV_ROUND_UP(fb->height / 2,
uv_tile_height);drivers/gpu/drm/i915/intel_display.c static void skylake_update_primary_plane(struct · line 3173
Quoted 1 line
drivers/gpu/drm/i915/intel_display.c +1
-0+ aux_dist =
intel_plane_obj_offset(to_intel_plane(plane), obj, 1)-drivers/gpu/drm/i915/intel_display.c intel_check_primary_plane(struct drm_plane
Quoted 9 lines
drivers/gpu/drm/i915/intel_display.c +4
-0+ surf_addr; + aux_x_offset = aux_stride * uv_tile_height - y /2 - fb- height /2 ; + aux_y_offset = x /2 ; + } }else {drivers/gpu/drm/i915/intel_display.c +0
-0stride = fb->pitches[0 ] / stride_div; x_offset = x;@@ -13144,6 +13149,10 @@ intel_check_primary_plane(struct drm_plane*plane,
Quoted 12 lines
drivers/gpu/drm/i915/intel_display.c intel_check_primary_plane(struct drm_plane *plane, · line 13155
Quoted 7 lines
drivers/gpu/drm/i915/intel_display.c +4
-0if (fb &&format_is_yuv (fb->pixel_format)) { src->x1 &= ~0x10000 ; src->x2 &= ~0x10000 ; +if (intel_rotation_90_or_270 (state->base.rotation)) { + src->y1 &= ~0x10000 ; + src->y2 &= ~0x10000 ; + }This feels fishy. Why do we need to make the Y coordinates even? The reson for making the X coordinates even is to make them macropixel aligned, but there are no macropixels in the Y direction so this doesn't make much sense to me.
Hi Ville,
Per skl spec, it is expecting even lines aligned with 90/270 rotation not only for NV12 but also for 422 formats. Perhaps we might have missed when 90/270 enabled for packed YUV formats.
Quoted 74 lines
Review
Quoted 5 lines
drivers/gpu/drm/i915/intel_display.c +0
-0}if (INTEL_INFO (dev)->gen >=9 ) {(quoted diff) +0
-0
b/drivers/gpu/drm/i915/intel_sprite.cdrivers/gpu/drm/i915/intel_sprite.c skl_update_plane(struct drm_plane *drm_plane,
Quoted 4 lines
index e23fe8e..d4ce7eb 100644
drivers/gpu/drm/i915/intel_sprite.c +0
-0@@ -190,7 +190,8 @@ skl_update_plane(struct drm_plane *drm_plane,struct
drm_crtc*crtc,drivers/gpu/drm/i915/intel_sprite.c skl_update_plane(struct drm_plane *drm_plane,
Quoted 10 lines
drivers/gpu/drm/i915/intel_sprite.c +2
-1int x_offset, y_offset;struct intel_crtc_state *crtc_state =to_intel_crtc (crtc)->config;int scaler_id; -u32 aux_dist =0 , aux_x_offset =0 , aux_y_offset =0 , aux_stride =0 ; +unsigned long aux_dist =0 ; +u32 aux_x_offset =0 , aux_y_offset =0 , aux_stride =0 ;u32 tile_row_adjustment =0 ; plane_ctl = PLANE_CTL_ENABLE |@@ -239,12 +240,14 @@ skl_update_plane(struct drm_plane *drm_plane,struct
drm_crtc*crtc,Quoted 4 lines
drivers/gpu/drm/i915/intel_sprite.c +0
-1x_offset = stride * tile_height - y - (src_h +1 ); y_offset = x; -/* drivers/gpu/drm/i915/intel_sprite.c skl_update_plane(struct drm_plane *drm_plane, struct drm_crtc *crtc,
Quoted 10 lines
drivers/gpu/drm/i915/intel_sprite.c +4
-5-* TBD: For NV12 90/270 rotation, Y and UV subplanes should -* be treated as separate surfaces and GTT remapping for -* rotation should be done separately for each subplane. -* Enable support once seperate remappings are available. -*/ +if (fb->pixel_format ==DRM_FORMAT_NV12 ) { +u32 uv_tile_height =intel_tile_height (dev, fb- pixel_format, + fb->modifier[0 ],1 ); + aux_stride = DIV_ROUND_UP(fb->height / 2,
uv_tile_height);drivers/gpu/drm/i915/intel_sprite.c skl_update_plane(struct drm_plane *drm_plane, · line 248
Quoted 1 line
drivers/gpu/drm/i915/intel_sprite.c +1
-0+ aux_dist = intel_plane_obj_offset(intel_plane, obj, 1) -
surf_addr;Quoted 16 lines
drivers/gpu/drm/i915/intel_sprite.c +3
-0+ aux_x_offset = aux_stride * uv_tile_height - y /2 - fb- height /2 ; + aux_y_offset = x /2 ; + } }else {drivers/gpu/drm/i915/intel_sprite.c +5
-0stride = fb->pitches[0 ] / stride_div; plane_size = (src_h <<16 ) | src_w;@@ -909,6 +912,21 @@ intel_check_sprite_plane(struct drm_plane *plane,if (crtc_w ==0 ) state->visible = false; + +if (intel_rotation_90_or_270 (state->base.rotation)) { + src_y &= ~1 ; + src_h &= ~1 ; +drivers/gpu/drm/i915/intel_sprite.c intel_check_sprite_plane(struct drm_plane *plane, · line 929
Quoted 10 lines
drivers/gpu/drm/i915/intel_sprite.c +10
-0+/* +* Must keep src and dst the +* same if we can't scale. +*/ +if (!intel_plane->can_scale) + crtc_h &= ~1 ; + +if (crtc_h ==0 ) + state->visible = false; + }Same here.
Quoted 6 lines
drivers/gpu/drm/i915/intel_sprite.c +0
-1} } --1.7.9.5
Quoted 8 lines
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx--
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/2] drm/i915: Add 90/270 rotation for NV12 format.
Quoted 78 lines · Chandra
Quoted 65 lines
-----Original Message-----
From: Ville Syrjälä [mailto:[email protected]]
Sent: Monday, May 11, 2015 5:03 AM
To: Konduru, Chandra
Cc: [email protected]; Vetter, Daniel; Syrjala, Ville
Subject: Re: [Intel-gfx] [PATCH 2/2] drm/i915: Add 90/270 rotation for NV12 format.Quoted 6 lines · Chandra Konduru
Adding NV12 90/270 rotation support for primary and sprite planes.
Signed-off-by Chandra Konduru <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 23 ++++++++++++++++------- drivers/gpu/drm/i915/intel_sprite.c | 32 +++++++++++++++++++++++++-------
Review
Quoted 3 lines
2 files changed, 41 insertions(+), 14 deletions(-)(quoted diff) +0
-0
b/drivers/gpu/drm/i915/intel_display.cdrivers/gpu/drm/i915/intel_display.c static void skylake_update_primary_plane(struct
Quoted 4 lines
index c385a3b..77d7f69 100644
drivers/gpu/drm/i915/intel_display.c +0
-0@@ -3105,7 +3105,8 @@ static void skylake_update_primary_plane(struct
drm_crtc*crtc,drivers/gpu/drm/i915/intel_display.c static void skylake_update_primary_plane(struct
Quoted 10 lines
drivers/gpu/drm/i915/intel_display.c +2
-1int src_x =0 , src_y =0 , src_w =0 , src_h =0 ;int dst_x =0 , dst_y =0 , dst_w =0 , dst_h =0 ;int scaler_id =-1 ; -u32 aux_dist =0 , aux_x_offset =0 , aux_y_offset =0 , aux_stride =0 ; +unsigned long aux_dist =0 ; +u32 aux_x_offset =0 , aux_y_offset =0 , aux_stride =0 ;u32 tile_row_adjustment =0 ; plane_state =to_intel_plane_state (plane->state);@@ -3163,12 +3164,16 @@ static void skylake_update_primary_plane(struct
drm_crtc*crtc,Quoted 5 lines
drivers/gpu/drm/i915/intel_display.c +0
-2x_offset = stride * tile_height - y - src_h; y_offset = x; plane_size = (src_w -1 ) <<16 | (src_h -1 ); -/* -* TBD: For NV12 90/270 rotation, Y and UV subplanes should drivers/gpu/drm/i915/intel_display.c static void skylake_update_primary_plane(struct drm_crtc *crtc,
Quoted 10 lines
drivers/gpu/drm/i915/intel_display.c +5
-4-* be treated as separate surfaces and GTT remapping for -* rotation should be done separately for each subplane. -* Enable support once seperate remappings are available. -*/ + +if (fb->pixel_format ==DRM_FORMAT_NV12 ) { +u32 uv_tile_height =intel_tile_height (dev, fb- pixel_format, + fb->modifier[0 ],1 ); + aux_stride = DIV_ROUND_UP(fb->height / 2,
uv_tile_height);drivers/gpu/drm/i915/intel_display.c static void skylake_update_primary_plane(struct · line 3173
Quoted 1 line
drivers/gpu/drm/i915/intel_display.c +1
-0+ aux_dist =
intel_plane_obj_offset(to_intel_plane(plane), obj, 1)-drivers/gpu/drm/i915/intel_display.c intel_check_primary_plane(struct drm_plane
Quoted 9 lines
drivers/gpu/drm/i915/intel_display.c +4
-0+ surf_addr; + aux_x_offset = aux_stride * uv_tile_height - y /2 - fb- height /2 ; + aux_y_offset = x /2 ; + } }else {drivers/gpu/drm/i915/intel_display.c +0
-0stride = fb->pitches[0 ] / stride_div; x_offset = x;@@ -13144,6 +13149,10 @@ intel_check_primary_plane(struct drm_plane*plane,
Quoted 12 lines
drivers/gpu/drm/i915/intel_display.c intel_check_primary_plane(struct drm_plane *plane, · line 13155
Quoted 7 lines
drivers/gpu/drm/i915/intel_display.c +4
-0if (fb &&format_is_yuv (fb->pixel_format)) { src->x1 &= ~0x10000 ; src->x2 &= ~0x10000 ; +if (intel_rotation_90_or_270 (state->base.rotation)) { + src->y1 &= ~0x10000 ; + src->y2 &= ~0x10000 ; + }This feels fishy. Why do we need to make the Y coordinates even? The reson for making the X coordinates even is to make them macropixel aligned, but there are no macropixels in the Y direction so this doesn't make much sense to me.
Quoted 4 lines
Hi Ville,
Per skl spec, it is expecting even lines aligned with 90/270 rotation not only for NV12 but also for 422 formats. Perhaps we might have missed when 90/270 enabled for packed YUV formats.
The src coordinates are always in the fb orientation, so macropixels appear in the src.x direction only. And when we do 90/270 rotation the hardware Y offset comes from src.x coordinates.
The spec does seem a bit confused though; It claims the X offset must always be even for YUV422+NV12, and the Y offset must be even when rotated 90/270 degrees. I suspect the X offset text just didn't get updated when 90/270 rotation was added.
Art, can you confirm?
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/2] drm/i915: Add 90/270 rotation for NV12 format.
I'll take a look.
-----Original Message-----
From: Ville Syrjälä [mailto:[email protected]]
Sent: Tuesday, May 12, 2015 3:44 AM
To: Konduru, Chandra
Cc: [email protected]; Vetter, Daniel; Syrjala, Ville; Jindal, Sonika; Runyan, Arthur J
Subject: Re: [Intel-gfx] [PATCH 2/2] drm/i915: Add 90/270 rotation for NV12 format.
Quoted 78 lines · Chandra
Quoted 65 lines
-----Original Message-----
From: Ville Syrjälä [mailto:[email protected]]
Sent: Monday, May 11, 2015 5:03 AM
To: Konduru, Chandra
Cc: [email protected]; Vetter, Daniel; Syrjala, Ville
Subject: Re: [Intel-gfx] [PATCH 2/2] drm/i915: Add 90/270 rotation for NV12 format.Quoted 6 lines · Chandra Konduru
Adding NV12 90/270 rotation support for primary and sprite planes.
Signed-off-by Chandra Konduru <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 23 ++++++++++++++++------- drivers/gpu/drm/i915/intel_sprite.c | 32 +++++++++++++++++++++++++-------
Review
Quoted 3 lines
2 files changed, 41 insertions(+), 14 deletions(-)(quoted diff) +0
-0
b/drivers/gpu/drm/i915/intel_display.cdrivers/gpu/drm/i915/intel_display.c static void skylake_update_primary_plane(struct
Quoted 4 lines
index c385a3b..77d7f69 100644
drivers/gpu/drm/i915/intel_display.c +0
-0@@ -3105,7 +3105,8 @@ static void skylake_update_primary_plane(struct
drm_crtc*crtc,drivers/gpu/drm/i915/intel_display.c static void skylake_update_primary_plane(struct
Quoted 10 lines
drivers/gpu/drm/i915/intel_display.c +2
-1int src_x =0 , src_y =0 , src_w =0 , src_h =0 ;int dst_x =0 , dst_y =0 , dst_w =0 , dst_h =0 ;int scaler_id =-1 ; -u32 aux_dist =0 , aux_x_offset =0 , aux_y_offset =0 , aux_stride =0 ; +unsigned long aux_dist =0 ; +u32 aux_x_offset =0 , aux_y_offset =0 , aux_stride =0 ;u32 tile_row_adjustment =0 ; plane_state =to_intel_plane_state (plane->state);@@ -3163,12 +3164,16 @@ static void skylake_update_primary_plane(struct
drm_crtc*crtc,Quoted 5 lines
drivers/gpu/drm/i915/intel_display.c +0
-2x_offset = stride * tile_height - y - src_h; y_offset = x; plane_size = (src_w -1 ) <<16 | (src_h -1 ); -/* -* TBD: For NV12 90/270 rotation, Y and UV subplanes should drivers/gpu/drm/i915/intel_display.c static void skylake_update_primary_plane(struct drm_crtc *crtc,
Quoted 10 lines
drivers/gpu/drm/i915/intel_display.c +5
-4-* be treated as separate surfaces and GTT remapping for -* rotation should be done separately for each subplane. -* Enable support once seperate remappings are available. -*/ + +if (fb->pixel_format ==DRM_FORMAT_NV12 ) { +u32 uv_tile_height =intel_tile_height (dev, fb- pixel_format, + fb->modifier[0 ],1 ); + aux_stride = DIV_ROUND_UP(fb->height / 2,
uv_tile_height);drivers/gpu/drm/i915/intel_display.c static void skylake_update_primary_plane(struct · line 3173
Quoted 1 line
drivers/gpu/drm/i915/intel_display.c +1
-0+ aux_dist =
intel_plane_obj_offset(to_intel_plane(plane), obj, 1)-drivers/gpu/drm/i915/intel_display.c intel_check_primary_plane(struct drm_plane
Quoted 9 lines
drivers/gpu/drm/i915/intel_display.c +4
-0+ surf_addr; + aux_x_offset = aux_stride * uv_tile_height - y /2 - fb- height /2 ; + aux_y_offset = x /2 ; + } }else {drivers/gpu/drm/i915/intel_display.c +0
-0stride = fb->pitches[0 ] / stride_div; x_offset = x;@@ -13144,6 +13149,10 @@ intel_check_primary_plane(struct drm_plane*plane,
Quoted 12 lines
drivers/gpu/drm/i915/intel_display.c intel_check_primary_plane(struct drm_plane *plane, · line 13155
Quoted 7 lines
drivers/gpu/drm/i915/intel_display.c +4
-0if (fb &&format_is_yuv (fb->pixel_format)) { src->x1 &= ~0x10000 ; src->x2 &= ~0x10000 ; +if (intel_rotation_90_or_270 (state->base.rotation)) { + src->y1 &= ~0x10000 ; + src->y2 &= ~0x10000 ; + }This feels fishy. Why do we need to make the Y coordinates even? The reson for making the X coordinates even is to make them macropixel aligned, but there are no macropixels in the Y direction so this doesn't make much sense to me.
Quoted 4 lines
Hi Ville,
Per skl spec, it is expecting even lines aligned with 90/270 rotation not only for NV12 but also for 422 formats. Perhaps we might have missed when 90/270 enabled for packed YUV formats.
The src coordinates are always in the fb orientation, so macropixels appear in the src.x direction only. And when we do 90/270 rotation the hardware Y offset comes from src.x coordinates.
The spec does seem a bit confused though; It claims the X offset must always be even for YUV422+NV12, and the Y offset must be even when rotated 90/270 degrees. I suspect the X offset text just didn't get updated when 90/270 rotation was added.
Art, can you confirm?
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/2] drm/i915: Add 90/270 rotation for NV12 format.
Quoted 4 lines
From: Runyan, Arthur J
I'll take a look.
Art, Any update to close on this?
[snip]
Quoted 30 lines
Quoted 16 lines
Quoted 15 lines
Quoted 2 lines
(quoted diff) +0
-0@@ -13144,6 +13149,10 @@ intel_check_primary_plane(struct
drm_plane*plane,
drivers/gpu/drm/i915/intel_display.c intel_check_primary_plane(struct drm_plane *plane, · line 13155
Quoted 7 lines
drivers/gpu/drm/i915/intel_display.c +4
-0if (fb &&format_is_yuv (fb->pixel_format)) { src->x1 &= ~0x10000 ; src->x2 &= ~0x10000 ; +if (intel_rotation_90_or_270 (state->base.rotation)) { + src->y1 &= ~0x10000 ; + src->y2 &= ~0x10000 ; + }This feels fishy. Why do we need to make the Y coordinates even? The reson for making the X coordinates even is to make them macropixel aligned, but there are no macropixels in the Y direction so this doesn't make much sense to me.
Quoted 4 lines
Hi Ville,
Per skl spec, it is expecting even lines aligned with 90/270 rotation not only for NV12 but also for 422 formats. Perhaps we might have missed when 90/270 enabled for packed YUV formats.The src coordinates are always in the fb orientation, so macropixels appear in the src.x direction only. And when we do 90/270 rotation the hardware Y offset comes from src.x coordinates.
The spec does seem a bit confused though; It claims the X offset must always be even for YUV422+NV12, and the Y offset must be even when rotated 90/270 degrees. I suspect the X offset text just didn't get updated when 90/270 rotation was added.
Quoted 5 lines
Art, can you confirm?
--
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/2] drm/i915: Add 90/270 rotation for NV12 format.
The statement is correct - " the X offset must always be even for YUV422+NV12, and the Y offset must be even when rotated 90/270 degrees."
Quoted 44 lines
From: Konduru, Chandra
Quoted 3 lines
From: Runyan, Arthur J
I'll take a look.
Art, Any update to close on this?
[snip]
Quoted 35 lines
Quoted 16 lines
Quoted 15 lines
Quoted 2 lines
(quoted diff) +0
-0@@ -13144,6 +13149,10 @@ intel_check_primary_plane(struct
drm_plane*plane,
drivers/gpu/drm/i915/intel_display.c intel_check_primary_plane(struct drm_plane *plane, · line 13155
Quoted 7 lines
drivers/gpu/drm/i915/intel_display.c +4
-0if (fb &&format_is_yuv (fb->pixel_format)) { src->x1 &= ~0x10000 ; src->x2 &= ~0x10000 ; +if (intel_rotation_90_or_270 (state->base.rotation)) { + src->y1 &= ~0x10000 ; + src->y2 &= ~0x10000 ; + }This feels fishy. Why do we need to make the Y coordinates even? The reson for making the X coordinates even is to make them macropixel aligned, but there are no macropixels in the Y direction so this doesn't make much sense to me.
Quoted 4 lines
Hi Ville,
Per skl spec, it is expecting even lines aligned with 90/270 rotation not only for NV12 but also for 422 formats. Perhaps we might have missed when 90/270 enabled for packed YUV formats.The src coordinates are always in the fb orientation, so macropixels appear in the src.x direction only. And when we do 90/270 rotation the hardware Y offset comes from src.x coordinates.
The spec does seem a bit confused though; It claims the X offset must always be even for YUV422+NV12, and the Y offset must be even when rotated 90/270 degrees. I suspect the X offset text just didn't get updated when 90/270 rotation was added.
Art, can you confirm?
--
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/2] drm/i915: Add 90/270 rotation for NV12 format.
Quoted 10 lines
-----Original Message-----
From: Runyan, Arthur J
Sent: Monday, May 18, 2015 12:19 PM
To: Konduru, Chandra; Ville Syrjälä
Cc: [email protected]; Vetter, Daniel; Syrjala, Ville; Jindal, Sonika
Subject: RE: [Intel-gfx] [PATCH 2/2] drm/i915: Add 90/270 rotation for NV12 format.
Quoted 2 lines
The statement is correct - " the X offset must always be even for YUV422+NV12, and the Y offset must be even when rotated 90/270 degrees."
Thanks Art.
Then below code to take care evenness for both X and Y offsets when YUV 90/270 is ok.
Ville, with this, can you give R-b tag on the ones you reviewed?
Quoted 33 lines
Quoted 33 lines
From: Konduru, Chandra
Quoted 3 lines
From: Runyan, Arthur J
I'll take a look.
Art, Any update to close on this?
[snip]
Quoted 23 lines
Quoted 16 lines
Quoted 15 lines
Quoted 2 lines
(quoted diff) +0
-0@@ -13144,6 +13149,10 @@ intel_check_primary_plane(struct
drm_plane*plane,
Review
Quoted 7 lines
(quoted diff) +4
-0if (fb && format_is_yuv(fb->pixel_format)) { src->x1 &= ~0x10000; src->x2 &= ~0x10000; + if (intel_rotation_90_or_270(state->base.rotation)) { + src->y1 &= ~0x10000; + src->y2 &= ~0x10000; + }This feels fishy. Why do we need to make the Y coordinates even? The reson for making the X coordinates even is to make them macropixel aligned, but there are no macropixels in the Y direction so this doesn't make much sense to me.
Quoted 4 lines
Hi Ville,
Per skl spec, it is expecting even lines aligned with 90/270 rotation not only for NV12 but also for 422 formats. Perhaps we might have missed when 90/270 enabled for packed YUV formats.The src coordinates are always in the fb orientation, so macropixels appear in the src.x direction only. And when we do 90/270 rotation the hardware Y
Quoted 15 lines
offset
Quoted 3 lines
Quoted 3 lines
comes from src.x coordinates.
The spec does seem a bit confused though; It claims the X offset must always
be
Quoted 2 lines
Quoted 2 lines
even for YUV422+NV12, and the Y offset must be even when rotated 90/270 degrees. I suspect the X offset text just didn't get updated when 90/270
rotation
Quoted 7 lines
Quoted 7 lines
was added.
Art, can you confirm?
--
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/2] drm/i915: Add 90/270 rotation for NV12 format.
In reply to Runyan, Arthur JQuoted 1 line · Arthur J
The statement is correct - " the X offset must always be even for YUV422+NV12, and the Y offset must be even when rotated 90/270 degrees."
Hmm. Can you elaborate a bit? I'm curious where this limitation comes from.
Quoted 45 lines
Quoted 45 lines
From: Konduru, Chandra
Quoted 3 lines
From: Runyan, Arthur J
I'll take a look.
Art, Any update to close on this?
[snip]
Quoted 35 lines
Quoted 16 lines
Quoted 15 lines
Quoted 2 lines
(quoted diff) +0
-0@@ -13144,6 +13149,10 @@ intel_check_primary_plane(struct
drm_plane*plane,
Review
Quoted 7 lines
(quoted diff) +4
-0if (fb && format_is_yuv(fb->pixel_format)) { src->x1 &= ~0x10000; src->x2 &= ~0x10000; + if (intel_rotation_90_or_270(state->base.rotation)) { + src->y1 &= ~0x10000; + src->y2 &= ~0x10000; + }This feels fishy. Why do we need to make the Y coordinates even? The reson for making the X coordinates even is to make them macropixel aligned, but there are no macropixels in the Y direction so this doesn't make much sense to me.
Quoted 4 lines
Hi Ville,
Per skl spec, it is expecting even lines aligned with 90/270 rotation not only for NV12 but also for 422 formats. Perhaps we might have missed when 90/270 enabled for packed YUV formats.The src coordinates are always in the fb orientation, so macropixels appear in the src.x direction only. And when we do 90/270 rotation the hardware Y offset comes from src.x coordinates.
The spec does seem a bit confused though; It claims the X offset must always be even for YUV422+NV12, and the Y offset must be even when rotated 90/270 degrees. I suspect the X offset text just didn't get updated when 90/270 rotation was added.
Art, can you confirm?
--
Ville Syrjälä
Intel OTC
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/2] drm/i915: Add 90/270 rotation for NV12 format.
Quoted 9 lines
From: Ville Syrjälä [mailto:[email protected]]
Quoted 1 line · Arthur J
The statement is correct - " the X offset must always be even for YUV422+NV12,
and the Y offset must be even when rotated 90/270 degrees."
Hmm. Can you elaborate a bit? I'm curious where this limitation comes from.
Ah, I get what you are asking now. They don't both have to be even when roated. The text should say " the X offset must be even for YUV422+NV12 ***when not rotated 90/270***, and the Y offset must be even when rotated 90/270 degrees." I'll fix that text.
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/2] drm/i915: Add 90/270 rotation for NV12 format.
Quoted 10 lines · Arthur J
Quoted 9 lines
From: Ville Syrjälä [mailto:[email protected]]
Quoted 1 line · Arthur J
The statement is correct - " the X offset must always be even for YUV422+NV12,
and the Y offset must be even when rotated 90/270 degrees."
Hmm. Can you elaborate a bit? I'm curious where this limitation comes from.
Ah, I get what you are asking now. They don't both have to be even when roated. The text should say " the X offset must be even for YUV422+NV12 ***when not rotated 90/270***, and the Y offset must be even when rotated 90/270 degrees." I'll fix that text.
Excellent. Thanks for confirming my hunch :)
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx