* [PATCH] drm/i915: Disallow any pinning when kms is enabled
@ 2014-08-25 19:59 Daniel Vetter
2014-08-26 6:10 ` Chris Wilson
0 siblings, 1 reply; 2+ messages in thread
From: Daniel Vetter @ 2014-08-25 19:59 UTC (permalink / raw
To: Intel Graphics Development; +Cc: Daniel Vetter, stable
So apparently userspace managed to get itself into a corner with
tricky tricks and the kernel can't work around because the batch
buffer ends up being pinned. For simplicity let's just take the toys
away.
References: http://mid.gmane.org/20140825063250.GC17083@nuc-i3427.alporthouse.com
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: stable@vger.kernel.org
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
drivers/gpu/drm/i915/i915_gem.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index dcd8d7b42552..247f44bd082d 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -4149,7 +4149,7 @@ i915_gem_pin_ioctl(struct drm_device *dev, void *data,
struct drm_i915_gem_object *obj;
int ret;
- if (INTEL_INFO(dev)->gen >= 6)
+ if (drm_core_check_feature(dev, DRIVER_MODESET))
return -ENODEV;
ret = i915_mutex_lock_interruptible(dev);
--
2.0.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] drm/i915: Disallow any pinning when kms is enabled
2014-08-25 19:59 [PATCH] drm/i915: Disallow any pinning when kms is enabled Daniel Vetter
@ 2014-08-26 6:10 ` Chris Wilson
0 siblings, 0 replies; 2+ messages in thread
From: Chris Wilson @ 2014-08-26 6:10 UTC (permalink / raw
To: Daniel Vetter; +Cc: Intel Graphics Development, stable
On Mon, Aug 25, 2014 at 09:59:33PM +0200, Daniel Vetter wrote:
> So apparently userspace managed to get itself into a corner with
> tricky tricks and the kernel can't work around because the batch
> buffer ends up being pinned. For simplicity let's just take the toys
> away.
No. Same nak as for the last pin_ioctl change. But I don't think you are
listening.
-Chris
--
Chris Wilson, Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-08-26 6:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-08-25 19:59 [PATCH] drm/i915: Disallow any pinning when kms is enabled Daniel Vetter
2014-08-26 6:10 ` Chris Wilson
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.