diff options
| author | Oscar Mateo | 2014-07-24 18:04:44 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2014-08-20 17:17:49 +0200 |
| commit | 71386ef9008817feebd863e46d8711ebe9e7cbbb (patch) | |
| tree | b2aa7e9445eb7e5e328f24c700696e16d0629c6f /drivers/gpu/drm/i915/i915_drv.c | |
| parent | drm/i915/bdw: Make sure gpu reset still works with Execlists (diff) | |
| download | kernel-qcow2-linux-71386ef9008817feebd863e46d8711ebe9e7cbbb.tar.gz kernel-qcow2-linux-71386ef9008817feebd863e46d8711ebe9e7cbbb.tar.xz kernel-qcow2-linux-71386ef9008817feebd863e46d8711ebe9e7cbbb.zip | |
drm/i915/bdw: Disable semaphores for Execlists
Up until recently, semaphores weren't enabled in BDW so we didn't care
about them. But then Rodrigo came and enabled them:
commit 521e62e49a42661a4ee0102644517dbe2f100a23
Author: Rodrigo Vivi <rodrigo.vivi@intel.com>
drm/i915: Enable semaphores on BDW
So now we have to explicitly disable them for Execlists until both
features play nicely.
Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 2f112853c36f..117f5c16df74 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -481,6 +481,10 @@ bool i915_semaphore_is_enabled(struct drm_device *dev) if (i915.semaphores >= 0) return i915.semaphores; + /* TODO: make semaphores and Execlists play nicely together */ + if (i915.enable_execlists) + return false; + /* Until we get further testing... */ if (IS_GEN8(dev)) return false; |