[igt-dev] [PATCH i-g-t] i915/gem_mocs_settings: Update TGL MOCS table

[igt-dev] [PATCH i-g-t] i915/gem_mocs_settings: Update TGL MOCS table

[Matt Roper]

The TGL MOCS table was corrected in the bspec and the kernel.  Since
this test hardcodes its own copy of the MOCS table, we need to make
corresponding fixes here.

References: 046091758b50 ("Revert "drm/i915/ehl: Update MOCS table for EHL"")
References: bfb0e8e63d86 ("drm/i915/tgl: MOCS table update")
Cc: Prathap Kumar Valsan <prathap.kumar.valsan@intel.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: Francisco Jerez <francisco.jerez.plata@intel.com>
Cc: Tomasz Lis <tomasz.lis@intel.com>
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
---
 tests/i915/gem_mocs_settings.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tests/i915/gem_mocs_settings.c b/tests/i915/gem_mocs_settings.c
index fc2ccb21..8f8f0768 100644
--- a/tests/i915/gem_mocs_settings.c
+++ b/tests/i915/gem_mocs_settings.c
@@ -95,8 +95,6 @@ static const struct mocs_entry tigerlake_mocs_table[GEN11_NUM_MOCS_ENTRIES] = {
 	[13] = { 0x00000057, 0x0030, 0x1},
 	[14] = { 0x00000067, 0x0010, 0x1},
 	[15] = { 0x00000067, 0x0030, 0x1},
-	[16] = { 0x00004005, 0x0010, 0x1},
-	[17] = { 0x00004005, 0x0030, 0x1},
 	[18] = { 0x00060037, 0x0030, 0x1},
 	[19] = { 0x00000737, 0x0030, 0x1},
 	[20] = { 0x00000337, 0x0030, 0x1},
@@ -108,7 +106,7 @@ static const struct mocs_entry tigerlake_mocs_table[GEN11_NUM_MOCS_ENTRIES] = {
 	[50] = { 0x00000037, 0x0010, 0x1},
 	[51] = { 0x00000005, 0x0010, 0x1},
 	[60] = { 0x00000037, 0x0010, 0x1},
-	[61] = { 0x00004005, 0x0030, 0x1},
+	[61] = { 0x00000005, 0x0030, 0x1},
 	[62] = { 0x00000037, 0x0010, 0x1},
 	[63] = { 0x00000037, 0x0010, 0x1},
 };
-- 
2.21.0

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

Re: [igt-dev] [PATCH i-g-t] i915/gem_mocs_settings: Update TGL MOCS table

[Lucas De Marchi]

On Wed, Nov 13, 2019 at 08:51:03AM -0800, Matt Roper wrote:
>The TGL MOCS table was corrected in the bspec and the kernel.  Since
>this test hardcodes its own copy of the MOCS table, we need to make
>corresponding fixes here.
>
>References: 046091758b50 ("Revert "drm/i915/ehl: Update MOCS table for EHL"")
>References: bfb0e8e63d86 ("drm/i915/tgl: MOCS table update")
>Cc: Prathap Kumar Valsan <prathap.kumar.valsan@intel.com>
>Cc: Lucas De Marchi <lucas.demarchi@intel.com>
>Cc: Francisco Jerez <francisco.jerez.plata@intel.com>
>Cc: Tomasz Lis <tomasz.lis@intel.com>
>Signed-off-by: Matt Roper <matthew.d.roper@intel.com>


Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>

Lucas De Marchi

>---
> tests/i915/gem_mocs_settings.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
>diff --git a/tests/i915/gem_mocs_settings.c b/tests/i915/gem_mocs_settings.c
>index fc2ccb21..8f8f0768 100644
>--- a/tests/i915/gem_mocs_settings.c
>+++ b/tests/i915/gem_mocs_settings.c
>@@ -95,8 +95,6 @@ static const struct mocs_entry tigerlake_mocs_table[GEN11_NUM_MOCS_ENTRIES] = {
> 	[13] = { 0x00000057, 0x0030, 0x1},
> 	[14] = { 0x00000067, 0x0010, 0x1},
> 	[15] = { 0x00000067, 0x0030, 0x1},
>-	[16] = { 0x00004005, 0x0010, 0x1},
>-	[17] = { 0x00004005, 0x0030, 0x1},
> 	[18] = { 0x00060037, 0x0030, 0x1},
> 	[19] = { 0x00000737, 0x0030, 0x1},
> 	[20] = { 0x00000337, 0x0030, 0x1},
>@@ -108,7 +106,7 @@ static const struct mocs_entry tigerlake_mocs_table[GEN11_NUM_MOCS_ENTRIES] = {
> 	[50] = { 0x00000037, 0x0010, 0x1},
> 	[51] = { 0x00000005, 0x0010, 0x1},
> 	[60] = { 0x00000037, 0x0010, 0x1},
>-	[61] = { 0x00004005, 0x0030, 0x1},
>+	[61] = { 0x00000005, 0x0030, 0x1},
> 	[62] = { 0x00000037, 0x0010, 0x1},
> 	[63] = { 0x00000037, 0x0010, 0x1},
> };
>-- 
>2.21.0
>
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev