* [PATCH] drm/i915: Fix and clean BDW PCH identification
@ 2015-01-20 18:18 Rodrigo Vivi
2015-01-21 3:08 ` shuang.he
2015-01-21 16:08 ` Jani Nikula
0 siblings, 2 replies; 9+ messages in thread
From: Rodrigo Vivi @ 2015-01-20 18:18 UTC (permalink / raw)
To: intel-gfx; +Cc: Jani Nikula, Paulo Zanoni, Rodrigo Vivi
It seems in the past we have BDW with PCH not been propperly identified
and we force it to be LPT and we were warning !IS_HASWELL on propper identification.
Now that products are out there we are receiveing logs with this incorrect WARN.
And also according to local tests on all production BDW here ULT or HALO we don't
need this force anymore. So let's clean this block for real.
Reference: https://bugs.freedesktop.org/attachment.cgi?id=110972
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Cc: Xion Zhang <xiong.y.zhang@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
drivers/gpu/drm/i915/i915_drv.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 308774f..1d14311 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -462,14 +462,9 @@ void intel_detect_pch(struct drm_device *dev)
} else if (id == INTEL_PCH_LPT_DEVICE_ID_TYPE) {
dev_priv->pch_type = PCH_LPT;
DRM_DEBUG_KMS("Found LynxPoint PCH\n");
- WARN_ON(!IS_HASWELL(dev));
+ WARN_ON(!IS_HASWELL(dev) && !IS_BROADWELL(dev));
WARN_ON(IS_HSW_ULT(dev));
- } else if (IS_BROADWELL(dev)) {
- dev_priv->pch_type = PCH_LPT;
- dev_priv->pch_id =
- INTEL_PCH_LPT_LP_DEVICE_ID_TYPE;
- DRM_DEBUG_KMS("This is Broadwell, assuming "
- "LynxPoint LP PCH\n");
+ WARN_ON(IS_BDW_ULT(dev));
} else if (id == INTEL_PCH_LPT_LP_DEVICE_ID_TYPE) {
dev_priv->pch_type = PCH_LPT;
DRM_DEBUG_KMS("Found LynxPoint LP PCH\n");
--
2.1.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH] drm/i915: Fix and clean BDW PCH identification
2015-01-20 18:18 [PATCH] drm/i915: Fix and clean BDW PCH identification Rodrigo Vivi
@ 2015-01-21 3:08 ` shuang.he
2015-01-21 16:08 ` Jani Nikula
1 sibling, 0 replies; 9+ messages in thread
From: shuang.he @ 2015-01-21 3:08 UTC (permalink / raw)
To: shuang.he, ethan.gao, intel-gfx, rodrigo.vivi
Tested-By: PRC QA PRTS (Patch Regression Test System Contact: shuang.he@intel.com)
Task id: 5616
-------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV -2 353/353 351/353
ILK 200/200 200/200
SNB 400/422 400/422
IVB 487/487 487/487
BYT 296/296 296/296
HSW 508/508 508/508
BDW 401/402 401/402
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
*PNV igt_gen3_render_linear_blits PASS(2, M25M23) NRUN(1, M23)
*PNV igt_gen3_render_mixed_blits PASS(2, M25M23) CRASH(1, M23)
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] drm/i915: Fix and clean BDW PCH identification
2015-01-20 18:18 [PATCH] drm/i915: Fix and clean BDW PCH identification Rodrigo Vivi
2015-01-21 3:08 ` shuang.he
@ 2015-01-21 16:08 ` Jani Nikula
2015-01-21 16:45 ` Rodrigo Vivi
1 sibling, 1 reply; 9+ messages in thread
From: Jani Nikula @ 2015-01-21 16:08 UTC (permalink / raw)
To: intel-gfx; +Cc: Paulo Zanoni, Rodrigo Vivi
On Tue, 20 Jan 2015, Rodrigo Vivi <rodrigo.vivi@intel.com> wrote:
> It seems in the past we have BDW with PCH not been propperly identified
> and we force it to be LPT and we were warning !IS_HASWELL on propper identification.
>
> Now that products are out there we are receiveing logs with this incorrect WARN.
> And also according to local tests on all production BDW here ULT or HALO we don't
> need this force anymore. So let's clean this block for real.
>
> Reference: https://bugs.freedesktop.org/attachment.cgi?id=110972
>
> Cc: Jani Nikula <jani.nikula@intel.com>
> Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
> Cc: Xion Zhang <xiong.y.zhang@intel.com>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
> drivers/gpu/drm/i915/i915_drv.c | 9 ++-------
> 1 file changed, 2 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index 308774f..1d14311 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -462,14 +462,9 @@ void intel_detect_pch(struct drm_device *dev)
> } else if (id == INTEL_PCH_LPT_DEVICE_ID_TYPE) {
> dev_priv->pch_type = PCH_LPT;
> DRM_DEBUG_KMS("Found LynxPoint PCH\n");
> - WARN_ON(!IS_HASWELL(dev));
> + WARN_ON(!IS_HASWELL(dev) && !IS_BROADWELL(dev));
> WARN_ON(IS_HSW_ULT(dev));
> - } else if (IS_BROADWELL(dev)) {
> - dev_priv->pch_type = PCH_LPT;
> - dev_priv->pch_id =
> - INTEL_PCH_LPT_LP_DEVICE_ID_TYPE;
> - DRM_DEBUG_KMS("This is Broadwell, assuming "
> - "LynxPoint LP PCH\n");
> + WARN_ON(IS_BDW_ULT(dev));
> } else if (id == INTEL_PCH_LPT_LP_DEVICE_ID_TYPE) {
> dev_priv->pch_type = PCH_LPT;
> DRM_DEBUG_KMS("Found LynxPoint LP PCH\n");
This will now produce a warn with the BDW ULT & LPT LP combo.
BR,
Jani.
> --
> 2.1.0
>
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH] drm/i915: Fix and clean BDW PCH identification
2015-01-21 16:08 ` Jani Nikula
@ 2015-01-21 16:45 ` Rodrigo Vivi
2015-01-21 17:22 ` Jani Nikula
0 siblings, 1 reply; 9+ messages in thread
From: Rodrigo Vivi @ 2015-01-21 16:45 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx, Paulo Zanoni, Rodrigo Vivi
On Wed, Jan 21, 2015 at 8:08 AM, Jani Nikula <jani.nikula@intel.com> wrote:
> On Tue, 20 Jan 2015, Rodrigo Vivi <rodrigo.vivi@intel.com> wrote:
>> It seems in the past we have BDW with PCH not been propperly identified
>> and we force it to be LPT and we were warning !IS_HASWELL on propper identification.
>>
>> Now that products are out there we are receiveing logs with this incorrect WARN.
>> And also according to local tests on all production BDW here ULT or HALO we don't
>> need this force anymore. So let's clean this block for real.
>>
>> Reference: https://bugs.freedesktop.org/attachment.cgi?id=110972
>>
>> Cc: Jani Nikula <jani.nikula@intel.com>
>> Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
>> Cc: Xion Zhang <xiong.y.zhang@intel.com>
>> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
>> ---
>> drivers/gpu/drm/i915/i915_drv.c | 9 ++-------
>> 1 file changed, 2 insertions(+), 7 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
>> index 308774f..1d14311 100644
>> --- a/drivers/gpu/drm/i915/i915_drv.c
>> +++ b/drivers/gpu/drm/i915/i915_drv.c
>> @@ -462,14 +462,9 @@ void intel_detect_pch(struct drm_device *dev)
>> } else if (id == INTEL_PCH_LPT_DEVICE_ID_TYPE) {
>> dev_priv->pch_type = PCH_LPT;
>> DRM_DEBUG_KMS("Found LynxPoint PCH\n");
>> - WARN_ON(!IS_HASWELL(dev));
>> + WARN_ON(!IS_HASWELL(dev) && !IS_BROADWELL(dev));
>> WARN_ON(IS_HSW_ULT(dev));
>> - } else if (IS_BROADWELL(dev)) {
>> - dev_priv->pch_type = PCH_LPT;
>> - dev_priv->pch_id =
>> - INTEL_PCH_LPT_LP_DEVICE_ID_TYPE;
>> - DRM_DEBUG_KMS("This is Broadwell, assuming "
>> - "LynxPoint LP PCH\n");
>> + WARN_ON(IS_BDW_ULT(dev));
>> } else if (id == INTEL_PCH_LPT_LP_DEVICE_ID_TYPE) {
>> dev_priv->pch_type = PCH_LPT;
>> DRM_DEBUG_KMS("Found LynxPoint LP PCH\n");
>
> This will now produce a warn with the BDW ULT & LPT LP combo.
No it wont. The LPT_LP identification is on the following block while
the WARN is on LPT (non LP) block.
>
> BR,
> Jani.
>
>> --
>> 2.1.0
>>
>
> --
> Jani Nikula, Intel Open Source Technology Center
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Rodrigo Vivi
Blog: http://blog.vivi.eng.br
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH] drm/i915: Fix and clean BDW PCH identification
2015-01-21 16:45 ` Rodrigo Vivi
@ 2015-01-21 17:22 ` Jani Nikula
2015-01-21 18:33 ` Rodrigo Vivi
0 siblings, 1 reply; 9+ messages in thread
From: Jani Nikula @ 2015-01-21 17:22 UTC (permalink / raw)
To: Rodrigo Vivi; +Cc: intel-gfx, Paulo Zanoni, Rodrigo Vivi
On Wed, 21 Jan 2015, Rodrigo Vivi <rodrigo.vivi@gmail.com> wrote:
> On Wed, Jan 21, 2015 at 8:08 AM, Jani Nikula <jani.nikula@intel.com> wrote:
>> On Tue, 20 Jan 2015, Rodrigo Vivi <rodrigo.vivi@intel.com> wrote:
>>> It seems in the past we have BDW with PCH not been propperly identified
>>> and we force it to be LPT and we were warning !IS_HASWELL on propper identification.
>>>
>>> Now that products are out there we are receiveing logs with this incorrect WARN.
>>> And also according to local tests on all production BDW here ULT or HALO we don't
>>> need this force anymore. So let's clean this block for real.
>>>
>>> Reference: https://bugs.freedesktop.org/attachment.cgi?id=110972
>>>
>>> Cc: Jani Nikula <jani.nikula@intel.com>
>>> Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
>>> Cc: Xion Zhang <xiong.y.zhang@intel.com>
>>> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
>>> ---
>>> drivers/gpu/drm/i915/i915_drv.c | 9 ++-------
>>> 1 file changed, 2 insertions(+), 7 deletions(-)
>>>
>>> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
>>> index 308774f..1d14311 100644
>>> --- a/drivers/gpu/drm/i915/i915_drv.c
>>> +++ b/drivers/gpu/drm/i915/i915_drv.c
>>> @@ -462,14 +462,9 @@ void intel_detect_pch(struct drm_device *dev)
>>> } else if (id == INTEL_PCH_LPT_DEVICE_ID_TYPE) {
>>> dev_priv->pch_type = PCH_LPT;
>>> DRM_DEBUG_KMS("Found LynxPoint PCH\n");
>>> - WARN_ON(!IS_HASWELL(dev));
>>> + WARN_ON(!IS_HASWELL(dev) && !IS_BROADWELL(dev));
>>> WARN_ON(IS_HSW_ULT(dev));
>>> - } else if (IS_BROADWELL(dev)) {
>>> - dev_priv->pch_type = PCH_LPT;
>>> - dev_priv->pch_id =
>>> - INTEL_PCH_LPT_LP_DEVICE_ID_TYPE;
>>> - DRM_DEBUG_KMS("This is Broadwell, assuming "
>>> - "LynxPoint LP PCH\n");
>>> + WARN_ON(IS_BDW_ULT(dev));
>>> } else if (id == INTEL_PCH_LPT_LP_DEVICE_ID_TYPE) {
>>> dev_priv->pch_type = PCH_LPT;
>>> DRM_DEBUG_KMS("Found LynxPoint LP PCH\n");
>>
>> This will now produce a warn with the BDW ULT & LPT LP combo.
>
> No it wont. The LPT_LP identification is on the following block while
> the WARN is on LPT (non LP) block.
I meant that the LPT LP block has
WARN_ON(!IS_HASWELL(dev));
WARN_ON(!IS_HSW_ULT(dev));
which will now warn on BDW.
BR,
Jani.
>
>>
>> BR,
>> Jani.
>>
>>> --
>>> 2.1.0
>>>
>>
>> --
>> Jani Nikula, Intel Open Source Technology Center
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx@lists.freedesktop.org
>> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
>
>
> --
> Rodrigo Vivi
> Blog: http://blog.vivi.eng.br
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH] drm/i915: Fix and clean BDW PCH identification
2015-01-21 17:22 ` Jani Nikula
@ 2015-01-21 18:33 ` Rodrigo Vivi
2015-01-21 18:40 ` Jani Nikula
2015-01-21 19:12 ` Jani Nikula
0 siblings, 2 replies; 9+ messages in thread
From: Rodrigo Vivi @ 2015-01-21 18:33 UTC (permalink / raw)
To: intel-gfx; +Cc: Jani Nikula, Paulo Zanoni, Rodrigo Vivi
It seems in the past we have BDW with PCH not been propperly identified
and we force it to be LPT and we were warning !IS_HASWELL on propper identification.
Now that products are out there we are receiveing logs with this incorrect WARN.
And also according to local tests on all production BDW here ULT or HALO we don't
need this force anymore. So let's clean this block for real.
v2: Fix LPT_LP WARNs to avoid wrong warns on BDW_ULT (By Jani).
Reference: https://bugs.freedesktop.org/attachment.cgi?id=110972
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Cc: Xion Zhang <xiong.y.zhang@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
drivers/gpu/drm/i915/i915_drv.c | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 6484229..66c72bd 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -462,19 +462,13 @@ void intel_detect_pch(struct drm_device *dev)
} else if (id == INTEL_PCH_LPT_DEVICE_ID_TYPE) {
dev_priv->pch_type = PCH_LPT;
DRM_DEBUG_KMS("Found LynxPoint PCH\n");
- WARN_ON(!IS_HASWELL(dev));
- WARN_ON(IS_HSW_ULT(dev));
- } else if (IS_BROADWELL(dev)) {
- dev_priv->pch_type = PCH_LPT;
- dev_priv->pch_id =
- INTEL_PCH_LPT_LP_DEVICE_ID_TYPE;
- DRM_DEBUG_KMS("This is Broadwell, assuming "
- "LynxPoint LP PCH\n");
+ WARN_ON(!IS_HASWELL(dev) && !IS_BROADWELL(dev));
+ WARN_ON(IS_HSW_ULT(dev) || IS_BDW_ULT(dev));
} else if (id == INTEL_PCH_LPT_LP_DEVICE_ID_TYPE) {
dev_priv->pch_type = PCH_LPT;
DRM_DEBUG_KMS("Found LynxPoint LP PCH\n");
- WARN_ON(!IS_HASWELL(dev));
- WARN_ON(!IS_HSW_ULT(dev));
+ WARN_ON(!IS_HASWELL(dev) && !IS_BROADWELL(dev));
+ WARN_ON(!IS_HSW_ULT(dev) && !IS_BDW_ULT(dev));
} else if (id == INTEL_PCH_SPT_DEVICE_ID_TYPE) {
dev_priv->pch_type = PCH_SPT;
DRM_DEBUG_KMS("Found SunrisePoint PCH\n");
--
2.1.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH] drm/i915: Fix and clean BDW PCH identification
2015-01-21 18:33 ` Rodrigo Vivi
@ 2015-01-21 18:40 ` Jani Nikula
2015-01-22 6:15 ` Daniel Vetter
2015-01-21 19:12 ` Jani Nikula
1 sibling, 1 reply; 9+ messages in thread
From: Jani Nikula @ 2015-01-21 18:40 UTC (permalink / raw)
To: intel-gfx; +Cc: Paulo Zanoni, Rodrigo Vivi
On Wed, 21 Jan 2015, Rodrigo Vivi <rodrigo.vivi@intel.com> wrote:
> It seems in the past we have BDW with PCH not been propperly identified
> and we force it to be LPT and we were warning !IS_HASWELL on propper identification.
>
> Now that products are out there we are receiveing logs with this incorrect WARN.
> And also according to local tests on all production BDW here ULT or HALO we don't
> need this force anymore. So let's clean this block for real.
>
> v2: Fix LPT_LP WARNs to avoid wrong warns on BDW_ULT (By Jani).
>
> Reference: https://bugs.freedesktop.org/attachment.cgi?id=110972
>
> Cc: Jani Nikula <jani.nikula@intel.com>
> Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
> Cc: Xion Zhang <xiong.y.zhang@intel.com>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
With the caveat that I have no idea how common the early pre-release
Broadwells that do *not* have proper pch identification are,
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
> ---
> drivers/gpu/drm/i915/i915_drv.c | 14 ++++----------
> 1 file changed, 4 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index 6484229..66c72bd 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -462,19 +462,13 @@ void intel_detect_pch(struct drm_device *dev)
> } else if (id == INTEL_PCH_LPT_DEVICE_ID_TYPE) {
> dev_priv->pch_type = PCH_LPT;
> DRM_DEBUG_KMS("Found LynxPoint PCH\n");
> - WARN_ON(!IS_HASWELL(dev));
> - WARN_ON(IS_HSW_ULT(dev));
> - } else if (IS_BROADWELL(dev)) {
> - dev_priv->pch_type = PCH_LPT;
> - dev_priv->pch_id =
> - INTEL_PCH_LPT_LP_DEVICE_ID_TYPE;
> - DRM_DEBUG_KMS("This is Broadwell, assuming "
> - "LynxPoint LP PCH\n");
> + WARN_ON(!IS_HASWELL(dev) && !IS_BROADWELL(dev));
> + WARN_ON(IS_HSW_ULT(dev) || IS_BDW_ULT(dev));
> } else if (id == INTEL_PCH_LPT_LP_DEVICE_ID_TYPE) {
> dev_priv->pch_type = PCH_LPT;
> DRM_DEBUG_KMS("Found LynxPoint LP PCH\n");
> - WARN_ON(!IS_HASWELL(dev));
> - WARN_ON(!IS_HSW_ULT(dev));
> + WARN_ON(!IS_HASWELL(dev) && !IS_BROADWELL(dev));
> + WARN_ON(!IS_HSW_ULT(dev) && !IS_BDW_ULT(dev));
> } else if (id == INTEL_PCH_SPT_DEVICE_ID_TYPE) {
> dev_priv->pch_type = PCH_SPT;
> DRM_DEBUG_KMS("Found SunrisePoint PCH\n");
> --
> 2.1.0
>
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH] drm/i915: Fix and clean BDW PCH identification
2015-01-21 18:40 ` Jani Nikula
@ 2015-01-22 6:15 ` Daniel Vetter
0 siblings, 0 replies; 9+ messages in thread
From: Daniel Vetter @ 2015-01-22 6:15 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx, Paulo Zanoni, Rodrigo Vivi
On Wed, Jan 21, 2015 at 08:40:02PM +0200, Jani Nikula wrote:
> On Wed, 21 Jan 2015, Rodrigo Vivi <rodrigo.vivi@intel.com> wrote:
> > It seems in the past we have BDW with PCH not been propperly identified
> > and we force it to be LPT and we were warning !IS_HASWELL on propper identification.
> >
> > Now that products are out there we are receiveing logs with this incorrect WARN.
> > And also according to local tests on all production BDW here ULT or HALO we don't
> > need this force anymore. So let's clean this block for real.
> >
> > v2: Fix LPT_LP WARNs to avoid wrong warns on BDW_ULT (By Jani).
> >
> > Reference: https://bugs.freedesktop.org/attachment.cgi?id=110972
> >
> > Cc: Jani Nikula <jani.nikula@intel.com>
> > Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
> > Cc: Xion Zhang <xiong.y.zhang@intel.com>
> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
>
> With the caveat that I have no idea how common the early pre-release
> Broadwells that do *not* have proper pch identification are,
Generally we throw out all preproduction hacks once production machines
are widely available. Which is the case now for bdw, so imo no concern.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] drm/i915: Fix and clean BDW PCH identification
2015-01-21 18:33 ` Rodrigo Vivi
2015-01-21 18:40 ` Jani Nikula
@ 2015-01-21 19:12 ` Jani Nikula
1 sibling, 0 replies; 9+ messages in thread
From: Jani Nikula @ 2015-01-21 19:12 UTC (permalink / raw)
To: intel-gfx; +Cc: Paulo Zanoni, Rodrigo Vivi
On Wed, 21 Jan 2015, Rodrigo Vivi <rodrigo.vivi@intel.com> wrote:
> It seems in the past we have BDW with PCH not been propperly identified
> and we force it to be LPT and we were warning !IS_HASWELL on propper identification.
>
> Now that products are out there we are receiveing logs with this incorrect WARN.
> And also according to local tests on all production BDW here ULT or HALO we don't
> need this force anymore. So let's clean this block for real.
>
> v2: Fix LPT_LP WARNs to avoid wrong warns on BDW_ULT (By Jani).
>
> Reference: https://bugs.freedesktop.org/attachment.cgi?id=110972
>
> Cc: Jani Nikula <jani.nikula@intel.com>
> Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
> Cc: Xion Zhang <xiong.y.zhang@intel.com>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Pushed to drm-intel-fixes with cc: stable, thanks for the patch.
BR,
Jani.
> ---
> drivers/gpu/drm/i915/i915_drv.c | 14 ++++----------
> 1 file changed, 4 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index 6484229..66c72bd 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -462,19 +462,13 @@ void intel_detect_pch(struct drm_device *dev)
> } else if (id == INTEL_PCH_LPT_DEVICE_ID_TYPE) {
> dev_priv->pch_type = PCH_LPT;
> DRM_DEBUG_KMS("Found LynxPoint PCH\n");
> - WARN_ON(!IS_HASWELL(dev));
> - WARN_ON(IS_HSW_ULT(dev));
> - } else if (IS_BROADWELL(dev)) {
> - dev_priv->pch_type = PCH_LPT;
> - dev_priv->pch_id =
> - INTEL_PCH_LPT_LP_DEVICE_ID_TYPE;
> - DRM_DEBUG_KMS("This is Broadwell, assuming "
> - "LynxPoint LP PCH\n");
> + WARN_ON(!IS_HASWELL(dev) && !IS_BROADWELL(dev));
> + WARN_ON(IS_HSW_ULT(dev) || IS_BDW_ULT(dev));
> } else if (id == INTEL_PCH_LPT_LP_DEVICE_ID_TYPE) {
> dev_priv->pch_type = PCH_LPT;
> DRM_DEBUG_KMS("Found LynxPoint LP PCH\n");
> - WARN_ON(!IS_HASWELL(dev));
> - WARN_ON(!IS_HSW_ULT(dev));
> + WARN_ON(!IS_HASWELL(dev) && !IS_BROADWELL(dev));
> + WARN_ON(!IS_HSW_ULT(dev) && !IS_BDW_ULT(dev));
> } else if (id == INTEL_PCH_SPT_DEVICE_ID_TYPE) {
> dev_priv->pch_type = PCH_SPT;
> DRM_DEBUG_KMS("Found SunrisePoint PCH\n");
> --
> 2.1.0
>
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2015-01-22 6:15 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-01-20 18:18 [PATCH] drm/i915: Fix and clean BDW PCH identification Rodrigo Vivi
2015-01-21 3:08 ` shuang.he
2015-01-21 16:08 ` Jani Nikula
2015-01-21 16:45 ` Rodrigo Vivi
2015-01-21 17:22 ` Jani Nikula
2015-01-21 18:33 ` Rodrigo Vivi
2015-01-21 18:40 ` Jani Nikula
2015-01-22 6:15 ` Daniel Vetter
2015-01-21 19:12 ` Jani Nikula
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox