summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_gem.c
diff options
context:
space:
mode:
authorChris Wilson2014-03-07 09:30:36 +0100
committerDaniel Vetter2014-03-08 00:03:01 +0100
commit17793c9a4659b272a9f892d44940062ed8b5fd0e (patch)
treefa3b63d7cab27dc45b94397cbcbb1f2e325ba5ce /drivers/gpu/drm/i915/i915_gem.c
parentdrm/i915: Go OCD on the Makefile (diff)
downloadkernel-qcow2-linux-17793c9a4659b272a9f892d44940062ed8b5fd0e.tar.gz
kernel-qcow2-linux-17793c9a4659b272a9f892d44940062ed8b5fd0e.tar.xz
kernel-qcow2-linux-17793c9a4659b272a9f892d44940062ed8b5fd0e.zip
drm/i915: Process page flags once rather than per pwrite/pread
We used to lock individual pages inside the buffer object and so needed to update the page flags every time. However, we now pin the pages into the object for the duration of the pwrite/pread (and hopefully much longer) and so we can forgo the flag updates until we release all the pages. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Brad Volkin <bradley.d.volkin@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
-rw-r--r--drivers/gpu/drm/i915/i915_gem.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 177c20722656..da5d9ca98024 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -510,12 +510,10 @@ i915_gem_shmem_pread(struct drm_device *dev,
mutex_lock(&dev->struct_mutex);
-next_page:
- mark_page_accessed(page);
-
if (ret)
goto out;
+next_page:
remain -= page_length;
user_data += page_length;
offset += page_length;
@@ -831,13 +829,10 @@ i915_gem_shmem_pwrite(struct drm_device *dev,
mutex_lock(&dev->struct_mutex);
-next_page:
- set_page_dirty(page);
- mark_page_accessed(page);
-
if (ret)
goto out;
+next_page:
remain -= page_length;
user_data += page_length;
offset += page_length;