drm/i915: Remove mostly unused variable in intel_rotate_fb_obj_pages
Subsystems (2)
PATCH 1/3 drm/i915: Remove mostly unused variable in intel_rotate_fb_obj_pages
From: Tvrtko Ursulin <[email protected]>
It is only used in logging and it doesn't need to exist on its own.
--- drivers/gpu/drm/i915/i915_gem_gtt.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/i915_gem_gtt.c +3 -4
@@ -2702,7 +2702,7 @@ intel_rotate_fb_obj_pages(struct i915_ggtt_view *ggtt_view, {struct drm_device *dev = obj->base.dev;struct intel_rotation_info *rot_info = &ggtt_view->rotation_info; -unsigned long size, pages, rot_pages; +unsigned long pages, rot_pages;struct sg_page_iter sg_iter;unsigned long i;dma_addr_t *page_addr_list;
@@ -2720,7 +2720,6 @@ intel_rotate_fb_obj_pages(struct i915_ggtt_view *ggtt_view, width_pages =DIV_ROUND_UP (rot_info->pitch, tile_pitch); height_pages =DIV_ROUND_UP (rot_info->height, tile_height); rot_pages = width_pages * height_pages; - size = rot_pages *PAGE_SIZE ;/* Allocate a temporary list of source pages for random access. */ page_addr_list =drm_malloc_ab (pages,sizeof (dma_addr_t));
@@ -2748,7 +2747,7 @@ intel_rotate_fb_obj_pages(struct i915_ggtt_view *ggtt_view,DRM_DEBUG_KMS ("Created rotated page mapping for object size %lu (pitch=%u, height=%u, pixel_format=0x%x, %ux%u tiles, %lu pages).\n" , - size, rot_info->pitch, rot_info->height, + obj->base.size, rot_info->pitch, rot_info->height, rot_info->pixel_format, width_pages, height_pages, rot_pages);
@@ -2763,7 +2762,7 @@ err_st_alloc:DRM_DEBUG_KMS ("Failed to create rotated mapping for object size %lu! (%d) (pitch=%u, height=%u, pixel_format=0x%x, %ux%u tiles, %lu pages)\n" , - size, ret, rot_info->pitch, rot_info->height, + obj->base.size, ret, rot_info->pitch, rot_info->height, rot_info->pixel_format, width_pages, height_pages, rot_pages);return ERR_PTR (ret);
Signature · 6 lines
2.4.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/3 drm/i915: Move rotated geometry calculations into the fill helper
From: Tvrtko Ursulin <[email protected]>
This way data is available as soon as the view is passed into the call chain.
---
This will be needed in the following patch which fixes i915_ggtt_view_size.
--- drivers/gpu/drm/i915/i915_gem_gtt.c | 35 ++++++++++++----------------------- drivers/gpu/drm/i915/i915_gem_gtt.h | 2 ++ drivers/gpu/drm/i915/intel_display.c | 8 ++++++++ 3 files changed, 22 insertions(+), 23 deletions(-)
drivers/gpu/drm/i915/i915_gem_gtt.c +12 -23
@@ -2700,29 +2700,16 @@ static struct sg_table * intel_rotate_fb_obj_pages(struct i915_ggtt_view *ggtt_view, struct drm_i915_gem_object *obj) { - struct drm_device *dev = obj->base.dev; struct intel_rotation_info *rot_info = &ggtt_view->rotation_info; -unsigned long pages, rot_pages;struct sg_page_iter sg_iter;unsigned long i;dma_addr_t *page_addr_list;struct sg_table *st; -unsigned int tile_pitch, tile_height; -unsigned int width_pages, height_pages;int ret = -ENOMEM ; - pages = obj->base.size /PAGE_SIZE ; - -/* Calculate tiling geometry. */ - tile_height =intel_tile_height (dev, rot_info->pixel_format, - rot_info->fb_modifier); - tile_pitch =PAGE_SIZE / tile_height; - width_pages =DIV_ROUND_UP (rot_info->pitch, tile_pitch); - height_pages =DIV_ROUND_UP (rot_info->height, tile_height); - rot_pages = width_pages * height_pages; -/* Allocate a temporary list of source pages for random access. */ - page_addr_list =drm_malloc_ab (pages,sizeof (dma_addr_t)); + page_addr_list =drm_malloc_ab (obj->base.size /PAGE_SIZE , +sizeof (dma_addr_t));if (!page_addr_list)return ERR_PTR (ret);
@@ -2731,7 +2718,7 @@ intel_rotate_fb_obj_pages(struct i915_ggtt_view *ggtt_view,if (!st) goto err_st_alloc; - ret =sg_alloc_table (st, rot_pages,GFP_KERNEL ); + ret =sg_alloc_table (st, rot_info->pages,GFP_KERNEL );if (ret) goto err_sg_alloc;
@@ -2743,13 +2730,15 @@ intel_rotate_fb_obj_pages(struct i915_ggtt_view *ggtt_view, }/* Rotate the pages. */ -rotate_pages (page_addr_list, width_pages, height_pages, st); +rotate_pages (page_addr_list, + rot_info->width_pages, rot_info->height_pages, + st);DRM_DEBUG_KMS ( -"Created rotated page mapping for object size %lu (pitch=%u, height=%u, pixel_format=0x%x, %ux%u tiles, %lu pages).\n" , +"Created rotated page mapping for object size %lu (pitch=%u, height=%u, pixel_format=0x%x, %ux%u tiles, %u pages).\n" , obj->base.size, rot_info->pitch, rot_info->height, - rot_info->pixel_format, width_pages, height_pages, - rot_pages); + rot_info->pixel_format, rot_info->width_pages, + rot_info->height_pages, rot_info->pages);drm_free_large (page_addr_list);
@@ -2761,10 +2750,10 @@ err_st_alloc:drm_free_large (page_addr_list);DRM_DEBUG_KMS ( -"Failed to create rotated mapping for object size %lu! (%d) (pitch=%u, height=%u, pixel_format=0x%x, %ux%u tiles, %lu pages)\n" , +"Failed to create rotated mapping for object size %lu! (%d) (pitch=%u, height=%u, pixel_format=0x%x, %ux%u tiles, %u pages)\n" , obj->base.size, ret, rot_info->pitch, rot_info->height, - rot_info->pixel_format, width_pages, height_pages, - rot_pages); + rot_info->pixel_format, rot_info->width_pages, + rot_info->height_pages, rot_info->pages);return ERR_PTR (ret); }
drivers/gpu/drm/i915/i915_gem_gtt.h +2 -0
@@ -126,6 +126,8 @@ struct intel_rotation_info {unsigned int pitch;uint32_t pixel_format;uint64_t fb_modifier; +unsigned int width_pages, height_pages; +unsigned int pages; };struct i915_ggtt_view {
drivers/gpu/drm/i915/intel_display.c +8 -0
@@ -2268,6 +2268,7 @@ intel_fill_fb_ggtt_view(struct i915_ggtt_view *view, struct drm_framebuffer *fb, const struct drm_plane_state *plane_state) {struct intel_rotation_info *info = &view->rotation_info; +unsigned int tile_height, tile_pitch; *view = i915_ggtt_view_normal;
@@ -2284,6 +2285,13 @@ 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 ]; + tile_height =intel_tile_height (fb->dev, fb->pixel_format, + fb->modifier[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); + info->pages = info->width_pages * info->height_pages; +return 0 ; }
Signature · 6 lines
2.4.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/3 drm/i915: Return correct size for rotated views
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
Currently object size is returned for the rotated VMA size which can be bigger than the rotated view itself. Since the binding code pads all excess size with scratch pages the only minor issue with this is wasting some GGTT space, but still feels nicer to fix and report the real size.
--- drivers/gpu/drm/i915/i915_gem_gtt.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_gem_gtt.c +3 -2
@@ -2898,9 +2898,10 @@ size_t i915_ggtt_view_size(struct drm_i915_gem_object *obj, const struct i915_ggtt_view *view) { -if (view->type ==I915_GGTT_VIEW_NORMAL || - view->type ==I915_GGTT_VIEW_ROTATED ) { +if (view->type ==I915_GGTT_VIEW_NORMAL ) {return obj->base.size; + }else if (view->type ==I915_GGTT_VIEW_ROTATED ) { +return view->rotation_info.pages <<PAGE_SHIFT ; }else if (view->type ==I915_GGTT_VIEW_PARTIAL ) {return view->params.partial.size <<PAGE_SHIFT ; }else {
Signature · 6 lines
2.4.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 3/3] drm/i915: Return correct size for rotated views
Quoted 18 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
Currently object size is returned for the rotated VMA size which can be bigger than the rotated view itself. Since the binding code pads all excess size with scratch pages the only minor issue with this is wasting some GGTT space, but still feels nicer to fix and report the real size.
Signed-off-by Tvrtko Ursulin <[email protected]>Cc Joonas Lahtinen <[email protected]>--- drivers/gpu/drm/i915/i915_gem_gtt.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/i915_gem_gtt.c +0
-0
drivers/gpu/drm/i915/i915_gem_gtt.c size_t · line 2904
Quoted 9 lines
drivers/gpu/drm/i915/i915_gem_gtt.c +3
-2@@ -2898,9 +2898,10 @@ size_t i915_ggtt_view_size(struct drm_i915_gem_object *obj, const struct i915_ggtt_view *view) { -if (view->type ==I915_GGTT_VIEW_NORMAL || - view->type ==I915_GGTT_VIEW_ROTATED ) { +if (view->type ==I915_GGTT_VIEW_NORMAL ) {return obj->base.size; + }else if (view->type ==I915_GGTT_VIEW_ROTATED ) { +return view->rotation_info.pages <<PAGE_SHIFT ;
Time to change that variable name. pages is already used in both the vma and obj to represent the struct sg_table, not the count. -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 3/3] drm/i915: Return correct size for rotated views
Quoted 23 lines · Chris Wilson
Quoted 22 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
Currently object size is returned for the rotated VMA size which can be bigger than the rotated view itself. Since the binding code pads all excess size with scratch pages the only minor issue with this is wasting some GGTT space, but still feels nicer to fix and report the real size.
Signed-off-by Tvrtko Ursulin <[email protected]>Cc Joonas Lahtinen <[email protected]>--- drivers/gpu/drm/i915/i915_gem_gtt.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/i915_gem_gtt.c +0
-1@@ -2898,9 +2898,10 @@ size_t i915_ggtt_view_size(struct drm_i915_gem_object *obj, const struct i915_ggtt_view *view) { - if (view->type == I915_GGTT_VIEW_NORMAL ||
Quoted 8 lines
drivers/gpu/drm/i915/i915_gem_gtt.c size_t · line 2904
Quoted 5 lines
drivers/gpu/drm/i915/i915_gem_gtt.c +3
-1- view->type == I915_GGTT_VIEW_ROTATED) { +if (view->type ==I915_GGTT_VIEW_NORMAL ) {return obj->base.size; + }else if (view->type ==I915_GGTT_VIEW_ROTATED ) { +return view->rotation_info.pages <<PAGE_SHIFT ;Time to change that variable name. pages is already used in both the vma and obj to represent the struct
sg_table, not the count.
Changed to "size_t size" as per IRC discussion and resent the series. Thought that will be cleaner since two of of three patches are now v2.
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx