NV12 90/270 rotated GGTT mapping
Subsystems (2)
v2 cover NV12 90/270 rotated GGTT mapping
From: Tvrtko Ursulin <[email protected]>
Still the first attempt at rotated GGTT mapping for the NV12 format.
Just rebased on latest -nighlty this time.
Sending out for Chandra to try the full rotated NV12 patches with the latest NV12 workarounds.
Only smoke tested with "normal" (not NV12) kms_rotation_crc.
Tvrtko Ursulin (4):
drm/i915: Support planar formats in tile height calculations drm/i915: Support appending to the rotated pages mapping drm/i915: Support NV12 in rotated GGTT mapping drm/i915: Enable querying offset of UV plane with
intel_plane_obj_offset
drivers/gpu/drm/i915/i915_gem_gtt.c | 58 ++++++++++++++++++++++++++++-------- drivers/gpu/drm/i915/i915_gem_gtt.h | 4 +++ drivers/gpu/drm/i915/intel_display.c | 48 ++++++++++++++++++++++------- drivers/gpu/drm/i915/intel_drv.h | 6 ++-- drivers/gpu/drm/i915/intel_sprite.c | 4 +-- 5 files changed, 93 insertions(+), 27 deletions(-)
Signature · 6 lines
2.4.6 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/4 drm/i915: Support planar formats in tile height calculations
From: Tvrtko Ursulin <[email protected]>
This will be needed for NV12 support.
v2: Rebase.
--- drivers/gpu/drm/i915/intel_display.c | 10 +++++----- drivers/gpu/drm/i915/intel_drv.h | 2 +- drivers/gpu/drm/i915/intel_sprite.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/intel_display.c +5 -5
@@ -2224,7 +2224,7 @@ static bool need_vtd_wa(struct drm_device *dev)unsigned int intel_tile_height (struct drm_device *dev,uint32_t pixel_format, -uint64_t fb_format_modifier) +uint64_t fb_format_modifier,unsigned int plane) {unsigned int tile_height;uint32_t pixel_bytes;
@@ -2240,7 +2240,7 @@ intel_tile_height(struct drm_device *dev, uint32_t pixel_format, tile_height =32 ;break ;case I915_FORMAT_MOD_Yf_TILED: - pixel_bytes =drm_format_plane_cpp (pixel_format,0 ); + pixel_bytes =drm_format_plane_cpp (pixel_format, plane);switch (pixel_bytes) {default :case 1 :
@@ -2274,7 +2274,7 @@ intel_fb_align_height(struct drm_device *dev, unsigned int height, uint32_t pixel_format, uint64_t fb_format_modifier) {return ALIGN (height,intel_tile_height (dev, pixel_format, - fb_format_modifier)); + fb_format_modifier,0 )); } static int
@@ -2300,7 +2300,7 @@ intel_fill_fb_ggtt_view(struct i915_ggtt_view *view, struct drm_framebuffer *fb, info->fb_modifier = fb->modifier[0 ]; tile_height =intel_tile_height (fb->dev, fb->pixel_format, - fb->modifier[0 ]); + fb->modifier[0 ],0 ); tile_pitch =PAGE_SIZE / tile_height; info->width_pages =DIV_ROUND_UP (fb->pitches[0 ], tile_pitch); info->height_pages =DIV_ROUND_UP (fb->height, tile_height);
@@ -3094,7 +3094,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->pixel_format, - fb->modifier[0 ]); + fb->modifier[0 ],0 ); stride =DIV_ROUND_UP (fb->height, tile_height); x_offset = stride * tile_height - y - src_h; y_offset = x;
drivers/gpu/drm/i915/intel_drv.h +1 -1
@@ -1061,7 +1061,7 @@ int intel_plane_atomic_calc_changes(struct drm_crtc_state *crtc_state,unsigned int intel_tile_height (struct drm_device *dev,uint32_t pixel_format, -uint64_t fb_format_modifier); +uint64_t fb_format_modifier,unsigned int plane);static inline bool intel_rotation_90_or_270 (unsigned int rotation)
drivers/gpu/drm/i915/intel_sprite.c +1 -1
@@ -228,7 +228,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->pixel_format, - fb->modifier[0 ]); + fb->modifier[0 ],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 );
Signature · 6 lines
2.4.6 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/4 drm/i915: Support appending to the rotated pages mapping
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
By providing a start offset into the source array of pages, and returning the end position in the scatter-gather table, we will be able to append the UV plane to the rotated mapping in later patches.
v2: Rebase.
--- drivers/gpu/drm/i915/i915_gem_gtt.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/i915_gem_gtt.c +13 -8
@@ -2722,15 +2722,18 @@ i915_gem_obj_lookup_or_create_ggtt_vma(struct drm_i915_gem_object *obj, } -static void -rotate_pages (dma_addr_t *in,unsigned int width,unsigned int height, -struct sg_table *st) +static struct scatterlist * +rotate_pages (dma_addr_t *in,unsigned int offset, +unsigned int width,unsigned int height, +struct sg_table *st,struct scatterlist *sg) {unsigned int column, row;unsigned int src_idx; -struct scatterlist *sg = st->sgl; - st->nents =0 ; +if (!sg) { + st->nents =0 ; + sg = st->sgl; + }for (column =0 ; column < width; column++) { src_idx = width * (height -1 ) + column;
@@ -2741,12 +2744,14 @@ rotate_pages(dma_addr_t *in, unsigned int width, unsigned int height,* The only thing we need are DMA addresses. */ sg_set_page (sg,NULL ,PAGE_SIZE ,0 ); -sg_dma_address (sg) = in[src_idx]; +sg_dma_address (sg) = in[offset + src_idx];sg_dma_len (sg) =PAGE_SIZE ; sg =sg_next (sg); src_idx -= width; } } + +return sg; } static struct sg_table *
@@ -2784,9 +2789,9 @@ intel_rotate_fb_obj_pages(struct i915_ggtt_view *ggtt_view, }/* Rotate the pages. */ -rotate_pages (page_addr_list, +rotate_pages (page_addr_list,0 , rot_info->width_pages, rot_info->height_pages, - st); + st,NULL ); DRM_DEBUG_KMS( "Created rotated page mapping for object size %zu (pitch=%u, height=%u, pixel_format=0x%x, %ux%u tiles, %u pages).\n",
Signature · 6 lines
2.4.6 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/4 drm/i915: Support NV12 in rotated GGTT mapping
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
Just adding the rotated UV plane at the end of the rotated Y plane.
v2: Rebase.
--- drivers/gpu/drm/i915/i915_gem_gtt.c | 37 ++++++++++++++++++++++++++++++------ drivers/gpu/drm/i915/i915_gem_gtt.h | 3 +++ drivers/gpu/drm/i915/intel_display.c | 12 ++++++++++++ 3 files changed, 46 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/i915_gem_gtt.c +31 -6
@@ -2760,10 +2760,13 @@ intel_rotate_fb_obj_pages(struct i915_ggtt_view *ggtt_view, {struct intel_rotation_info *rot_info = &ggtt_view->rotation_info;unsigned int size_pages = rot_info->size >>PAGE_SHIFT ; +unsigned int size_pages_uv;struct sg_page_iter sg_iter;unsigned long i;dma_addr_t *page_addr_list;struct sg_table *st; +unsigned int uv_start_page; +struct scatterlist *sg;int ret = -ENOMEM ;/* Allocate a temporary list of source pages for random access. */
@@ -2772,12 +2775,18 @@ intel_rotate_fb_obj_pages(struct i915_ggtt_view *ggtt_view,if (!page_addr_list)return ERR_PTR (ret); +/* Account for UV plane with NV12. */ +if (rot_info->pixel_format ==DRM_FORMAT_NV12 ) + size_pages_uv = rot_info->size_uv >>PAGE_SHIFT ; +else + size_pages_uv =0 ; +/* Allocate target SG list. */ st =kmalloc (sizeof (*st),GFP_KERNEL );if (!st) goto err_st_alloc; - ret =sg_alloc_table (st, size_pages,GFP_KERNEL ); + ret =sg_alloc_table (st, size_pages + size_pages_uv,GFP_KERNEL );if (ret) goto err_sg_alloc;
@@ -2789,15 +2798,30 @@ intel_rotate_fb_obj_pages(struct i915_ggtt_view *ggtt_view, }/* Rotate the pages. */ -rotate_pages (page_addr_list,0 , + sg =rotate_pages (page_addr_list,0 , rot_info->width_pages, rot_info->height_pages, st,NULL ); +/* Append the UV plane if NV12. */ +if (rot_info->pixel_format ==DRM_FORMAT_NV12 ) { + uv_start_page = size_pages; + +/* Check for tile-row un-alignment. */ +if (offset_in_page (rot_info->uv_offset)) + uv_start_page--; + +rotate_pages (page_addr_list, uv_start_page, + rot_info->width_pages_uv, + rot_info->height_pages_uv, + st, sg); + } +DRM_DEBUG_KMS ( -"Created rotated page mapping for object size %zu (pitch=%u, height=%u, pixel_format=0x%x, %ux%u tiles, %u pages).\n" , +"Created rotated page mapping for object size %zu (pitch=%u, height=%u, pixel_format=0x%x, %ux%u tiles, %u pages (%u plane 0)).\n" , obj->base.size, rot_info->pitch, rot_info->height, rot_info->pixel_format, rot_info->width_pages, - rot_info->height_pages, size_pages); + rot_info->height_pages, size_pages + size_pages_uv, + size_pages);drm_free_large (page_addr_list);
@@ -2809,10 +2833,11 @@ err_st_alloc:drm_free_large (page_addr_list);DRM_DEBUG_KMS ( -"Failed to create rotated mapping for object size %zu! (%d) (pitch=%u, height=%u, pixel_format=0x%x, %ux%u tiles, %u pages)\n" , +"Failed to create rotated mapping for object size %zu! (%d) (pitch=%u, height=%u, pixel_format=0x%x, %ux%u tiles, %u pages (%u plane 0))\n" , obj->base.size, ret, rot_info->pitch, rot_info->height, rot_info->pixel_format, rot_info->width_pages, - rot_info->height_pages, size_pages); + rot_info->height_pages, size_pages + size_pages_uv, + size_pages);return ERR_PTR (ret); }
drivers/gpu/drm/i915/i915_gem_gtt.h +3 -0
@@ -124,10 +124,13 @@ enum i915_ggtt_view_type {struct intel_rotation_info {unsigned int height;unsigned int pitch; +unsigned int uv_offset;uint32_t pixel_format;uint64_t fb_modifier;unsigned int width_pages, height_pages;uint64_t size; +unsigned int width_pages_uv, height_pages_uv; +uint64_t size_uv; };struct i915_ggtt_view {
drivers/gpu/drm/i915/intel_display.c +12 -0
@@ -2297,6 +2297,7 @@ intel_fill_fb_ggtt_view(struct i915_ggtt_view *view, struct drm_framebuffer *fb, info->height = fb->height; info->pixel_format = fb->pixel_format; info->pitch = fb->pitches[0 ]; + info->uv_offset = fb->offsets[1 ]; info->fb_modifier = fb->modifier[0 ]; tile_height = intel_tile_height(fb->dev, fb->pixel_format,
@@ -2306,6 +2307,17 @@ intel_fill_fb_ggtt_view(struct i915_ggtt_view *view, struct drm_framebuffer *fb, info->height_pages =DIV_ROUND_UP (fb->height, tile_height); info->size = info->width_pages * info->height_pages *PAGE_SIZE ; +if (info->pixel_format ==DRM_FORMAT_NV12 ) { + tile_height =intel_tile_height (fb->dev, fb->pixel_format, + fb->modifier[0 ],1 ); + tile_pitch =PAGE_SIZE / tile_height; + info->width_pages_uv =DIV_ROUND_UP (fb->pitches[0 ], tile_pitch); + info->height_pages_uv =DIV_ROUND_UP (fb->height /2 , + tile_height); + info->size_uv = info->width_pages_uv * info->height_pages_uv * +PAGE_SIZE ; + } +return 0 ; }
Signature · 6 lines
2.4.6 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 4/4 drm/i915: Enable querying offset of UV plane with intel_plane_obj_offset
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
v2: Rebase.
--- drivers/gpu/drm/i915/i915_gem_gtt.c | 2 ++ drivers/gpu/drm/i915/i915_gem_gtt.h | 1 + drivers/gpu/drm/i915/intel_display.c | 26 +++++++++++++++++++++----- drivers/gpu/drm/i915/intel_drv.h | 4 +++- drivers/gpu/drm/i915/intel_sprite.c | 2 +- 5 files changed, 28 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/i915_gem_gtt.c +2 -0
@@ -2810,6 +2810,8 @@ intel_rotate_fb_obj_pages(struct i915_ggtt_view *ggtt_view,if (offset_in_page (rot_info->uv_offset)) uv_start_page--; + rot_info->uv_start_page = uv_start_page; + rotate_pages(page_addr_list, uv_start_page, rot_info->width_pages_uv, rot_info->height_pages_uv,
drivers/gpu/drm/i915/i915_gem_gtt.h +1 -0
@@ -131,6 +131,7 @@ struct intel_rotation_info {uint64_t size;unsigned int width_pages_uv, height_pages_uv;uint64_t size_uv; +unsigned int uv_start_page; };struct i915_ggtt_view {
drivers/gpu/drm/i915/intel_display.c +21 -5
@@ -2914,14 +2914,29 @@ u32 intel_fb_stride_alignment(struct drm_device *dev, uint64_t fb_modifier, }unsigned long intel_plane_obj_offset (struct intel_plane *intel_plane, -struct drm_i915_gem_object *obj) +struct drm_i915_gem_object *obj, +unsigned int plane) {const struct i915_ggtt_view *view = &i915_ggtt_view_normal; +struct i915_vma *vma; +unsigned char *offset;if (intel_rotation_90_or_270 (intel_plane->base.state->rotation)) view = &i915_ggtt_view_rotated; -return i915_gem_obj_ggtt_offset_view (obj, view); + vma =i915_gem_obj_to_ggtt_view (obj, view); +if (WARN (!vma,"ggtt vma for display object not found! (view=%u)\n" , + view->type)) +return -1 ; + + offset = (unsigned char *)vma->node.start; + +if (plane ==1 ) { + offset += vma->ggtt_view.rotation_info.uv_start_page * +PAGE_SIZE ; + } + +return (unsigned long )offset; }static void skl_detach_scaler (struct intel_crtc *intel_crtc,int id)
@@ -3079,7 +3094,7 @@ static void skylake_update_primary_plane(struct drm_crtc *crtc, 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 (plane), obj); + surf_addr =intel_plane_obj_offset (to_intel_plane (plane), obj,0 );/* * FIXME: intel_plane_state->src, dst aren't set when transitional
@@ -11520,8 +11535,9 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,if (ret) goto cleanup_pending; - work->gtt_offset =intel_plane_obj_offset (to_intel_plane (primary), obj) - + intel_crtc->dspaddr_offset; + work->gtt_offset =intel_plane_obj_offset (to_intel_plane (primary), + obj,0 ); + work->gtt_offset += intel_crtc->dspaddr_offset;if (mmio_flip) { ret = intel_queue_mmio_flip(dev, crtc, fb, obj, ring,
drivers/gpu/drm/i915/intel_drv.h +3 -1
@@ -1142,7 +1142,9 @@ int skl_update_scaler_crtc(struct intel_crtc_state *crtc_state);int skl_max_scale (struct intel_crtc *crtc,struct intel_crtc_state *crtc_state);unsigned long intel_plane_obj_offset (struct intel_plane *intel_plane, -struct drm_i915_gem_object *obj); +struct drm_i915_gem_object *obj, +unsigned int plane); +u32 skl_plane_ctl_format (uint32_t pixel_format);u32 skl_plane_ctl_tiling (uint64_t fb_modifier);u32 skl_plane_ctl_rotation (unsigned int rotation);
drivers/gpu/drm/i915/intel_sprite.c +1 -1
@@ -223,7 +223,7 @@ skl_update_plane(struct drm_plane *drm_plane, struct drm_crtc *crtc,else if (key->flags &I915_SET_COLORKEY_SOURCE ) plane_ctl |=PLANE_CTL_KEY_ENABLE_SOURCE ; - surf_addr =intel_plane_obj_offset (intel_plane, obj); + surf_addr =intel_plane_obj_offset (intel_plane, obj,0 );if (intel_rotation_90_or_270 (rotation)) {/* stride: Surface height in tiles */
Signature · 6 lines
2.4.6 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 4/4] drm/i915: Enable querying offset of UV plane with intel_plane_obj_offset
Quoted 43 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
v2: Rebase.
Signed-off-by Tvrtko Ursulin <[email protected]>--- drivers/gpu/drm/i915/i915_gem_gtt.c | 2 ++ drivers/gpu/drm/i915/i915_gem_gtt.h | 1 + drivers/gpu/drm/i915/intel_display.c | 26 +++++++++++++++++++++----- drivers/gpu/drm/i915/intel_drv.h | 4 +++- drivers/gpu/drm/i915/intel_sprite.c | 2 +- 5 files changed, 28 insertions(+), 7 deletions(-)drivers/gpu/drm/i915/i915_gem_gtt.c +2
-0@@ -2810,6 +2810,8 @@ intel_rotate_fb_obj_pages(struct i915_ggtt_view *ggtt_view,if (offset_in_page (rot_info->uv_offset)) uv_start_page--; + rot_info->uv_start_page = uv_start_page; + rotate_pages(page_addr_list, uv_start_page, rot_info->width_pages_uv, rot_info->height_pages_uv,drivers/gpu/drm/i915/i915_gem_gtt.h +1
-0@@ -131,6 +131,7 @@ struct intel_rotation_info {uint64_t size;unsigned int width_pages_uv, height_pages_uv;uint64_t size_uv; +unsigned int uv_start_page; };struct i915_ggtt_view {drivers/gpu/drm/i915/intel_display.c +0
-0
drivers/gpu/drm/i915/intel_display.c u32 intel_fb_stride_alignment(struct drm_device *dev, uint64_t fb_modifier, · line 2918
Quoted 6 lines
drivers/gpu/drm/i915/intel_display.c +2
-1@@ -2914,14 +2914,29 @@ u32 intel_fb_stride_alignment(struct drm_device *dev, uint64_t fb_modifier, }unsigned long intel_plane_obj_offset (struct intel_plane *intel_plane, -struct drm_i915_gem_object *obj) +struct drm_i915_gem_object *obj, +unsigned int plane)
All callers pass in .plane=0; how is this supposed to work? -Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 4/4] drm/i915: Enable querying offset of UV plane with intel_plane_obj_offset
Quoted 46 lines · Chris Wilson
Quoted 45 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
v2: Rebase.
Signed-off-by Tvrtko Ursulin <[email protected]>--- drivers/gpu/drm/i915/i915_gem_gtt.c | 2 ++ drivers/gpu/drm/i915/i915_gem_gtt.h | 1 + drivers/gpu/drm/i915/intel_display.c | 26 +++++++++++++++++++++----- drivers/gpu/drm/i915/intel_drv.h | 4 +++- drivers/gpu/drm/i915/intel_sprite.c | 2 +- 5 files changed, 28 insertions(+), 7 deletions(-)drivers/gpu/drm/i915/i915_gem_gtt.c +2
-0@@ -2810,6 +2810,8 @@ intel_rotate_fb_obj_pages(struct i915_ggtt_view *ggtt_view,if (offset_in_page (rot_info->uv_offset)) uv_start_page--; + rot_info->uv_start_page = uv_start_page; + rotate_pages(page_addr_list, uv_start_page, rot_info->width_pages_uv, rot_info->height_pages_uv,drivers/gpu/drm/i915/i915_gem_gtt.h +1
-0@@ -131,6 +131,7 @@ struct intel_rotation_info {uint64_t size;unsigned int width_pages_uv, height_pages_uv;uint64_t size_uv; +unsigned int uv_start_page; };struct i915_ggtt_view {drivers/gpu/drm/i915/intel_display.c +0
-0@@ -2914,14 +2914,29 @@ u32 intel_fb_stride_alignment(struct drm_device *dev, uint64_t fb_modifier, }
Quoted 6 lines
drivers/gpu/drm/i915/intel_display.c u32 intel_fb_stride_alignment(struct drm_device *dev, uint64_t fb_modifier, · line 2918
Quoted 4 lines
drivers/gpu/drm/i915/intel_display.c +2
-1unsigned long intel_plane_obj_offset (struct intel_plane *intel_plane, -struct drm_i915_gem_object *obj) +struct drm_i915_gem_object *obj, +unsigned int plane)All callers pass in .plane=0; how is this supposed to work?
I forgot to include a critical piece of information in the cover letter this time - this series only deals with GGTT mapping part of the story, while Chandra has many more patches on top which implement the actual rotated NV12 scanout.
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 4/4] drm/i915: Enable querying offset of UV plane with intel_plane_obj_offset
In reply to Tvrtko UrsulinTask id: 6929 -------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
ILK -1 302/302 301/302
SNB 315/315 315/315 IVB 336/336 336/336 BYT 283/283 283/283 HSW 378/378 378/378
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
*ILK igt@kms_flip@wf_vblank-vs-modeset-interruptible PASS(1) DMESG_WARN(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