[PATCH 09/18] drm/i915: Differentiate between prime and stolen objects

Chris Wilson
2012-10-19T17:05:02Z

Stolen objects also share the property that they have no backing shmemfs
filp, but they can be used with pwrite/pread/gtt-mapping.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
---
drivers/gpu/drm/i915/i915_drv.h | 5 +++++
drivers/gpu/drm/i915/i915_gem.c | 4 ++--
2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 055bd08..6b893c7 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1071,6 +1071,11 @@ struct drm_i915_gem_object {
atomic_t pending_flip;
};

+inline static bool i915_gem_object_is_prime(struct drm_i915_gem_object *obj)
+{
+ return obj->base.import_attach != NULL;
+}
+
#define to_intel_bo(x) container_of(x, struct drm_i915_gem_object, base)

/**
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index eb3316b..29402e3 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -553,7 +553,7 @@ i915_gem_pread_ioctl(struct drm_device *dev, void *data,
/* prime objects have no backing filp to GEM pread/pwrite
* pages from.
*/
- if (!obj->base.filp) {
+ if (i915_gem_object_is_prime(obj)) {
ret = -EINVAL;
goto out;
}
@@ -902,7 +902,7 @@ i915_gem_pwrite_ioctl(struct drm_device *dev, void *data,
/* prime objects have no backing filp to GEM pread/pwrite
* pages from.
*/
- if (!obj->base.filp) {
+ if (i915_gem_object_is_prime(obj)) {
ret = -EINVAL;
goto out;
}
--
1.7.10.4