* [PATCH] drm/i915: don't warn about Skylake CPU - KabyPoint PCH combo
@ 2017-02-01 13:46 Jani Nikula
2017-02-01 14:57 ` Vivi, Rodrigo
0 siblings, 1 reply; 3+ messages in thread
From: Jani Nikula @ 2017-02-01 13:46 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula, Rainer Koenig, Rodrigo Vivi, stable
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@ts.fujitsu.com>
Cc: Rainer Koenig <Rainer.Koenig@ts.fujitsu.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: <stable@vger.kernel.org> # v4.8+
Signed-off-by: Jani Nikula <jani.nikula@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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] drm/i915: don't warn about Skylake CPU - KabyPoint PCH combo
2017-02-01 13:46 [PATCH] drm/i915: don't warn about Skylake CPU - KabyPoint PCH combo Jani Nikula
@ 2017-02-01 14:57 ` Vivi, Rodrigo
2017-02-02 14:27 ` Jani Nikula
0 siblings, 1 reply; 3+ messages in thread
From: Vivi, Rodrigo @ 2017-02-01 14:57 UTC (permalink / raw)
To: Nikula, Jani
Cc: intel-gfx@lists.freedesktop.org, Rainer Koenig,
stable@vger.kernel.org
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> On Feb 1, 2017, at 5:46 AM, Nikula, Jani <jani.nikula@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@ts.fujitsu.com>
> Cc: Rainer Koenig <Rainer.Koenig@ts.fujitsu.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Cc: <stable@vger.kernel.org> # v4.8+
> Signed-off-by: Jani Nikula <jani.nikula@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
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] drm/i915: don't warn about Skylake CPU - KabyPoint PCH combo
2017-02-01 14:57 ` Vivi, Rodrigo
@ 2017-02-02 14:27 ` Jani Nikula
0 siblings, 0 replies; 3+ messages in thread
From: Jani Nikula @ 2017-02-02 14:27 UTC (permalink / raw)
To: Vivi, Rodrigo
Cc: intel-gfx@lists.freedesktop.org, Rainer Koenig,
stable@vger.kernel.org
On Wed, 01 Feb 2017, "Vivi, Rodrigo" <rodrigo.vivi@intel.com> wrote:
> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Pushed to drm-intel-next-queued, thanks for the review.
BR,
Jani.
>
>> On Feb 1, 2017, at 5:46 AM, Nikula, Jani <jani.nikula@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@ts.fujitsu.com>
>> Cc: Rainer Koenig <Rainer.Koenig@ts.fujitsu.com>
>> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
>> Cc: <stable@vger.kernel.org> # v4.8+
>> Signed-off-by: Jani Nikula <jani.nikula@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
>>
--
Jani Nikula, Intel Open Source Technology Center
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-02-02 14:27 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-02-01 13:46 [PATCH] drm/i915: don't warn about Skylake CPU - KabyPoint PCH combo Jani Nikula
2017-02-01 14:57 ` Vivi, Rodrigo
2017-02-02 14:27 ` Jani Nikula
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).