[PATCH 08/22] drm/i915 disallow physical batchbuffers for KMS

Daniel Vetter
2012-04-23T15:55:44Z

Even the horrible gen3 XvMC code has learned to do this
right by the time xf86-video-intel releases learned to do
kernel modesetting. So we can just disallow this.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
drivers/gpu/drm/i915/i915_dma.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 1fa122e..68fc81b 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -1326,8 +1326,10 @@ static int i915_load_gem_init(struct drm_device *dev)
i915_setup_compression(dev, cfb_size);
}

- /* Allow hardware batchbuffers unless told otherwise. */
- dev_priv->dri1.allow_batchbuffer = 1;
+ /* Allow hardware batchbuffers unless told otherwise, but not for KMS. */
+ if (!drm_core_check_feature(dev, DRIVER_MODESET))
+ dev_priv->dri1.allow_batchbuffer = 1;
+
return 0;
}

--
1.7.7.6