[Intel-gfx] [PATCH] drm/i915: don't warn about Skylake CPU - KabyPoint PCH combo

[Vivi, Rodrigo]

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

> On Feb 1, 2017, at 5:46 AM, Nikula, Jani <jani.nikula at intel.com> wrote:
> 
> Apparently there are machines out there with Skylake CPU and KabyPoint
> PCH. Judging from our driver code, there doesn't seem to be any code
> paths that would do anything different between SunrisePoint and
> KabyPoint PCHs, so it would seem okay to accept the combo without
> warnings.
> 
> Fixes: 22dea0be50b2 ("drm/i915: Introduce Kabypoint PCH for Kabylake H/DT.")
> References: https://lists.freedesktop.org/archives/intel-gfx/2017-February/118611.html
> Reported-by: Rainer Koenig <Rainer.Koenig at ts.fujitsu.com>
> Cc: Rainer Koenig <Rainer.Koenig at ts.fujitsu.com>
> Cc: Rodrigo Vivi <rodrigo.vivi at intel.com>
> Cc: <stable at vger.kernel.org> # v4.8+
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>
> ---
> drivers/gpu/drm/i915/i915_drv.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index 267d5f8c49e1..6a430648fa71 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -213,7 +213,8 @@ static void intel_detect_pch(struct drm_i915_private *dev_priv)
>            } else if (id == INTEL_PCH_KBP_DEVICE_ID_TYPE) {
>                dev_priv->pch_type = PCH_KBP;
>                DRM_DEBUG_KMS("Found KabyPoint PCH\n");
> -                WARN_ON(!IS_KABYLAKE(dev_priv));
> +                WARN_ON(!IS_SKYLAKE(dev_priv) &&
> +                    !IS_KABYLAKE(dev_priv));
>            } else if ((id == INTEL_PCH_P2X_DEVICE_ID_TYPE) ||
>                   (id == INTEL_PCH_P3X_DEVICE_ID_TYPE) ||
>                   ((id == INTEL_PCH_QEMU_DEVICE_ID_TYPE) &&
> -- 
> 2.1.4
>