diff mbox series

[21/22] drm/i915: check for missing aperture in GTT pread/pwrite paths

Message ID 20190927173409.31175-22-matthew.auld@intel.com (mailing list archive)
State New, archived
Headers show
Series LMEM basics | expand

Commit Message

Matthew Auld Sept. 27, 2019, 5:34 p.m. UTC 
From: CQ Tang <cq.tang@intel.com>

drm_mm_insert_node_in_range() treats range_start > range_end as a
programmer error, such that we explode in insert_mappable_node. For now
simply check for missing aperture on such paths.

Signed-off-by: CQ Tang <cq.tang@intel.com>
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
---
 drivers/gpu/drm/i915/i915_gem.c | 6 ++++++
 1 file changed, 6 insertions(+)

Comments

Chris Wilson Sept. 27, 2019, 5:57 p.m. UTC | #1 
Quoting Matthew Auld (2019-09-27 18:34:08)
> From: CQ Tang <cq.tang@intel.com>
> 
> drm_mm_insert_node_in_range() treats range_start > range_end as a
> programmer error, such that we explode in insert_mappable_node. For now
> simply check for missing aperture on such paths.

range_start is 0.
range_end is 0.

drm_mm_insert_node_in_range():
	DRM_MM_BUG_ON(range_start > range_end);

	if (size == 0 || range_end - range_start < size)
		return -ENOSPC;

This patch is superfluous.
-Chris
diff mbox series

Patch

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index fd329b6b475c..82daaab022d8 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -337,6 +337,9 @@  i915_gem_gtt_pread(struct drm_i915_gem_object *obj,
 	u64 remain, offset;
 	int ret;
 
+	if (!HAS_MAPPABLE_APERTURE(i915))
+		return -ENOSPC;
+
 	ret = mutex_lock_interruptible(&i915->drm.struct_mutex);
 	if (ret)
 		return ret;
@@ -530,6 +533,9 @@  i915_gem_gtt_pwrite_fast(struct drm_i915_gem_object *obj,
 	void __user *user_data;
 	int ret;
 
+	if (!HAS_MAPPABLE_APERTURE(i915))
+		return -ENOSPC;
+
 	ret = mutex_lock_interruptible(&i915->drm.struct_mutex);
 	if (ret)
 		return ret;