[Intel-gfx] [PATCH 3/8] drm/i915: Remove pointless calculation in intel_rotate_fb_obj_pages
Tvrtko Ursulin
tvrtko.ursulin at linux.intel.com
Fri May 8 05:02:38 PDT 2015
From: Tvrtko Ursulin <tvrtko.ursulin at intel.com>
Leftover from refactoring and it serves no purpose now.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin at intel.com>
---
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 a388670..f5709d4 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -2686,7 +2686,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;
@@ -2704,7 +2704,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));
@@ -2732,7 +2731,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);
@@ -2747,7 +2746,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);
--
2.4.0
More information about the Intel-gfx
mailing list