From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
To: Intel-gfx@lists.freedesktop.org
Subject: [PATCH 3/8] drm/i915: Remove pointless calculation in intel_rotate_fb_obj_pages
Date: Fri, 8 May 2015 13:02:38 +0100 [thread overview]
Message-ID: <1431086563-4498-4-git-send-email-tvrtko.ursulin@linux.intel.com> (raw)
In-Reply-To: <1431086563-4498-1-git-send-email-tvrtko.ursulin@linux.intel.com>
From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Leftover from refactoring and it serves no purpose now.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@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
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2015-05-08 12:03 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-08 12:02 [PATCH 0/8] NV12 90/270 rotated GGTT mapping Tvrtko Ursulin
2015-05-08 12:02 ` [PATCH 1/8] drm/i915: Remove duplicated intel_tile_height declaration Tvrtko Ursulin
2015-05-11 10:26 ` Daniel Vetter
2015-05-08 12:02 ` [PATCH 2/8] drm/i915: Support planar formats in tile height calculations Tvrtko Ursulin
2015-05-08 12:02 ` Tvrtko Ursulin [this message]
2015-05-08 12:02 ` [PATCH 4/8] drm/i915: Extract tiled geometry calculation into a helper function Tvrtko Ursulin
2015-05-08 12:02 ` [PATCH 5/8] drm/i915: Support appending to the rotated pages mapping Tvrtko Ursulin
2015-05-08 12:02 ` [PATCH 6/8] drm/i915: Support NV12 in rotated GGTT mapping Tvrtko Ursulin
2015-05-08 12:02 ` [PATCH 7/8] drm/i915: Enable querying offset of UV plane with intel_plane_obj_offset Tvrtko Ursulin
2015-05-08 12:02 ` [PATCH 8/8] drm/i915: Allow NV12 with 90/270 rotation Tvrtko Ursulin
2015-05-11 3:52 ` shuang.he
2015-05-08 14:59 ` [PATCH 0/8] NV12 90/270 rotated GGTT mapping Damien Lespiau
2015-05-08 15:05 ` Tvrtko Ursulin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1431086563-4498-4-git-send-email-tvrtko.ursulin@linux.intel.com \
--to=tvrtko.ursulin@linux.intel.com \
--cc=Intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox