On ti, 2015-06-23 at 12:57 +0100, Tvrtko Ursulin wrote:
> From: Tvrtko Ursulin <tvrtko.ursulin@xxxxxxxxx>
>
> It is only used in logging and it doesn't need to exist on its own.
>
Comment below.
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@xxxxxxxxxxxxxxx>
> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@xxxxxxxxx>
> Cc: Joonas Lahtinen <joonas.lahtinen@xxxxxxxxxxxxxxx>
> ---
> drivers/gpu/drm/i915/i915_gem_gtt.c | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
> index a8c33f7..c1c16b0 100644
> --- a/drivers/gpu/drm/i915/i915_gem_gtt.c
> +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
> @@ -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,
This will display a possibly differing size than before, but that's the
point, right?
> 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);
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
