All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drm/i915: don't warn about Skylake CPU - KabyPoint PCH combo
@ 2017-02-01 13:46 ` Jani Nikula
  0 siblings, 0 replies; 6+ 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] 6+ messages in thread
* [PATCH] drm/i915: don't warn about Skylake CPU - KabyPoint PCH combo
@ 2017-02-01 13:46 ` Jani Nikula
  0 siblings, 0 replies; 6+ 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] 6+ messages in thread
* Re: [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
  2017-02-02 14:27     ` Jani Nikula
  -1 siblings, 1 reply; 6+ messages in thread
From: Vivi, Rodrigo @ 2017-02-01 14:57 UTC (permalink / raw)
  To: Nikula, Jani; +Cc: intel-gfx, Rainer Koenig, stable



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] 6+ messages in thread
* ✓ Fi.CI.BAT: success for drm/i915: don't warn about Skylake CPU - KabyPoint PCH combo
  2017-02-01 13:46 ` Jani Nikula
  (?)
  (?)
@ 2017-02-01 16:24 ` Patchwork
  -1 siblings, 0 replies; 6+ messages in thread
From: Patchwork @ 2017-02-01 16:24 UTC (permalink / raw)
  To: Jani Nikula; +Cc: intel-gfx

== Series Details ==

Series: drm/i915: don't warn about Skylake CPU - KabyPoint PCH combo
URL   : https://patchwork.freedesktop.org/series/18924/
State : success

== Summary ==

Series 18924v1 drm/i915: don't warn about Skylake CPU - KabyPoint PCH combo
https://patchwork.freedesktop.org/api/1.0/series/18924/revisions/1/mbox/


fi-bdw-5557u     total:247  pass:233  dwarn:0   dfail:0   fail:0   skip:14 
fi-bsw-n3050     total:247  pass:208  dwarn:0   dfail:0   fail:0   skip:39 
fi-bxt-j4205     total:247  pass:225  dwarn:0   dfail:0   fail:0   skip:22 
fi-bxt-t5700     total:78   pass:65   dwarn:0   dfail:0   fail:0   skip:12 
fi-byt-j1900     total:247  pass:220  dwarn:0   dfail:0   fail:0   skip:27 
fi-byt-n2820     total:247  pass:216  dwarn:0   dfail:0   fail:0   skip:31 
fi-hsw-4770      total:247  pass:228  dwarn:0   dfail:0   fail:0   skip:19 
fi-hsw-4770r     total:247  pass:228  dwarn:0   dfail:0   fail:0   skip:19 
fi-ivb-3520m     total:247  pass:226  dwarn:0   dfail:0   fail:0   skip:21 
fi-ivb-3770      total:247  pass:226  dwarn:0   dfail:0   fail:0   skip:21 
fi-kbl-7500u     total:247  pass:224  dwarn:0   dfail:0   fail:2   skip:21 
fi-skl-6260u     total:247  pass:234  dwarn:0   dfail:0   fail:0   skip:13 
fi-skl-6700hq    total:247  pass:227  dwarn:0   dfail:0   fail:0   skip:20 
fi-skl-6700k     total:247  pass:222  dwarn:4   dfail:0   fail:0   skip:21 
fi-snb-2520m     total:247  pass:216  dwarn:0   dfail:0   fail:0   skip:31 
fi-snb-2600      total:247  pass:215  dwarn:0   dfail:0   fail:0   skip:32 

8126864ab4eab95a09af5677535e8ccae3b6b73a drm-tip: 2017y-02m-01d-15h-25m-23s UTC integration manifest
0557387 drm/i915: don't warn about Skylake CPU - KabyPoint PCH combo

== Logs ==

For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3666/
_______________________________________________
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] 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; 6+ messages in thread
From: Jani Nikula @ 2017-02-02 14:27 UTC (permalink / raw)
  To: Vivi, Rodrigo; +Cc: intel-gfx, Rainer Koenig, stable

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] 6+ messages in thread
* Re: [PATCH] drm/i915: don't warn about Skylake CPU - KabyPoint PCH combo
@ 2017-02-02 14:27     ` Jani Nikula
  0 siblings, 0 replies; 6+ messages in thread
From: Jani Nikula @ 2017-02-02 14:27 UTC (permalink / raw)
  To: Vivi, Rodrigo; +Cc: intel-gfx, Rainer Koenig, stable

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] 6+ messages in thread
end of thread, other threads:[~2017-02-02 14:27 UTC | newest]

Thread overview: 6+ 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 13:46 ` Jani Nikula
2017-02-01 14:57 ` Vivi, Rodrigo
2017-02-02 14:27   ` Jani Nikula
2017-02-02 14:27     ` Jani Nikula
2017-02-01 16:24 ` ✓ Fi.CI.BAT: success for " Patchwork

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.