[Intel-gfx] [PATCH] drm/i915: Fix and clean BDW PCH identification

[Jani Nikula]

On Wed, 21 Jan 2015, Rodrigo Vivi <rodrigo.vivi at gmail.com> wrote:
> On Wed, Jan 21, 2015 at 8:08 AM, Jani Nikula <jani.nikula at intel.com> wrote:
>> On Tue, 20 Jan 2015, Rodrigo Vivi <rodrigo.vivi at 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 at intel.com>
>>> Cc: Paulo Zanoni <paulo.r.zanoni at intel.com>
>>> Cc: Xion Zhang <xiong.y.zhang at intel.com>
>>> Signed-off-by: Rodrigo Vivi <rodrigo.vivi at 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 at 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