diff options
author | Oscar Mateo <oscar.mateo@intel.com> | 2014-07-24 12:04:44 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-08-20 11:17:49 -0400 |
commit | 71386ef9008817feebd863e46d8711ebe9e7cbbb (patch) | |
tree | b2aa7e9445eb7e5e328f24c700696e16d0629c6f | |
parent | cc9130be805d955f0e06642e57741dd9df1fbc86 (diff) |
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>
-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) | |||
481 | if (i915.semaphores >= 0) | 481 | if (i915.semaphores >= 0) |
482 | return i915.semaphores; | 482 | return i915.semaphores; |
483 | 483 | ||
484 | /* TODO: make semaphores and Execlists play nicely together */ | ||
485 | if (i915.enable_execlists) | ||
486 | return false; | ||
487 | |||
484 | /* Until we get further testing... */ | 488 | /* Until we get further testing... */ |
485 | if (IS_GEN8(dev)) | 489 | if (IS_GEN8(dev)) |
486 | return false; | 490 | return false; |