From patchwork Fri Oct 19 20:19:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodrigo Vivi X-Patchwork-Id: 10650137 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 42AE03B73 for ; Fri, 19 Oct 2018 20:19:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 33CAF27FA3 for ; Fri, 19 Oct 2018 20:19:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2811627FA8; Fri, 19 Oct 2018 20:19:54 +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=-5.2 required=2.0 tests=BAYES_00,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 AC5AE28066 for ; Fri, 19 Oct 2018 20:19:53 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CF76C6E541; Fri, 19 Oct 2018 20:19:52 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2104A6E53C for ; Fri, 19 Oct 2018 20:19:48 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 19 Oct 2018 13:19:47 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,401,1534834800"; d="scan'208";a="242729876" Received: from rdvivi-vienna.jf.intel.com ([10.7.196.56]) by orsmga004.jf.intel.com with ESMTP; 19 Oct 2018 13:19:47 -0700 From: Rodrigo Vivi To: intel-gfx@lists.freedesktop.org Date: Fri, 19 Oct 2018 13:19:45 -0700 Message-Id: <20181019201945.9792-3-rodrigo.vivi@intel.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181019201945.9792-1-rodrigo.vivi@intel.com> References: <20181019201945.9792-1-rodrigo.vivi@intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH 3/3] drm/i915: Use the ddi_ports info to kill ugly CNL_WITH_PORT_F. 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: , Cc: Jani Nikula , Daniel Vetter , Lucas De Marchi , Rodrigo Vivi Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Now that we have the number of ddi ports information available let's use it instead of that ugly platform macro. v2: - Don't override platform info (Jani) But use platform info (Daniel) - Don't use ddi_ports when it doesn't make sense (Lucas) - Add a comment to let clear that port E is fused off. (Rodrigo) Cc: Daniel Vetter Cc: Jani Nikula Cc: Lucas De Marchi Signed-off-by: Rodrigo Vivi --- drivers/gpu/drm/i915/i915_drv.h | 2 -- drivers/gpu/drm/i915/i915_irq.c | 5 ++--- drivers/gpu/drm/i915/i915_pci.c | 8 ++++++++ drivers/gpu/drm/i915/intel_dp.c | 2 +- drivers/gpu/drm/i915/intel_runtime_pm.c | 2 +- include/drm/i915_pciids.h | 4 +++- 6 files changed, 15 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 7ad232849268..99e42df79ed8 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -2485,8 +2485,6 @@ intel_info(const struct drm_i915_private *dev_priv) (dev_priv)->info.gt == 2) #define IS_CFL_GT3(dev_priv) (IS_COFFEELAKE(dev_priv) && \ (dev_priv)->info.gt == 3) -#define IS_CNL_WITH_PORT_F(dev_priv) (IS_CANNONLAKE(dev_priv) && \ - (INTEL_DEVID(dev_priv) & 0x0004) == 0x0004) #define IS_ALPHA_SUPPORT(intel_info) ((intel_info)->is_alpha_support) diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 5d1f53723388..63d676de3840 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -2782,8 +2782,7 @@ gen8_de_irq_handler(struct drm_i915_private *dev_priv, u32 master_ctl) if (INTEL_GEN(dev_priv) >= 11) tmp_mask |= ICL_AUX_CHANNEL_E; - if (IS_CNL_WITH_PORT_F(dev_priv) || - INTEL_GEN(dev_priv) >= 11) + if (INTEL_INFO(dev_priv)->ddi_ports >= 6) tmp_mask |= CNL_AUX_CHANNEL_F; if (iir & tmp_mask) { @@ -4220,7 +4219,7 @@ static void gen8_de_irq_postinstall(struct drm_i915_private *dev_priv) if (INTEL_GEN(dev_priv) >= 11) de_port_masked |= ICL_AUX_CHANNEL_E; - if (IS_CNL_WITH_PORT_F(dev_priv) || INTEL_GEN(dev_priv) >= 11) + if (INTEL_INFO(dev_priv)->ddi_ports >= 6) de_port_masked |= CNL_AUX_CHANNEL_F; de_pipe_enables = de_pipe_masked | GEN8_PIPE_VBLANK | diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c index 0427486f63d0..dc78daca145f 100644 --- a/drivers/gpu/drm/i915/i915_pci.c +++ b/drivers/gpu/drm/i915/i915_pci.c @@ -593,6 +593,13 @@ static const struct intel_device_info intel_cannonlake_info = { .gt = 2, }; +static const struct intel_device_info intel_cannonlake_portf_info = { + GEN10_FEATURES, + PLATFORM(INTEL_CANNONLAKE), + .gt = 2, + .ddi_ports = 6, /* Although port E is fused off, full port F is added */ +}; + #define GEN11_FEATURES \ GEN10_FEATURES, \ GEN(11), \ @@ -672,6 +679,7 @@ static const struct pci_device_id pciidlist[] = { INTEL_AML_CFL_GT2_IDS(&intel_coffeelake_gt2_info), INTEL_WHL_U_GT3_IDS(&intel_coffeelake_gt3_info), INTEL_CNL_IDS(&intel_cannonlake_info), + INTEL_CNL_PORTF_IDS(&intel_cannonlake_portf_info), INTEL_ICL_11_IDS(&intel_icelake_11_info), {0, 0, 0} }; diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 3384a9bbdafd..0ea0414ccef4 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -402,7 +402,7 @@ static int cnl_max_source_rate(struct intel_dp *intel_dp) return 540000; /* For this SKU 8.1G is supported in all ports */ - if (IS_CNL_WITH_PORT_F(dev_priv)) + if (INTEL_INFO(dev_priv)->ddi_ports == 6) return 810000; /* For other SKUs, max rate on ports A and D is 5.4G */ diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c index 31a49bdcf193..80e14be11279 100644 --- a/drivers/gpu/drm/i915/intel_runtime_pm.c +++ b/drivers/gpu/drm/i915/intel_runtime_pm.c @@ -3099,7 +3099,7 @@ int intel_power_domains_init(struct drm_i915_private *dev_priv) * timeouts, lets remove them from the list * for the SKUs without port F. */ - if (!IS_CNL_WITH_PORT_F(dev_priv)) + if (INTEL_INFO(dev_priv)->ddi_ports == 5) power_domains->power_well_count -= 2; } else if (IS_BROXTON(dev_priv)) { diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h index 192667144693..486822205151 100644 --- a/include/drm/i915_pciids.h +++ b/include/drm/i915_pciids.h @@ -445,7 +445,9 @@ INTEL_VGA_DEVICE(0x5A42, info), \ INTEL_VGA_DEVICE(0x5A4A, info), \ INTEL_VGA_DEVICE(0x5A50, info), \ - INTEL_VGA_DEVICE(0x5A40, info), \ + INTEL_VGA_DEVICE(0x5A40, info) + +#define INTEL_CNL_PORTF_IDS(info) \ INTEL_VGA_DEVICE(0x5A54, info), \ INTEL_VGA_DEVICE(0x5A5C, info), \ INTEL_VGA_DEVICE(0x5A44, info), \