* [PATCH] drm/i915: simplify swapin/out swizzle checking a bit
@ 2011-09-12 19:30 Daniel Vetter
2011-09-13 7:43 ` Chris Wilson
2011-09-23 16:12 ` Daniel Vetter
0 siblings, 2 replies; 3+ messages in thread
From: Daniel Vetter @ 2011-09-12 19:30 UTC (permalink / raw)
To: intel-gfx; +Cc: Daniel Vetter
Use the helper function already employed by the pwrite/pread
functions.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
drivers/gpu/drm/i915/i915_gem.c | 4 ++--
drivers/gpu/drm/i915/i915_gem_tiling.c | 10 ----------
2 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index a546a71..a19ba04 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -1557,7 +1557,7 @@ i915_gem_object_get_pages_gtt(struct drm_i915_gem_object *obj,
obj->pages[i] = page;
}
- if (obj->tiling_mode != I915_TILING_NONE)
+ if (i915_gem_object_needs_bit17_swizzle(obj))
i915_gem_object_do_bit_17_swizzle(obj);
return 0;
@@ -1579,7 +1579,7 @@ i915_gem_object_put_pages_gtt(struct drm_i915_gem_object *obj)
BUG_ON(obj->madv == __I915_MADV_PURGED);
- if (obj->tiling_mode != I915_TILING_NONE)
+ if (i915_gem_object_needs_bit17_swizzle(obj))
i915_gem_object_save_bit_17_swizzle(obj);
if (obj->madv == I915_MADV_DONTNEED)
diff --git a/drivers/gpu/drm/i915/i915_gem_tiling.c b/drivers/gpu/drm/i915/i915_gem_tiling.c
index 103da6f..31d334d 100644
--- a/drivers/gpu/drm/i915/i915_gem_tiling.c
+++ b/drivers/gpu/drm/i915/i915_gem_tiling.c
@@ -443,14 +443,9 @@ i915_gem_swizzle_page(struct page *page)
void
i915_gem_object_do_bit_17_swizzle(struct drm_i915_gem_object *obj)
{
- struct drm_device *dev = obj->base.dev;
- drm_i915_private_t *dev_priv = dev->dev_private;
int page_count = obj->base.size >> PAGE_SHIFT;
int i;
- if (dev_priv->mm.bit_6_swizzle_x != I915_BIT_6_SWIZZLE_9_10_17)
- return;
-
if (obj->bit_17 == NULL)
return;
@@ -467,14 +462,9 @@ i915_gem_object_do_bit_17_swizzle(struct drm_i915_gem_object *obj)
void
i915_gem_object_save_bit_17_swizzle(struct drm_i915_gem_object *obj)
{
- struct drm_device *dev = obj->base.dev;
- drm_i915_private_t *dev_priv = dev->dev_private;
int page_count = obj->base.size >> PAGE_SHIFT;
int i;
- if (dev_priv->mm.bit_6_swizzle_x != I915_BIT_6_SWIZZLE_9_10_17)
- return;
-
if (obj->bit_17 == NULL) {
obj->bit_17 = kmalloc(BITS_TO_LONGS(page_count) *
sizeof(long), GFP_KERNEL);
--
1.7.6
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/i915: simplify swapin/out swizzle checking a bit
2011-09-12 19:30 [PATCH] drm/i915: simplify swapin/out swizzle checking a bit Daniel Vetter
@ 2011-09-13 7:43 ` Chris Wilson
2011-09-23 16:12 ` Daniel Vetter
1 sibling, 0 replies; 3+ messages in thread
From: Chris Wilson @ 2011-09-13 7:43 UTC (permalink / raw)
To: intel-gfx; +Cc: Daniel Vetter
On Mon, 12 Sep 2011 21:30:02 +0200, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> Use the helper function already employed by the pwrite/pread
> functions.
>
> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
-Chris
--
Chris Wilson, Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/i915: simplify swapin/out swizzle checking a bit
2011-09-12 19:30 [PATCH] drm/i915: simplify swapin/out swizzle checking a bit Daniel Vetter
2011-09-13 7:43 ` Chris Wilson
@ 2011-09-23 16:12 ` Daniel Vetter
1 sibling, 0 replies; 3+ messages in thread
From: Daniel Vetter @ 2011-09-23 16:12 UTC (permalink / raw)
To: intel-gfx; +Cc: Daniel Vetter
Hi Keith
Small code-cleanup noticed while reviewing functions in that area. Please
merge for -next.
Yours, Daniel
--
Daniel Vetter
Mail: daniel@ffwll.ch
Mobile: +41 (0)79 365 57 48
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-09-23 16:11 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-09-12 19:30 [PATCH] drm/i915: simplify swapin/out swizzle checking a bit Daniel Vetter
2011-09-13 7:43 ` Chris Wilson
2011-09-23 16:12 ` Daniel Vetter
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.