| Message ID | 20201126105155.540350-1-lionel.g.landwerlin@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915/perf: also include Gen11 in OATAILPTR workaround | expand |
On Thu, Nov 26, 2020 at 12:51:55PM +0200, Lionel Landwerlin wrote: >CI shows this workaround is also needed on Gen11. > >Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com> Considering this failed on gen11, this is Reviewed-by: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com> Thanks, Umesh >Fixes: 059a0beb486344 ("drm/i915/perf: workaround register corruption in OATAILPTR") >--- > drivers/gpu/drm/i915/i915_perf.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > >diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c >index 3640d0e229d2..acdfbe5344a4 100644 >--- a/drivers/gpu/drm/i915/i915_perf.c >+++ b/drivers/gpu/drm/i915/i915_perf.c >@@ -913,7 +913,7 @@ static int gen8_oa_read(struct i915_perf_stream *stream, > intel_uncore_rmw(uncore, oastatus_reg, > GEN8_OASTATUS_COUNTER_OVERFLOW | > GEN8_OASTATUS_REPORT_LOST, >- IS_GEN_RANGE(uncore->i915, 8, 10) ? >+ IS_GEN_RANGE(uncore->i915, 8, 11) ? > (GEN8_OASTATUS_HEAD_POINTER_WRAP | > GEN8_OASTATUS_TAIL_POINTER_WRAP) : 0); > } >-- >2.29.2 >
diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c index 3640d0e229d2..acdfbe5344a4 100644 --- a/drivers/gpu/drm/i915/i915_perf.c +++ b/drivers/gpu/drm/i915/i915_perf.c @@ -913,7 +913,7 @@ static int gen8_oa_read(struct i915_perf_stream *stream, intel_uncore_rmw(uncore, oastatus_reg, GEN8_OASTATUS_COUNTER_OVERFLOW | GEN8_OASTATUS_REPORT_LOST, - IS_GEN_RANGE(uncore->i915, 8, 10) ? + IS_GEN_RANGE(uncore->i915, 8, 11) ? (GEN8_OASTATUS_HEAD_POINTER_WRAP | GEN8_OASTATUS_TAIL_POINTER_WRAP) : 0); }
CI shows this workaround is also needed on Gen11. Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com> Fixes: 059a0beb486344 ("drm/i915/perf: workaround register corruption in OATAILPTR") --- drivers/gpu/drm/i915/i915_perf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)