diff mbox

[20/67] drm/i915/cnl: Cannonlake has same MOCS table than Skylake.

Message ID 1491506163-14587-20-git-send-email-rodrigo.vivi@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Rodrigo Vivi April 6, 2017, 7:15 p.m. UTC
All registers and default configuration are the same for Skylake
and Cannonlake.

v2: Don't apply Wa for platforms without MOCS. (Paulo)

Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
 drivers/gpu/drm/i915/intel_mocs.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Joonas Lahtinen June 2, 2017, 11:20 a.m. UTC | #1
On to, 2017-04-06 at 12:15 -0700, Rodrigo Vivi wrote:
> All registers and default configuration are the same for Skylake
> and Cannonlake.
> 
> v2: Don't apply Wa for platforms without MOCS. (Paulo)
> 
> Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

Bspec: 12239

> @@ -191,8 +191,8 @@ static bool get_mocs_settings(struct drm_i915_private *dev_priv,
>  			  "Platform that should have a MOCS table does not.\n");
>  	}
>  
> -	/* WaDisableSkipCaching:skl,bxt,kbl,glk */
> -	if (IS_GEN9(dev_priv)) {
> +	/* WaDisableSkipCaching:skl,bxt,kbl,glk,cnl */
> +	if (IS_GEN9(dev_priv) || IS_CANNONLAKE(dev_priv)) {

This is not applicable (or spec needs to be fixed). With just applying
the mocs table;

Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>

Regards, Joonas
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/intel_mocs.c b/drivers/gpu/drm/i915/intel_mocs.c
index 92e461c..4143b12 100644
--- a/drivers/gpu/drm/i915/intel_mocs.c
+++ b/drivers/gpu/drm/i915/intel_mocs.c
@@ -178,7 +178,7 @@  static bool get_mocs_settings(struct drm_i915_private *dev_priv,
 {
 	bool result = false;
 
-	if (IS_GEN9_BC(dev_priv)) {
+	if (IS_GEN9_BC(dev_priv) || IS_CANNONLAKE(dev_priv)) {
 		table->size  = ARRAY_SIZE(skylake_mocs_table);
 		table->table = skylake_mocs_table;
 		result = true;
@@ -191,8 +191,8 @@  static bool get_mocs_settings(struct drm_i915_private *dev_priv,
 			  "Platform that should have a MOCS table does not.\n");
 	}
 
-	/* WaDisableSkipCaching:skl,bxt,kbl,glk */
-	if (IS_GEN9(dev_priv)) {
+	/* WaDisableSkipCaching:skl,bxt,kbl,glk,cnl */
+	if (IS_GEN9(dev_priv) || IS_CANNONLAKE(dev_priv)) {
 		int i;
 
 		for (i = 0; i < table->size; i++)