From: Matt Roper <matthew.d.ro...@intel.com>

These extra EHL entries were not behaving as expected without proper
flushing implemented in kernel.
Commit a679f58d0510 ("drm/i915: Flush pages on acquisition")
introduces proper flushing to make it work as expected.

Hence adding those EHL entries back.

Changes since V1:
        - commit message modified with Commit - Joonas

Cc: Francisco Jerez <francisco.jerez.pl...@intel.com>
Cc: Jon Bloomfield <jon.bloomfi...@intel.com>
Cc: Lucas De Marchi <lucas.demar...@intel.com>
Cc: <sta...@vger.kernel.org>
Signed-off-by: Matt Roper <matthew.d.ro...@intel.com>
Fixes: 046091758b50 ("Revert "drm/i915/ehl: Update MOCS table for EHL"")
Link: 
https://patchwork.freedesktop.org/patch/msgid/20191112224757.25116-1-matthew.d.ro...@intel.com
---
 drivers/gpu/drm/i915/gt/intel_mocs.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/drivers/gpu/drm/i915/gt/intel_mocs.c 
b/drivers/gpu/drm/i915/gt/intel_mocs.c
index 17848807f111..7d9ef0210805 100644
--- a/drivers/gpu/drm/i915/gt/intel_mocs.c
+++ b/drivers/gpu/drm/i915/gt/intel_mocs.c
@@ -194,6 +194,14 @@ static const struct drm_i915_mocs_entry 
broxton_mocs_table[] = {
        MOCS_ENTRY(15, \
                   LE_3_WB | LE_TC_1_LLC | LE_LRUM(2) | LE_AOM(1), \
                   L3_3_WB), \
+       /* Bypass LLC - Uncached (EHL+) */ \
+       MOCS_ENTRY(16, \
+                  LE_1_UC | LE_TC_1_LLC | LE_SCF(1), \
+                  L3_1_UC), \
+       /* Bypass LLC - L3 (Read-Only) (EHL+) */ \
+       MOCS_ENTRY(17, \
+                  LE_1_UC | LE_TC_1_LLC | LE_SCF(1), \
+                  L3_3_WB), \
        /* Self-Snoop - L3 + LLC */ \
        MOCS_ENTRY(18, \
                   LE_3_WB | LE_TC_1_LLC | LE_LRUM(3) | LE_SSE(3), \
-- 
2.31.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reply via email to