From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com ([192.55.52.93]:65283 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750881AbdBBO1v (ORCPT ); Thu, 2 Feb 2017 09:27:51 -0500 From: Jani Nikula To: "Vivi\, Rodrigo" Cc: "intel-gfx\@lists.freedesktop.org" , Rainer Koenig , "stable\@vger.kernel.org" Subject: Re: [PATCH] drm/i915: don't warn about Skylake CPU - KabyPoint PCH combo In-Reply-To: References: <1485956769-26015-1-git-send-email-jani.nikula@intel.com> Date: Thu, 02 Feb 2017 16:27:48 +0200 Message-ID: <877f58zmzf.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Sender: stable-owner@vger.kernel.org List-ID: On Wed, 01 Feb 2017, "Vivi, Rodrigo" wrote: > Reviewed-by: Rodrigo Vivi Pushed to drm-intel-next-queued, thanks for the review. BR, Jani. > >> On Feb 1, 2017, at 5:46 AM, Nikula, Jani 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 >> Cc: Rainer Koenig >> Cc: Rodrigo Vivi >> Cc: # v4.8+ >> Signed-off-by: Jani Nikula >> --- >> 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