From patchwork Tue May 29 04:50:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin Xu X-Patchwork-Id: 10429779 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 652F860327 for ; Mon, 28 May 2018 04:48:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 56B6428B5E for ; Mon, 28 May 2018 04:48:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4B2AC28B6F; Mon, 28 May 2018 04:48:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.2 required=2.0 tests=BAYES_00, DATE_IN_FUTURE_24_48, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E35DF28B5E for ; Mon, 28 May 2018 04:48:09 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7355C6E115; Mon, 28 May 2018 04:48:08 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6B6766E09A for ; Mon, 28 May 2018 04:48:06 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 27 May 2018 21:48:06 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,450,1520924400"; d="scan'208";a="52786912" Received: from coxu-arch-shz.sh.intel.com ([10.239.160.25]) by FMSMGA003.fm.intel.com with ESMTP; 27 May 2018 21:48:05 -0700 From: colin.xu@intel.com To: jani.nikula@intel.com, intel-gfx@lists.freedesktop.org Date: Tue, 29 May 2018 12:50:37 +0800 Message-Id: <20180529045038.31397-2-colin.xu@intel.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180529045038.31397-1-colin.xu@intel.com> References: <20180529045038.31397-1-colin.xu@intel.com> Subject: [Intel-gfx] [PATCH 1/2] drm/i915: Update virtual PCH in single function X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP From: Colin Xu The existing way to update virtual PCH will return wrong PCH type in case the host doesn't have PCH: - intel_virt_detect_pch returns guessed PCH id 0 - id 0 maps to PCH_NOP. >> should be PCH_NONE. Since PCH_NONE and PCH_NOP are different types, mixing them up will break vbt initialization logic. In addition, to add new none/nop PCH override for a specific platform, branching need to be added to intel_virt_detect_pch(), intel_pch_type() and the caller since none/nop PCH is not always mapping to the same predefined PCH id. This patch merges the virtual PCH update/sanity check logic into single function intel_virt_update_pch(), which still keeps using existing intel_pch_type() to do the sanity check, while making it clean to override virtual PCH id for a specific platform for future platform enablement. Signed-off-by: Colin Xu --- drivers/gpu/drm/i915/i915_drv.c | 56 ++++++++++++++++++--------------- 1 file changed, 30 insertions(+), 26 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index fb39e40c0847..637ba86104be 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -209,10 +209,11 @@ static bool intel_is_virt_pch(unsigned short id, sdevice == PCI_SUBDEVICE_ID_QEMU)); } -static unsigned short -intel_virt_detect_pch(const struct drm_i915_private *dev_priv) +static void +intel_virt_update_pch(struct drm_i915_private *dev_priv) { unsigned short id = 0; + enum intel_pch pch_type = PCH_NONE; /* * In a virtualized passthrough environment we can be in a @@ -221,25 +222,37 @@ intel_virt_detect_pch(const struct drm_i915_private *dev_priv) * make an educated guess as to which PCH is really there. */ - if (IS_GEN5(dev_priv)) + if (IS_GEN5(dev_priv)) { id = INTEL_PCH_IBX_DEVICE_ID_TYPE; - else if (IS_GEN6(dev_priv) || IS_IVYBRIDGE(dev_priv)) + pch_type = intel_pch_type(dev_priv, id); + DRM_DEBUG_KMS("Assuming Ibex Peak PCH id %04x\n", id); + } else if (IS_GEN6(dev_priv) || IS_IVYBRIDGE(dev_priv)) { id = INTEL_PCH_CPT_DEVICE_ID_TYPE; - else if (IS_HSW_ULT(dev_priv) || IS_BDW_ULT(dev_priv)) - id = INTEL_PCH_LPT_LP_DEVICE_ID_TYPE; - else if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv)) - id = INTEL_PCH_LPT_DEVICE_ID_TYPE; - else if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv)) + pch_type = intel_pch_type(dev_priv, id); + DRM_DEBUG_KMS("Assuming CougarPoint PCH id %04x\n", id); + } else if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv)) { + if (IS_HSW_ULT(dev_priv) || IS_BDW_ULT(dev_priv)) + id = INTEL_PCH_LPT_LP_DEVICE_ID_TYPE; + else + id = INTEL_PCH_LPT_DEVICE_ID_TYPE; + pch_type = intel_pch_type(dev_priv, id); + DRM_DEBUG_KMS("Assuming LynxPoint PCH id %04x\n", id); + } else if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv)) { id = INTEL_PCH_SPT_DEVICE_ID_TYPE; - else if (IS_COFFEELAKE(dev_priv) || IS_CANNONLAKE(dev_priv)) + pch_type = intel_pch_type(dev_priv, id); + DRM_DEBUG_KMS("Assuming SunrisePoint PCH id %04x\n", id); + } else if (IS_COFFEELAKE(dev_priv) || IS_CANNONLAKE(dev_priv)) { id = INTEL_PCH_CNP_DEVICE_ID_TYPE; + pch_type = intel_pch_type(dev_priv, id); + DRM_DEBUG_KMS("Assuming CannonPoint PCH id %04x\n", id); + } else { + id = 0; + pch_type = PCH_NOP; + DRM_DEBUG_KMS("Assuming NOP PCH\n"); + } - if (id) - DRM_DEBUG_KMS("Assuming PCH ID %04x\n", id); - else - DRM_DEBUG_KMS("Assuming no PCH\n"); - - return id; + dev_priv->pch_type = pch_type; + dev_priv->pch_id = id; } static void intel_detect_pch(struct drm_i915_private *dev_priv) @@ -281,16 +294,7 @@ static void intel_detect_pch(struct drm_i915_private *dev_priv) break; } else if (intel_is_virt_pch(id, pch->subsystem_vendor, pch->subsystem_device)) { - id = intel_virt_detect_pch(dev_priv); - if (id) { - pch_type = intel_pch_type(dev_priv, id); - if (WARN_ON(pch_type == PCH_NONE)) - pch_type = PCH_NOP; - } else { - pch_type = PCH_NOP; - } - dev_priv->pch_type = pch_type; - dev_priv->pch_id = id; + intel_virt_update_pch(dev_priv); break; } }