drm/i915/skl: Allow universal planes to position
Subsystems (2)
PATCH 1/2 drm/i915/skl: Allow universal planes to position
--- drivers/gpu/drm/i915/intel_display.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_display.c +6 -1
@@ -12150,16 +12150,21 @@ intel_check_primary_plane(struct drm_plane *plane,struct drm_rect *dest = &state->dst;struct drm_rect *src = &state->src;const struct drm_rect *clip = &state->clip; +bool can_position = false;int ret; crtc = crtc ? crtc : plane->crtc; intel_crtc =to_intel_crtc (crtc); +if (INTEL_INFO (dev)->gen >=9 ) + can_position = true; + ret =drm_plane_helper_check_update (plane, crtc, fb, src, dest, clip,DRM_PLANE_HELPER_NO_SCALING ,DRM_PLANE_HELPER_NO_SCALING , - false, true, &state->visible); + can_position, true, + &state->visible);if (ret)return ret;
Signature · 6 lines
1.7.10.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/2 drm/i915/skl: Support for 90/270 rotation
v2: Moving creation of property in a function, checking for 90/270 rotation simultaneously (Chris)
Letting primary plane to be positioned
v3: Adding if/else for 90/270 and rest params programming, adding check for pixel_format, some cleanup (review comments)
v4: Adding right pixel_formats, using src_* params instead of crtc_* for offset and size programming (Ville)
v5: Rebased on -nightly and Tvrtko's series for gtt remapping.
v6: Rebased on -nightly (Tvrtko's series merged)
--- drivers/gpu/drm/i915/i915_reg.h | 2 + drivers/gpu/drm/i915/intel_display.c | 103 +++++++++++++++++++++++++++------- drivers/gpu/drm/i915/intel_drv.h | 6 ++ drivers/gpu/drm/i915/intel_sprite.c | 52 ++++++++++++----- 4 files changed, 129 insertions(+), 34 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +2 -0
@@ -4854,7 +4854,9 @@ enum skl_disp_power_wells {#define PLANE_CTL_ALPHA_HW_PREMULTIPLY ( 3 << 4)#define PLANE_CTL_ROTATE_MASK 0x3#define PLANE_CTL_ROTATE_0 0x0 +#define PLANE_CTL_ROTATE_90 0x1#define PLANE_CTL_ROTATE_180 0x2 +#define PLANE_CTL_ROTATE_270 0x3#define _PLANE_STRIDE_1_A 0x70188#define _PLANE_STRIDE_2_A 0x70288#define _PLANE_STRIDE_3_A 0x70388
drivers/gpu/drm/i915/intel_display.c +84 -19
142 lines not on this page · raw message
drivers/gpu/drm/i915/intel_drv.h +6 -0
@@ -995,6 +995,12 @@ intel_rotation_90_or_270(unsigned int rotation)return rotation & (BIT (DRM_ROTATE_90 ) |BIT (DRM_ROTATE_270 )); } +unsigned int +intel_tile_height (struct drm_device *dev,uint32_t bits_per_pixel, +uint64_t fb_modifier); +void intel_create_rotation_property (struct drm_device *dev, +struct intel_plane *plane); +bool intel_wm_need_update (struct drm_plane *plane,struct drm_plane_state *state);
drivers/gpu/drm/i915/intel_sprite.c +37 -15
81 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
Re: [PATCH 2/2] drm/i915/skl: Support for 90/270 rotation
Task id: 6091 -------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV -4 270/270 266/270
ILK 303/303 303/303
SNB -1 304/304 303/304
IVB 337/337 337/337 BYT 287/287 287/287 HSW 361/361 361/361 BDW 309/309 309/309 -------------------------------------Detailed------------------------------------- Platform Test drm-intel-nightly Series Applied PNV igt@gem_userptr_blits@coherency-sync CRASH(2)PASS(2) CRASH(2) *PNV igt@gem_fence_thrash@bo-write-verify-threaded-none PASS(2) FAIL(1)PASS(1) *PNV igt@gem_fence_thrash@bo-write-verify-x PASS(2) FAIL(1)PASS(1) *PNV igt@gem_fence_thrash@bo-write-verify-y PASS(2) FAIL(1)PASS(1) *SNB igt@kms_rotation_crc@sprite-rotation PASS(3) FAIL(1)PASS(1)
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list [email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/2] drm/i915/skl: Support for 90/270 rotation
In reply to Sonika JindalQuoted 51 lines · Sonika Jindal
v2: Moving creation of property in a function, checking for 90/270 rotation simultaneously (Chris)
Letting primary plane to be positioned
v3: Adding if/else for 90/270 and rest params programming, adding check forpixel_format, some cleanup (review comments)
v4: Adding rightpixel_formats, using src_* params instead of crtc_* for offset and size programming (Ville)
v5: Rebased on -nightly and Tvrtko's series for gtt remapping.
v6: Rebased on -nightly (Tvrtko's series merged)Signed-off-by Sonika Jindal <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 2 + drivers/gpu/drm/i915/intel_display.c | 103 +++++++++++++++++++++++++++------- drivers/gpu/drm/i915/intel_drv.h | 6 ++ drivers/gpu/drm/i915/intel_sprite.c | 52 ++++++++++++----- 4 files changed, 129 insertions(+), 34 deletions(-)drivers/gpu/drm/i915/i915_reg.h +2
-0@@ -4854,7 +4854,9 @@ enum skl_disp_power_wells {#define PLANE_CTL_ALPHA_HW_PREMULTIPLY ( 3 << 4)#define PLANE_CTL_ROTATE_MASK 0x3#define PLANE_CTL_ROTATE_0 0x0 +#define PLANE_CTL_ROTATE_90 0x1#define PLANE_CTL_ROTATE_180 0x2 +#define PLANE_CTL_ROTATE_270 0x3#define _PLANE_STRIDE_1_A 0x70188#define _PLANE_STRIDE_2_A 0x70288#define _PLANE_STRIDE_3_A 0x70388drivers/gpu/drm/i915/intel_display.c +11
-0@@ -2318,6 +2318,28 @@ intel_fill_fb_ggtt_view(struct i915_ggtt_view *view, struct drm_framebuffer *fb,return -EINVAL ; } +switch (fb->pixel_format) { +case DRM_FORMAT_XRGB8888 : +case DRM_FORMAT_ARGB8888 : +case DRM_FORMAT_XBGR8888 : +case DRM_FORMAT_ABGR8888 : +case DRM_FORMAT_XRGB2101010 : +case DRM_FORMAT_ARGB2101010 : +case DRM_FORMAT_XBGR2101010 : +case DRM_FORMAT_ABGR2101010 : +case DRM_FORMAT_YUYV : +case DRM_FORMAT_YVYU :
drivers/gpu/drm/i915/intel_display.c intel_fill_fb_ggtt_view(struct i915_ggtt_view *view, struct drm_framebuffer *fb, · line 2341
Quoted 10 lines
drivers/gpu/drm/i915/intel_display.c +10
-0+case DRM_FORMAT_UYVY : +case DRM_FORMAT_VYUY : +case DRM_FORMAT_NV12 : +break ; + +default : +DRM_DEBUG_KMS ("Unsupported pixel format:%d for 90/270 rotation!\n" , + fb->pixel_format); +return -EINVAL ; + }
Shouldn't we be matching against the list of formats the plane supports (which may vary by platform, or by specific plane) rather than this generic list? We already specified what formats the plane can handle at plane init time, so it seems like what you'd really want is just a call to
drm_plane_check_pixel_format(plane_state->plane, fb->pixel_format)
then follow that up with explicit checks to exclude any formats that we can handle in 0/180, but not in 90/270.
I'd also move this check to intel_plane_atomic_check(), since the 'check' code path is where I'd usually go looking for these types of checks; the function you've got it in at the moment gets called from the 'prepare' step which works as well, but seems a bit less obvious.
Quoted 33 lines
drivers/gpu/drm/i915/intel_display.c +15
-2+return 0 ; }@@ -2919,8 +2941,12 @@ static void skylake_update_primary_plane(struct drm_crtc *crtc,struct intel_crtc *intel_crtc =to_intel_crtc (crtc);struct drm_i915_gem_object *obj;int pipe = intel_crtc->pipe; -u32 plane_ctl, stride_div; +u32 plane_ctl, stride_div, stride; +u32 tile_height, plane_offset, plane_size; +unsigned int rotation; +int x_offset, y_offset;unsigned long surf_addr; +struct drm_plane *plane;if (!intel_crtc->primary_enabled) {I915_WRITE (PLANE_CTL (pipe,0 ),0 );@@ -2981,21 +3007,51 @@ static void skylake_update_primary_plane(struct drm_crtc *crtc, } plane_ctl |=PLANE_CTL_PLANE_GAMMA_DISABLE ; -if (crtc->primary->state->rotation ==BIT (DRM_ROTATE_180 )) + + plane = crtc->primary; + rotation = plane->state->rotation; +switch (rotation) { +case BIT (DRM_ROTATE_90 ): + plane_ctl |=PLANE_CTL_ROTATE_90 ; +break ; + +case BIT (DRM_ROTATE_180 ): plane_ctl |=PLANE_CTL_ROTATE_180 ;
drivers/gpu/drm/i915/intel_display.c static void skylake_update_primary_plane(struct drm_crtc *crtc, · line 3029
Quoted 10 lines
drivers/gpu/drm/i915/intel_display.c +6
-0+break ; + +case BIT (DRM_ROTATE_270 ): + plane_ctl |=PLANE_CTL_ROTATE_270 ; +break ; + } obj =intel_fb_obj (fb); stride_div =intel_fb_stride_alignment (dev, fb->modifier[0 ], fb->pixel_format);
Minor nit; can we move this down inside the 'else' branch to make it apparent how this serves a parallel role to 'tile_height' from the 'if' branch.
drivers/gpu/drm/i915/intel_display.c static void skylake_update_primary_plane(struct drm_crtc *crtc, · line 3032
Quoted 4 lines
drivers/gpu/drm/i915/intel_display.c +3
-1- surf_addr =intel_plane_obj_offset (to_intel_plane (crtc->primary), obj); + surf_addr =intel_plane_obj_offset (to_intel_plane (plane), obj); + +if (rotation & (BIT (DRM_ROTATE_90 ) |BIT (DRM_ROTATE_270 ))) {
Might as well use the intel_rotation_90_or_270() function since we have it. Same comment for the sprite path farther down.
Quoted 187 lines
drivers/gpu/drm/i915/intel_display.c +39
-16+/* stride = Surface height in tiles */ + tile_height =intel_tile_height (dev, fb->bits_per_pixel, + fb->modifier[0 ]); + stride =DIV_ROUND_UP (fb->height, tile_height); + x_offset = stride * tile_height - y - (plane->state->src_h >>16 ); + y_offset = x; + plane_size = ((plane->state->src_w >>16 ) -1 ) <<16 | + ((plane->state->src_h >>16 ) -1 ); + }else { + stride = fb->pitches[0 ] / stride_div; + x_offset = x; + y_offset = y; + plane_size = ((plane->state->src_h >>16 ) -1 ) <<16 | + ((plane->state->src_w >>16 ) -1 ); + } + plane_offset = y_offset <<16 | x_offset;I915_WRITE (PLANE_CTL (pipe,0 ), plane_ctl);I915_WRITE (PLANE_POS (pipe,0 ),0 ); -I915_WRITE (PLANE_OFFSET (pipe,0 ), (y <<16 ) | x); -I915_WRITE (PLANE_SIZE (pipe,0 ), - (intel_crtc->config->pipe_src_h -1 ) <<16 | - (intel_crtc->config->pipe_src_w -1 )); -I915_WRITE (PLANE_STRIDE (pipe,0 ), fb->pitches[0 ] / stride_div); +I915_WRITE (PLANE_OFFSET (pipe,0 ), plane_offset); +I915_WRITE (PLANE_SIZE (pipe,0 ), plane_size); +I915_WRITE (PLANE_STRIDE (pipe,0 ), stride);I915_WRITE (PLANE_SURF (pipe,0 ), surf_addr);POSTING_READ (PLANE_SURF (pipe,0 ));@@ -12406,23 +12462,32 @@ static struct drm_plane *intel_primary_plane_create(struct drm_device *dev, intel_primary_formats, num_formats, DRM_PLANE_TYPE_PRIMARY); -if (INTEL_INFO (dev)->gen >=4 ) { -if (!dev->mode_config.rotation_property) - dev->mode_config.rotation_property = -drm_mode_create_rotation_property (dev, -BIT (DRM_ROTATE_0 ) | -BIT (DRM_ROTATE_180 )); -if (dev->mode_config.rotation_property) -drm_object_attach_property (&primary->base.base, - dev->mode_config.rotation_property, - state->base.rotation); - } +if (INTEL_INFO (dev)->gen >=4 ) +intel_create_rotation_property (dev, primary);drm_plane_helper_add (&primary->base, &intel_plane_helper_funcs);return &primary->base; } +void intel_create_rotation_property (struct drm_device *dev,struct intel_plane *plane) +{ +if (!dev->mode_config.rotation_property) { +unsigned long flags =BIT (DRM_ROTATE_0 ) | +BIT (DRM_ROTATE_180 ); + +if (INTEL_INFO (dev)->gen >=9 ) + flags |=BIT (DRM_ROTATE_90 ) |BIT (DRM_ROTATE_270 ); + + dev->mode_config.rotation_property = +drm_mode_create_rotation_property (dev, flags); + } +if (dev->mode_config.rotation_property) +drm_object_attach_property (&plane->base.base, + dev->mode_config.rotation_property, + plane->base.state->rotation); +} +static int intel_check_cursor_plane (struct drm_plane *plane,struct intel_plane_state *state)drivers/gpu/drm/i915/intel_drv.h +6
-0@@ -995,6 +995,12 @@ intel_rotation_90_or_270(unsigned int rotation)return rotation & (BIT (DRM_ROTATE_90 ) |BIT (DRM_ROTATE_270 )); } +unsigned int +intel_tile_height (struct drm_device *dev,uint32_t bits_per_pixel, +uint64_t fb_modifier); +void intel_create_rotation_property (struct drm_device *dev, +struct intel_plane *plane); +bool intel_wm_need_update (struct drm_plane *plane,struct drm_plane_state *state);drivers/gpu/drm/i915/intel_sprite.c +37
-15@@ -190,10 +190,13 @@ skl_update_plane(struct drm_plane *drm_plane, struct drm_crtc *crtc,struct drm_i915_gem_object *obj =intel_fb_obj (fb);const int pipe = intel_plane->pipe;const int plane = intel_plane->plane +1 ; -u32 plane_ctl, stride_div; +u32 plane_ctl, stride_div, stride;int pixel_size =drm_format_plane_cpp (fb->pixel_format,0 );const struct drm_intel_sprite_colorkey *key = &intel_plane->ckey;unsigned long surf_addr; +u32 tile_height, plane_offset, plane_size; +unsigned int rotation; +int x_offset, y_offset; plane_ctl =PLANE_CTL_ENABLE |PLANE_CTL_PIPE_CSC_ENABLE ;@@ -254,8 +257,20 @@ skl_update_plane(struct drm_plane *drm_plane, struct drm_crtc *crtc,MISSING_CASE (fb->modifier[0 ]); } -if (drm_plane->state->rotation ==BIT (DRM_ROTATE_180 )) + rotation = drm_plane->state->rotation; +switch (rotation) { +case BIT (DRM_ROTATE_90 ): + plane_ctl |=PLANE_CTL_ROTATE_90 ; +break ; + +case BIT (DRM_ROTATE_180 ): plane_ctl |=PLANE_CTL_ROTATE_180 ; +break ; + +case BIT (DRM_ROTATE_270 ): + plane_ctl |=PLANE_CTL_ROTATE_270 ; +break ; + } intel_update_sprite_watermarks(drm_plane, crtc, src_w, src_h, pixel_size, true,@@ -283,10 +298,26 @@ skl_update_plane(struct drm_plane *drm_plane, struct drm_crtc *crtc, surf_addr =intel_plane_obj_offset (intel_plane, obj); -I915_WRITE (PLANE_OFFSET (pipe, plane), (y <<16 ) | x); -I915_WRITE (PLANE_STRIDE (pipe, plane), fb->pitches[0 ] / stride_div); +if (rotation & (BIT (DRM_ROTATE_90 ) |BIT (DRM_ROTATE_270 ))) { +/* stride: Surface height in tiles */ + tile_height =intel_tile_height (dev, fb->bits_per_pixel, + fb->modifier[0 ]); + stride =DIV_ROUND_UP (fb->height, tile_height); + plane_size = (src_w <<16 ) | src_h; + x_offset = stride * tile_height - y - (src_h +1 ); + y_offset = x; + }else { + stride = fb->pitches[0 ] / stride_div; + plane_size = (src_h <<16 ) | src_w; + x_offset = x; + y_offset = y; + } + plane_offset = y_offset <<16 | x_offset; + +I915_WRITE (PLANE_OFFSET (pipe, plane), plane_offset); +I915_WRITE (PLANE_STRIDE (pipe, plane), stride);I915_WRITE (PLANE_POS (pipe, plane), (crtc_y <<16 ) | crtc_x); -I915_WRITE (PLANE_SIZE (pipe, plane), (crtc_h <<16 ) | crtc_w); +I915_WRITE (PLANE_SIZE (pipe, plane), plane_size);I915_WRITE (PLANE_CTL (pipe, plane), plane_ctl);I915_WRITE (PLANE_SURF (pipe, plane), surf_addr);POSTING_READ (PLANE_SURF (pipe, plane));@@ -1310,16 +1341,7 @@ intel_plane_init(struct drm_device *dev, enum pipe pipe, int plane) goto out; } -if (!dev->mode_config.rotation_property) - dev->mode_config.rotation_property = -drm_mode_create_rotation_property (dev, -BIT (DRM_ROTATE_0 ) | -BIT (DRM_ROTATE_180 )); - -if (dev->mode_config.rotation_property) -drm_object_attach_property (&intel_plane->base.base, - dev->mode_config.rotation_property, - state->base.rotation); +intel_create_rotation_property (dev, intel_plane);drm_plane_helper_add (&intel_plane->base, &intel_plane_helper_funcs);Signature · 6 lines
1.7.10.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 9 lines
Matt Roper Graphics Software Engineer IoTG Platform Enabling & Development Intel Corporation (916) 356-2795 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/2] drm/i915/skl: Support for 90/270 rotation
Quoted 69 lines · Matt Roper
Quoted 51 lines · Sonika Jindal
v2: Moving creation of property in a function, checking for 90/270 rotation simultaneously (Chris)
Letting primary plane to be positioned
v3: Adding if/else for 90/270 and rest params programming, adding check forpixel_format, some cleanup (review comments)
v4: Adding rightpixel_formats, using src_* params instead of crtc_* for offset and size programming (Ville)
v5: Rebased on -nightly and Tvrtko's series for gtt remapping.
v6: Rebased on -nightly (Tvrtko's series merged)Signed-off-by Sonika Jindal <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 2 + drivers/gpu/drm/i915/intel_display.c | 103 +++++++++++++++++++++++++++------- drivers/gpu/drm/i915/intel_drv.h | 6 ++ drivers/gpu/drm/i915/intel_sprite.c | 52 ++++++++++++----- 4 files changed, 129 insertions(+), 34 deletions(-)drivers/gpu/drm/i915/i915_reg.h +2
-0@@ -4854,7 +4854,9 @@ enum skl_disp_power_wells {#define PLANE_CTL_ALPHA_HW_PREMULTIPLY ( 3 << 4)#define PLANE_CTL_ROTATE_MASK 0x3#define PLANE_CTL_ROTATE_0 0x0 +#define PLANE_CTL_ROTATE_90 0x1#define PLANE_CTL_ROTATE_180 0x2 +#define PLANE_CTL_ROTATE_270 0x3#define _PLANE_STRIDE_1_A 0x70188#define _PLANE_STRIDE_2_A 0x70288#define _PLANE_STRIDE_3_A 0x70388drivers/gpu/drm/i915/intel_display.c +11
-0@@ -2318,6 +2318,28 @@ intel_fill_fb_ggtt_view(struct i915_ggtt_view *view, struct drm_framebuffer *fb,return -EINVAL ; } +switch (fb->pixel_format) { +case DRM_FORMAT_XRGB8888 : +case DRM_FORMAT_ARGB8888 : +case DRM_FORMAT_XBGR8888 : +case DRM_FORMAT_ABGR8888 : +case DRM_FORMAT_XRGB2101010 : +case DRM_FORMAT_ARGB2101010 : +case DRM_FORMAT_XBGR2101010 : +case DRM_FORMAT_ABGR2101010 : +case DRM_FORMAT_YUYV : +case DRM_FORMAT_YVYU :drivers/gpu/drm/i915/intel_display.c intel_fill_fb_ggtt_view(struct i915_ggtt_view *view, struct drm_framebuffer *fb, · line 2341
Quoted 10 lines
drivers/gpu/drm/i915/intel_display.c +10
-0+case DRM_FORMAT_UYVY : +case DRM_FORMAT_VYUY : +case DRM_FORMAT_NV12 : +break ; + +default : +DRM_DEBUG_KMS ("Unsupported pixel format:%d for 90/270 rotation!\n" , + fb->pixel_format); +return -EINVAL ; + }Shouldn't we be matching against the list of formats the plane supports (which may vary by platform, or by specific plane) rather than this generic list? We already specified what formats the plane can handle at plane init time, so it seems like what you'd really want is just a call to
Quoted 5 lines
drm_plane_check_pixel_format(plane_state->plane, fb->pixel_format)then follow that up with explicit checks to exclude any formats that we can handle in 0/180, but not in 90/270.
I am not sure how it will help. drm_plane_check_pixel_format should be used to check the pixel format of the fb which we should be doing in some -check functions (I don't think we do that right now?) against what is supported by the plane. But to check for the formats which are allowed for 90/270, we would need this kind of explicit check.
Quoted 5 lines
I'd also move this check to
intel_plane_atomic_check(), since the 'check' code path is where I'd usually go looking for these types of checks; the function you've got it in at the moment gets called from the 'prepare' step which works as well, but seems a bit less obvious.
Yes, I agree, but this is on top of Tvrtko's patch for secondary buffer mapping where based upon tiling and pixel format we are allowing the rotated gtt.
Tvrtko,
Can these be moved to the intel_plane_atomic_check()
Quoted 40 lines
Quoted 40 lines
drivers/gpu/drm/i915/intel_display.c +21
-2+return 0 ; }@@ -2919,8 +2941,12 @@ static void skylake_update_primary_plane(struct drm_crtc *crtc,struct intel_crtc *intel_crtc =to_intel_crtc (crtc);struct drm_i915_gem_object *obj;int pipe = intel_crtc->pipe; -u32 plane_ctl, stride_div; +u32 plane_ctl, stride_div, stride; +u32 tile_height, plane_offset, plane_size; +unsigned int rotation; +int x_offset, y_offset;unsigned long surf_addr; +struct drm_plane *plane;if (!intel_crtc->primary_enabled) {I915_WRITE (PLANE_CTL (pipe,0 ),0 );@@ -2981,21 +3007,51 @@ static void skylake_update_primary_plane(struct drm_crtc *crtc, } plane_ctl |=PLANE_CTL_PLANE_GAMMA_DISABLE ; -if (crtc->primary->state->rotation ==BIT (DRM_ROTATE_180 )) + + plane = crtc->primary; + rotation = plane->state->rotation; +switch (rotation) { +case BIT (DRM_ROTATE_90 ): + plane_ctl |=PLANE_CTL_ROTATE_90 ; +break ; + +case BIT (DRM_ROTATE_180 ): plane_ctl |=PLANE_CTL_ROTATE_180 ; +break ; + +case BIT (DRM_ROTATE_270 ): + plane_ctl |=PLANE_CTL_ROTATE_270 ; +break ; + }
Quoted 8 lines
drivers/gpu/drm/i915/intel_display.c static void skylake_update_primary_plane(struct drm_crtc *crtc, · line 3029
Quoted 3 lines
drivers/gpu/drm/i915/intel_display.c +0
-0obj =intel_fb_obj (fb); stride_div =intel_fb_stride_alignment (dev, fb->modifier[0 ], fb->pixel_format);Minor nit; can we move this down inside the 'else' branch to make it apparent how this serves a parallel role to '
tile_height' from the 'if' branch.
Yes sure.
Quoted 9 lines
drivers/gpu/drm/i915/intel_display.c static void skylake_update_primary_plane(struct drm_crtc *crtc, · line 3032
Quoted 5 lines
drivers/gpu/drm/i915/intel_display.c +3
-1- surf_addr =intel_plane_obj_offset (to_intel_plane (crtc->primary), obj); + surf_addr =intel_plane_obj_offset (to_intel_plane (plane), obj); + +if (rotation & (BIT (DRM_ROTATE_90 ) |BIT (DRM_ROTATE_270 ))) {Might as well use the
intel_rotation_90_or_270()function since we have it. Same comment for the sprite path farther down.
Sure.
Regards,
Sonika
Quoted 180 lines
Quoted 180 lines
drivers/gpu/drm/i915/intel_display.c +39
-16+/* stride = Surface height in tiles */ + tile_height =intel_tile_height (dev, fb->bits_per_pixel, + fb->modifier[0 ]); + stride =DIV_ROUND_UP (fb->height, tile_height); + x_offset = stride * tile_height - y - (plane->state->src_h >>16 ); + y_offset = x; + plane_size = ((plane->state->src_w >>16 ) -1 ) <<16 | + ((plane->state->src_h >>16 ) -1 ); + }else { + stride = fb->pitches[0 ] / stride_div; + x_offset = x; + y_offset = y; + plane_size = ((plane->state->src_h >>16 ) -1 ) <<16 | + ((plane->state->src_w >>16 ) -1 ); + } + plane_offset = y_offset <<16 | x_offset;I915_WRITE (PLANE_CTL (pipe,0 ), plane_ctl);I915_WRITE (PLANE_POS (pipe,0 ),0 ); -I915_WRITE (PLANE_OFFSET (pipe,0 ), (y <<16 ) | x); -I915_WRITE (PLANE_SIZE (pipe,0 ), - (intel_crtc->config->pipe_src_h -1 ) <<16 | - (intel_crtc->config->pipe_src_w -1 )); -I915_WRITE (PLANE_STRIDE (pipe,0 ), fb->pitches[0 ] / stride_div); +I915_WRITE (PLANE_OFFSET (pipe,0 ), plane_offset); +I915_WRITE (PLANE_SIZE (pipe,0 ), plane_size); +I915_WRITE (PLANE_STRIDE (pipe,0 ), stride);I915_WRITE (PLANE_SURF (pipe,0 ), surf_addr);POSTING_READ (PLANE_SURF (pipe,0 ));@@ -12406,23 +12462,32 @@ static struct drm_plane *intel_primary_plane_create(struct drm_device *dev, intel_primary_formats, num_formats, DRM_PLANE_TYPE_PRIMARY); -if (INTEL_INFO (dev)->gen >=4 ) { -if (!dev->mode_config.rotation_property) - dev->mode_config.rotation_property = -drm_mode_create_rotation_property (dev, -BIT (DRM_ROTATE_0 ) | -BIT (DRM_ROTATE_180 )); -if (dev->mode_config.rotation_property) -drm_object_attach_property (&primary->base.base, - dev->mode_config.rotation_property, - state->base.rotation); - } +if (INTEL_INFO (dev)->gen >=4 ) +intel_create_rotation_property (dev, primary);drm_plane_helper_add (&primary->base, &intel_plane_helper_funcs);return &primary->base; } +void intel_create_rotation_property (struct drm_device *dev,struct intel_plane *plane) +{ +if (!dev->mode_config.rotation_property) { +unsigned long flags =BIT (DRM_ROTATE_0 ) | +BIT (DRM_ROTATE_180 ); + +if (INTEL_INFO (dev)->gen >=9 ) + flags |=BIT (DRM_ROTATE_90 ) |BIT (DRM_ROTATE_270 ); + + dev->mode_config.rotation_property = +drm_mode_create_rotation_property (dev, flags); + } +if (dev->mode_config.rotation_property) +drm_object_attach_property (&plane->base.base, + dev->mode_config.rotation_property, + plane->base.state->rotation); +} +static int intel_check_cursor_plane (struct drm_plane *plane,struct intel_plane_state *state)drivers/gpu/drm/i915/intel_drv.h +6
-0@@ -995,6 +995,12 @@ intel_rotation_90_or_270(unsigned int rotation)return rotation & (BIT (DRM_ROTATE_90 ) |BIT (DRM_ROTATE_270 )); } +unsigned int +intel_tile_height (struct drm_device *dev,uint32_t bits_per_pixel, +uint64_t fb_modifier); +void intel_create_rotation_property (struct drm_device *dev, +struct intel_plane *plane); +bool intel_wm_need_update (struct drm_plane *plane,struct drm_plane_state *state);drivers/gpu/drm/i915/intel_sprite.c +37
-15@@ -190,10 +190,13 @@ skl_update_plane(struct drm_plane *drm_plane, struct drm_crtc *crtc,struct drm_i915_gem_object *obj =intel_fb_obj (fb);const int pipe = intel_plane->pipe;const int plane = intel_plane->plane +1 ; -u32 plane_ctl, stride_div; +u32 plane_ctl, stride_div, stride;int pixel_size =drm_format_plane_cpp (fb->pixel_format,0 );const struct drm_intel_sprite_colorkey *key = &intel_plane->ckey;unsigned long surf_addr; +u32 tile_height, plane_offset, plane_size; +unsigned int rotation; +int x_offset, y_offset; plane_ctl =PLANE_CTL_ENABLE |PLANE_CTL_PIPE_CSC_ENABLE ;@@ -254,8 +257,20 @@ skl_update_plane(struct drm_plane *drm_plane, struct drm_crtc *crtc,MISSING_CASE (fb->modifier[0 ]); } -if (drm_plane->state->rotation ==BIT (DRM_ROTATE_180 )) + rotation = drm_plane->state->rotation; +switch (rotation) { +case BIT (DRM_ROTATE_90 ): + plane_ctl |=PLANE_CTL_ROTATE_90 ; +break ; + +case BIT (DRM_ROTATE_180 ): plane_ctl |=PLANE_CTL_ROTATE_180 ; +break ; + +case BIT (DRM_ROTATE_270 ): + plane_ctl |=PLANE_CTL_ROTATE_270 ; +break ; + } intel_update_sprite_watermarks(drm_plane, crtc, src_w, src_h, pixel_size, true,@@ -283,10 +298,26 @@ skl_update_plane(struct drm_plane *drm_plane, struct drm_crtc *crtc, surf_addr =intel_plane_obj_offset (intel_plane, obj); -I915_WRITE (PLANE_OFFSET (pipe, plane), (y <<16 ) | x); -I915_WRITE (PLANE_STRIDE (pipe, plane), fb->pitches[0 ] / stride_div); +if (rotation & (BIT (DRM_ROTATE_90 ) |BIT (DRM_ROTATE_270 ))) { +/* stride: Surface height in tiles */ + tile_height =intel_tile_height (dev, fb->bits_per_pixel, + fb->modifier[0 ]); + stride =DIV_ROUND_UP (fb->height, tile_height); + plane_size = (src_w <<16 ) | src_h; + x_offset = stride * tile_height - y - (src_h +1 ); + y_offset = x; + }else { + stride = fb->pitches[0 ] / stride_div; + plane_size = (src_h <<16 ) | src_w; + x_offset = x; + y_offset = y; + } + plane_offset = y_offset <<16 | x_offset; + +I915_WRITE (PLANE_OFFSET (pipe, plane), plane_offset); +I915_WRITE (PLANE_STRIDE (pipe, plane), stride);I915_WRITE (PLANE_POS (pipe, plane), (crtc_y <<16 ) | crtc_x); -I915_WRITE (PLANE_SIZE (pipe, plane), (crtc_h <<16 ) | crtc_w); +I915_WRITE (PLANE_SIZE (pipe, plane), plane_size);I915_WRITE (PLANE_CTL (pipe, plane), plane_ctl);I915_WRITE (PLANE_SURF (pipe, plane), surf_addr);POSTING_READ (PLANE_SURF (pipe, plane));@@ -1310,16 +1341,7 @@ intel_plane_init(struct drm_device *dev, enum pipe pipe, int plane) goto out; } -if (!dev->mode_config.rotation_property) - dev->mode_config.rotation_property = -drm_mode_create_rotation_property (dev, -BIT (DRM_ROTATE_0 ) | -BIT (DRM_ROTATE_180 )); - -if (dev->mode_config.rotation_property) -drm_object_attach_property (&intel_plane->base.base, - dev->mode_config.rotation_property, - state->base.rotation); +intel_create_rotation_property (dev, intel_plane);drm_plane_helper_add (&intel_plane->base, &intel_plane_helper_funcs);
Quoted 8 lines
Quoted 7 lines
--
1.7.10.4_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/2] drm/i915/skl: Support for 90/270 rotation
Hi,
Quoted 56 lines · Sonika
Quoted 39 lines
Quoted 22 lines
drivers/gpu/drm/i915/intel_display.c +12
-0@@ -2318,6 +2318,28 @@ intel_fill_fb_ggtt_view(struct i915_ggtt_view *view, struct drm_framebuffer *fb, return -EINVAL ; } +switch (fb->pixel_format) { +case DRM_FORMAT_XRGB8888 : +case DRM_FORMAT_ARGB8888 : +case DRM_FORMAT_XBGR8888 : +case DRM_FORMAT_ABGR8888 : +case DRM_FORMAT_XRGB2101010 : +case DRM_FORMAT_ARGB2101010 : +case DRM_FORMAT_XBGR2101010 : +case DRM_FORMAT_ABGR2101010 : +case DRM_FORMAT_YUYV : +case DRM_FORMAT_YVYU : +case DRM_FORMAT_UYVY :drivers/gpu/drm/i915/intel_display.c intel_fill_fb_ggtt_view(struct i915_ggtt_view · line 2343
Quoted 10 lines
drivers/gpu/drm/i915/intel_display.c +9
-0+case DRM_FORMAT_VYUY : +case DRM_FORMAT_NV12 : +break ; + +default : +DRM_DEBUG_KMS ("Unsupported pixel format:%d for 90/270 rotation!\n", + fb->pixel_format); +return -EINVAL ; + }Shouldn't we be matching against the list of formats the plane supports (which may vary by platform, or by specific plane) rather than this generic list? We already specified what formats the plane can handle at plane init time, so it seems like what you'd really want is just a call to
Quoted 5 lines
drm_plane_check_pixel_format(plane_state->plane, fb->pixel_format)then follow that up with explicit checks to exclude any formats that we can handle in 0/180, but not in 90/270.
I am not sure how it will help.
drm_plane_check_pixel_formatshould be used to check the pixel format of the fb which we should be doing in some -check functions (I don't think we do that right now?) against what is supported by the plane.
But to check for the formats which are allowed for 90/270, we would need this kind of explicit check.Quoted 5 lines
I'd also move this check to
intel_plane_atomic_check(), since the 'check' code path is where I'd usually go looking for these types of checks; the function you've got it in at the moment gets called from the 'prepare' step which works as well, but seems a bit less obvious.
Quoted 6 lines
Yes, I agree, but this is on top of Tvrtko's patch for secondary buffer mapping where based upon tiling and pixel format we are allowing the rotated gtt.
Tvrtko,
Can these be moved to theintel_plane_atomic_check()
Good point, I think it can and should. I suppose it was just an oversight during endless rebasing, that I put the Y tiling check in there. So you can move that part as well while you are doing it.
Also highlights the fact we have no negative testing in kms_rotation_crc for this. I mean, trying to rotate by 90/270 linear or X tiled, or wrong pixel format.
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/2] drm/i915/skl: Support for 90/270 rotation
In reply to Jindal, SonikaQuoted 77 lines · Sonika
Quoted 69 lines · Matt Roper
Quoted 51 lines · Sonika Jindal
v2: Moving creation of property in a function, checking for 90/270 rotation simultaneously (Chris)
Letting primary plane to be positioned
v3: Adding if/else for 90/270 and rest params programming, adding check forpixel_format, some cleanup (review comments)
v4: Adding rightpixel_formats, using src_* params instead of crtc_* for offset and size programming (Ville)
v5: Rebased on -nightly and Tvrtko's series for gtt remapping.
v6: Rebased on -nightly (Tvrtko's series merged)Signed-off-by Sonika Jindal <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 2 + drivers/gpu/drm/i915/intel_display.c | 103 +++++++++++++++++++++++++++------- drivers/gpu/drm/i915/intel_drv.h | 6 ++ drivers/gpu/drm/i915/intel_sprite.c | 52 ++++++++++++----- 4 files changed, 129 insertions(+), 34 deletions(-)drivers/gpu/drm/i915/i915_reg.h +2
-0@@ -4854,7 +4854,9 @@ enum skl_disp_power_wells {#define PLANE_CTL_ALPHA_HW_PREMULTIPLY ( 3 << 4)#define PLANE_CTL_ROTATE_MASK 0x3#define PLANE_CTL_ROTATE_0 0x0 +#define PLANE_CTL_ROTATE_90 0x1#define PLANE_CTL_ROTATE_180 0x2 +#define PLANE_CTL_ROTATE_270 0x3#define _PLANE_STRIDE_1_A 0x70188#define _PLANE_STRIDE_2_A 0x70288#define _PLANE_STRIDE_3_A 0x70388drivers/gpu/drm/i915/intel_display.c +11
-0@@ -2318,6 +2318,28 @@ intel_fill_fb_ggtt_view(struct i915_ggtt_view *view, struct drm_framebuffer *fb,return -EINVAL ; } +switch (fb->pixel_format) { +case DRM_FORMAT_XRGB8888 : +case DRM_FORMAT_ARGB8888 : +case DRM_FORMAT_XBGR8888 : +case DRM_FORMAT_ABGR8888 : +case DRM_FORMAT_XRGB2101010 : +case DRM_FORMAT_ARGB2101010 : +case DRM_FORMAT_XBGR2101010 : +case DRM_FORMAT_ABGR2101010 : +case DRM_FORMAT_YUYV : +case DRM_FORMAT_YVYU :drivers/gpu/drm/i915/intel_display.c intel_fill_fb_ggtt_view(struct i915_ggtt_view *view, struct drm_framebuffer *fb, · line 2341
Quoted 10 lines
drivers/gpu/drm/i915/intel_display.c +10
-0+case DRM_FORMAT_UYVY : +case DRM_FORMAT_VYUY : +case DRM_FORMAT_NV12 : +break ; + +default : +DRM_DEBUG_KMS ("Unsupported pixel format:%d for 90/270 rotation!\n" , + fb->pixel_format); +return -EINVAL ; + }Shouldn't we be matching against the list of formats the plane supports (which may vary by platform, or by specific plane) rather than this generic list? We already specified what formats the plane can handle at plane init time, so it seems like what you'd really want is just a call to
Quoted 5 lines
drm_plane_check_pixel_format(plane_state->plane, fb->pixel_format)then follow that up with explicit checks to exclude any formats that we can handle in 0/180, but not in 90/270.
Quoted 6 lines
I am not sure how it will help.
drm_plane_check_pixel_formatshould be used to check the pixel format of the fb which we should be doing in some -check functions (I don't think we do that right now?) against what is supported by the plane.
But to check for the formats which are allowed for 90/270, we would need this kind of explicit check.
Right, I guess there are two aspects here. First, we need to properly test for acceptable pixel formats for the plane in general; at the moment the DRM core setplane() tests this, but if we use the atomic ioctl it never gets checked (which is a bug). So as you say, we need a test in a _check() function to verify this. We probably also need to add an i-g-t test for it too.
Once we know that the pixel format is valid in general, it makes sense to have a simpler test to reject some subset of those formats iff we notice we're doing 90/270 rotation. Maybe it's not really a big deal, but it seems like that's a little easier to understand and verify than having two completely separate lists, especially when future platforms may support different formats, or even different planes of the same platform have varying pixel format capabilities.
Matt
Quoted 262 lines
Quoted 5 lines
I'd also move this check to
intel_plane_atomic_check(), since the 'check' code path is where I'd usually go looking for these types of checks; the function you've got it in at the moment gets called from the 'prepare' step which works as well, but seems a bit less obvious.Yes, I agree, but this is on top of Tvrtko's patch for secondary buffer mapping where based upon tiling and pixel format we are allowing the rotated gtt.
Tvrtko,
Can these be moved to theintel_plane_atomic_check()Quoted 40 lines
Quoted 40 lines
drivers/gpu/drm/i915/intel_display.c +21
-2+return 0 ; }@@ -2919,8 +2941,12 @@ static void skylake_update_primary_plane(struct drm_crtc *crtc,struct intel_crtc *intel_crtc =to_intel_crtc (crtc);struct drm_i915_gem_object *obj;int pipe = intel_crtc->pipe; -u32 plane_ctl, stride_div; +u32 plane_ctl, stride_div, stride; +u32 tile_height, plane_offset, plane_size; +unsigned int rotation; +int x_offset, y_offset;unsigned long surf_addr; +struct drm_plane *plane;if (!intel_crtc->primary_enabled) {I915_WRITE (PLANE_CTL (pipe,0 ),0 );@@ -2981,21 +3007,51 @@ static void skylake_update_primary_plane(struct drm_crtc *crtc, } plane_ctl |=PLANE_CTL_PLANE_GAMMA_DISABLE ; -if (crtc->primary->state->rotation ==BIT (DRM_ROTATE_180 )) + + plane = crtc->primary; + rotation = plane->state->rotation; +switch (rotation) { +case BIT (DRM_ROTATE_90 ): + plane_ctl |=PLANE_CTL_ROTATE_90 ; +break ; + +case BIT (DRM_ROTATE_180 ): plane_ctl |=PLANE_CTL_ROTATE_180 ; +break ; + +case BIT (DRM_ROTATE_270 ): + plane_ctl |=PLANE_CTL_ROTATE_270 ; +break ; + }Quoted 8 lines
drivers/gpu/drm/i915/intel_display.c static void skylake_update_primary_plane(struct drm_crtc *crtc, · line 3029
Quoted 3 lines
drivers/gpu/drm/i915/intel_display.c +0
-0obj =intel_fb_obj (fb); stride_div =intel_fb_stride_alignment (dev, fb->modifier[0 ], fb->pixel_format);Minor nit; can we move this down inside the 'else' branch to make it apparent how this serves a parallel role to '
tile_height' from the 'if' branch.Yes sure.
Quoted 9 lines
drivers/gpu/drm/i915/intel_display.c static void skylake_update_primary_plane(struct drm_crtc *crtc, · line 3032
Quoted 5 lines
drivers/gpu/drm/i915/intel_display.c +3
-1- surf_addr =intel_plane_obj_offset (to_intel_plane (crtc->primary), obj); + surf_addr =intel_plane_obj_offset (to_intel_plane (plane), obj); + +if (rotation & (BIT (DRM_ROTATE_90 ) |BIT (DRM_ROTATE_270 ))) {Might as well use the
intel_rotation_90_or_270()function since we have it. Same comment for the sprite path farther down.Sure.
Regards,
SonikaQuoted 188 lines
Quoted 187 lines
drivers/gpu/drm/i915/intel_display.c +39
-16+/* stride = Surface height in tiles */ + tile_height =intel_tile_height (dev, fb->bits_per_pixel, + fb->modifier[0 ]); + stride =DIV_ROUND_UP (fb->height, tile_height); + x_offset = stride * tile_height - y - (plane->state->src_h >>16 ); + y_offset = x; + plane_size = ((plane->state->src_w >>16 ) -1 ) <<16 | + ((plane->state->src_h >>16 ) -1 ); + }else { + stride = fb->pitches[0 ] / stride_div; + x_offset = x; + y_offset = y; + plane_size = ((plane->state->src_h >>16 ) -1 ) <<16 | + ((plane->state->src_w >>16 ) -1 ); + } + plane_offset = y_offset <<16 | x_offset;I915_WRITE (PLANE_CTL (pipe,0 ), plane_ctl);I915_WRITE (PLANE_POS (pipe,0 ),0 ); -I915_WRITE (PLANE_OFFSET (pipe,0 ), (y <<16 ) | x); -I915_WRITE (PLANE_SIZE (pipe,0 ), - (intel_crtc->config->pipe_src_h -1 ) <<16 | - (intel_crtc->config->pipe_src_w -1 )); -I915_WRITE (PLANE_STRIDE (pipe,0 ), fb->pitches[0 ] / stride_div); +I915_WRITE (PLANE_OFFSET (pipe,0 ), plane_offset); +I915_WRITE (PLANE_SIZE (pipe,0 ), plane_size); +I915_WRITE (PLANE_STRIDE (pipe,0 ), stride);I915_WRITE (PLANE_SURF (pipe,0 ), surf_addr);POSTING_READ (PLANE_SURF (pipe,0 ));@@ -12406,23 +12462,32 @@ static struct drm_plane *intel_primary_plane_create(struct drm_device *dev, intel_primary_formats, num_formats, DRM_PLANE_TYPE_PRIMARY); -if (INTEL_INFO (dev)->gen >=4 ) { -if (!dev->mode_config.rotation_property) - dev->mode_config.rotation_property = -drm_mode_create_rotation_property (dev, -BIT (DRM_ROTATE_0 ) | -BIT (DRM_ROTATE_180 )); -if (dev->mode_config.rotation_property) -drm_object_attach_property (&primary->base.base, - dev->mode_config.rotation_property, - state->base.rotation); - } +if (INTEL_INFO (dev)->gen >=4 ) +intel_create_rotation_property (dev, primary);drm_plane_helper_add (&primary->base, &intel_plane_helper_funcs);return &primary->base; } +void intel_create_rotation_property (struct drm_device *dev,struct intel_plane *plane) +{ +if (!dev->mode_config.rotation_property) { +unsigned long flags =BIT (DRM_ROTATE_0 ) | +BIT (DRM_ROTATE_180 ); + +if (INTEL_INFO (dev)->gen >=9 ) + flags |=BIT (DRM_ROTATE_90 ) |BIT (DRM_ROTATE_270 ); + + dev->mode_config.rotation_property = +drm_mode_create_rotation_property (dev, flags); + } +if (dev->mode_config.rotation_property) +drm_object_attach_property (&plane->base.base, + dev->mode_config.rotation_property, + plane->base.state->rotation); +} +static int intel_check_cursor_plane (struct drm_plane *plane,struct intel_plane_state *state)drivers/gpu/drm/i915/intel_drv.h +6
-0@@ -995,6 +995,12 @@ intel_rotation_90_or_270(unsigned int rotation)return rotation & (BIT (DRM_ROTATE_90 ) |BIT (DRM_ROTATE_270 )); } +unsigned int +intel_tile_height (struct drm_device *dev,uint32_t bits_per_pixel, +uint64_t fb_modifier); +void intel_create_rotation_property (struct drm_device *dev, +struct intel_plane *plane); +bool intel_wm_need_update (struct drm_plane *plane,struct drm_plane_state *state);drivers/gpu/drm/i915/intel_sprite.c +37
-16@@ -190,10 +190,13 @@ skl_update_plane(struct drm_plane *drm_plane, struct drm_crtc *crtc,struct drm_i915_gem_object *obj =intel_fb_obj (fb);const int pipe = intel_plane->pipe;const int plane = intel_plane->plane +1 ; -u32 plane_ctl, stride_div; +u32 plane_ctl, stride_div, stride;int pixel_size =drm_format_plane_cpp (fb->pixel_format,0 );const struct drm_intel_sprite_colorkey *key = &intel_plane->ckey;unsigned long surf_addr; +u32 tile_height, plane_offset, plane_size; +unsigned int rotation; +int x_offset, y_offset; plane_ctl =PLANE_CTL_ENABLE |PLANE_CTL_PIPE_CSC_ENABLE ;@@ -254,8 +257,20 @@ skl_update_plane(struct drm_plane *drm_plane, struct drm_crtc *crtc,MISSING_CASE (fb->modifier[0 ]); } -if (drm_plane->state->rotation ==BIT (DRM_ROTATE_180 )) + rotation = drm_plane->state->rotation; +switch (rotation) { +case BIT (DRM_ROTATE_90 ): + plane_ctl |=PLANE_CTL_ROTATE_90 ; +break ; + +case BIT (DRM_ROTATE_180 ): plane_ctl |=PLANE_CTL_ROTATE_180 ; +break ; + +case BIT (DRM_ROTATE_270 ): + plane_ctl |=PLANE_CTL_ROTATE_270 ; +break ; + } intel_update_sprite_watermarks(drm_plane, crtc, src_w, src_h, pixel_size, true,@@ -283,10 +298,26 @@ skl_update_plane(struct drm_plane *drm_plane, struct drm_crtc *crtc, surf_addr =intel_plane_obj_offset (intel_plane, obj); -I915_WRITE (PLANE_OFFSET (pipe, plane), (y <<16 ) | x); -I915_WRITE (PLANE_STRIDE (pipe, plane), fb->pitches[0 ] / stride_div); +if (rotation & (BIT (DRM_ROTATE_90 ) |BIT (DRM_ROTATE_270 ))) { +/* stride: Surface height in tiles */ + tile_height =intel_tile_height (dev, fb->bits_per_pixel, + fb->modifier[0 ]); + stride =DIV_ROUND_UP (fb->height, tile_height); + plane_size = (src_w <<16 ) | src_h; + x_offset = stride * tile_height - y - (src_h +1 ); + y_offset = x; + }else { + stride = fb->pitches[0 ] / stride_div; + plane_size = (src_h <<16 ) | src_w; + x_offset = x; + y_offset = y; + } + plane_offset = y_offset <<16 | x_offset; + +I915_WRITE (PLANE_OFFSET (pipe, plane), plane_offset); +I915_WRITE (PLANE_STRIDE (pipe, plane), stride);I915_WRITE (PLANE_POS (pipe, plane), (crtc_y <<16 ) | crtc_x); -I915_WRITE (PLANE_SIZE (pipe, plane), (crtc_h <<16 ) | crtc_w); +I915_WRITE (PLANE_SIZE (pipe, plane), plane_size);I915_WRITE (PLANE_CTL (pipe, plane), plane_ctl);I915_WRITE (PLANE_SURF (pipe, plane), surf_addr);POSTING_READ (PLANE_SURF (pipe, plane));@@ -1310,16 +1341,7 @@ intel_plane_init(struct drm_device *dev, enum pipe pipe, int plane) goto out; } -if (!dev->mode_config.rotation_property) - dev->mode_config.rotation_property = -drm_mode_create_rotation_property (dev, -BIT (DRM_ROTATE_0 ) | -BIT (DRM_ROTATE_180 )); - -if (dev->mode_config.rotation_property) -drm_object_attach_property (&intel_plane->base.base, - dev->mode_config.rotation_property, - state->base.rotation); +intel_create_rotation_property (dev, intel_plane);drm_plane_helper_add (&intel_plane->base, &intel_plane_helper_funcs); --1.7.10.4
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 9 lines
Matt Roper Graphics Software Engineer IoTG Platform Enabling & Development Intel Corporation (916) 356-2795 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/2] drm/i915/skl: Support for 90/270 rotation
Quoted 85 lines · Matt Roper
Quoted 77 lines · Sonika
Quoted 69 lines · Matt Roper
Quoted 51 lines · Sonika Jindal
v2: Moving creation of property in a function, checking for 90/270 rotation simultaneously (Chris)
Letting primary plane to be positioned
v3: Adding if/else for 90/270 and rest params programming, adding check forpixel_format, some cleanup (review comments)
v4: Adding rightpixel_formats, using src_* params instead of crtc_* for offset and size programming (Ville)
v5: Rebased on -nightly and Tvrtko's series for gtt remapping.
v6: Rebased on -nightly (Tvrtko's series merged)Signed-off-by Sonika Jindal <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 2 + drivers/gpu/drm/i915/intel_display.c | 103 +++++++++++++++++++++++++++------- drivers/gpu/drm/i915/intel_drv.h | 6 ++ drivers/gpu/drm/i915/intel_sprite.c | 52 ++++++++++++----- 4 files changed, 129 insertions(+), 34 deletions(-)drivers/gpu/drm/i915/i915_reg.h +2
-0@@ -4854,7 +4854,9 @@ enum skl_disp_power_wells {#define PLANE_CTL_ALPHA_HW_PREMULTIPLY ( 3 << 4)#define PLANE_CTL_ROTATE_MASK 0x3#define PLANE_CTL_ROTATE_0 0x0 +#define PLANE_CTL_ROTATE_90 0x1#define PLANE_CTL_ROTATE_180 0x2 +#define PLANE_CTL_ROTATE_270 0x3#define _PLANE_STRIDE_1_A 0x70188#define _PLANE_STRIDE_2_A 0x70288#define _PLANE_STRIDE_3_A 0x70388drivers/gpu/drm/i915/intel_display.c +11
-0@@ -2318,6 +2318,28 @@ intel_fill_fb_ggtt_view(struct i915_ggtt_view *view, struct drm_framebuffer *fb,return -EINVAL ; } +switch (fb->pixel_format) { +case DRM_FORMAT_XRGB8888 : +case DRM_FORMAT_ARGB8888 : +case DRM_FORMAT_XBGR8888 : +case DRM_FORMAT_ABGR8888 : +case DRM_FORMAT_XRGB2101010 : +case DRM_FORMAT_ARGB2101010 : +case DRM_FORMAT_XBGR2101010 : +case DRM_FORMAT_ABGR2101010 : +case DRM_FORMAT_YUYV : +case DRM_FORMAT_YVYU :drivers/gpu/drm/i915/intel_display.c intel_fill_fb_ggtt_view(struct i915_ggtt_view *view, struct drm_framebuffer *fb, · line 2341
Quoted 10 lines
drivers/gpu/drm/i915/intel_display.c +10
-0+case DRM_FORMAT_UYVY : +case DRM_FORMAT_VYUY : +case DRM_FORMAT_NV12 : +break ; + +default : +DRM_DEBUG_KMS ("Unsupported pixel format:%d for 90/270 rotation!\n" , + fb->pixel_format); +return -EINVAL ; + }Shouldn't we be matching against the list of formats the plane supports (which may vary by platform, or by specific plane) rather than this generic list? We already specified what formats the plane can handle at plane init time, so it seems like what you'd really want is just a call to
Quoted 5 lines
drm_plane_check_pixel_format(plane_state->plane, fb->pixel_format)then follow that up with explicit checks to exclude any formats that we can handle in 0/180, but not in 90/270.
Quoted 6 lines
I am not sure how it will help.
drm_plane_check_pixel_formatshould be used to check the pixel format of the fb which we should be doing in some -check functions (I don't think we do that right now?) against what is supported by the plane.
But to check for the formats which are allowed for 90/270, we would need this kind of explicit check.
Quoted 7 lines
Right, I guess there are two aspects here. First, we need to properly test for acceptable pixel formats for the plane in general; at the moment the DRM core
setplane()tests this, but if we use the atomic ioctl it never gets checked (which is a bug). So as you say, we need a test in a_check()function to verify this. We probably also need to add an i-g-t test for it too.
OK, I'l add that check in intel_atomic_plane_check()
Quoted 8 lines
Once we know that the pixel format is valid in general, it makes sense to have a simpler test to reject some subset of those formats iff we notice we're doing 90/270 rotation. Maybe it's not really a big deal, but it seems like that's a little easier to understand and verify than having two completely separate lists, especially when future platforms may support different formats, or even different planes of the same platform have varying pixel format capabilities.
I will send out a patch with the changes and add negative test case in kms_rotation_crc.
Regards,
Sonika
Quoted 266 lines
Matt
Quoted 262 lines
Quoted 5 lines
I'd also move this check to
intel_plane_atomic_check(), since the 'check' code path is where I'd usually go looking for these types of checks; the function you've got it in at the moment gets called from the 'prepare' step which works as well, but seems a bit less obvious.Yes, I agree, but this is on top of Tvrtko's patch for secondary buffer mapping where based upon tiling and pixel format we are allowing the rotated gtt.
Tvrtko,
Can these be moved to theintel_plane_atomic_check()Quoted 40 lines
Quoted 40 lines
drivers/gpu/drm/i915/intel_display.c +21
-2+return 0 ; }@@ -2919,8 +2941,12 @@ static void skylake_update_primary_plane(struct drm_crtc *crtc,struct intel_crtc *intel_crtc =to_intel_crtc (crtc);struct drm_i915_gem_object *obj;int pipe = intel_crtc->pipe; -u32 plane_ctl, stride_div; +u32 plane_ctl, stride_div, stride; +u32 tile_height, plane_offset, plane_size; +unsigned int rotation; +int x_offset, y_offset;unsigned long surf_addr; +struct drm_plane *plane;if (!intel_crtc->primary_enabled) {I915_WRITE (PLANE_CTL (pipe,0 ),0 );@@ -2981,21 +3007,51 @@ static void skylake_update_primary_plane(struct drm_crtc *crtc, } plane_ctl |=PLANE_CTL_PLANE_GAMMA_DISABLE ; -if (crtc->primary->state->rotation ==BIT (DRM_ROTATE_180 )) + + plane = crtc->primary; + rotation = plane->state->rotation; +switch (rotation) { +case BIT (DRM_ROTATE_90 ): + plane_ctl |=PLANE_CTL_ROTATE_90 ; +break ; + +case BIT (DRM_ROTATE_180 ): plane_ctl |=PLANE_CTL_ROTATE_180 ; +break ; + +case BIT (DRM_ROTATE_270 ): + plane_ctl |=PLANE_CTL_ROTATE_270 ; +break ; + }Quoted 8 lines
drivers/gpu/drm/i915/intel_display.c static void skylake_update_primary_plane(struct drm_crtc *crtc, · line 3029
Quoted 3 lines
drivers/gpu/drm/i915/intel_display.c +0
-0obj =intel_fb_obj (fb); stride_div =intel_fb_stride_alignment (dev, fb->modifier[0 ], fb->pixel_format);Minor nit; can we move this down inside the 'else' branch to make it apparent how this serves a parallel role to '
tile_height' from the 'if' branch.Yes sure.
Quoted 9 lines
drivers/gpu/drm/i915/intel_display.c static void skylake_update_primary_plane(struct drm_crtc *crtc, · line 3032
Quoted 5 lines
drivers/gpu/drm/i915/intel_display.c +3
-1- surf_addr =intel_plane_obj_offset (to_intel_plane (crtc->primary), obj); + surf_addr =intel_plane_obj_offset (to_intel_plane (plane), obj); + +if (rotation & (BIT (DRM_ROTATE_90 ) |BIT (DRM_ROTATE_270 ))) {Might as well use the
intel_rotation_90_or_270()function since we have it. Same comment for the sprite path farther down.Sure.
Regards,
SonikaQuoted 188 lines
Quoted 187 lines
drivers/gpu/drm/i915/intel_display.c +39
-16+/* stride = Surface height in tiles */ + tile_height =intel_tile_height (dev, fb->bits_per_pixel, + fb->modifier[0 ]); + stride =DIV_ROUND_UP (fb->height, tile_height); + x_offset = stride * tile_height - y - (plane->state->src_h >>16 ); + y_offset = x; + plane_size = ((plane->state->src_w >>16 ) -1 ) <<16 | + ((plane->state->src_h >>16 ) -1 ); + }else { + stride = fb->pitches[0 ] / stride_div; + x_offset = x; + y_offset = y; + plane_size = ((plane->state->src_h >>16 ) -1 ) <<16 | + ((plane->state->src_w >>16 ) -1 ); + } + plane_offset = y_offset <<16 | x_offset;I915_WRITE (PLANE_CTL (pipe,0 ), plane_ctl);I915_WRITE (PLANE_POS (pipe,0 ),0 ); -I915_WRITE (PLANE_OFFSET (pipe,0 ), (y <<16 ) | x); -I915_WRITE (PLANE_SIZE (pipe,0 ), - (intel_crtc->config->pipe_src_h -1 ) <<16 | - (intel_crtc->config->pipe_src_w -1 )); -I915_WRITE (PLANE_STRIDE (pipe,0 ), fb->pitches[0 ] / stride_div); +I915_WRITE (PLANE_OFFSET (pipe,0 ), plane_offset); +I915_WRITE (PLANE_SIZE (pipe,0 ), plane_size); +I915_WRITE (PLANE_STRIDE (pipe,0 ), stride);I915_WRITE (PLANE_SURF (pipe,0 ), surf_addr);POSTING_READ (PLANE_SURF (pipe,0 ));@@ -12406,23 +12462,32 @@ static struct drm_plane *intel_primary_plane_create(struct drm_device *dev, intel_primary_formats, num_formats, DRM_PLANE_TYPE_PRIMARY); -if (INTEL_INFO (dev)->gen >=4 ) { -if (!dev->mode_config.rotation_property) - dev->mode_config.rotation_property = -drm_mode_create_rotation_property (dev, -BIT (DRM_ROTATE_0 ) | -BIT (DRM_ROTATE_180 )); -if (dev->mode_config.rotation_property) -drm_object_attach_property (&primary->base.base, - dev->mode_config.rotation_property, - state->base.rotation); - } +if (INTEL_INFO (dev)->gen >=4 ) +intel_create_rotation_property (dev, primary);drm_plane_helper_add (&primary->base, &intel_plane_helper_funcs);return &primary->base; } +void intel_create_rotation_property (struct drm_device *dev,struct intel_plane *plane) +{ +if (!dev->mode_config.rotation_property) { +unsigned long flags =BIT (DRM_ROTATE_0 ) | +BIT (DRM_ROTATE_180 ); + +if (INTEL_INFO (dev)->gen >=9 ) + flags |=BIT (DRM_ROTATE_90 ) |BIT (DRM_ROTATE_270 ); + + dev->mode_config.rotation_property = +drm_mode_create_rotation_property (dev, flags); + } +if (dev->mode_config.rotation_property) +drm_object_attach_property (&plane->base.base, + dev->mode_config.rotation_property, + plane->base.state->rotation); +} +static int intel_check_cursor_plane (struct drm_plane *plane,struct intel_plane_state *state)drivers/gpu/drm/i915/intel_drv.h +6
-0@@ -995,6 +995,12 @@ intel_rotation_90_or_270(unsigned int rotation)return rotation & (BIT (DRM_ROTATE_90 ) |BIT (DRM_ROTATE_270 )); } +unsigned int +intel_tile_height (struct drm_device *dev,uint32_t bits_per_pixel, +uint64_t fb_modifier); +void intel_create_rotation_property (struct drm_device *dev, +struct intel_plane *plane); +bool intel_wm_need_update (struct drm_plane *plane,struct drm_plane_state *state);drivers/gpu/drm/i915/intel_sprite.c +37
-16@@ -190,10 +190,13 @@ skl_update_plane(struct drm_plane *drm_plane, struct drm_crtc *crtc,struct drm_i915_gem_object *obj =intel_fb_obj (fb);const int pipe = intel_plane->pipe;const int plane = intel_plane->plane +1 ; -u32 plane_ctl, stride_div; +u32 plane_ctl, stride_div, stride;int pixel_size =drm_format_plane_cpp (fb->pixel_format,0 );const struct drm_intel_sprite_colorkey *key = &intel_plane->ckey;unsigned long surf_addr; +u32 tile_height, plane_offset, plane_size; +unsigned int rotation; +int x_offset, y_offset; plane_ctl =PLANE_CTL_ENABLE |PLANE_CTL_PIPE_CSC_ENABLE ;@@ -254,8 +257,20 @@ skl_update_plane(struct drm_plane *drm_plane, struct drm_crtc *crtc,MISSING_CASE (fb->modifier[0 ]); } -if (drm_plane->state->rotation ==BIT (DRM_ROTATE_180 )) + rotation = drm_plane->state->rotation; +switch (rotation) { +case BIT (DRM_ROTATE_90 ): + plane_ctl |=PLANE_CTL_ROTATE_90 ; +break ; + +case BIT (DRM_ROTATE_180 ): plane_ctl |=PLANE_CTL_ROTATE_180 ; +break ; + +case BIT (DRM_ROTATE_270 ): + plane_ctl |=PLANE_CTL_ROTATE_270 ; +break ; + } intel_update_sprite_watermarks(drm_plane, crtc, src_w, src_h, pixel_size, true,@@ -283,10 +298,26 @@ skl_update_plane(struct drm_plane *drm_plane, struct drm_crtc *crtc, surf_addr =intel_plane_obj_offset (intel_plane, obj); -I915_WRITE (PLANE_OFFSET (pipe, plane), (y <<16 ) | x); -I915_WRITE (PLANE_STRIDE (pipe, plane), fb->pitches[0 ] / stride_div); +if (rotation & (BIT (DRM_ROTATE_90 ) |BIT (DRM_ROTATE_270 ))) { +/* stride: Surface height in tiles */ + tile_height =intel_tile_height (dev, fb->bits_per_pixel, + fb->modifier[0 ]); + stride =DIV_ROUND_UP (fb->height, tile_height); + plane_size = (src_w <<16 ) | src_h; + x_offset = stride * tile_height - y - (src_h +1 ); + y_offset = x; + }else { + stride = fb->pitches[0 ] / stride_div; + plane_size = (src_h <<16 ) | src_w; + x_offset = x; + y_offset = y; + } + plane_offset = y_offset <<16 | x_offset; + +I915_WRITE (PLANE_OFFSET (pipe, plane), plane_offset); +I915_WRITE (PLANE_STRIDE (pipe, plane), stride);I915_WRITE (PLANE_POS (pipe, plane), (crtc_y <<16 ) | crtc_x); -I915_WRITE (PLANE_SIZE (pipe, plane), (crtc_h <<16 ) | crtc_w); +I915_WRITE (PLANE_SIZE (pipe, plane), plane_size);I915_WRITE (PLANE_CTL (pipe, plane), plane_ctl);I915_WRITE (PLANE_SURF (pipe, plane), surf_addr);POSTING_READ (PLANE_SURF (pipe, plane));@@ -1310,16 +1341,7 @@ intel_plane_init(struct drm_device *dev, enum pipe pipe, int plane) goto out; } -if (!dev->mode_config.rotation_property) - dev->mode_config.rotation_property = -drm_mode_create_rotation_property (dev, -BIT (DRM_ROTATE_0 ) | -BIT (DRM_ROTATE_180 )); - -if (dev->mode_config.rotation_property) -drm_object_attach_property (&intel_plane->base.base, - dev->mode_config.rotation_property, - state->base.rotation); +intel_create_rotation_property (dev, intel_plane);drm_plane_helper_add (&intel_plane->base, &intel_plane_helper_funcs); --1.7.10.4
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/2] drm/i915/skl: Support for 90/270 rotation
In reply to Matt RoperQuoted 8 lines · Matt Roper
Quoted 6 lines · Sonika
I am not sure how it will help.
drm_plane_check_pixel_formatshould be used to check the pixel format of the fb which we should be doing in some -check functions (I don't think we do that right now?) against what is supported by the plane.
But to check for the formats which are allowed for 90/270, we would need this kind of explicit check.
Quoted 6 lines
Right, I guess there are two aspects here. First, we need to properly test for acceptable pixel formats for the plane in general; at the moment the DRM core
setplane()tests this, but if we use the atomic ioctl it never gets checked (which is a bug). So as you say, we need a test in a_check()function to verify this. We probably also need to add an i-g-t test for it too.
The core atomic ioctl does check for valid plane pixel formats for you. And there shouldn't be any other entrypoint (except internal ones, but that's ok). Is there a bug left?
Definitely agree that testcases would be nice.
-Daniel
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
Re: [PATCH 2/2] drm/i915/skl: Support for 90/270 rotation
Quoted 16 lines · Daniel Vetter
Quoted 8 lines · Matt Roper
Quoted 6 lines · Sonika
I am not sure how it will help.
drm_plane_check_pixel_formatshould be used to check the pixel format of the fb which we should be doing in some -check functions (I don't think we do that right now?) against what is supported by the plane.
But to check for the formats which are allowed for 90/270, we would need this kind of explicit check.Quoted 6 lines
Right, I guess there are two aspects here. First, we need to properly test for acceptable pixel formats for the plane in general; at the moment the DRM core
setplane()tests this, but if we use the atomic ioctl it never gets checked (which is a bug). So as you say, we need a test in a_check()function to verify this. We probably also need to add an i-g-t test for it too.
Quoted 4 lines
The core atomic ioctl does check for valid plane pixel formats for you. And there shouldn't be any other entrypoint (except internal ones, but that's ok). Is there a bug left?
Oh, yes the check is there. Will abandon that check then and just move the 90/270 pixel format check to intel_plane_atomic_check.
Regards,
Sonika
Quoted 3 lines
Definitely agree that testcases would be nice.
-Daniel
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 drm/i915/skl: Support for 90/270 rotation
v2: Moving creation of property in a function, checking for 90/270 rotation simultaneously (Chris)
Letting primary plane to be positioned
v3: Adding if/else for 90/270 and rest params programming, adding check for pixel_format, some cleanup (review comments)
v4: Adding right pixel_formats, using src_* params instead of crtc_* for offset and size programming (Ville)
v5: Rebased on -nightly and Tvrtko's series for gtt remapping.
v6: Rebased on -nightly (Tvrtko's series merged)
v7: Moving pixel_format check to intel_atomic_plane_check (Matt)
--- drivers/gpu/drm/i915/i915_reg.h | 2 + drivers/gpu/drm/i915/intel_atomic_plane.c | 23 ++++++++ drivers/gpu/drm/i915/intel_display.c | 88 ++++++++++++++++++++--------- drivers/gpu/drm/i915/intel_drv.h | 6 ++ drivers/gpu/drm/i915/intel_sprite.c | 52 ++++++++++++----- 5 files changed, 130 insertions(+), 41 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +2 -0
@@ -4854,7 +4854,9 @@ enum skl_disp_power_wells {#define PLANE_CTL_ALPHA_HW_PREMULTIPLY ( 3 << 4)#define PLANE_CTL_ROTATE_MASK 0x3#define PLANE_CTL_ROTATE_0 0x0 +#define PLANE_CTL_ROTATE_90 0x1#define PLANE_CTL_ROTATE_180 0x2 +#define PLANE_CTL_ROTATE_270 0x3#define _PLANE_STRIDE_1_A 0x70188#define _PLANE_STRIDE_2_A 0x70288#define _PLANE_STRIDE_3_A 0x70388
drivers/gpu/drm/i915/intel_atomic_plane.c +23 -0
@@ -162,6 +162,29 @@ static int intel_plane_atomic_check(struct drm_plane *plane, (1 <<drm_plane_index (plane)); } +if (state->fb &&intel_rotation_90_or_270 (state->rotation)) { +if (!(state->fb->modifier[0 ] ==I915_FORMAT_MOD_Y_TILED || + state->fb->modifier[0 ] == I915_FORMAT_MOD_Yf_TILED)) { +DRM_DEBUG_KMS ("Y/Yf tiling required for 90/270!\n" ); +return -EINVAL ; + } + +/* +* 90/270 is not allowed with RGB64 16:16:16:16, +* RGB 16-bit 5:6:5, and Indexed 8-bit. +*/ +switch (state->fb->pixel_format) { +case DRM_FORMAT_C8 : +case DRM_FORMAT_RGB565 : +DRM_DEBUG_KMS ("Unsupported pixel format %s for 90/270!\n" , +drm_get_format_name (state->fb->pixel_format)); +return -EINVAL ; + +default : +break ; + } + } +return intel_plane->check_plane (plane, intel_state); }
drivers/gpu/drm/i915/intel_display.c +62 -26
127 lines not on this page · raw message
drivers/gpu/drm/i915/intel_drv.h +6 -0
@@ -995,6 +995,12 @@ intel_rotation_90_or_270(unsigned int rotation)return rotation & (BIT (DRM_ROTATE_90 ) |BIT (DRM_ROTATE_270 )); } +unsigned int +intel_tile_height (struct drm_device *dev,uint32_t bits_per_pixel, +uint64_t fb_modifier); +void intel_create_rotation_property (struct drm_device *dev, +struct intel_plane *plane); +bool intel_wm_need_update (struct drm_plane *plane,struct drm_plane_state *state);
drivers/gpu/drm/i915/intel_sprite.c +37 -15
81 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
Re: [PATCH] drm/i915/skl: Support for 90/270 rotation
Task id: 6135 -------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV -1 272/272 271/272
ILK 302/302 302/302 SNB 303/303 303/303 IVB -1 338/338 337/338 BYT -1 287/287 286/287 HSW 361/361 361/361 BDW 308/308 308/308
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
PNV igt@gen3_render_tiledx_blits FAIL(7)PASS(6) FAIL(2)
*IVB igt@gem_storedw_batches_loop@secure-dispatch PASS(2) DMESG_WARN(1)PASS(1)
(dmesg patch applied)drm:i915_hangcheck_elapsed[i915]]*ERROR*Hangcheck_timer_elapsed...blitter_ring_idle@Hangcheck timer elapsed... blitter ring idle
*BYT igt@gem_exec_bad_domains@conflicting-write-domain PASS(20) FAIL(1)PASS(1)
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] drm/i915/skl: Support for 90/270 rotation
In reply to Sonika JindalQuoted 46 lines · Sonika Jindal
v2: Moving creation of property in a function, checking for 90/270 rotation simultaneously (Chris)
Letting primary plane to be positioned
v3: Adding if/else for 90/270 and rest params programming, adding check forpixel_format, some cleanup (review comments)
v4: Adding rightpixel_formats, using src_* params instead of crtc_* for offset and size programming (Ville)
v5: Rebased on -nightly and Tvrtko's series for gtt remapping.
v6: Rebased on -nightly (Tvrtko's series merged)
v7: Movingpixel_formatcheck tointel_atomic_plane_check(Matt)Signed-off-by Sonika Jindal <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 2 + drivers/gpu/drm/i915/intel_atomic_plane.c | 23 ++++++++ drivers/gpu/drm/i915/intel_display.c | 88 ++++++++++++++++++++--------- drivers/gpu/drm/i915/intel_drv.h | 6 ++ drivers/gpu/drm/i915/intel_sprite.c | 52 ++++++++++++----- 5 files changed, 130 insertions(+), 41 deletions(-)drivers/gpu/drm/i915/i915_reg.h +2
-0@@ -4854,7 +4854,9 @@ enum skl_disp_power_wells {#define PLANE_CTL_ALPHA_HW_PREMULTIPLY ( 3 << 4)#define PLANE_CTL_ROTATE_MASK 0x3#define PLANE_CTL_ROTATE_0 0x0 +#define PLANE_CTL_ROTATE_90 0x1#define PLANE_CTL_ROTATE_180 0x2 +#define PLANE_CTL_ROTATE_270 0x3#define _PLANE_STRIDE_1_A 0x70188#define _PLANE_STRIDE_2_A 0x70288#define _PLANE_STRIDE_3_A 0x70388drivers/gpu/drm/i915/intel_atomic_plane.c +4
-0@@ -162,6 +162,29 @@ static int intel_plane_atomic_check(struct drm_plane *plane, (1 <<drm_plane_index (plane)); } +if (state->fb &&intel_rotation_90_or_270 (state->rotation)) { +if (!(state->fb->modifier[0 ] ==I915_FORMAT_MOD_Y_TILED || + state->fb->modifier[0 ] == I915_FORMAT_MOD_Yf_TILED)) { +DRM_DEBUG_KMS ("Y/Yf tiling required for 90/270!\n" );
drivers/gpu/drm/i915/intel_atomic_plane.c static int intel_plane_atomic_check(struct drm_plane *plane, · line 178
Quoted 10 lines
drivers/gpu/drm/i915/intel_atomic_plane.c +10
-0+return -EINVAL ; + } + +/* +* 90/270 is not allowed with RGB64 16:16:16:16, +* RGB 16-bit 5:6:5, and Indexed 8-bit. +*/ +switch (state->fb->pixel_format) { +case DRM_FORMAT_C8 : +case DRM_FORMAT_RGB565 :
Your comment mentions RGB64, which isn't handled in the case statement here. But we don't support RGB64 at all today (in skl_plane_formats[]), so I'd just remove it from the comment to avoid confusion.
Aside from that, you can consider this
Quoted 256 lines
drivers/gpu/drm/i915/intel_atomic_plane.c +9
-0+DRM_DEBUG_KMS ("Unsupported pixel format %s for 90/270!\n" , +drm_get_format_name (state->fb->pixel_format)); +return -EINVAL ; + +default : +break ; + } + } +return intel_plane->check_plane (plane, intel_state); }drivers/gpu/drm/i915/intel_display.c +62
-26@@ -2311,13 +2311,6 @@ intel_fill_fb_ggtt_view(struct i915_ggtt_view *view, struct drm_framebuffer *fb, info->pitch = fb->pitches[0 ]; info->fb_modifier = fb->modifier[0 ]; -if (!(info->fb_modifier ==I915_FORMAT_MOD_Y_TILED || - info->fb_modifier == I915_FORMAT_MOD_Yf_TILED)) { -DRM_DEBUG_KMS ( -"Y or Yf tiling is needed for 90/270 rotation!\n" ); -return -EINVAL ; - } -return 0 ; }@@ -2919,8 +2912,12 @@ static void skylake_update_primary_plane(struct drm_crtc *crtc,struct intel_crtc *intel_crtc =to_intel_crtc (crtc);struct drm_i915_gem_object *obj;int pipe = intel_crtc->pipe; -u32 plane_ctl, stride_div; +u32 plane_ctl, stride_div, stride; +u32 tile_height, plane_offset, plane_size; +unsigned int rotation; +int x_offset, y_offset;unsigned long surf_addr; +struct drm_plane *plane;if (!intel_crtc->primary_enabled) {I915_WRITE (PLANE_CTL (pipe,0 ),0 );@@ -2981,21 +2978,51 @@ static void skylake_update_primary_plane(struct drm_crtc *crtc, } plane_ctl |=PLANE_CTL_PLANE_GAMMA_DISABLE ; -if (crtc->primary->state->rotation ==BIT (DRM_ROTATE_180 )) + + plane = crtc->primary; + rotation = plane->state->rotation; +switch (rotation) { +case BIT (DRM_ROTATE_90 ): + plane_ctl |=PLANE_CTL_ROTATE_90 ; +break ; + +case BIT (DRM_ROTATE_180 ): plane_ctl |=PLANE_CTL_ROTATE_180 ; +break ; + +case BIT (DRM_ROTATE_270 ): + plane_ctl |=PLANE_CTL_ROTATE_270 ; +break ; + } obj =intel_fb_obj (fb); stride_div =intel_fb_stride_alignment (dev, fb->modifier[0 ], fb->pixel_format); - surf_addr =intel_plane_obj_offset (to_intel_plane (crtc->primary), obj); + surf_addr =intel_plane_obj_offset (to_intel_plane (plane), obj); + +if (intel_rotation_90_or_270 (rotation)) { +/* stride = Surface height in tiles */ + tile_height =intel_tile_height (dev, fb->bits_per_pixel, + fb->modifier[0 ]); + stride =DIV_ROUND_UP (fb->height, tile_height); + x_offset = stride * tile_height - y - (plane->state->src_h >>16 ); + y_offset = x; + plane_size = ((plane->state->src_w >>16 ) -1 ) <<16 | + ((plane->state->src_h >>16 ) -1 ); + }else { + stride = fb->pitches[0 ] / stride_div; + x_offset = x; + y_offset = y; + plane_size = ((plane->state->src_h >>16 ) -1 ) <<16 | + ((plane->state->src_w >>16 ) -1 ); + } + plane_offset = y_offset <<16 | x_offset;I915_WRITE (PLANE_CTL (pipe,0 ), plane_ctl);I915_WRITE (PLANE_POS (pipe,0 ),0 ); -I915_WRITE (PLANE_OFFSET (pipe,0 ), (y <<16 ) | x); -I915_WRITE (PLANE_SIZE (pipe,0 ), - (intel_crtc->config->pipe_src_h -1 ) <<16 | - (intel_crtc->config->pipe_src_w -1 )); -I915_WRITE (PLANE_STRIDE (pipe,0 ), fb->pitches[0 ] / stride_div); +I915_WRITE (PLANE_OFFSET (pipe,0 ), plane_offset); +I915_WRITE (PLANE_SIZE (pipe,0 ), plane_size); +I915_WRITE (PLANE_STRIDE (pipe,0 ), stride);I915_WRITE (PLANE_SURF (pipe,0 ), surf_addr);POSTING_READ (PLANE_SURF (pipe,0 ));@@ -12406,23 +12433,32 @@ static struct drm_plane *intel_primary_plane_create(struct drm_device *dev, intel_primary_formats, num_formats, DRM_PLANE_TYPE_PRIMARY); -if (INTEL_INFO (dev)->gen >=4 ) { -if (!dev->mode_config.rotation_property) - dev->mode_config.rotation_property = -drm_mode_create_rotation_property (dev, -BIT (DRM_ROTATE_0 ) | -BIT (DRM_ROTATE_180 )); -if (dev->mode_config.rotation_property) -drm_object_attach_property (&primary->base.base, - dev->mode_config.rotation_property, - state->base.rotation); - } +if (INTEL_INFO (dev)->gen >=4 ) +intel_create_rotation_property (dev, primary);drm_plane_helper_add (&primary->base, &intel_plane_helper_funcs);return &primary->base; } +void intel_create_rotation_property (struct drm_device *dev,struct intel_plane *plane) +{ +if (!dev->mode_config.rotation_property) { +unsigned long flags =BIT (DRM_ROTATE_0 ) | +BIT (DRM_ROTATE_180 ); + +if (INTEL_INFO (dev)->gen >=9 ) + flags |=BIT (DRM_ROTATE_90 ) |BIT (DRM_ROTATE_270 ); + + dev->mode_config.rotation_property = +drm_mode_create_rotation_property (dev, flags); + } +if (dev->mode_config.rotation_property) +drm_object_attach_property (&plane->base.base, + dev->mode_config.rotation_property, + plane->base.state->rotation); +} +static int intel_check_cursor_plane (struct drm_plane *plane,struct intel_plane_state *state)drivers/gpu/drm/i915/intel_drv.h +6
-0@@ -995,6 +995,12 @@ intel_rotation_90_or_270(unsigned int rotation)return rotation & (BIT (DRM_ROTATE_90 ) |BIT (DRM_ROTATE_270 )); } +unsigned int +intel_tile_height (struct drm_device *dev,uint32_t bits_per_pixel, +uint64_t fb_modifier); +void intel_create_rotation_property (struct drm_device *dev, +struct intel_plane *plane); +bool intel_wm_need_update (struct drm_plane *plane,struct drm_plane_state *state);drivers/gpu/drm/i915/intel_sprite.c +37
-15@@ -190,10 +190,13 @@ skl_update_plane(struct drm_plane *drm_plane, struct drm_crtc *crtc,struct drm_i915_gem_object *obj =intel_fb_obj (fb);const int pipe = intel_plane->pipe;const int plane = intel_plane->plane +1 ; -u32 plane_ctl, stride_div; +u32 plane_ctl, stride_div, stride;int pixel_size =drm_format_plane_cpp (fb->pixel_format,0 );const struct drm_intel_sprite_colorkey *key = &intel_plane->ckey;unsigned long surf_addr; +u32 tile_height, plane_offset, plane_size; +unsigned int rotation; +int x_offset, y_offset; plane_ctl =PLANE_CTL_ENABLE |PLANE_CTL_PIPE_CSC_ENABLE ;@@ -254,8 +257,20 @@ skl_update_plane(struct drm_plane *drm_plane, struct drm_crtc *crtc,MISSING_CASE (fb->modifier[0 ]); } -if (drm_plane->state->rotation ==BIT (DRM_ROTATE_180 )) + rotation = drm_plane->state->rotation; +switch (rotation) { +case BIT (DRM_ROTATE_90 ): + plane_ctl |=PLANE_CTL_ROTATE_90 ; +break ; + +case BIT (DRM_ROTATE_180 ): plane_ctl |=PLANE_CTL_ROTATE_180 ; +break ; + +case BIT (DRM_ROTATE_270 ): + plane_ctl |=PLANE_CTL_ROTATE_270 ; +break ; + } intel_update_sprite_watermarks(drm_plane, crtc, src_w, src_h, pixel_size, true,@@ -283,10 +298,26 @@ skl_update_plane(struct drm_plane *drm_plane, struct drm_crtc *crtc, surf_addr =intel_plane_obj_offset (intel_plane, obj); -I915_WRITE (PLANE_OFFSET (pipe, plane), (y <<16 ) | x); -I915_WRITE (PLANE_STRIDE (pipe, plane), fb->pitches[0 ] / stride_div); +if (intel_rotation_90_or_270 (rotation)) { +/* stride: Surface height in tiles */ + tile_height =intel_tile_height (dev, fb->bits_per_pixel, + fb->modifier[0 ]); + stride =DIV_ROUND_UP (fb->height, tile_height); + plane_size = (src_w <<16 ) | src_h; + x_offset = stride * tile_height - y - (src_h +1 ); + y_offset = x; + }else { + stride = fb->pitches[0 ] / stride_div; + plane_size = (src_h <<16 ) | src_w; + x_offset = x; + y_offset = y; + } + plane_offset = y_offset <<16 | x_offset; + +I915_WRITE (PLANE_OFFSET (pipe, plane), plane_offset); +I915_WRITE (PLANE_STRIDE (pipe, plane), stride);I915_WRITE (PLANE_POS (pipe, plane), (crtc_y <<16 ) | crtc_x); -I915_WRITE (PLANE_SIZE (pipe, plane), (crtc_h <<16 ) | crtc_w); +I915_WRITE (PLANE_SIZE (pipe, plane), plane_size);I915_WRITE (PLANE_CTL (pipe, plane), plane_ctl);I915_WRITE (PLANE_SURF (pipe, plane), surf_addr);POSTING_READ (PLANE_SURF (pipe, plane));@@ -1310,16 +1341,7 @@ intel_plane_init(struct drm_device *dev, enum pipe pipe, int plane) goto out; } -if (!dev->mode_config.rotation_property) - dev->mode_config.rotation_property = -drm_mode_create_rotation_property (dev, -BIT (DRM_ROTATE_0 ) | -BIT (DRM_ROTATE_180 )); - -if (dev->mode_config.rotation_property) -drm_object_attach_property (&intel_plane->base.base, - dev->mode_config.rotation_property, - state->base.rotation); +intel_create_rotation_property (dev, intel_plane);drm_plane_helper_add (&intel_plane->base, &intel_plane_helper_funcs);Signature · 1 line
1.7.10.4
Signature · 9 lines
Matt Roper Graphics Software Engineer IoTG Platform Enabling & Development Intel Corporation (916) 356-2795 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 1 line · Sonika Jindal
Signed-off-by Sonika Jindal <[email protected]>
It looks like this is dependent on Ville's patch
[PATCH v2 6/9] drm/i915: Pass the primary plane position to .update_primary_plane()
to actually let us do something sensible with the destination rectangle at the hardware level. Looks like that patch has a r-b, but hasn't made it into di-nightly yet.
Assuming Ville's patch lands first, this is
Matt
Quoted 38 lines
--- drivers/gpu/drm/i915/intel_display.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/intel_display.c +6
-1@@ -12150,16 +12150,21 @@ intel_check_primary_plane(struct drm_plane *plane,struct drm_rect *dest = &state->dst;struct drm_rect *src = &state->src;const struct drm_rect *clip = &state->clip; +bool can_position = false;int ret; crtc = crtc ? crtc : plane->crtc; intel_crtc =to_intel_crtc (crtc); +if (INTEL_INFO (dev)->gen >=9 ) + can_position = true; + ret =drm_plane_helper_check_update (plane, crtc, fb, src, dest, clip,DRM_PLANE_HELPER_NO_SCALING ,DRM_PLANE_HELPER_NO_SCALING , - false, true, &state->visible); + can_position, true, + &state->visible);if (ret)return ret;Signature · 6 lines
1.7.10.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 9 lines
Matt Roper Graphics Software Engineer IoTG Platform Enabling & Development Intel Corporation (916) 356-2795 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 11 lines · Matt Roper
Quoted 1 line · Sonika Jindal
Signed-off-by Sonika Jindal <[email protected]>It looks like this is dependent on Ville's patch
[PATCH v2 6/9] drm/i915: Pass the primary plane position to .update_primary_plane()
to actually let us do something sensible with the destination rectangle at the hardware level. Looks like that patch has a r-b, but hasn't made it into di-nightly yet.
Right now, can_position is used to check for the scenarios where the primary plane is not covering the complete crtc. This could be due to positioning or a smaller fb on primary plane. With Ville's patch, we would be able to allow positioning to happen.
But I need it here, to create a smaller fb for 90/270 rotation.
I agree that, until Ville's patch is there, we won't be entertaining any positioning requests on the primary plane and we will not be throwing any error also.
But for the 90/270 testcase in kms_rotation_crc to go through, we would need this to create a smaller fb so that we can rotate it.
Quoted 37 lines
Assuming Ville's patch lands first, this is
Reviewed-by Matt Roper <[email protected]>Matt
Quoted 31 lines
--- drivers/gpu/drm/i915/intel_display.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/intel_display.c +6
-1@@ -12150,16 +12150,21 @@ intel_check_primary_plane(struct drm_plane *plane,struct drm_rect *dest = &state->dst;struct drm_rect *src = &state->src;const struct drm_rect *clip = &state->clip; +bool can_position = false;int ret; crtc = crtc ? crtc : plane->crtc; intel_crtc =to_intel_crtc (crtc); +if (INTEL_INFO (dev)->gen >=9 ) + can_position = true; + ret =drm_plane_helper_check_update (plane, crtc, fb, src, dest, clip,DRM_PLANE_HELPER_NO_SCALING ,DRM_PLANE_HELPER_NO_SCALING , - false, true, &state->visible); + can_position, true, + &state->visible);if (ret)return ret;
Quoted 8 lines
Quoted 7 lines
--
1.7.10.4_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 20 lines · Sonika
Quoted 11 lines · Matt Roper
Quoted 1 line · Sonika Jindal
Signed-off-by Sonika Jindal <[email protected]>It looks like this is dependent on Ville's patch
[PATCH v2 6/9] drm/i915: Pass the primary plane position to .update_primary_plane()
to actually let us do something sensible with the destination rectangle at the hardware level. Looks like that patch has a r-b, but hasn't made it into di-nightly yet.
Right now,
can_positionis used to check for the scenarios where the primary plane is not covering the complete crtc. This could be due to positioning or a smaller fb on primary plane.
With Ville's patch, we would be able to allow positioning to happen. But I need it here, to create a smaller fb for 90/270 rotation.
Quoted 3 lines
I agree that, until Ville's patch is there, we won't be entertaining any positioning requests on the primary plane and we will not be throwing any error also.
Right...and I think failing to throw an error would be seen as a bug, which is why I think Ville's patch needs to go in first. Since it's already been reviewed, I'm not aware of anything holding that up from happening.
Quoted 2 lines
But for the 90/270 testcase in
kms_rotation_crcto go through, we would need this to create a smaller fb so that we can rotate it.
So is your worry here that drm_plane_helper_check_update() doesn't understand rotation and winds up mixing up width/height? If so, I think the proper course of action is to write a patch for the helper function that makes it rotation-aware.
Matt
Quoted 46 lines
Quoted 46 lines
Assuming Ville's patch lands first, this is
Reviewed-by Matt Roper <[email protected]>Matt
Quoted 38 lines
--- drivers/gpu/drm/i915/intel_display.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/intel_display.c +6
-2@@ -12150,16 +12150,21 @@ intel_check_primary_plane(struct drm_plane *plane,struct drm_rect *dest = &state->dst;struct drm_rect *src = &state->src;const struct drm_rect *clip = &state->clip; +bool can_position = false;int ret; crtc = crtc ? crtc : plane->crtc; intel_crtc =to_intel_crtc (crtc); +if (INTEL_INFO (dev)->gen >=9 ) + can_position = true; + ret =drm_plane_helper_check_update (plane, crtc, fb, src, dest, clip,DRM_PLANE_HELPER_NO_SCALING ,DRM_PLANE_HELPER_NO_SCALING , - false, true, &state->visible); + can_position, true, + &state->visible);if (ret)return ret; --1.7.10.4
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 9 lines
Matt Roper Graphics Software Engineer IoTG Platform Enabling & Development Intel Corporation (916) 356-2795 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 21 lines · Matt Roper
Quoted 20 lines · Sonika
Quoted 11 lines · Matt Roper
Quoted 1 line · Sonika Jindal
Signed-off-by Sonika Jindal <[email protected]>It looks like this is dependent on Ville's patch
[PATCH v2 6/9] drm/i915: Pass the primary plane position to .update_primary_plane()
to actually let us do something sensible with the destination rectangle at the hardware level. Looks like that patch has a r-b, but hasn't made it into di-nightly yet.
Right now,
can_positionis used to check for the scenarios where the primary plane is not covering the complete crtc. This could be due to positioning or a smaller fb on primary plane.
With Ville's patch, we would be able to allow positioning to happen. But I need it here, to create a smaller fb for 90/270 rotation.
Quoted 9 lines
Quoted 3 lines
I agree that, until Ville's patch is there, we won't be entertaining any positioning requests on the primary plane and we will not be throwing any error also.
Right...and I think failing to throw an error would be seen as a bug, which is why I think Ville's patch needs to go in first. Since it's already been reviewed, I'm not aware of anything holding that up from happening.
Agree, will check with Daniel on this.
Quoted 8 lines
Quoted 2 lines
But for the 90/270 testcase in
kms_rotation_crcto go through, we would need this to create a smaller fb so that we can rotate it.So is your worry here that
drm_plane_helper_check_update()doesn't understand rotation and winds up mixing up width/height? If so, I think the proper course of action is to write a patch for the helper function that makes it rotation-aware.
No, the worry is that it rejects a smaller fb for primary plane for all the platforms. I mentioned 90/270 rotation, because I create a smaller fb (rather than the full screen fb), so that the rotated plane fits into the screen. If it is lets say 1920x1080, and the pipe is set at 1920x1080, after rotation the plane becomes 1080x1920 and the height of the plane surpasses that of crtc. For gen >=9 , we can have smaller fb for primary plane which might not cover the entire crtc.
Regards,
Sonika
Quoted 50 lines
Matt
Quoted 46 lines
Quoted 46 lines
Assuming Ville's patch lands first, this is
Reviewed-by Matt Roper <[email protected]>Matt
Quoted 38 lines
--- drivers/gpu/drm/i915/intel_display.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/intel_display.c +6
-2@@ -12150,16 +12150,21 @@ intel_check_primary_plane(struct drm_plane *plane,struct drm_rect *dest = &state->dst;struct drm_rect *src = &state->src;const struct drm_rect *clip = &state->clip; +bool can_position = false;int ret; crtc = crtc ? crtc : plane->crtc; intel_crtc =to_intel_crtc (crtc); +if (INTEL_INFO (dev)->gen >=9 ) + can_position = true; + ret =drm_plane_helper_check_update (plane, crtc, fb, src, dest, clip,DRM_PLANE_HELPER_NO_SCALING ,DRM_PLANE_HELPER_NO_SCALING , - false, true, &state->visible); + can_position, true, + &state->visible);if (ret)return ret; --1.7.10.4
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 43 lines · Sonika
Quoted 21 lines · Matt Roper
Quoted 20 lines · Sonika
Quoted 11 lines · Matt Roper
Quoted 1 line · Sonika Jindal
Signed-off-by Sonika Jindal <[email protected]>It looks like this is dependent on Ville's patch
[PATCH v2 6/9] drm/i915: Pass the primary plane position to .update_primary_plane()
to actually let us do something sensible with the destination rectangle at the hardware level. Looks like that patch has a r-b, but hasn't made it into di-nightly yet.
Right now,
can_positionis used to check for the scenarios where the primary plane is not covering the complete crtc. This could be due to positioning or a smaller fb on primary plane.
With Ville's patch, we would be able to allow positioning to happen. But I need it here, to create a smaller fb for 90/270 rotation.Quoted 9 lines
Quoted 3 lines
I agree that, until Ville's patch is there, we won't be entertaining any positioning requests on the primary plane and we will not be throwing any error also.
Right...and I think failing to throw an error would be seen as a bug, which is why I think Ville's patch needs to go in first. Since it's already been reviewed, I'm not aware of anything holding that up from happening.
Agree, will check with Daniel on this.
Quoted 8 lines
Quoted 2 lines
But for the 90/270 testcase in
kms_rotation_crcto go through, we would need this to create a smaller fb so that we can rotate it.So is your worry here that
drm_plane_helper_check_update()doesn't understand rotation and winds up mixing up width/height? If so, I think the proper course of action is to write a patch for the helper function that makes it rotation-aware.
Quoted 8 lines
No, the worry is that it rejects a smaller fb for primary plane for all the platforms. I mentioned 90/270 rotation, because I create a smaller fb (rather than the full screen fb), so that the rotated plane fits into the screen. If it is lets say 1920x1080, and the pipe is set at 1920x1080, after rotation the plane becomes 1080x1920 and the height of the plane surpasses that of crtc.
For gen >=9 , we can have smaller fb for primary plane which might not cover the entire crtc.
That sounds like a bug in the helper though if it rejects such a framebuffer.
-Daniel
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
Quoted 53 lines · Daniel Vetter
Quoted 43 lines · Sonika
Quoted 21 lines · Matt Roper
Quoted 20 lines · Sonika
Quoted 11 lines · Matt Roper
Quoted 1 line · Sonika Jindal
Signed-off-by Sonika Jindal <[email protected]>It looks like this is dependent on Ville's patch
[PATCH v2 6/9] drm/i915: Pass the primary plane position to .update_primary_plane()
to actually let us do something sensible with the destination rectangle at the hardware level. Looks like that patch has a r-b, but hasn't made it into di-nightly yet.
Right now,
can_positionis used to check for the scenarios where the primary plane is not covering the complete crtc. This could be due to positioning or a smaller fb on primary plane.
With Ville's patch, we would be able to allow positioning to happen. But I need it here, to create a smaller fb for 90/270 rotation.Quoted 9 lines
Quoted 3 lines
I agree that, until Ville's patch is there, we won't be entertaining any positioning requests on the primary plane and we will not be throwing any error also.
Right...and I think failing to throw an error would be seen as a bug, which is why I think Ville's patch needs to go in first. Since it's already been reviewed, I'm not aware of anything holding that up from happening.
Agree, will check with Daniel on this.
Quoted 8 lines
Quoted 2 lines
But for the 90/270 testcase in
kms_rotation_crcto go through, we would need this to create a smaller fb so that we can rotate it.So is your worry here that
drm_plane_helper_check_update()doesn't understand rotation and winds up mixing up width/height? If so, I think the proper course of action is to write a patch for the helper function that makes it rotation-aware.Quoted 8 lines
No, the worry is that it rejects a smaller fb for primary plane for all the platforms. I mentioned 90/270 rotation, because I create a smaller fb (rather than the full screen fb), so that the rotated plane fits into the screen. If it is lets say 1920x1080, and the pipe is set at 1920x1080, after rotation the plane becomes 1080x1920 and the height of the plane surpasses that of crtc.
For gen >=9 , we can have smaller fb for primary plane which might not cover the entire crtc.
Quoted 3 lines
That sounds like a bug in the helper though if it rejects such a framebuffer.
-Daniel
Till now we used to have primary plane covering the crtc, so its not a bug. For gen > 9 we can have smaller primary planes (or with other platforms as well?) Anyways, we need to add this patch to get past that restriction.
Regards,
Sonika
Quoted 1 line
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx