* [PATCH 1/2] drm/i915: add a few missing platform tags to workaround tags
@ 2016-09-26 12:07 Jani Nikula
2016-09-26 12:07 ` [PATCH 2/2] drm/i915/skl: tell the user about pre-production hardware Jani Nikula
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Jani Nikula @ 2016-09-26 12:07 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula, Paulo Zanoni
Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/intel_guc_loader.c | 2 +-
drivers/gpu/drm/i915/intel_pm.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c b/drivers/gpu/drm/i915/intel_guc_loader.c
index a4e37c8db782..7ace96be82a8 100644
--- a/drivers/gpu/drm/i915/intel_guc_loader.c
+++ b/drivers/gpu/drm/i915/intel_guc_loader.c
@@ -381,7 +381,7 @@ static int guc_ucode_xfer(struct drm_i915_private *dev_priv)
~GUC_ENABLE_MIA_CLOCK_GATING));
}
- /* WaC6DisallowByGfxPause*/
+ /* WaC6DisallowByGfxPause:bxt */
if (IS_BXT_REVID(dev, 0, BXT_REVID_B0))
I915_WRITE(GEN6_GFXPAUSE, 0x30FFF);
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index a860c4082eb8..fa6472b2d0c7 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -5334,7 +5334,7 @@ static void gen9_enable_rc6(struct drm_i915_private *dev_priv)
if (intel_enable_rc6() & INTEL_RC6_ENABLE)
rc6_mask = GEN6_RC_CTL_RC6_ENABLE;
DRM_INFO("RC6 %s\n", onoff(rc6_mask & GEN6_RC_CTL_RC6_ENABLE));
- /* WaRsUseTimeoutMode */
+ /* WaRsUseTimeoutMode:bxt */
if (IS_BXT_REVID(dev_priv, 0, BXT_REVID_A1)) {
I915_WRITE(GEN6_RC6_THRESHOLD, 625); /* 800us */
I915_WRITE(GEN6_RC_CONTROL, GEN6_RC_CTL_HW_ENABLE |
--
2.1.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/2] drm/i915/skl: tell the user about pre-production hardware
2016-09-26 12:07 [PATCH 1/2] drm/i915: add a few missing platform tags to workaround tags Jani Nikula
@ 2016-09-26 12:07 ` Jani Nikula
2016-09-26 13:20 ` ✗ Fi.CI.BAT: warning for series starting with [1/2] drm/i915: add a few missing platform tags to workaround tags Patchwork
2016-09-26 17:53 ` [PATCH 1/2] " Paulo Zanoni
2 siblings, 0 replies; 6+ messages in thread
From: Jani Nikula @ 2016-09-26 12:07 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula, Paulo Zanoni
From: Paulo Zanoni <paulo.r.zanoni@intel.com>
We just removed the implementation for all the pre-production
workarounds, so now tell the user that we expect his machine to not
work properly. Also convert this to DRM_ERROR so we can more easily
spot these problems in bug reports and CI/QA runs.
Cc: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
resending here to get CI results
---
drivers/gpu/drm/i915/i915_drv.c | 21 ++++++++++++++-------
1 file changed, 14 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index bfb2efd8d4d4..9c1543240e27 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -771,6 +771,19 @@ static void i915_workqueues_cleanup(struct drm_i915_private *dev_priv)
destroy_workqueue(dev_priv->wq);
}
+/*
+ * We don't keep the workarounds for pre-production hardware, so we expect our
+ * driver to fail on these machines in one way or another. A little warning on
+ * dmesg may help both the user and the bug triagers.
+ */
+static void intel_detect_preproduction_hw(struct drm_i915_private *dev_priv)
+{
+ if (IS_HSW_EARLY_SDV(dev_priv) ||
+ IS_SKL_REVID(dev_priv, 0, SKL_REVID_F0))
+ DRM_ERROR("This is a pre-production stepping. "
+ "It may not be fully functional.\n");
+}
+
/**
* i915_driver_init_early - setup state not requiring device access
* @dev_priv: device private
@@ -838,13 +851,7 @@ static int i915_driver_init_early(struct drm_i915_private *dev_priv,
intel_device_info_dump(dev_priv);
- /* Not all pre-production machines fall into this category, only the
- * very first ones. Almost everything should work, except for maybe
- * suspend/resume. And we don't implement workarounds that affect only
- * pre-production machines. */
- if (IS_HSW_EARLY_SDV(dev_priv))
- DRM_INFO("This is an early pre-production Haswell machine. "
- "It may not be fully functional.\n");
+ intel_detect_preproduction_hw(dev_priv);
return 0;
--
2.1.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 6+ messages in thread* ✗ Fi.CI.BAT: warning for series starting with [1/2] drm/i915: add a few missing platform tags to workaround tags
2016-09-26 12:07 [PATCH 1/2] drm/i915: add a few missing platform tags to workaround tags Jani Nikula
2016-09-26 12:07 ` [PATCH 2/2] drm/i915/skl: tell the user about pre-production hardware Jani Nikula
@ 2016-09-26 13:20 ` Patchwork
2016-09-26 17:51 ` Paulo Zanoni
2016-09-26 17:53 ` [PATCH 1/2] " Paulo Zanoni
2 siblings, 1 reply; 6+ messages in thread
From: Patchwork @ 2016-09-26 13:20 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
== Series Details ==
Series: series starting with [1/2] drm/i915: add a few missing platform tags to workaround tags
URL : https://patchwork.freedesktop.org/series/12925/
State : warning
== Summary ==
Series 12925v1 Series without cover letter
https://patchwork.freedesktop.org/api/1.0/series/12925/revisions/1/mbox/
Test kms_cursor_legacy:
Subgroup basic-flip-before-cursor-legacy:
pass -> DMESG-WARN (fi-skl-6700k)
Test kms_psr_sink_crc:
Subgroup psr_basic:
dmesg-warn -> PASS (fi-skl-6700hq)
fi-bdw-5557u total:244 pass:229 dwarn:0 dfail:0 fail:0 skip:15
fi-bsw-n3050 total:244 pass:202 dwarn:0 dfail:0 fail:0 skip:42
fi-byt-n2820 total:244 pass:208 dwarn:0 dfail:0 fail:1 skip:35
fi-hsw-4770 total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22
fi-hsw-4770r total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22
fi-ilk-650 total:244 pass:182 dwarn:0 dfail:0 fail:2 skip:60
fi-ivb-3520m total:244 pass:219 dwarn:0 dfail:0 fail:0 skip:25
fi-ivb-3770 total:244 pass:207 dwarn:0 dfail:0 fail:0 skip:37
fi-skl-6260u total:244 pass:230 dwarn:0 dfail:0 fail:0 skip:14
fi-skl-6700hq total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22
fi-skl-6700k total:244 pass:218 dwarn:2 dfail:0 fail:0 skip:24
fi-skl-6770hq total:244 pass:228 dwarn:1 dfail:0 fail:1 skip:14
fi-snb-2520m total:244 pass:208 dwarn:0 dfail:0 fail:0 skip:36
fi-snb-2600 total:244 pass:207 dwarn:0 dfail:0 fail:0 skip:37
Results at /archive/results/CI_IGT_test/Patchwork_2576/
aab15c274da587bcab19376d2caa9d6626440335 drm-intel-nightly: 2016y-09m-26d-12h-11m-33s UTC integration manifest
dd59906 drm/i915/skl: tell the user about pre-production hardware
f9db5c5 drm/i915: add a few missing platform tags to workaround tags
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: ✗ Fi.CI.BAT: warning for series starting with [1/2] drm/i915: add a few missing platform tags to workaround tags
2016-09-26 13:20 ` ✗ Fi.CI.BAT: warning for series starting with [1/2] drm/i915: add a few missing platform tags to workaround tags Patchwork
@ 2016-09-26 17:51 ` Paulo Zanoni
0 siblings, 0 replies; 6+ messages in thread
From: Paulo Zanoni @ 2016-09-26 17:51 UTC (permalink / raw)
To: intel-gfx, Jani Nikula
Em Seg, 2016-09-26 às 13:20 +0000, Patchwork escreveu:
> == Series Details ==
>
> Series: series starting with [1/2] drm/i915: add a few missing
> platform tags to workaround tags
> URL : https://patchwork.freedesktop.org/series/12925/
> State : warning
>
> == Summary ==
>
> Series 12925v1 Series without cover letter
> https://patchwork.freedesktop.org/api/1.0/series/12925/revisions/1/mb
> ox/
>
> Test kms_cursor_legacy:
> Subgroup basic-flip-before-cursor-legacy:
> pass -> DMESG-WARN (fi-skl-6700k)
That's "just" a FIFO underrun, which is unfortunately normal for SKL.
> Test kms_psr_sink_crc:
> Subgroup psr_basic:
> dmesg-warn -> PASS (fi-skl-6700hq)
>
> fi-bdw-
> 5557u total:244 pass:229 dwarn:0 dfail:0 fail:0 skip:15
> fi-bsw-
> n3050 total:244 pass:202 dwarn:0 dfail:0 fail:0 skip:42
> fi-byt-
> n2820 total:244 pass:208 dwarn:0 dfail:0 fail:1 skip:35
> fi-hsw-
> 4770 total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22
> fi-hsw-
> 4770r total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22
> fi-ilk-
> 650 total:244 pass:182 dwarn:0 dfail:0 fail:2 skip:60
> fi-ivb-
> 3520m total:244 pass:219 dwarn:0 dfail:0 fail:0 skip:25
> fi-ivb-
> 3770 total:244 pass:207 dwarn:0 dfail:0 fail:0 skip:37
> fi-skl-
> 6260u total:244 pass:230 dwarn:0 dfail:0 fail:0 skip:14
> fi-skl-
> 6700hq total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22
> fi-skl-
> 6700k total:244 pass:218 dwarn:2 dfail:0 fail:0 skip:24
> fi-skl-
> 6770hq total:244 pass:228 dwarn:1 dfail:0 fail:1 skip:14
> fi-snb-
> 2520m total:244 pass:208 dwarn:0 dfail:0 fail:0 skip:36
> fi-snb-
> 2600 total:244 pass:207 dwarn:0 dfail:0 fail:0 skip:37
>
> Results at /archive/results/CI_IGT_test/Patchwork_2576/
>
> aab15c274da587bcab19376d2caa9d6626440335 drm-intel-nightly: 2016y-
> 09m-26d-12h-11m-33s UTC integration manifest
> dd59906 drm/i915/skl: tell the user about pre-production hardware
> f9db5c5 drm/i915: add a few missing platform tags to workaround tags
>
> _______________________________________________
> 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] 6+ messages in thread
* Re: [PATCH 1/2] drm/i915: add a few missing platform tags to workaround tags
2016-09-26 12:07 [PATCH 1/2] drm/i915: add a few missing platform tags to workaround tags Jani Nikula
2016-09-26 12:07 ` [PATCH 2/2] drm/i915/skl: tell the user about pre-production hardware Jani Nikula
2016-09-26 13:20 ` ✗ Fi.CI.BAT: warning for series starting with [1/2] drm/i915: add a few missing platform tags to workaround tags Patchwork
@ 2016-09-26 17:53 ` Paulo Zanoni
2016-09-27 6:45 ` Jani Nikula
2 siblings, 1 reply; 6+ messages in thread
From: Paulo Zanoni @ 2016-09-26 17:53 UTC (permalink / raw)
To: Jani Nikula, intel-gfx
Em Seg, 2016-09-26 às 15:07 +0300, Jani Nikula escreveu:
> Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
> ---
> drivers/gpu/drm/i915/intel_guc_loader.c | 2 +-
> drivers/gpu/drm/i915/intel_pm.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c
> b/drivers/gpu/drm/i915/intel_guc_loader.c
> index a4e37c8db782..7ace96be82a8 100644
> --- a/drivers/gpu/drm/i915/intel_guc_loader.c
> +++ b/drivers/gpu/drm/i915/intel_guc_loader.c
> @@ -381,7 +381,7 @@ static int guc_ucode_xfer(struct drm_i915_private
> *dev_priv)
> ~GUC_ENABLE_MIA_CLOCK_
> GATING));
> }
>
> - /* WaC6DisallowByGfxPause*/
> + /* WaC6DisallowByGfxPause:bxt */
> if (IS_BXT_REVID(dev, 0, BXT_REVID_B0))
> I915_WRITE(GEN6_GFXPAUSE, 0x30FFF);
>
> diff --git a/drivers/gpu/drm/i915/intel_pm.c
> b/drivers/gpu/drm/i915/intel_pm.c
> index a860c4082eb8..fa6472b2d0c7 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -5334,7 +5334,7 @@ static void gen9_enable_rc6(struct
> drm_i915_private *dev_priv)
> if (intel_enable_rc6() & INTEL_RC6_ENABLE)
> rc6_mask = GEN6_RC_CTL_RC6_ENABLE;
> DRM_INFO("RC6 %s\n", onoff(rc6_mask &
> GEN6_RC_CTL_RC6_ENABLE));
> - /* WaRsUseTimeoutMode */
> + /* WaRsUseTimeoutMode:bxt */
> if (IS_BXT_REVID(dev_priv, 0, BXT_REVID_A1)) {
> I915_WRITE(GEN6_RC6_THRESHOLD, 625); /* 800us */
> I915_WRITE(GEN6_RC_CONTROL, GEN6_RC_CTL_HW_ENABLE |
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 1/2] drm/i915: add a few missing platform tags to workaround tags
2016-09-26 17:53 ` [PATCH 1/2] " Paulo Zanoni
@ 2016-09-27 6:45 ` Jani Nikula
0 siblings, 0 replies; 6+ messages in thread
From: Jani Nikula @ 2016-09-27 6:45 UTC (permalink / raw)
To: Paulo Zanoni, intel-gfx
On Mon, 26 Sep 2016, Paulo Zanoni <paulo.r.zanoni@intel.com> wrote:
> Em Seg, 2016-09-26 às 15:07 +0300, Jani Nikula escreveu:
>> Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>
> Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Thanks, pushed both to dinq.
BR,
Jani.
>
>> ---
>> drivers/gpu/drm/i915/intel_guc_loader.c | 2 +-
>> drivers/gpu/drm/i915/intel_pm.c | 2 +-
>> 2 files changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c
>> b/drivers/gpu/drm/i915/intel_guc_loader.c
>> index a4e37c8db782..7ace96be82a8 100644
>> --- a/drivers/gpu/drm/i915/intel_guc_loader.c
>> +++ b/drivers/gpu/drm/i915/intel_guc_loader.c
>> @@ -381,7 +381,7 @@ static int guc_ucode_xfer(struct drm_i915_private
>> *dev_priv)
>> ~GUC_ENABLE_MIA_CLOCK_
>> GATING));
>> }
>>
>> - /* WaC6DisallowByGfxPause*/
>> + /* WaC6DisallowByGfxPause:bxt */
>> if (IS_BXT_REVID(dev, 0, BXT_REVID_B0))
>> I915_WRITE(GEN6_GFXPAUSE, 0x30FFF);
>>
>> diff --git a/drivers/gpu/drm/i915/intel_pm.c
>> b/drivers/gpu/drm/i915/intel_pm.c
>> index a860c4082eb8..fa6472b2d0c7 100644
>> --- a/drivers/gpu/drm/i915/intel_pm.c
>> +++ b/drivers/gpu/drm/i915/intel_pm.c
>> @@ -5334,7 +5334,7 @@ static void gen9_enable_rc6(struct
>> drm_i915_private *dev_priv)
>> if (intel_enable_rc6() & INTEL_RC6_ENABLE)
>> rc6_mask = GEN6_RC_CTL_RC6_ENABLE;
>> DRM_INFO("RC6 %s\n", onoff(rc6_mask &
>> GEN6_RC_CTL_RC6_ENABLE));
>> - /* WaRsUseTimeoutMode */
>> + /* WaRsUseTimeoutMode:bxt */
>> if (IS_BXT_REVID(dev_priv, 0, BXT_REVID_A1)) {
>> I915_WRITE(GEN6_RC6_THRESHOLD, 625); /* 800us */
>> I915_WRITE(GEN6_RC_CONTROL, GEN6_RC_CTL_HW_ENABLE |
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-09-27 6:45 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-09-26 12:07 [PATCH 1/2] drm/i915: add a few missing platform tags to workaround tags Jani Nikula
2016-09-26 12:07 ` [PATCH 2/2] drm/i915/skl: tell the user about pre-production hardware Jani Nikula
2016-09-26 13:20 ` ✗ Fi.CI.BAT: warning for series starting with [1/2] drm/i915: add a few missing platform tags to workaround tags Patchwork
2016-09-26 17:51 ` Paulo Zanoni
2016-09-26 17:53 ` [PATCH 1/2] " Paulo Zanoni
2016-09-27 6:45 ` Jani Nikula
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.