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 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.
Also it was misleading to log view size as object size.
v2: Improve commit message. (Joonas Lahtinen)
--- 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
Quoted 8 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
It is only used in logging and it doesn't need to exist on its own.
Also it was misleading to log view size as object size.
v2: Improve commit message. (Joonas Lahtinen)
Quoted 37 lines
Signed-off-by Tvrtko Ursulin <[email protected]>Cc Joonas Lahtinen <[email protected]>--- drivers/gpu/drm/i915/i915_gem_gtt.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)drivers/gpu/drm/i915/i915_gem_gtt.c +2
-3@@ -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);
drivers/gpu/drm/i915/i915_gem_gtt.c err_st_alloc: · line 2768
Quoted 8 lines
drivers/gpu/drm/i915/i915_gem_gtt.c +1
-1@@ -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);
_______________________________________________
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
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
This way data is available as soon as the view is passed into the call chain.
v2: Store size in bytes instead of pages under the appropriate name. (Chris Wilson)
---
This will be needed in the following patch which fixes i915_ggtt_view_size.
--- drivers/gpu/drm/i915/i915_gem_gtt.c | 36 +++++++++++++----------------------- drivers/gpu/drm/i915/i915_gem_gtt.h | 2 ++ drivers/gpu/drm/i915/intel_display.c | 8 ++++++++ 3 files changed, 23 insertions(+), 23 deletions(-)
drivers/gpu/drm/i915/i915_gem_gtt.c +13 -23
@@ -2700,29 +2700,17 @@ 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; +unsigned int size_pages = rot_info->size >>PAGE_SHIFT ;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 +2719,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, size_pages,GFP_KERNEL );if (ret) goto err_sg_alloc;
@@ -2743,13 +2731,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, size_pages);drm_free_large (page_addr_list);
@@ -2761,10 +2751,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, size_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; +size_t size; };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->size = info->width_pages * info->height_pages *PAGE_SIZE ; +return 0 ; }
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.
v2: Store size in bytes instead of pages under the appropriate name. (Chris Wilson)
v3: Use uint64_t instead of size_t. (Daniel Vetter)
---
This will be needed in the following patch which fixes i915_ggtt_view_size.
--- drivers/gpu/drm/i915/i915_gem_gtt.c | 36 +++++++++++++----------------------- drivers/gpu/drm/i915/i915_gem_gtt.h | 2 ++ drivers/gpu/drm/i915/intel_display.c | 8 ++++++++ 3 files changed, 23 insertions(+), 23 deletions(-)
drivers/gpu/drm/i915/i915_gem_gtt.c +13 -23
@@ -2700,29 +2700,17 @@ 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; +unsigned int size_pages = rot_info->size >>PAGE_SHIFT ;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 +2719,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, size_pages,GFP_KERNEL );if (ret) goto err_sg_alloc;
@@ -2743,13 +2731,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, size_pages);drm_free_large (page_addr_list);
@@ -2761,10 +2751,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, size_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; +uint64_t size; };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->size = info->width_pages * info->height_pages *PAGE_SIZE ; +return 0 ; }
Signature · 6 lines
2.4.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/3] drm/i915: Move rotated geometry calculations into the fill helper
In reply to Tvrtko UrsulinQuoted 6 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
This way data is available as soon as the view is passed into the call chain.
v2: Store size in bytes instead of pages under the appropriate name. (Chris Wilson)
Quoted 120 lines
Signed-off-by Tvrtko Ursulin <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc Chris Wilson <[email protected]>---
This will be needed in the following patch which fixesi915_ggtt_view_size.--- drivers/gpu/drm/i915/i915_gem_gtt.c | 36 +++++++++++++----------------------- drivers/gpu/drm/i915/i915_gem_gtt.h | 2 ++ drivers/gpu/drm/i915/intel_display.c | 8 ++++++++ 3 files changed, 23 insertions(+), 23 deletions(-)drivers/gpu/drm/i915/i915_gem_gtt.c +13
-23@@ -2700,29 +2700,17 @@ 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; +unsigned int size_pages = rot_info->size >>PAGE_SHIFT ;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 +2719,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, size_pages,GFP_KERNEL );if (ret) goto err_sg_alloc;@@ -2743,13 +2731,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, size_pages);drm_free_large (page_addr_list);@@ -2761,10 +2751,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, size_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; +size_t size; };struct i915_ggtt_view {drivers/gpu/drm/i915/intel_display.c +1
-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 ];
drivers/gpu/drm/i915/intel_display.c intel_fill_fb_ggtt_view(struct i915_ggtt_view *view, struct drm_framebuffer *fb, · line 2297
Quoted 10 lines
drivers/gpu/drm/i915/intel_display.c +7
-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->size = info->width_pages * info->height_pages *PAGE_SIZE ; +return 0 ; }
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 4 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
It is only used in logging and it doesn't need to exist on its own.
Comment below.
Quoted 28 lines
Signed-off-by Tvrtko Ursulin <[email protected]>Cc Joonas Lahtinen <[email protected]>--- drivers/gpu/drm/i915/i915_gem_gtt.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)drivers/gpu/drm/i915/i915_gem_gtt.c +1
-2@@ -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));
drivers/gpu/drm/i915/i915_gem_gtt.c intel_rotate_fb_obj_pages(struct i915_ggtt_view *ggtt_view, · line 2750
Quoted 5 lines
drivers/gpu/drm/i915/i915_gem_gtt.c +1
-1@@ -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,
This will display a possibly differing size than before, but that's the point, right?
drivers/gpu/drm/i915/i915_gem_gtt.c err_st_alloc: · line 2768
Quoted 12 lines
drivers/gpu/drm/i915/i915_gem_gtt.c +1
-1rot_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);
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 39 lines · Joonas Lahtinen
Quoted 4 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
It is only used in logging and it doesn't need to exist on its own.
Comment below.
Reviewed-by Joonas Lahtinen <[email protected]>Quoted 29 lines
Signed-off-by Tvrtko Ursulin <[email protected]>Cc Joonas Lahtinen <[email protected]>--- drivers/gpu/drm/i915/i915_gem_gtt.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)drivers/gpu/drm/i915/i915_gem_gtt.c +1
-2@@ -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,
Quoted 7 lines
drivers/gpu/drm/i915/i915_gem_gtt.c intel_rotate_fb_obj_pages(struct i915_ggtt_view *ggtt_view, · line 2750
Quoted 4 lines
drivers/gpu/drm/i915/i915_gem_gtt.c +1
-1DRM_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,This will display a possibly differing size than before, but that's the point, right?
Yes, not the best commit message. I'll update and re-send.
Thanks,
Tvrtko
_______________________________________________
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.
v2: Rebase for tracking size in bytes instead of pages.
--- 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
@@ -2899,9 +2899,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.size; }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 9 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.
v2: Rebase for tracking size in bytes instead of pages.
Quoted 13 lines
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@@ -2899,9 +2899,10 @@ size_t i915_ggtt_view_size(struct drm_i915_gem_object *obj, const struct i915_ggtt_view *view)
drivers/gpu/drm/i915/i915_gem_gtt.c size_t · line 2908
Quoted 10 lines
drivers/gpu/drm/i915/i915_gem_gtt.c +3
-2{ -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.size; }else if (view->type ==I915_GGTT_VIEW_PARTIAL ) {return view->params.partial.size <<PAGE_SHIFT ; }else {
_______________________________________________
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 8 lines · Joonas Lahtinen
Quoted 7 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.
Quoted 4 lines
Quoted 2 lines
v2: Rebase for tracking size in bytes instead of pages.
Reviewed-by Joonas Lahtinen <[email protected]>
All three merged to dinq, thanks.
-Daniel
Quoted 30 lines
Quoted 14 lines
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@@ -2899,9 +2899,10 @@ size_t i915_ggtt_view_size(struct drm_i915_gem_object *obj, const struct i915_ggtt_view *view)drivers/gpu/drm/i915/i915_gem_gtt.c size_t · line 2908
Quoted 10 lines
drivers/gpu/drm/i915/i915_gem_gtt.c +3
-2{ -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.size; }else if (view->type ==I915_GGTT_VIEW_PARTIAL ) {return view->params.partial.size <<PAGE_SHIFT ; }else {_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx