drm/i915: merge shmem_pread slow&fast-path
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Sun, 25 Mar 2012 17:47:29 +0000 (19:47 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 27 Mar 2012 11:19:11 +0000 (13:19 +0200)
commitdbf7bff074d5fdc87c61b1b41d8e809109cf0bf8
treea0adbbbc73b75dd97b8b134d1c4b289c20f2fa56
parente244a443bf72bccb44c75cadf04720101d1f313a
drm/i915: merge shmem_pread slow&fast-path

With the previous rewrite, they've become essential identical.

v2: Simplify the page_do_bit17_swizzling logic as suggested by Chris
Wilson.

Tested-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/i915_gem.c