intel-gfx.lists.freedesktop.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/3] drm/i915/DMC/GLK: Load DMC on GLK
@ 2016-12-16 15:42 Ander Conselvan de Oliveira
  2016-12-16 15:42 ` [PATCH 2/3] drm/i915/glk: Add missing bits to allow runtime pm suspend " Ander Conselvan de Oliveira
                   ` (5 more replies)
  0 siblings, 6 replies; 15+ messages in thread
From: Ander Conselvan de Oliveira @ 2016-12-16 15:42 UTC (permalink / raw)
  To: intel-gfx; +Cc: Rodrigo Vivi

From: Anusha Srivatsa <anusha.srivatsa@intel.com>

This patch loads the DMC on GLK. There is a single
firmware image for all steppings on a GLK.

Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
 drivers/gpu/drm/i915/intel_csr.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_csr.c b/drivers/gpu/drm/i915/intel_csr.c
index 9cbb8d8..0085bc7 100644
--- a/drivers/gpu/drm/i915/intel_csr.c
+++ b/drivers/gpu/drm/i915/intel_csr.c
@@ -34,6 +34,10 @@
  * low-power state and comes back to normal.
  */
 
+#define I915_CSR_GLK "i915/glk_dmc_ver1_01.bin"
+MODULE_FIRMWARE(I915_CSR_GLK);
+#define GLK_CSR_VERSION_REQUIRED	CSR_VERSION(1, 1)
+
 #define I915_CSR_KBL "i915/kbl_dmc_ver1_01.bin"
 MODULE_FIRMWARE(I915_CSR_KBL);
 #define KBL_CSR_VERSION_REQUIRED	CSR_VERSION(1, 1)
@@ -286,7 +290,9 @@ static uint32_t *parse_csr_fw(struct drm_i915_private *dev_priv,
 
 	csr->version = css_header->version;
 
-	if (IS_KABYLAKE(dev_priv)) {
+	if (IS_GEMINILAKE(dev_priv)) {
+		required_version = GLK_CSR_VERSION_REQUIRED;
+	} else if (IS_KABYLAKE(dev_priv)) {
 		required_version = KBL_CSR_VERSION_REQUIRED;
 	} else if (IS_SKYLAKE(dev_priv)) {
 		required_version = SKL_CSR_VERSION_REQUIRED;
@@ -435,7 +441,9 @@ void intel_csr_ucode_init(struct drm_i915_private *dev_priv)
 	if (!HAS_CSR(dev_priv))
 		return;
 
-	if (IS_KABYLAKE(dev_priv))
+	if (IS_GEMINILAKE(dev_priv))
+		csr->fw_path = I915_CSR_GLK;
+	else if (IS_KABYLAKE(dev_priv))
 		csr->fw_path = I915_CSR_KBL;
 	else if (IS_SKYLAKE(dev_priv))
 		csr->fw_path = I915_CSR_SKL;
-- 
2.5.5

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

^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [PATCH 2/3] drm/i915/glk: Add missing bits to allow runtime pm suspend on GLK.
  2016-12-16 15:42 [PATCH 1/3] drm/i915/DMC/GLK: Load DMC on GLK Ander Conselvan de Oliveira
@ 2016-12-16 15:42 ` Ander Conselvan de Oliveira
  2016-12-16 15:42 ` [PATCH 3/3] drm/i915/glk: Convert a few more IS_BROXTON() to IS_GEN9_LP() Ander Conselvan de Oliveira
                   ` (4 subsequent siblings)
  5 siblings, 0 replies; 15+ messages in thread
From: Ander Conselvan de Oliveira @ 2016-12-16 15:42 UTC (permalink / raw)
  To: intel-gfx; +Cc: Ander Conselvan de Oliveira, Rodrigo Vivi

From: Rodrigo Vivi <rodrigo.vivi@intel.com>

Besides having the DMC firmware in place and loaded let's
handle runtime suspend and dc9 as we do for Broxton.

Cc: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
---
 drivers/gpu/drm/i915/i915_drv.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 6428588..034de9a 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -1472,7 +1472,7 @@ static int i915_drm_suspend_late(struct drm_device *dev, bool hibernation)
 
 	intel_display_set_init_power(dev_priv, false);
 
-	fw_csr = !IS_BROXTON(dev_priv) &&
+	fw_csr = !IS_GEN9_LP(dev_priv) &&
 		suspend_to_idle(dev_priv) && dev_priv->csr.dmc_payload;
 	/*
 	 * In case of firmware assisted context save/restore don't manually
@@ -1485,7 +1485,7 @@ static int i915_drm_suspend_late(struct drm_device *dev, bool hibernation)
 		intel_power_domains_suspend(dev_priv);
 
 	ret = 0;
-	if (IS_BROXTON(dev_priv))
+	if (IS_GEN9_LP(dev_priv))
 		bxt_enable_dc9(dev_priv);
 	else if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv))
 		hsw_enable_pc8(dev_priv);
@@ -1693,7 +1693,7 @@ static int i915_drm_resume_early(struct drm_device *dev)
 
 	intel_uncore_early_sanitize(dev_priv, true);
 
-	if (IS_BROXTON(dev_priv)) {
+	if (IS_GEN9_LP(dev_priv)) {
 		if (!dev_priv->suspended_to_idle)
 			gen9_sanitize_dc_state(dev_priv);
 		bxt_disable_dc9(dev_priv);
@@ -1703,7 +1703,7 @@ static int i915_drm_resume_early(struct drm_device *dev)
 
 	intel_uncore_sanitize(dev_priv);
 
-	if (IS_BROXTON(dev_priv) ||
+	if (IS_GEN9_LP(dev_priv) ||
 	    !(dev_priv->suspended_to_idle && dev_priv->csr.dmc_payload))
 		intel_power_domains_init_hw(dev_priv, true);
 
@@ -2326,7 +2326,7 @@ static int intel_runtime_suspend(struct device *kdev)
 	intel_runtime_pm_disable_interrupts(dev_priv);
 
 	ret = 0;
-	if (IS_BROXTON(dev_priv)) {
+	if (IS_GEN9_LP(dev_priv)) {
 		bxt_display_core_uninit(dev_priv);
 		bxt_enable_dc9(dev_priv);
 	} else if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv)) {
@@ -2411,7 +2411,7 @@ static int intel_runtime_resume(struct device *kdev)
 	if (IS_GEN6(dev_priv))
 		intel_init_pch_refclk(dev_priv);
 
-	if (IS_BROXTON(dev_priv)) {
+	if (IS_GEN9_LP(dev_priv)) {
 		bxt_disable_dc9(dev_priv);
 		bxt_display_core_init(dev_priv, true);
 		if (dev_priv->csr.dmc_payload &&
-- 
2.5.5

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

^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [PATCH 3/3] drm/i915/glk: Convert a few more IS_BROXTON() to IS_GEN9_LP()
  2016-12-16 15:42 [PATCH 1/3] drm/i915/DMC/GLK: Load DMC on GLK Ander Conselvan de Oliveira
  2016-12-16 15:42 ` [PATCH 2/3] drm/i915/glk: Add missing bits to allow runtime pm suspend " Ander Conselvan de Oliveira
@ 2016-12-16 15:42 ` Ander Conselvan de Oliveira
  2016-12-19 13:17   ` Tomasz Lis
  2017-01-09 14:51   ` [PATCH v2] " Ander Conselvan de Oliveira
  2016-12-16 17:52 ` ✗ Fi.CI.BAT: failure for series starting with [1/3] drm/i915/DMC/GLK: Load DMC on GLK Patchwork
                   ` (3 subsequent siblings)
  5 siblings, 2 replies; 15+ messages in thread
From: Ander Conselvan de Oliveira @ 2016-12-16 15:42 UTC (permalink / raw)
  To: intel-gfx; +Cc: Ander Conselvan de Oliveira, Rodrigo Vivi, Daniel Vetter

From: Michel Thierry <michel.thierry@intel.com>

Commit 89b3c3c7ee9d ("drm/i915/glk: Reuse broxton's cdclk code for GLK")
missed a few of occurences of IS_BROXTON() that should have been
coverted to IS_GEN9_LP().

Fixes: 89b3c3c7ee9d ("drm/i915/glk: Reuse broxton's cdclk code for GLK")
Cc: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Daniel Vetter <daniel.vetter@intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: intel-gfx@lists.freedesktop.org
Signed-off-by: Michel Thierry <michel.thierry@intel.com>
Signed-off-by: Tomasz Lis <tomasz.lis@intel.com>
Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
---
 drivers/gpu/drm/i915/i915_sysfs.c        | 2 +-
 drivers/gpu/drm/i915/intel_device_info.c | 2 +-
 drivers/gpu/drm/i915/intel_dp.c          | 2 +-
 drivers/gpu/drm/i915/intel_guc_loader.c  | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_sysfs.c b/drivers/gpu/drm/i915/i915_sysfs.c
index 40c0ac7..376ac95 100644
--- a/drivers/gpu/drm/i915/i915_sysfs.c
+++ b/drivers/gpu/drm/i915/i915_sysfs.c
@@ -58,7 +58,7 @@ static u32 calc_residency(struct drm_i915_private *dev_priv,
 
 		if (I915_READ(VLV_COUNTER_CONTROL) & VLV_COUNT_RANGE_HIGH)
 			units <<= 8;
-	} else if (IS_BROXTON(dev_priv)) {
+	} else if (IS_GEN9_LP(dev_priv)) {
 		units = 1;
 		div = 1200;		/* 833.33ns */
 	}
diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c
index c46415b..6aeb1ed 100644
--- a/drivers/gpu/drm/i915/intel_device_info.c
+++ b/drivers/gpu/drm/i915/intel_device_info.c
@@ -192,7 +192,7 @@ static void gen9_sseu_info_init(struct drm_i915_private *dev_priv)
 		(IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv)) &&
 		hweight8(sseu->slice_mask) > 1;
 	sseu->has_subslice_pg =
-		IS_BROXTON(dev_priv) && sseu_subslice_total(sseu) > 1;
+		IS_GEN9_LP(dev_priv) && sseu_subslice_total(sseu) > 1;
 	sseu->has_eu_pg = sseu->eu_per_subslice > 2;
 
 	if (IS_BROXTON(dev_priv)) {
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 45ebc96..ae08c19 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -3375,7 +3375,7 @@ intel_dp_set_signal_levels(struct intel_dp *intel_dp)
 	if (HAS_DDI(dev_priv)) {
 		signal_levels = ddi_signal_levels(intel_dp);
 
-		if (IS_BROXTON(dev_priv))
+		if (IS_GEN9_LP(dev_priv))
 			signal_levels = 0;
 		else
 			mask = DDI_BUF_EMP_MASK;
diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c b/drivers/gpu/drm/i915/intel_guc_loader.c
index 21db697..8b74525 100644
--- a/drivers/gpu/drm/i915/intel_guc_loader.c
+++ b/drivers/gpu/drm/i915/intel_guc_loader.c
@@ -339,7 +339,7 @@ static u32 guc_wopcm_size(struct drm_i915_private *dev_priv)
 	u32 wopcm_size = GUC_WOPCM_TOP;
 
 	/* On BXT, the top of WOPCM is reserved for RC6 context */
-	if (IS_BROXTON(dev_priv))
+	if (IS_GEN9_LP(dev_priv))
 		wopcm_size -= BXT_GUC_WOPCM_RC6_RESERVED;
 
 	return wopcm_size;
@@ -388,7 +388,7 @@ static int guc_ucode_xfer(struct drm_i915_private *dev_priv)
 	if (IS_BXT_REVID(dev_priv, 0, BXT_REVID_B0))
 		I915_WRITE(GEN6_GFXPAUSE, 0x30FFF);
 
-	if (IS_BROXTON(dev_priv))
+	if (IS_GEN9_LP(dev_priv))
 		I915_WRITE(GEN9LP_GT_PM_CONFIG, GT_DOORBELL_ENABLE);
 	else
 		I915_WRITE(GEN9_GT_PM_CONFIG, GT_DOORBELL_ENABLE);
-- 
2.5.5

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

^ permalink raw reply related	[flat|nested] 15+ messages in thread
* ✗ Fi.CI.BAT: failure for series starting with [1/3] drm/i915/DMC/GLK: Load DMC on GLK
  2016-12-16 15:42 [PATCH 1/3] drm/i915/DMC/GLK: Load DMC on GLK Ander Conselvan de Oliveira
  2016-12-16 15:42 ` [PATCH 2/3] drm/i915/glk: Add missing bits to allow runtime pm suspend " Ander Conselvan de Oliveira
  2016-12-16 15:42 ` [PATCH 3/3] drm/i915/glk: Convert a few more IS_BROXTON() to IS_GEN9_LP() Ander Conselvan de Oliveira
@ 2016-12-16 17:52 ` Patchwork
  2016-12-20 12:53 ` Patchwork
                   ` (2 subsequent siblings)
  5 siblings, 0 replies; 15+ messages in thread
From: Patchwork @ 2016-12-16 17:52 UTC (permalink / raw)
  To: Ander Conselvan de Oliveira; +Cc: intel-gfx

== Series Details ==

Series: series starting with [1/3] drm/i915/DMC/GLK: Load DMC on GLK
URL   : https://patchwork.freedesktop.org/series/16926/
State : failure

== Summary ==

Series 16926v1 Series without cover letter
https://patchwork.freedesktop.org/api/1.0/series/16926/revisions/1/mbox/

Test drv_module_reload:
        Subgroup basic-reload-inject:
                pass       -> INCOMPLETE (fi-kbl-7500u)
Test kms_pipe_crc_basic:
        Subgroup suspend-read-crc-pipe-b:
                pass       -> SKIP       (fi-bxt-j4205)

fi-bdw-5557u     total:247  pass:233  dwarn:0   dfail:0   fail:0   skip:14 
fi-bsw-n3050     total:247  pass:208  dwarn:0   dfail:0   fail:0   skip:39 
fi-bxt-j4205     total:247  pass:222  dwarn:0   dfail:0   fail:0   skip:25 
fi-bxt-t5700     total:247  pass:220  dwarn:0   dfail:0   fail:0   skip:27 
fi-byt-j1900     total:247  pass:220  dwarn:0   dfail:0   fail:0   skip:27 
fi-byt-n2820     total:247  pass:216  dwarn:0   dfail:0   fail:0   skip:31 
fi-hsw-4770      total:247  pass:228  dwarn:0   dfail:0   fail:0   skip:19 
fi-hsw-4770r     total:247  pass:228  dwarn:0   dfail:0   fail:0   skip:19 
fi-ilk-650       total:247  pass:195  dwarn:0   dfail:0   fail:0   skip:52 
fi-ivb-3520m     total:247  pass:226  dwarn:0   dfail:0   fail:0   skip:21 
fi-ivb-3770      total:247  pass:226  dwarn:0   dfail:0   fail:0   skip:21 
fi-kbl-7500u     total:7    pass:6    dwarn:0   dfail:0   fail:0   skip:0  
fi-skl-6260u     total:247  pass:234  dwarn:0   dfail:0   fail:0   skip:13 
fi-skl-6700hq    total:247  pass:227  dwarn:0   dfail:0   fail:0   skip:20 
fi-skl-6700k     total:247  pass:224  dwarn:3   dfail:0   fail:0   skip:20 
fi-skl-6770hq    total:247  pass:234  dwarn:0   dfail:0   fail:0   skip:13 
fi-snb-2520m     total:247  pass:216  dwarn:0   dfail:0   fail:0   skip:31 
fi-snb-2600      total:247  pass:215  dwarn:0   dfail:0   fail:0   skip:32 

705f1e8fef81d504f0032df8e21bdc2e74850b3a drm-tip: 2016y-12m-16d-15h-40m-02s UTC integration manifest
376d7cf drm/i915/glk: Convert a few more IS_BROXTON() to IS_GEN9_LP()
8c9049c drm/i915/glk: Add missing bits to allow runtime pm suspend on GLK.
2a48676 drm/i915/DMC/GLK: Load DMC on GLK

== Logs ==

For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3311/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 15+ messages in thread
* Re: [PATCH 3/3] drm/i915/glk: Convert a few more IS_BROXTON() to IS_GEN9_LP()
  2016-12-16 15:42 ` [PATCH 3/3] drm/i915/glk: Convert a few more IS_BROXTON() to IS_GEN9_LP() Ander Conselvan de Oliveira
@ 2016-12-19 13:17   ` Tomasz Lis
  2017-01-09 14:51   ` [PATCH v2] " Ander Conselvan de Oliveira
  1 sibling, 0 replies; 15+ messages in thread
From: Tomasz Lis @ 2016-12-19 13:17 UTC (permalink / raw)
  To: Ander Conselvan de Oliveira, intel-gfx; +Cc: Daniel Vetter, Rodrigo Vivi



W dniu 2016-12-16 o 16:42, Ander Conselvan de Oliveira pisze:
> From: Michel Thierry <michel.thierry@intel.com>
>
> Commit 89b3c3c7ee9d ("drm/i915/glk: Reuse broxton's cdclk code for GLK")
> missed a few of occurences of IS_BROXTON() that should have been
> coverted to IS_GEN9_LP().
>
> Fixes: 89b3c3c7ee9d ("drm/i915/glk: Reuse broxton's cdclk code for GLK")
> Cc: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Cc: Daniel Vetter <daniel.vetter@intel.com>
> Cc: Jani Nikula <jani.nikula@linux.intel.com>
> Cc: intel-gfx@lists.freedesktop.org
Checked each change, everything OK.

Reviewed-by: Tomasz Lis <tomasz.lis@intel.com>

> Signed-off-by: Michel Thierry <michel.thierry@intel.com>
> Signed-off-by: Tomasz Lis <tomasz.lis@intel.com>
> Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
> ---
>   drivers/gpu/drm/i915/i915_sysfs.c        | 2 +-
>   drivers/gpu/drm/i915/intel_device_info.c | 2 +-
>   drivers/gpu/drm/i915/intel_dp.c          | 2 +-
>   drivers/gpu/drm/i915/intel_guc_loader.c  | 4 ++--
>   4 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_sysfs.c b/drivers/gpu/drm/i915/i915_sysfs.c
> index 40c0ac7..376ac95 100644
> --- a/drivers/gpu/drm/i915/i915_sysfs.c
> +++ b/drivers/gpu/drm/i915/i915_sysfs.c
> @@ -58,7 +58,7 @@ static u32 calc_residency(struct drm_i915_private *dev_priv,
>   
>   		if (I915_READ(VLV_COUNTER_CONTROL) & VLV_COUNT_RANGE_HIGH)
>   			units <<= 8;
> -	} else if (IS_BROXTON(dev_priv)) {
> +	} else if (IS_GEN9_LP(dev_priv)) {
>   		units = 1;
>   		div = 1200;		/* 833.33ns */
>   	}
> diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c
> index c46415b..6aeb1ed 100644
> --- a/drivers/gpu/drm/i915/intel_device_info.c
> +++ b/drivers/gpu/drm/i915/intel_device_info.c
> @@ -192,7 +192,7 @@ static void gen9_sseu_info_init(struct drm_i915_private *dev_priv)
>   		(IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv)) &&
>   		hweight8(sseu->slice_mask) > 1;
>   	sseu->has_subslice_pg =
> -		IS_BROXTON(dev_priv) && sseu_subslice_total(sseu) > 1;
> +		IS_GEN9_LP(dev_priv) && sseu_subslice_total(sseu) > 1;
>   	sseu->has_eu_pg = sseu->eu_per_subslice > 2;
>   
>   	if (IS_BROXTON(dev_priv)) {
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index 45ebc96..ae08c19 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -3375,7 +3375,7 @@ intel_dp_set_signal_levels(struct intel_dp *intel_dp)
>   	if (HAS_DDI(dev_priv)) {
>   		signal_levels = ddi_signal_levels(intel_dp);
>   
> -		if (IS_BROXTON(dev_priv))
> +		if (IS_GEN9_LP(dev_priv))
>   			signal_levels = 0;
>   		else
>   			mask = DDI_BUF_EMP_MASK;
> diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c b/drivers/gpu/drm/i915/intel_guc_loader.c
> index 21db697..8b74525 100644
> --- a/drivers/gpu/drm/i915/intel_guc_loader.c
> +++ b/drivers/gpu/drm/i915/intel_guc_loader.c
> @@ -339,7 +339,7 @@ static u32 guc_wopcm_size(struct drm_i915_private *dev_priv)
>   	u32 wopcm_size = GUC_WOPCM_TOP;
>   
>   	/* On BXT, the top of WOPCM is reserved for RC6 context */
> -	if (IS_BROXTON(dev_priv))
> +	if (IS_GEN9_LP(dev_priv))
>   		wopcm_size -= BXT_GUC_WOPCM_RC6_RESERVED;
>   
>   	return wopcm_size;
> @@ -388,7 +388,7 @@ static int guc_ucode_xfer(struct drm_i915_private *dev_priv)
>   	if (IS_BXT_REVID(dev_priv, 0, BXT_REVID_B0))
>   		I915_WRITE(GEN6_GFXPAUSE, 0x30FFF);
>   
> -	if (IS_BROXTON(dev_priv))
> +	if (IS_GEN9_LP(dev_priv))
>   		I915_WRITE(GEN9LP_GT_PM_CONFIG, GT_DOORBELL_ENABLE);
>   	else
>   		I915_WRITE(GEN9_GT_PM_CONFIG, GT_DOORBELL_ENABLE);

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

^ permalink raw reply	[flat|nested] 15+ messages in thread
* ✗ Fi.CI.BAT: failure for series starting with [1/3] drm/i915/DMC/GLK: Load DMC on GLK
  2016-12-16 15:42 [PATCH 1/3] drm/i915/DMC/GLK: Load DMC on GLK Ander Conselvan de Oliveira
                   ` (2 preceding siblings ...)
  2016-12-16 17:52 ` ✗ Fi.CI.BAT: failure for series starting with [1/3] drm/i915/DMC/GLK: Load DMC on GLK Patchwork
@ 2016-12-20 12:53 ` Patchwork
  2016-12-20 14:34   ` Ander Conselvan De Oliveira
  2017-01-09  9:23 ` ✓ Fi.CI.BAT: success " Patchwork
  2017-01-09 15:53 ` ✗ Fi.CI.BAT: warning for series starting with [1/3] drm/i915/DMC/GLK: Load DMC on GLK (rev2) Patchwork
  5 siblings, 1 reply; 15+ messages in thread
From: Patchwork @ 2016-12-20 12:53 UTC (permalink / raw)
  To: Ander Conselvan de Oliveira; +Cc: intel-gfx

== Series Details ==

Series: series starting with [1/3] drm/i915/DMC/GLK: Load DMC on GLK
URL   : https://patchwork.freedesktop.org/series/16926/
State : failure

== Summary ==

Series 16926v1 Series without cover letter
https://patchwork.freedesktop.org/api/1.0/series/16926/revisions/1/mbox/

Test drv_module_reload:
        Subgroup basic-reload-inject:
                pass       -> DMESG-WARN (fi-kbl-7500u)
Test pm_rpm:
        Subgroup basic-pci-d3-state:
                pass       -> FAIL       (fi-kbl-7500u)
        Subgroup basic-rte:
                pass       -> FAIL       (fi-kbl-7500u)

fi-bdw-5557u     total:247  pass:233  dwarn:0   dfail:0   fail:0   skip:14 
fi-bsw-n3050     total:247  pass:208  dwarn:0   dfail:0   fail:0   skip:39 
fi-bxt-j4205     total:247  pass:225  dwarn:1   dfail:0   fail:0   skip:21 
fi-bxt-t5700     total:247  pass:220  dwarn:0   dfail:0   fail:0   skip:27 
fi-byt-j1900     total:247  pass:220  dwarn:0   dfail:0   fail:0   skip:27 
fi-byt-n2820     total:247  pass:216  dwarn:0   dfail:0   fail:0   skip:31 
fi-hsw-4770      total:247  pass:228  dwarn:0   dfail:0   fail:0   skip:19 
fi-ilk-650       total:247  pass:195  dwarn:0   dfail:0   fail:0   skip:52 
fi-ivb-3520m     total:247  pass:226  dwarn:0   dfail:0   fail:0   skip:21 
fi-ivb-3770      total:247  pass:226  dwarn:0   dfail:0   fail:0   skip:21 
fi-kbl-7500u     total:247  pass:223  dwarn:1   dfail:0   fail:2   skip:21 
fi-skl-6260u     total:247  pass:234  dwarn:0   dfail:0   fail:0   skip:13 
fi-skl-6700hq    total:247  pass:227  dwarn:0   dfail:0   fail:0   skip:20 
fi-skl-6700k     total:247  pass:224  dwarn:3   dfail:0   fail:0   skip:20 
fi-skl-6770hq    total:247  pass:234  dwarn:0   dfail:0   fail:0   skip:13 
fi-snb-2520m     total:247  pass:216  dwarn:0   dfail:0   fail:0   skip:31 
fi-snb-2600      total:247  pass:215  dwarn:0   dfail:0   fail:0   skip:32 

c0d7a4455b44d48ede0a38af3a1469d28dee10c9 drm-tip: 2016y-12m-20d-10h-01m-56s UTC integration manifest
09486c1 drm/i915/glk: Convert a few more IS_BROXTON() to IS_GEN9_LP()
2ba792e drm/i915/glk: Add missing bits to allow runtime pm suspend on GLK.
630af86 drm/i915/DMC/GLK: Load DMC on GLK

== Logs ==

For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3338/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 15+ messages in thread
* Re: ✗ Fi.CI.BAT: failure for series starting with [1/3] drm/i915/DMC/GLK: Load DMC on GLK
  2016-12-20 12:53 ` Patchwork
@ 2016-12-20 14:34   ` Ander Conselvan De Oliveira
  2016-12-20 14:46     ` Chris Wilson
  0 siblings, 1 reply; 15+ messages in thread
From: Ander Conselvan De Oliveira @ 2016-12-20 14:34 UTC (permalink / raw)
  To: intel-gfx

On Tue, 2016-12-20 at 12:53 +0000, Patchwork wrote:
> == Series Details ==
> 
> Series: series starting with [1/3] drm/i915/DMC/GLK: Load DMC on GLK
> URL   : https://patchwork.freedesktop.org/series/16926/
> State : failure
> 
> == Summary ==
> 
> Series 16926v1 Series without cover letter
> https://patchwork.freedesktop.org/api/1.0/series/16926/revisions/1/mbox/
> 
> Test drv_module_reload:
>         Subgroup basic-reload-inject:
>                 pass       -> DMESG-WARN (fi-kbl-7500u)

[   33.108496] WARNING: CPU: 2 PID: 6400 at drivers/gpu/drm/i915/i915_gem.c:4254 i915_gem_suspend+0x181/0x190 [i915]
[   33.108498] WARN_ON(dev_priv->gt.awake)
[   33.108499] Modules linked in:
[   33.108501]  i915(-) x86_pkg_temp_thermal intel_powerclamp coretemp crct10dif_pclmul crc32_pclmul ghash_clmulni_intel snd_hda_codec_hdmi snd_hda_codec_realtek snd_hda_codec_generic snd_hda_codec snd_hwdep mei_me snd_hda_core mei snd_pcm e1000e ptp pps_core i2c_hid [last unloaded: snd_hda_intel]
[   33.108519] CPU: 2 PID: 6400 Comm: drv_module_relo Tainted: G     U          4.9.0-CI-Patchwork_3338+ #1
[   33.108521] Hardware name: GIGABYTE GB-BKi7A-7500/MFLP7AP-00, BIOS F1 07/27/2016
[   33.108522]  ffffc90000547d18 ffffffff81435b05 ffffc90000547d68 0000000000000000
[   33.108527]  ffffc90000547d58 ffffffff8107e4d6 0000109e00000000 ffff88025c620000
[   33.108530]  0000000000000000 ffff88025c620068 ffffffffa013f4c0 0000000000000000
[   33.108534] Call Trace:
[   33.108540]  [<ffffffff81435b05>] dump_stack+0x67/0x92
[   33.108543]  [<ffffffff8107e4d6>] __warn+0xc6/0xe0
[   33.108547]  [<ffffffff8107e53a>] warn_slowpath_fmt+0x4a/0x50
[   33.108572]  [<ffffffffa0051601>] i915_gem_suspend+0x181/0x190 [i915]
[   33.108589]  [<ffffffffa000ef4e>] i915_driver_unload+0x1e/0x190 [i915]
[   33.108608]  [<ffffffffa0018b24>] i915_pci_remove+0x14/0x20 [i915]
[   33.108611]  [<ffffffff81489aa4>] pci_device_remove+0x34/0xb0
[   33.108614]  [<ffffffff81588eec>] __device_release_driver+0x9c/0x150
[   33.108617]  [<ffffffff81589a66>] driver_detach+0xb6/0xc0
[   33.108619]  [<ffffffff81588983>] bus_remove_driver+0x53/0xd0
[   33.108621]  [<ffffffff8158a527>] driver_unregister+0x27/0x50
[   33.108623]  [<ffffffff81488445>] pci_unregister_driver+0x25/0x70
[   33.108652]  [<ffffffffa00fd8a4>] i915_exit+0x1a/0x71 [i915]
[   33.108655]  [<ffffffff8111a813>] SyS_delete_module+0x193/0x1e0
[   33.108658]  [<ffffffff81827c6e>] entry_SYSCALL_64_fastpath+0x1c/0xb1
[   33.108660] ---[ end trace 247dfc1ad299c432 ]---

https://bugs.freedesktop.org/show_bug.cgi?id=98670

> Test pm_rpm:
>         Subgroup basic-pci-d3-state:
>                 pass       -> FAIL       (fi-kbl-7500u)
>         Subgroup basic-rte:
>                 pass       -> FAIL       (fi-kbl-7500u)

Out	
IGT-Version: 1.17-g38bffd9 (x86_64) (Linux: 4.9.0-CI-Patchwork_3338+ x86_64)
Runtime PM support: 1
PC8 residency support: 0
Stack trace:
  #0 [__igt_fail_assert+0x101]
  #1 [main+0x2514]
  #2 [__libc_start_main+0xf0]
  #3 [_start+0x29]
  #4 [<unknown>+0x29]
Subtest basic-rte: FAIL (10.053s)
Err	
(pm_rpm:9532) CRITICAL: Test assertion failure function basic_subtest, file pm_rpm.c:705:
(pm_rpm:9532) CRITICAL: Failed assertion: wait_for_suspended()
Subtest basic-rte failed.
**** DEBUG ****
(pm_rpm:9532) CRITICAL: Test assertion failure function basic_subtest, file pm_rpm.c:705:
(pm_rpm:9532) CRITICAL: Failed assertion: wait_for_suspended()

Is this related to the gt.awake WARN? Looking at CI history, it seems the three
tests always fail together.


Thanks,
Ander

> 
> fi-bdw-5557u     total:247  pass:233  dwarn:0   dfail:0   fail:0   skip:14 
> fi-bsw-n3050     total:247  pass:208  dwarn:0   dfail:0   fail:0   skip:39 
> fi-bxt-j4205     total:247  pass:225  dwarn:1   dfail:0   fail:0   skip:21 
> fi-bxt-t5700     total:247  pass:220  dwarn:0   dfail:0   fail:0   skip:27 
> fi-byt-j1900     total:247  pass:220  dwarn:0   dfail:0   fail:0   skip:27 
> fi-byt-n2820     total:247  pass:216  dwarn:0   dfail:0   fail:0   skip:31 
> fi-hsw-4770      total:247  pass:228  dwarn:0   dfail:0   fail:0   skip:19 
> fi-ilk-650       total:247  pass:195  dwarn:0   dfail:0   fail:0   skip:52 
> fi-ivb-3520m     total:247  pass:226  dwarn:0   dfail:0   fail:0   skip:21 
> fi-ivb-3770      total:247  pass:226  dwarn:0   dfail:0   fail:0   skip:21 
> fi-kbl-7500u     total:247  pass:223  dwarn:1   dfail:0   fail:2   skip:21 
> fi-skl-6260u     total:247  pass:234  dwarn:0   dfail:0   fail:0   skip:13 
> fi-skl-6700hq    total:247  pass:227  dwarn:0   dfail:0   fail:0   skip:20 
> fi-skl-6700k     total:247  pass:224  dwarn:3   dfail:0   fail:0   skip:20 
> fi-skl-6770hq    total:247  pass:234  dwarn:0   dfail:0   fail:0   skip:13 
> fi-snb-2520m     total:247  pass:216  dwarn:0   dfail:0   fail:0   skip:31 
> fi-snb-2600      total:247  pass:215  dwarn:0   dfail:0   fail:0   skip:32 
> 
> c0d7a4455b44d48ede0a38af3a1469d28dee10c9 drm-tip: 2016y-12m-20d-10h-01m-56s
> UTC integration manifest
> 09486c1 drm/i915/glk: Convert a few more IS_BROXTON() to IS_GEN9_LP()
> 2ba792e drm/i915/glk: Add missing bits to allow runtime pm suspend on GLK.
> 630af86 drm/i915/DMC/GLK: Load DMC on GLK
> 
> == Logs ==
> 
> For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3338/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 15+ messages in thread
* Re: ✗ Fi.CI.BAT: failure for series starting with [1/3] drm/i915/DMC/GLK: Load DMC on GLK
  2016-12-20 14:34   ` Ander Conselvan De Oliveira
@ 2016-12-20 14:46     ` Chris Wilson
  2016-12-20 15:10       ` Ander Conselvan De Oliveira
  0 siblings, 1 reply; 15+ messages in thread
From: Chris Wilson @ 2016-12-20 14:46 UTC (permalink / raw)
  To: Ander Conselvan De Oliveira; +Cc: intel-gfx

On Tue, Dec 20, 2016 at 04:34:20PM +0200, Ander Conselvan De Oliveira wrote:
> On Tue, 2016-12-20 at 12:53 +0000, Patchwork wrote:
> > == Series Details ==
> > 
> > Series: series starting with [1/3] drm/i915/DMC/GLK: Load DMC on GLK
> > URL   : https://patchwork.freedesktop.org/series/16926/
> > State : failure
> > 
> > == Summary ==
> > 
> > Series 16926v1 Series without cover letter
> > https://patchwork.freedesktop.org/api/1.0/series/16926/revisions/1/mbox/
> > 
> > Test drv_module_reload:
> >         Subgroup basic-reload-inject:
> >                 pass       -> DMESG-WARN (fi-kbl-7500u)
> 
> [   33.108496] WARNING: CPU: 2 PID: 6400 at drivers/gpu/drm/i915/i915_gem.c:4254 i915_gem_suspend+0x181/0x190 [i915]
> [   33.108498] WARN_ON(dev_priv->gt.awake)
> [   33.108499] Modules linked in:
> [   33.108501]  i915(-) x86_pkg_temp_thermal intel_powerclamp coretemp crct10dif_pclmul crc32_pclmul ghash_clmulni_intel snd_hda_codec_hdmi snd_hda_codec_realtek snd_hda_codec_generic snd_hda_codec snd_hwdep mei_me snd_hda_core mei snd_pcm e1000e ptp pps_core i2c_hid [last unloaded: snd_hda_intel]
> [   33.108519] CPU: 2 PID: 6400 Comm: drv_module_relo Tainted: G     U          4.9.0-CI-Patchwork_3338+ #1
> [   33.108521] Hardware name: GIGABYTE GB-BKi7A-7500/MFLP7AP-00, BIOS F1 07/27/2016
> [   33.108522]  ffffc90000547d18 ffffffff81435b05 ffffc90000547d68 0000000000000000
> [   33.108527]  ffffc90000547d58 ffffffff8107e4d6 0000109e00000000 ffff88025c620000
> [   33.108530]  0000000000000000 ffff88025c620068 ffffffffa013f4c0 0000000000000000
> [   33.108534] Call Trace:
> [   33.108540]  [<ffffffff81435b05>] dump_stack+0x67/0x92
> [   33.108543]  [<ffffffff8107e4d6>] __warn+0xc6/0xe0
> [   33.108547]  [<ffffffff8107e53a>] warn_slowpath_fmt+0x4a/0x50
> [   33.108572]  [<ffffffffa0051601>] i915_gem_suspend+0x181/0x190 [i915]
> [   33.108589]  [<ffffffffa000ef4e>] i915_driver_unload+0x1e/0x190 [i915]
> [   33.108608]  [<ffffffffa0018b24>] i915_pci_remove+0x14/0x20 [i915]
> [   33.108611]  [<ffffffff81489aa4>] pci_device_remove+0x34/0xb0
> [   33.108614]  [<ffffffff81588eec>] __device_release_driver+0x9c/0x150
> [   33.108617]  [<ffffffff81589a66>] driver_detach+0xb6/0xc0
> [   33.108619]  [<ffffffff81588983>] bus_remove_driver+0x53/0xd0
> [   33.108621]  [<ffffffff8158a527>] driver_unregister+0x27/0x50
> [   33.108623]  [<ffffffff81488445>] pci_unregister_driver+0x25/0x70
> [   33.108652]  [<ffffffffa00fd8a4>] i915_exit+0x1a/0x71 [i915]
> [   33.108655]  [<ffffffff8111a813>] SyS_delete_module+0x193/0x1e0
> [   33.108658]  [<ffffffff81827c6e>] entry_SYSCALL_64_fastpath+0x1c/0xb1
> [   33.108660] ---[ end trace 247dfc1ad299c432 ]---
> 
> https://bugs.freedesktop.org/show_bug.cgi?id=98670
> 
> > Test pm_rpm:
> >         Subgroup basic-pci-d3-state:
> >                 pass       -> FAIL       (fi-kbl-7500u)
> >         Subgroup basic-rte:
> >                 pass       -> FAIL       (fi-kbl-7500u)
> 
> Out	
> IGT-Version: 1.17-g38bffd9 (x86_64) (Linux: 4.9.0-CI-Patchwork_3338+ x86_64)
> Runtime PM support: 1
> PC8 residency support: 0
> Stack trace:
>   #0 [__igt_fail_assert+0x101]
>   #1 [main+0x2514]
>   #2 [__libc_start_main+0xf0]
>   #3 [_start+0x29]
>   #4 [<unknown>+0x29]
> Subtest basic-rte: FAIL (10.053s)
> Err	
> (pm_rpm:9532) CRITICAL: Test assertion failure function basic_subtest, file pm_rpm.c:705:
> (pm_rpm:9532) CRITICAL: Failed assertion: wait_for_suspended()
> Subtest basic-rte failed.
> **** DEBUG ****
> (pm_rpm:9532) CRITICAL: Test assertion failure function basic_subtest, file pm_rpm.c:705:
> (pm_rpm:9532) CRITICAL: Failed assertion: wait_for_suspended()
> 
> Is this related to the gt.awake WARN? Looking at CI history, it seems the three
> tests always fail together.

No. The message is from an earlier incarnation of the module (i.e. if it
does correlates, it is a bug in module loading not sanitizing hw state),
and https://intel-gfx-ci.01.org/CI/fi-kbl-7500u.html disagrees with you.
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 15+ messages in thread
* Re: ✗ Fi.CI.BAT: failure for series starting with [1/3] drm/i915/DMC/GLK: Load DMC on GLK
  2016-12-20 14:46     ` Chris Wilson
@ 2016-12-20 15:10       ` Ander Conselvan De Oliveira
  0 siblings, 0 replies; 15+ messages in thread
From: Ander Conselvan De Oliveira @ 2016-12-20 15:10 UTC (permalink / raw)
  To: Chris Wilson; +Cc: intel-gfx

On Tue, 2016-12-20 at 14:46 +0000, Chris Wilson wrote:
> On Tue, Dec 20, 2016 at 04:34:20PM +0200, Ander Conselvan De Oliveira wrote:
> > 
> > On Tue, 2016-12-20 at 12:53 +0000, Patchwork wrote:
> > > 
> > > == Series Details ==
> > > 
> > > Series: series starting with [1/3] drm/i915/DMC/GLK: Load DMC on GLK
> > > URL   : https://patchwork.freedesktop.org/series/16926/
> > > State : failure
> > > 
> > > == Summary ==
> > > 
> > > Series 16926v1 Series without cover letter
> > > https://patchwork.freedesktop.org/api/1.0/series/16926/revisions/1/mbox/
> > > 
> > > Test drv_module_reload:
> > >         Subgroup basic-reload-inject:
> > >                 pass       -> DMESG-WARN (fi-kbl-7500u)
> > [   33.108496] WARNING: CPU: 2 PID: 6400 at
> > drivers/gpu/drm/i915/i915_gem.c:4254 i915_gem_suspend+0x181/0x190 [i915]
> > [   33.108498] WARN_ON(dev_priv->gt.awake)
> > [   33.108499] Modules linked in:
> > [   33.108501]  i915(-) x86_pkg_temp_thermal intel_powerclamp coretemp
> > crct10dif_pclmul crc32_pclmul ghash_clmulni_intel snd_hda_codec_hdmi
> > snd_hda_codec_realtek snd_hda_codec_generic snd_hda_codec snd_hwdep mei_me
> > snd_hda_core mei snd_pcm e1000e ptp pps_core i2c_hid [last unloaded:
> > snd_hda_intel]
> > [   33.108519] CPU: 2 PID: 6400 Comm: drv_module_relo Tainted:
> > G     U          4.9.0-CI-Patchwork_3338+ #1
> > [   33.108521] Hardware name: GIGABYTE GB-BKi7A-7500/MFLP7AP-00, BIOS F1
> > 07/27/2016
> > [   33.108522]  ffffc90000547d18 ffffffff81435b05 ffffc90000547d68
> > 0000000000000000
> > [   33.108527]  ffffc90000547d58 ffffffff8107e4d6 0000109e00000000
> > ffff88025c620000
> > [   33.108530]  0000000000000000 ffff88025c620068 ffffffffa013f4c0
> > 0000000000000000
> > [   33.108534] Call Trace:
> > [   33.108540]  [<ffffffff81435b05>] dump_stack+0x67/0x92
> > [   33.108543]  [<ffffffff8107e4d6>] __warn+0xc6/0xe0
> > [   33.108547]  [<ffffffff8107e53a>] warn_slowpath_fmt+0x4a/0x50
> > [   33.108572]  [<ffffffffa0051601>] i915_gem_suspend+0x181/0x190 [i915]
> > [   33.108589]  [<ffffffffa000ef4e>] i915_driver_unload+0x1e/0x190 [i915]
> > [   33.108608]  [<ffffffffa0018b24>] i915_pci_remove+0x14/0x20 [i915]
> > [   33.108611]  [<ffffffff81489aa4>] pci_device_remove+0x34/0xb0
> > [   33.108614]  [<ffffffff81588eec>] __device_release_driver+0x9c/0x150
> > [   33.108617]  [<ffffffff81589a66>] driver_detach+0xb6/0xc0
> > [   33.108619]  [<ffffffff81588983>] bus_remove_driver+0x53/0xd0
> > [   33.108621]  [<ffffffff8158a527>] driver_unregister+0x27/0x50
> > [   33.108623]  [<ffffffff81488445>] pci_unregister_driver+0x25/0x70
> > [   33.108652]  [<ffffffffa00fd8a4>] i915_exit+0x1a/0x71 [i915]
> > [   33.108655]  [<ffffffff8111a813>] SyS_delete_module+0x193/0x1e0
> > [   33.108658]  [<ffffffff81827c6e>] entry_SYSCALL_64_fastpath+0x1c/0xb1
> > [   33.108660] ---[ end trace 247dfc1ad299c432 ]---
> > 
> > https://bugs.freedesktop.org/show_bug.cgi?id=98670
> > 
> > > 
> > > Test pm_rpm:
> > >         Subgroup basic-pci-d3-state:
> > >                 pass       -> FAIL       (fi-kbl-7500u)
> > >         Subgroup basic-rte:
> > >                 pass       -> FAIL       (fi-kbl-7500u)
> > Out	
> > IGT-Version: 1.17-g38bffd9 (x86_64) (Linux: 4.9.0-CI-Patchwork_3338+ x86_64)
> > Runtime PM support: 1
> > PC8 residency support: 0
> > Stack trace:
> >   #0 [__igt_fail_assert+0x101]
> >   #1 [main+0x2514]
> >   #2 [__libc_start_main+0xf0]
> >   #3 [_start+0x29]
> >   #4 [<unknown>+0x29]
> > Subtest basic-rte: FAIL (10.053s)
> > Err	
> > (pm_rpm:9532) CRITICAL: Test assertion failure function basic_subtest, file
> > pm_rpm.c:705:
> > (pm_rpm:9532) CRITICAL: Failed assertion: wait_for_suspended()
> > Subtest basic-rte failed.
> > **** DEBUG ****
> > (pm_rpm:9532) CRITICAL: Test assertion failure function basic_subtest, file
> > pm_rpm.c:705:
> > (pm_rpm:9532) CRITICAL: Failed assertion: wait_for_suspended()
> > 
> > Is this related to the gt.awake WARN? Looking at CI history, it seems the
> > three
> > tests always fail together.
> No. The message is from an earlier incarnation of the module (i.e. if it
> does correlates, it is a bug in module loading not sanitizing hw state),
> and https://intel-gfx-ci.01.org/CI/fi-kbl-7500u.html disagrees with you.

I shouldn't have said always. I was looking at that page, but only considered
the fails of basic-reload-inject that had a dmesg-warn type of fail. And that is
very small sample of 2. Anyway, thanks for the explanation.

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

^ permalink raw reply	[flat|nested] 15+ messages in thread
* ✓ Fi.CI.BAT: success for series starting with [1/3] drm/i915/DMC/GLK: Load DMC on GLK
  2016-12-16 15:42 [PATCH 1/3] drm/i915/DMC/GLK: Load DMC on GLK Ander Conselvan de Oliveira
                   ` (3 preceding siblings ...)
  2016-12-20 12:53 ` Patchwork
@ 2017-01-09  9:23 ` Patchwork
  2017-01-09 15:53 ` ✗ Fi.CI.BAT: warning for series starting with [1/3] drm/i915/DMC/GLK: Load DMC on GLK (rev2) Patchwork
  5 siblings, 0 replies; 15+ messages in thread
From: Patchwork @ 2017-01-09  9:23 UTC (permalink / raw)
  To: Ander Conselvan de Oliveira; +Cc: intel-gfx

== Series Details ==

Series: series starting with [1/3] drm/i915/DMC/GLK: Load DMC on GLK
URL   : https://patchwork.freedesktop.org/series/16926/
State : success

== Summary ==

Series 16926v1 Series without cover letter
https://patchwork.freedesktop.org/api/1.0/series/16926/revisions/1/mbox/


fi-bdw-5557u     total:246  pass:232  dwarn:0   dfail:0   fail:0   skip:14 
fi-bsw-n3050     total:246  pass:207  dwarn:0   dfail:0   fail:0   skip:39 
fi-bxt-j4205     total:246  pass:224  dwarn:0   dfail:0   fail:0   skip:22 
fi-bxt-t5700     total:82   pass:69   dwarn:0   dfail:0   fail:0   skip:12 
fi-byt-j1900     total:246  pass:219  dwarn:0   dfail:0   fail:0   skip:27 
fi-byt-n2820     total:246  pass:215  dwarn:0   dfail:0   fail:0   skip:31 
fi-hsw-4770      total:246  pass:227  dwarn:0   dfail:0   fail:0   skip:19 
fi-hsw-4770r     total:246  pass:227  dwarn:0   dfail:0   fail:0   skip:19 
fi-ivb-3520m     total:246  pass:225  dwarn:0   dfail:0   fail:0   skip:21 
fi-ivb-3770      total:246  pass:225  dwarn:0   dfail:0   fail:0   skip:21 
fi-kbl-7500u     total:246  pass:225  dwarn:0   dfail:0   fail:0   skip:21 
fi-skl-6260u     total:246  pass:233  dwarn:0   dfail:0   fail:0   skip:13 
fi-skl-6700hq    total:246  pass:226  dwarn:0   dfail:0   fail:0   skip:20 
fi-skl-6700k     total:246  pass:222  dwarn:3   dfail:0   fail:0   skip:21 
fi-skl-6770hq    total:246  pass:233  dwarn:0   dfail:0   fail:0   skip:13 
fi-snb-2520m     total:246  pass:215  dwarn:0   dfail:0   fail:0   skip:31 
fi-snb-2600      total:246  pass:214  dwarn:0   dfail:0   fail:0   skip:32 

eb5c556a1e5eff388e48e4b7cf61e95783019e83 drm-tip: 2017y-01m-06d-16h-59m-26s UTC integration manifest
0edb343 drm/i915/glk: Convert a few more IS_BROXTON() to IS_GEN9_LP()
36e30c0 drm/i915/glk: Add missing bits to allow runtime pm suspend on GLK.
afd5524 drm/i915/DMC/GLK: Load DMC on GLK

== Logs ==

For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3450/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 15+ messages in thread
* [PATCH v2] drm/i915/glk: Convert a few more IS_BROXTON() to IS_GEN9_LP()
  2016-12-16 15:42 ` [PATCH 3/3] drm/i915/glk: Convert a few more IS_BROXTON() to IS_GEN9_LP() Ander Conselvan de Oliveira
  2016-12-19 13:17   ` Tomasz Lis
@ 2017-01-09 14:51   ` Ander Conselvan de Oliveira
  2017-01-09 17:11     ` Vivi, Rodrigo
  1 sibling, 1 reply; 15+ messages in thread
From: Ander Conselvan de Oliveira @ 2017-01-09 14:51 UTC (permalink / raw)
  To: intel-gfx; +Cc: Ander Conselvan de Oliveira, Rodrigo Vivi, Daniel Vetter

From: Michel Thierry <michel.thierry@intel.com>

Commit cc3f90f0633c ("drm/i915/glk: Reuse broxton code for geminilake")
missed a few of occurences of IS_BROXTON() that should have been
coverted to IS_GEN9_LP().

v2: Cite the right commit. (Ander)

Fixes: cc3f90f0633c ("drm/i915/glk: Reuse broxton code for geminilake")
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Cc: Daniel Vetter <daniel.vetter@intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: intel-gfx@lists.freedesktop.org
Signed-off-by: Michel Thierry <michel.thierry@intel.com>
Signed-off-by: Tomasz Lis <tomasz.lis@intel.com>
Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Reviewed-by: Tomasz Lis <tomasz.lis@intel.com> (v1)
---
 drivers/gpu/drm/i915/i915_sysfs.c        | 2 +-
 drivers/gpu/drm/i915/intel_device_info.c | 2 +-
 drivers/gpu/drm/i915/intel_dp.c          | 2 +-
 drivers/gpu/drm/i915/intel_guc_loader.c  | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_sysfs.c b/drivers/gpu/drm/i915/i915_sysfs.c
index 40c0ac7..376ac95 100644
--- a/drivers/gpu/drm/i915/i915_sysfs.c
+++ b/drivers/gpu/drm/i915/i915_sysfs.c
@@ -58,7 +58,7 @@ static u32 calc_residency(struct drm_i915_private *dev_priv,
 
 		if (I915_READ(VLV_COUNTER_CONTROL) & VLV_COUNT_RANGE_HIGH)
 			units <<= 8;
-	} else if (IS_BROXTON(dev_priv)) {
+	} else if (IS_GEN9_LP(dev_priv)) {
 		units = 1;
 		div = 1200;		/* 833.33ns */
 	}
diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c
index f642f6d..fcf8181 100644
--- a/drivers/gpu/drm/i915/intel_device_info.c
+++ b/drivers/gpu/drm/i915/intel_device_info.c
@@ -192,7 +192,7 @@ static void gen9_sseu_info_init(struct drm_i915_private *dev_priv)
 		(IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv)) &&
 		hweight8(sseu->slice_mask) > 1;
 	sseu->has_subslice_pg =
-		IS_BROXTON(dev_priv) && sseu_subslice_total(sseu) > 1;
+		IS_GEN9_LP(dev_priv) && sseu_subslice_total(sseu) > 1;
 	sseu->has_eu_pg = sseu->eu_per_subslice > 2;
 
 	if (IS_BROXTON(dev_priv)) {
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index fb12896..8c18f72 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -3412,7 +3412,7 @@ intel_dp_set_signal_levels(struct intel_dp *intel_dp)
 	if (HAS_DDI(dev_priv)) {
 		signal_levels = ddi_signal_levels(intel_dp);
 
-		if (IS_BROXTON(dev_priv))
+		if (IS_GEN9_LP(dev_priv))
 			signal_levels = 0;
 		else
 			mask = DDI_BUF_EMP_MASK;
diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c b/drivers/gpu/drm/i915/intel_guc_loader.c
index 35d5690..aa2b866 100644
--- a/drivers/gpu/drm/i915/intel_guc_loader.c
+++ b/drivers/gpu/drm/i915/intel_guc_loader.c
@@ -339,7 +339,7 @@ static u32 guc_wopcm_size(struct drm_i915_private *dev_priv)
 	u32 wopcm_size = GUC_WOPCM_TOP;
 
 	/* On BXT, the top of WOPCM is reserved for RC6 context */
-	if (IS_BROXTON(dev_priv))
+	if (IS_GEN9_LP(dev_priv))
 		wopcm_size -= BXT_GUC_WOPCM_RC6_RESERVED;
 
 	return wopcm_size;
@@ -388,7 +388,7 @@ static int guc_ucode_xfer(struct drm_i915_private *dev_priv)
 	if (IS_BXT_REVID(dev_priv, 0, BXT_REVID_B0))
 		I915_WRITE(GEN6_GFXPAUSE, 0x30FFF);
 
-	if (IS_BROXTON(dev_priv))
+	if (IS_GEN9_LP(dev_priv))
 		I915_WRITE(GEN9LP_GT_PM_CONFIG, GT_DOORBELL_ENABLE);
 	else
 		I915_WRITE(GEN9_GT_PM_CONFIG, GT_DOORBELL_ENABLE);
-- 
2.5.5

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

^ permalink raw reply related	[flat|nested] 15+ messages in thread
* ✗ Fi.CI.BAT: warning for series starting with [1/3] drm/i915/DMC/GLK: Load DMC on GLK (rev2)
  2016-12-16 15:42 [PATCH 1/3] drm/i915/DMC/GLK: Load DMC on GLK Ander Conselvan de Oliveira
                   ` (4 preceding siblings ...)
  2017-01-09  9:23 ` ✓ Fi.CI.BAT: success " Patchwork
@ 2017-01-09 15:53 ` Patchwork
  2017-01-10  9:09   ` Ander Conselvan De Oliveira
  5 siblings, 1 reply; 15+ messages in thread
From: Patchwork @ 2017-01-09 15:53 UTC (permalink / raw)
  To: Ander Conselvan de Oliveira; +Cc: intel-gfx

== Series Details ==

Series: series starting with [1/3] drm/i915/DMC/GLK: Load DMC on GLK (rev2)
URL   : https://patchwork.freedesktop.org/series/16926/
State : warning

== Summary ==

Series 16926v2 Series without cover letter
https://patchwork.freedesktop.org/api/1.0/series/16926/revisions/2/mbox/

Test kms_force_connector_basic:
        Subgroup force-edid:
                pass       -> DMESG-WARN (fi-snb-2520m)

fi-bdw-5557u     total:246  pass:232  dwarn:0   dfail:0   fail:0   skip:14 
fi-bsw-n3050     total:246  pass:207  dwarn:0   dfail:0   fail:0   skip:39 
fi-bxt-j4205     total:246  pass:224  dwarn:0   dfail:0   fail:0   skip:22 
fi-bxt-t5700     total:82   pass:69   dwarn:0   dfail:0   fail:0   skip:12 
fi-byt-j1900     total:246  pass:219  dwarn:0   dfail:0   fail:0   skip:27 
fi-byt-n2820     total:246  pass:215  dwarn:0   dfail:0   fail:0   skip:31 
fi-hsw-4770      total:246  pass:227  dwarn:0   dfail:0   fail:0   skip:19 
fi-hsw-4770r     total:246  pass:227  dwarn:0   dfail:0   fail:0   skip:19 
fi-ivb-3520m     total:246  pass:225  dwarn:0   dfail:0   fail:0   skip:21 
fi-kbl-7500u     total:246  pass:225  dwarn:0   dfail:0   fail:0   skip:21 
fi-skl-6260u     total:246  pass:233  dwarn:0   dfail:0   fail:0   skip:13 
fi-skl-6700hq    total:246  pass:226  dwarn:0   dfail:0   fail:0   skip:20 
fi-skl-6700k     total:246  pass:222  dwarn:3   dfail:0   fail:0   skip:21 
fi-skl-6770hq    total:246  pass:233  dwarn:0   dfail:0   fail:0   skip:13 
fi-snb-2520m     total:246  pass:214  dwarn:1   dfail:0   fail:0   skip:31 
fi-snb-2600      total:246  pass:214  dwarn:0   dfail:0   fail:0   skip:32 

ea7e3e5c99e316fb6876399f9b32b2372e45c4af drm-tip: 2017y-01m-09d-14h-45m-54s UTC integration manifest
914ba9b drm/i915/glk: Convert a few more IS_BROXTON() to IS_GEN9_LP()
32dc09b drm/i915/glk: Add missing bits to allow runtime pm suspend on GLK.
aa47b07 drm/i915/DMC/GLK: Load DMC on GLK

== Logs ==

For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3454/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 15+ messages in thread
* Re: [PATCH v2] drm/i915/glk: Convert a few more IS_BROXTON() to IS_GEN9_LP()
  2017-01-09 14:51   ` [PATCH v2] " Ander Conselvan de Oliveira
@ 2017-01-09 17:11     ` Vivi, Rodrigo
  2017-01-10  9:52       ` Tomasz Lis
  0 siblings, 1 reply; 15+ messages in thread
From: Vivi, Rodrigo @ 2017-01-09 17:11 UTC (permalink / raw)
  To: Conselvan De Oliveira, Ander
  Cc: Vetter, Daniel, intel-gfx@lists.freedesktop.org

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

On Mon, 2017-01-09 at 16:51 +0200, Ander Conselvan de Oliveira wrote:
> From: Michel Thierry <michel.thierry@intel.com>
> 
> Commit cc3f90f0633c ("drm/i915/glk: Reuse broxton code for geminilake")
> missed a few of occurences of IS_BROXTON() that should have been
> coverted to IS_GEN9_LP().
> 
> v2: Cite the right commit. (Ander)
> 
> Fixes: cc3f90f0633c ("drm/i915/glk: Reuse broxton code for geminilake")
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Cc: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
> Cc: Daniel Vetter <daniel.vetter@intel.com>
> Cc: Jani Nikula <jani.nikula@linux.intel.com>
> Cc: intel-gfx@lists.freedesktop.org
> Signed-off-by: Michel Thierry <michel.thierry@intel.com>
> Signed-off-by: Tomasz Lis <tomasz.lis@intel.com>
> Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
> Reviewed-by: Tomasz Lis <tomasz.lis@intel.com> (v1)
> ---
>  drivers/gpu/drm/i915/i915_sysfs.c        | 2 +-
>  drivers/gpu/drm/i915/intel_device_info.c | 2 +-
>  drivers/gpu/drm/i915/intel_dp.c          | 2 +-
>  drivers/gpu/drm/i915/intel_guc_loader.c  | 4 ++--
>  4 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_sysfs.c b/drivers/gpu/drm/i915/i915_sysfs.c
> index 40c0ac7..376ac95 100644
> --- a/drivers/gpu/drm/i915/i915_sysfs.c
> +++ b/drivers/gpu/drm/i915/i915_sysfs.c
> @@ -58,7 +58,7 @@ static u32 calc_residency(struct drm_i915_private *dev_priv,
>  
>  		if (I915_READ(VLV_COUNTER_CONTROL) & VLV_COUNT_RANGE_HIGH)
>  			units <<= 8;
> -	} else if (IS_BROXTON(dev_priv)) {
> +	} else if (IS_GEN9_LP(dev_priv)) {
>  		units = 1;
>  		div = 1200;		/* 833.33ns */
>  	}
> diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c
> index f642f6d..fcf8181 100644
> --- a/drivers/gpu/drm/i915/intel_device_info.c
> +++ b/drivers/gpu/drm/i915/intel_device_info.c
> @@ -192,7 +192,7 @@ static void gen9_sseu_info_init(struct drm_i915_private *dev_priv)
>  		(IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv)) &&
>  		hweight8(sseu->slice_mask) > 1;
>  	sseu->has_subslice_pg =
> -		IS_BROXTON(dev_priv) && sseu_subslice_total(sseu) > 1;
> +		IS_GEN9_LP(dev_priv) && sseu_subslice_total(sseu) > 1;
>  	sseu->has_eu_pg = sseu->eu_per_subslice > 2;
>  
>  	if (IS_BROXTON(dev_priv)) {
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index fb12896..8c18f72 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -3412,7 +3412,7 @@ intel_dp_set_signal_levels(struct intel_dp *intel_dp)
>  	if (HAS_DDI(dev_priv)) {
>  		signal_levels = ddi_signal_levels(intel_dp);
>  
> -		if (IS_BROXTON(dev_priv))
> +		if (IS_GEN9_LP(dev_priv))
>  			signal_levels = 0;
>  		else
>  			mask = DDI_BUF_EMP_MASK;
> diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c b/drivers/gpu/drm/i915/intel_guc_loader.c
> index 35d5690..aa2b866 100644
> --- a/drivers/gpu/drm/i915/intel_guc_loader.c
> +++ b/drivers/gpu/drm/i915/intel_guc_loader.c
> @@ -339,7 +339,7 @@ static u32 guc_wopcm_size(struct drm_i915_private *dev_priv)
>  	u32 wopcm_size = GUC_WOPCM_TOP;
>  
>  	/* On BXT, the top of WOPCM is reserved for RC6 context */
> -	if (IS_BROXTON(dev_priv))
> +	if (IS_GEN9_LP(dev_priv))
>  		wopcm_size -= BXT_GUC_WOPCM_RC6_RESERVED;
>  
>  	return wopcm_size;
> @@ -388,7 +388,7 @@ static int guc_ucode_xfer(struct drm_i915_private *dev_priv)
>  	if (IS_BXT_REVID(dev_priv, 0, BXT_REVID_B0))
>  		I915_WRITE(GEN6_GFXPAUSE, 0x30FFF);
>  
> -	if (IS_BROXTON(dev_priv))
> +	if (IS_GEN9_LP(dev_priv))
>  		I915_WRITE(GEN9LP_GT_PM_CONFIG, GT_DOORBELL_ENABLE);
>  	else
>  		I915_WRITE(GEN9_GT_PM_CONFIG, GT_DOORBELL_ENABLE);

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

^ permalink raw reply	[flat|nested] 15+ messages in thread
* Re: ✗ Fi.CI.BAT: warning for series starting with [1/3] drm/i915/DMC/GLK: Load DMC on GLK (rev2)
  2017-01-09 15:53 ` ✗ Fi.CI.BAT: warning for series starting with [1/3] drm/i915/DMC/GLK: Load DMC on GLK (rev2) Patchwork
@ 2017-01-10  9:09   ` Ander Conselvan De Oliveira
  0 siblings, 0 replies; 15+ messages in thread
From: Ander Conselvan De Oliveira @ 2017-01-10  9:09 UTC (permalink / raw)
  To: intel-gfx

On Mon, 2017-01-09 at 15:53 +0000, Patchwork wrote:
> == Series Details ==
> 
> Series: series starting with [1/3] drm/i915/DMC/GLK: Load DMC on GLK (rev2)
> URL   : https://patchwork.freedesktop.org/series/16926/
> State : warning
> 
> == Summary ==
> 
> Series 16926v2 Series without cover letter
> https://patchwork.freedesktop.org/api/1.0/series/16926/revisions/2/mbox/
> 
> Test kms_force_connector_basic:
>         Subgroup force-edid:
>                 pass       -> DMESG-WARN (fi-snb-2520m)

[drm:drm_edid_block_valid] *ERROR* EDID checksum is invalid, remainder is 115

https://bugs.freedesktop.org/show_bug.cgi?id=98625


All three pushed. Thanks for the patches and reviews.

Ander


> 
> fi-bdw-5557u     total:246  pass:232  dwarn:0   dfail:0   fail:0   skip:14 
> fi-bsw-n3050     total:246  pass:207  dwarn:0   dfail:0   fail:0   skip:39 
> fi-bxt-j4205     total:246  pass:224  dwarn:0   dfail:0   fail:0   skip:22 
> fi-bxt-t5700     total:82   pass:69   dwarn:0   dfail:0   fail:0   skip:12 
> fi-byt-j1900     total:246  pass:219  dwarn:0   dfail:0   fail:0   skip:27 
> fi-byt-n2820     total:246  pass:215  dwarn:0   dfail:0   fail:0   skip:31 
> fi-hsw-4770      total:246  pass:227  dwarn:0   dfail:0   fail:0   skip:19 
> fi-hsw-4770r     total:246  pass:227  dwarn:0   dfail:0   fail:0   skip:19 
> fi-ivb-3520m     total:246  pass:225  dwarn:0   dfail:0   fail:0   skip:21 
> fi-kbl-7500u     total:246  pass:225  dwarn:0   dfail:0   fail:0   skip:21 
> fi-skl-6260u     total:246  pass:233  dwarn:0   dfail:0   fail:0   skip:13 
> fi-skl-6700hq    total:246  pass:226  dwarn:0   dfail:0   fail:0   skip:20 
> fi-skl-6700k     total:246  pass:222  dwarn:3   dfail:0   fail:0   skip:21 
> fi-skl-6770hq    total:246  pass:233  dwarn:0   dfail:0   fail:0   skip:13 
> fi-snb-2520m     total:246  pass:214  dwarn:1   dfail:0   fail:0   skip:31 
> fi-snb-2600      total:246  pass:214  dwarn:0   dfail:0   fail:0   skip:32 
> 
> ea7e3e5c99e316fb6876399f9b32b2372e45c4af drm-tip: 2017y-01m-09d-14h-45m-54s
> UTC integration manifest
> 914ba9b drm/i915/glk: Convert a few more IS_BROXTON() to IS_GEN9_LP()
> 32dc09b drm/i915/glk: Add missing bits to allow runtime pm suspend on GLK.
> aa47b07 drm/i915/DMC/GLK: Load DMC on GLK
> 
> == Logs ==
> 
> For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3454/
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 15+ messages in thread
* Re: [PATCH v2] drm/i915/glk: Convert a few more IS_BROXTON() to IS_GEN9_LP()
  2017-01-09 17:11     ` Vivi, Rodrigo
@ 2017-01-10  9:52       ` Tomasz Lis
  0 siblings, 0 replies; 15+ messages in thread
From: Tomasz Lis @ 2017-01-10  9:52 UTC (permalink / raw)
  To: Vivi, Rodrigo, Conselvan De Oliveira, Ander
  Cc: Vetter, Daniel, intel-gfx@lists.freedesktop.org

Reviewed-by: Tomasz Lis <tomasz.lis@intel.com>

W dniu 2017-01-09 o 18:11, Vivi, Rodrigo pisze:
> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
>
> On Mon, 2017-01-09 at 16:51 +0200, Ander Conselvan de Oliveira wrote:
>> From: Michel Thierry <michel.thierry@intel.com>
>>
>> Commit cc3f90f0633c ("drm/i915/glk: Reuse broxton code for geminilake")
>> missed a few of occurences of IS_BROXTON() that should have been
>> coverted to IS_GEN9_LP().
>>
>> v2: Cite the right commit. (Ander)
>>
>> Fixes: cc3f90f0633c ("drm/i915/glk: Reuse broxton code for geminilake")
>> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
>> Cc: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
>> Cc: Daniel Vetter <daniel.vetter@intel.com>
>> Cc: Jani Nikula <jani.nikula@linux.intel.com>
>> Cc: intel-gfx@lists.freedesktop.org
>> Signed-off-by: Michel Thierry <michel.thierry@intel.com>
>> Signed-off-by: Tomasz Lis <tomasz.lis@intel.com>
>> Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
>> Reviewed-by: Tomasz Lis <tomasz.lis@intel.com> (v1)
>> ---
>>   drivers/gpu/drm/i915/i915_sysfs.c        | 2 +-
>>   drivers/gpu/drm/i915/intel_device_info.c | 2 +-
>>   drivers/gpu/drm/i915/intel_dp.c          | 2 +-
>>   drivers/gpu/drm/i915/intel_guc_loader.c  | 4 ++--
>>   4 files changed, 5 insertions(+), 5 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/i915_sysfs.c b/drivers/gpu/drm/i915/i915_sysfs.c
>> index 40c0ac7..376ac95 100644
>> --- a/drivers/gpu/drm/i915/i915_sysfs.c
>> +++ b/drivers/gpu/drm/i915/i915_sysfs.c
>> @@ -58,7 +58,7 @@ static u32 calc_residency(struct drm_i915_private *dev_priv,
>>   
>>   		if (I915_READ(VLV_COUNTER_CONTROL) & VLV_COUNT_RANGE_HIGH)
>>   			units <<= 8;
>> -	} else if (IS_BROXTON(dev_priv)) {
>> +	} else if (IS_GEN9_LP(dev_priv)) {
>>   		units = 1;
>>   		div = 1200;		/* 833.33ns */
>>   	}
>> diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c
>> index f642f6d..fcf8181 100644
>> --- a/drivers/gpu/drm/i915/intel_device_info.c
>> +++ b/drivers/gpu/drm/i915/intel_device_info.c
>> @@ -192,7 +192,7 @@ static void gen9_sseu_info_init(struct drm_i915_private *dev_priv)
>>   		(IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv)) &&
>>   		hweight8(sseu->slice_mask) > 1;
>>   	sseu->has_subslice_pg =
>> -		IS_BROXTON(dev_priv) && sseu_subslice_total(sseu) > 1;
>> +		IS_GEN9_LP(dev_priv) && sseu_subslice_total(sseu) > 1;
>>   	sseu->has_eu_pg = sseu->eu_per_subslice > 2;
>>   
>>   	if (IS_BROXTON(dev_priv)) {
>> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
>> index fb12896..8c18f72 100644
>> --- a/drivers/gpu/drm/i915/intel_dp.c
>> +++ b/drivers/gpu/drm/i915/intel_dp.c
>> @@ -3412,7 +3412,7 @@ intel_dp_set_signal_levels(struct intel_dp *intel_dp)
>>   	if (HAS_DDI(dev_priv)) {
>>   		signal_levels = ddi_signal_levels(intel_dp);
>>   
>> -		if (IS_BROXTON(dev_priv))
>> +		if (IS_GEN9_LP(dev_priv))
>>   			signal_levels = 0;
>>   		else
>>   			mask = DDI_BUF_EMP_MASK;
>> diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c b/drivers/gpu/drm/i915/intel_guc_loader.c
>> index 35d5690..aa2b866 100644
>> --- a/drivers/gpu/drm/i915/intel_guc_loader.c
>> +++ b/drivers/gpu/drm/i915/intel_guc_loader.c
>> @@ -339,7 +339,7 @@ static u32 guc_wopcm_size(struct drm_i915_private *dev_priv)
>>   	u32 wopcm_size = GUC_WOPCM_TOP;
>>   
>>   	/* On BXT, the top of WOPCM is reserved for RC6 context */
>> -	if (IS_BROXTON(dev_priv))
>> +	if (IS_GEN9_LP(dev_priv))
>>   		wopcm_size -= BXT_GUC_WOPCM_RC6_RESERVED;
>>   
>>   	return wopcm_size;
>> @@ -388,7 +388,7 @@ static int guc_ucode_xfer(struct drm_i915_private *dev_priv)
>>   	if (IS_BXT_REVID(dev_priv, 0, BXT_REVID_B0))
>>   		I915_WRITE(GEN6_GFXPAUSE, 0x30FFF);
>>   
>> -	if (IS_BROXTON(dev_priv))
>> +	if (IS_GEN9_LP(dev_priv))
>>   		I915_WRITE(GEN9LP_GT_PM_CONFIG, GT_DOORBELL_ENABLE);
>>   	else
>>   		I915_WRITE(GEN9_GT_PM_CONFIG, GT_DOORBELL_ENABLE);

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

^ permalink raw reply	[flat|nested] 15+ messages in thread
end of thread, other threads:[~2017-01-10  9:52 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-12-16 15:42 [PATCH 1/3] drm/i915/DMC/GLK: Load DMC on GLK Ander Conselvan de Oliveira
2016-12-16 15:42 ` [PATCH 2/3] drm/i915/glk: Add missing bits to allow runtime pm suspend " Ander Conselvan de Oliveira
2016-12-16 15:42 ` [PATCH 3/3] drm/i915/glk: Convert a few more IS_BROXTON() to IS_GEN9_LP() Ander Conselvan de Oliveira
2016-12-19 13:17   ` Tomasz Lis
2017-01-09 14:51   ` [PATCH v2] " Ander Conselvan de Oliveira
2017-01-09 17:11     ` Vivi, Rodrigo
2017-01-10  9:52       ` Tomasz Lis
2016-12-16 17:52 ` ✗ Fi.CI.BAT: failure for series starting with [1/3] drm/i915/DMC/GLK: Load DMC on GLK Patchwork
2016-12-20 12:53 ` Patchwork
2016-12-20 14:34   ` Ander Conselvan De Oliveira
2016-12-20 14:46     ` Chris Wilson
2016-12-20 15:10       ` Ander Conselvan De Oliveira
2017-01-09  9:23 ` ✓ Fi.CI.BAT: success " Patchwork
2017-01-09 15:53 ` ✗ Fi.CI.BAT: warning for series starting with [1/3] drm/i915/DMC/GLK: Load DMC on GLK (rev2) Patchwork
2017-01-10  9:09   ` Ander Conselvan De Oliveira

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).