[Intel-gfx] [PATCH v2 41/71] drm/i915/chv: Add some workaround notes

2014-04-28 Thread ville . syrjala
From: Ville Syrjälä ville.syrj...@linux.intel.com

We implement the following workarounds:
* WaDisableAsyncFlipPerfMode:chv
* WaProgramMiArbOnOffAroundMiSetContext:chv

v2: Drop WaDisableSemaphoreAndSyncFlipWait note

Signed-off-by: Ville Syrjälä ville.syrj...@linux.intel.com
---
 drivers/gpu/drm/i915/i915_gem_context.c | 2 +-
 drivers/gpu/drm/i915/intel_ringbuffer.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_gem_context.c 
b/drivers/gpu/drm/i915/i915_gem_context.c
index 30b355a..37dc36d 100644
--- a/drivers/gpu/drm/i915/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/i915_gem_context.c
@@ -614,7 +614,7 @@ mi_set_context(struct intel_ring_buffer *ring,
if (ret)
return ret;
 
-   /* WaProgramMiArbOnOffAroundMiSetContext:ivb,vlv,hsw,bdw */
+   /* WaProgramMiArbOnOffAroundMiSetContext:ivb,vlv,hsw,bdw,chv */
if (INTEL_INFO(ring-dev)-gen = 7)
intel_ring_emit(ring, MI_ARB_ON_OFF | MI_ARB_DISABLE);
else
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c 
b/drivers/gpu/drm/i915/intel_ringbuffer.c
index eb3dd26..b025a51 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -599,7 +599,7 @@ static int init_render_ring(struct intel_ring_buffer *ring)
 * to use MI_WAIT_FOR_EVENT within the CS. It should already be
 * programmed to '1' on all products.
 *
-* WaDisableAsyncFlipPerfMode:snb,ivb,hsw,vlv,bdw
+* WaDisableAsyncFlipPerfMode:snb,ivb,hsw,vlv,bdw,chv
 */
if (INTEL_INFO(dev)-gen = 6)
I915_WRITE(MI_MODE, 
_MASKED_BIT_ENABLE(ASYNC_FLIP_PERF_DISABLE));
-- 
1.8.3.2

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx


Re: [Intel-gfx] [PATCH v2 41/71] drm/i915/chv: Add some workaround notes

2014-04-28 Thread Paulo Zanoni
2014-04-28 8:31 GMT-03:00  ville.syrj...@linux.intel.com:
 From: Ville Syrjälä ville.syrj...@linux.intel.com

 We implement the following workarounds:
 * WaDisableAsyncFlipPerfMode:chv
 * WaProgramMiArbOnOffAroundMiSetContext:chv

 v2: Drop WaDisableSemaphoreAndSyncFlipWait note

Reviewed-by: Paulo Zanoni paulo.r.zan...@intel.com


 Signed-off-by: Ville Syrjälä ville.syrj...@linux.intel.com
 ---
  drivers/gpu/drm/i915/i915_gem_context.c | 2 +-
  drivers/gpu/drm/i915/intel_ringbuffer.c | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)

 diff --git a/drivers/gpu/drm/i915/i915_gem_context.c 
 b/drivers/gpu/drm/i915/i915_gem_context.c
 index 30b355a..37dc36d 100644
 --- a/drivers/gpu/drm/i915/i915_gem_context.c
 +++ b/drivers/gpu/drm/i915/i915_gem_context.c
 @@ -614,7 +614,7 @@ mi_set_context(struct intel_ring_buffer *ring,
 if (ret)
 return ret;

 -   /* WaProgramMiArbOnOffAroundMiSetContext:ivb,vlv,hsw,bdw */
 +   /* WaProgramMiArbOnOffAroundMiSetContext:ivb,vlv,hsw,bdw,chv */
 if (INTEL_INFO(ring-dev)-gen = 7)
 intel_ring_emit(ring, MI_ARB_ON_OFF | MI_ARB_DISABLE);
 else
 diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c 
 b/drivers/gpu/drm/i915/intel_ringbuffer.c
 index eb3dd26..b025a51 100644
 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c
 +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
 @@ -599,7 +599,7 @@ static int init_render_ring(struct intel_ring_buffer 
 *ring)
  * to use MI_WAIT_FOR_EVENT within the CS. It should already be
  * programmed to '1' on all products.
  *
 -* WaDisableAsyncFlipPerfMode:snb,ivb,hsw,vlv,bdw
 +* WaDisableAsyncFlipPerfMode:snb,ivb,hsw,vlv,bdw,chv
  */
 if (INTEL_INFO(dev)-gen = 6)
 I915_WRITE(MI_MODE, 
 _MASKED_BIT_ENABLE(ASYNC_FLIP_PERF_DISABLE));
 --
 1.8.3.2




-- 
Paulo Zanoni
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx