Introduce Rocket Lake
Subsystems (5)
cover Introduce Rocket Lake
Rocket Lake (RKL) is another gen12 platform, so the driver support is mostly a straightforward evolution of our existing Tiger Lake support.
One area of this patch series that's a bit non-intuitive and warrants some extra explanation is the output handling. All four of RKL's output ports use combo PHYs, but the hardware guys have recycled the naming scheme from Tiger Lake. The DDI's are still named "A, B, TC1, and TC2" even though none of them are actually connected to Type-C PHYs on this platform. From a register offset perspective, these four DDIs are effectively A, B, D, and E (skipping over the register range that would usually be used for a "C" instance of the DDI). However the PHYs attached to those DDIs do *not* skip the "C" instance, so we wind up with the following output relationships:
DDI-A (port A) <-> PHY-A
DDI-B (port B) <-> PHY-B
DDI-TC1 (port D) <-> PHY-C
DDI-TC2 (port E) <-> PHY-DGiven that most of our past platforms have straight DDI==PHY mappings, extra care is needed to ensure we use the proper namespace (port or phy) when programming various output-related registers.
Aditya Swarup (1):
drm/i915/rkl: Don't try to read out DSI transcoders
José Roberto de Souza (1):
drm/i915/rkl: Disable PSR2
Lucas De Marchi (1):
drm/i915/rkl: provide port/phy mapping for vbt
Matt Roper (20):
drm/i915/rkl: Add RKL platform info and PCI ids x86/gpu: add RKL stolen memory support
drm/i915/rkl: Re-use TGL GuC/HuC firmware drm/i915/rkl: Load DMC firmware for Rocket Lake drm/i915/rkl: Add PCH support
drm/i915/rkl: Update memory bandwidth parameters drm/i915/rkl: Limit number of universal planes to 5 drm/i915/rkl: Add power well support
drm/i915/rkl: Program BW_BUDDY0 registers instead of BW_BUDDY1/2 drm/i915/rkl: RKL only uses PHY_MISC for PHY's A and B drm/i915/rkl: Add cdclk support
drm/i915/rkl: Handle new DPCLKA_CFGCR0 layout drm/i915/rkl: Check proper SDEISR bits for TC1 and TC2 outputs drm/i915/rkl: Setup ports/phys
drm/i915/rkl: Add DDC pin mapping
drm/i915/rkl: Don't try to access transcoder D drm/i915/rkl: Handle comp master/slave relationships for PHYs drm/i915/rkl: Add DPLL4 support
drm/i915/rkl: Handle HTI
drm/i915/rkl: Add initial workarounds
arch/x86/kernel/early-quirks.c | 1 + drivers/gpu/drm/i915/display/intel_bios.c | 72 ++++-- drivers/gpu/drm/i915/display/intel_bw.c | 10 +- drivers/gpu/drm/i915/display/intel_cdclk.c | 54 ++++- .../gpu/drm/i915/display/intel_combo_phy.c | 55 +++-- drivers/gpu/drm/i915/display/intel_csr.c | 10 +- drivers/gpu/drm/i915/display/intel_ddi.c | 18 +- drivers/gpu/drm/i915/display/intel_display.c | 82 +++++-- .../drm/i915/display/intel_display_power.c | 229 ++++++++++++++++-- drivers/gpu/drm/i915/display/intel_dp.c | 8 +- drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 50 +++- drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 1 + drivers/gpu/drm/i915/display/intel_hdmi.c | 22 +- drivers/gpu/drm/i915/display/intel_psr.c | 15 ++ drivers/gpu/drm/i915/display/intel_sprite.c | 22 +- drivers/gpu/drm/i915/display/intel_sprite.h | 11 +- drivers/gpu/drm/i915/display/intel_vdsc.c | 4 +- drivers/gpu/drm/i915/gt/intel_workarounds.c | 88 ++++--- drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 3 + drivers/gpu/drm/i915/i915_drv.h | 13 + drivers/gpu/drm/i915/i915_irq.c | 10 +- drivers/gpu/drm/i915/i915_pci.c | 13 + drivers/gpu/drm/i915/i915_reg.h | 33 ++- drivers/gpu/drm/i915/intel_device_info.c | 6 +- drivers/gpu/drm/i915/intel_device_info.h | 2 + drivers/gpu/drm/i915/intel_pch.c | 8 +- include/drm/i915_pciids.h | 9 + 27 files changed, 702 insertions(+), 147 deletions(-)
Signature · 6 lines
2.24.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/23 drm/i915/rkl: Add RKL platform info and PCI ids
Introduce the basic platform definition, macros, and PCI IDs.
Bspec: 44501
--- drivers/gpu/drm/i915/i915_drv.h | 8 ++++++++ drivers/gpu/drm/i915/i915_pci.c | 10 ++++++++++ drivers/gpu/drm/i915/intel_device_info.c | 1 + drivers/gpu/drm/i915/intel_device_info.h | 1 + include/drm/i915_pciids.h | 9 +++++++++ 5 files changed, 29 insertions(+)
drivers/gpu/drm/i915/i915_drv.h +8 -0
@@ -1406,6 +1406,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define IS_ICELAKE (dev_priv) IS_PLATFORM(dev_priv, INTEL_ICELAKE)#define IS_ELKHARTLAKE (dev_priv) IS_PLATFORM(dev_priv, INTEL_ELKHARTLAKE)#define IS_TIGERLAKE (dev_priv) IS_PLATFORM(dev_priv, INTEL_TIGERLAKE) +#define IS_ROCKETLAKE (dev_priv) IS_PLATFORM(dev_priv, INTEL_ROCKETLAKE)#define IS_HSW_EARLY_SDV (dev_priv) (IS_HASWELL(dev_priv) && \ (INTEL_DEVID(dev_priv) & 0xFF00) == 0x0C00)#define IS_BDW_ULT (dev_priv) \
@@ -1514,6 +1515,13 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define IS_TGL_REVID (p, since, until) \ (IS_TIGERLAKE(p) && IS_REVID(p, since, until)) +#define RKL_REVID_A0 0x0 +#define RKL_REVID_B0 0x1 +#define RKL_REVID_C0 0x4 + +#define IS_RKL_REVID (p, since, until) \ + (IS_ROCKETLAKE(p) && IS_REVID(p, since, until)) +#define IS_LP (dev_priv) (INTEL_INFO(dev_priv)->is_lp)#define IS_GEN9_LP (dev_priv) (IS_GEN(dev_priv, 9) && IS_LP(dev_priv))#define IS_GEN9_BC (dev_priv) (IS_GEN(dev_priv, 9) && !IS_LP(dev_priv))
drivers/gpu/drm/i915/i915_pci.c +10 -0
@@ -863,6 +863,15 @@ static const struct intel_device_info tgl_info = { BIT(RCS0) | BIT(BCS0) | BIT(VECS0) | BIT(VCS0) | BIT(VCS2), }; +static const struct intel_device_info rkl_info = { +GEN12_FEATURES , +PLATFORM (INTEL_ROCKETLAKE ), + .pipe_mask =BIT (PIPE_A ) |BIT (PIPE_B ) |BIT (PIPE_C ), + .require_force_probe =1 , + .engine_mask = +BIT (RCS0 ) |BIT (BCS0 ) |BIT (VECS0 ) |BIT (VCS0 ), +}; +#define GEN12_DGFX_FEATURES \ GEN12_FEATURES, \ .is_dgfx = 1
@@ -941,6 +950,7 @@ static const struct pci_device_id pciidlist[] = {INTEL_ICL_11_IDS (&icl_info),INTEL_EHL_IDS (&ehl_info),INTEL_TGL_12_IDS (&tgl_info), +INTEL_RKL_IDS (&rkl_info), {0, 0, 0} };MODULE_DEVICE_TABLE (pci, pciidlist);
drivers/gpu/drm/i915/intel_device_info.c +1 -0
@@ -61,6 +61,7 @@ static const char * const platform_names[] = {PLATFORM_NAME (ICELAKE ),PLATFORM_NAME (ELKHARTLAKE ),PLATFORM_NAME (TIGERLAKE ), + PLATFORM_NAME(ROCKETLAKE), };#undef PLATFORM_NAME
drivers/gpu/drm/i915/intel_device_info.h +1 -0
@@ -80,6 +80,7 @@ enum intel_platform {INTEL_ELKHARTLAKE ,/* gen12 */ INTEL_TIGERLAKE , +INTEL_ROCKETLAKE , INTEL_MAX_PLATFORMS };
include/drm/i915_pciids.h +9 -0
@@ -605,4 +605,13 @@INTEL_VGA_DEVICE (0x9AD9 , info), \INTEL_VGA_DEVICE (0x9AF8 , info) +/* RKL */ +#define INTEL_RKL_IDS (info) \ + INTEL_VGA_DEVICE(0x4C80, info), \ + INTEL_VGA_DEVICE(0x4C8A, info), \ + INTEL_VGA_DEVICE(0x4C8B, info), \ + INTEL_VGA_DEVICE(0x4C8C, info), \ + INTEL_VGA_DEVICE(0x4C90, info), \ + INTEL_VGA_DEVICE(0x4C9A, info) +#endif /* _I915_PCIIDS_H */
Signature · 6 lines
2.24.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH 01/23] drm/i915/rkl: Add RKL platform info and PCI ids
Matt,
This patch used to have version information such "v7: Add missing pipe mask". Why they are removed? For power on?
Otherwise
-caz
Quoted 115 lines · Matt Roper
Introduce the basic platform definition, macros, and PCI IDs.
Bspec: 44501
Cc Lucas De Marchi <[email protected]>Cc Caz Yokoyama <[email protected]>Cc Aditya Swarup <[email protected]>Signed-off-by Matt Roper <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 8 ++++++++ drivers/gpu/drm/i915/i915_pci.c | 10 ++++++++++ drivers/gpu/drm/i915/intel_device_info.c | 1 + drivers/gpu/drm/i915/intel_device_info.h | 1 + include/drm/i915_pciids.h | 9 +++++++++ 5 files changed, 29 insertions(+)drivers/gpu/drm/i915/i915_drv.h +1
-0@@ -1406,6 +1406,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define IS_ICELAKE (dev_priv) IS_PLATFORM(dev_priv, INTEL_ICELAKE)#define IS_ELKHARTLAKE (dev_priv) IS_PLATFORM(dev_priv, INTEL_ELKHARTLAKE)#define IS_TIGERLAKE (dev_priv) IS_PLATFORM(dev_priv, INTEL_TIGERLAKE) +#define IS_ROCKETLAKE (dev_priv) IS_PLATFORM(dev_priv,
INTEL_ROCKETLAKE)
#defineIS_HSW_EARLY_SDV(dev_priv)(IS_HASWELL(dev_priv)&& \
(INTEL_DEVID(dev_priv)&0xFF00) ==0x0C00)
#defineIS_BDW_ULT(dev_priv)\drivers/gpu/drm/i915/i915_drv.h +7
-0@@ -1514,6 +1515,13 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define IS_TGL_REVID (p, since, until) \ (IS_TIGERLAKE(p) && IS_REVID(p, since, until)) +#define RKL_REVID_A0 0x0 +#define RKL_REVID_B0 0x1 +#define RKL_REVID_C0 0x4 + +#define IS_RKL_REVID (p, since, until) \ + (IS_ROCKETLAKE(p) && IS_REVID(p, since, until)) +#define IS_LP (dev_priv) (INTEL_INFO(dev_priv)->is_lp)#define IS_GEN9_LP (dev_priv) (IS_GEN(dev_priv, 9) &&
IS_LP(dev_priv))
#defineIS_GEN9_BC(dev_priv)(IS_GEN(dev_priv, 9)&&
!IS_LP(dev_priv))drivers/gpu/drm/i915/i915_pci.c +9
-0@@ -863,6 +863,15 @@ static const struct intel_device_info tgl_info = {BIT (RCS0 ) |BIT (BCS0 ) |BIT (VECS0 ) |BIT (VCS0 ) | BIT(VCS2), }; +static const struct intel_device_info rkl_info = { +GEN12_FEATURES , +PLATFORM (INTEL_ROCKETLAKE ), + .pipe_mask =BIT (PIPE_A ) |BIT (PIPE_B ) |BIT (PIPE_C ), + .require_force_probe =1 , + .engine_mask = +BIT (RCS0 ) |BIT (BCS0 ) |BIT (VECS0 ) |BIT (VCS0 ), +}; +#define GEN12_DGFX_FEATURES \drivers/gpu/drm/i915/i915_pci.c +1
-0GEN12_FEATURES , \ .is_dgfx = 1@@ -941,6 +950,7 @@ static const struct pci_device_id pciidlist[] = {INTEL_ICL_11_IDS (&icl_info),INTEL_EHL_IDS (&ehl_info),INTEL_TGL_12_IDS (&tgl_info), +INTEL_RKL_IDS (&rkl_info), {0, 0, 0} };MODULE_DEVICE_TABLE (pci, pciidlist);drivers/gpu/drm/i915/intel_device_info.c +1
-0@@ -61,6 +61,7 @@ static const char * const platform_names[] = {PLATFORM_NAME (ICELAKE ),PLATFORM_NAME (ELKHARTLAKE ),PLATFORM_NAME (TIGERLAKE ), + PLATFORM_NAME(ROCKETLAKE), };#undef PLATFORM_NAMEdrivers/gpu/drm/i915/intel_device_info.h +1
-0@@ -80,6 +80,7 @@ enum intel_platform {INTEL_ELKHARTLAKE ,/* gen12 */ INTEL_TIGERLAKE , +INTEL_ROCKETLAKE , INTEL_MAX_PLATFORMS };include/drm/i915_pciids.h +0
-0@@ -605,4 +605,13 @@INTEL_VGA_DEVICE (0x9AD9 , info), \INTEL_VGA_DEVICE (0x9AF8 , info)
include/drm/i915_pciids.h line 617
Quoted 10 lines
include/drm/i915_pciids.h +9
-0+/* RKL */ +#define INTEL_RKL_IDS (info) \ + INTEL_VGA_DEVICE(0x4C80, info), \ + INTEL_VGA_DEVICE(0x4C8A, info), \ + INTEL_VGA_DEVICE(0x4C8B, info), \ + INTEL_VGA_DEVICE(0x4C8C, info), \ + INTEL_VGA_DEVICE(0x4C90, info), \ + INTEL_VGA_DEVICE(0x4C9A, info) +#endif /* _I915_PCIIDS_H */
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/23 x86/gpu: add RKL stolen memory support
In reply to Matt RoperRKL re-uses the same stolen memory registers as TGL and ICL.
Bspec: 52055
Bspec: 49589
Bspec: 49636
--- arch/x86/kernel/early-quirks.c | 1 + 1 file changed, 1 insertion(+)
arch/x86/kernel/early-quirks.c +1 -0
@@ -550,6 +550,7 @@ static const struct pci_device_id intel_early_ids[] __initconst = {INTEL_ICL_11_IDS (&gen11_early_ops),INTEL_EHL_IDS (&gen11_early_ops),INTEL_TGL_12_IDS (&gen11_early_ops), + INTEL_RKL_IDS(&gen11_early_ops), };struct resource intel_graphics_stolen_res__ro_after_init =DEFINE_RES_MEM (0 ,0 );
Signature · 6 lines
2.24.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/23 drm/i915/rkl: Re-use TGL GuC/HuC firmware
In reply to Matt RoperRKL uses the same GuC and HuC as TGL and should load the same firmwares.
Bspec: 50668
--- drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c +3 -0
@@ -47,8 +47,11 @@ void intel_uc_fw_change_status(struct intel_uc_fw *uc_fw,* TGL 35.2 is interface-compatible with 33.0 for previous Gens. The deltas * between 33.0 and 35.2 are only related to new additions to support new Gen12 * features. +* +* Note that RKL uses the same firmware as TGL. */ #define INTEL_UC_FIRMWARE_DEFS (fw_def, guc_def, huc_def) \ + fw_def(ROCKETLAKE, 0, guc_def(tgl, 35, 2, 0), huc_def(tgl, 7, 0, 12)) \ fw_def(TIGERLAKE, 0, guc_def(tgl, 35, 2, 0), huc_def(tgl, 7, 0, 12)) \ fw_def(ELKHARTLAKE, 0, guc_def(ehl, 33, 0, 4), huc_def(ehl, 9, 0, 0)) \ fw_def(ICELAKE, 0, guc_def(icl, 33, 0, 0), huc_def(icl, 9, 0, 0)) \
Signature · 6 lines
2.24.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH 03/23] drm/i915/rkl: Re-use TGL GuC/HuC firmware
Quoted 10 lines
-----Original Message-----
From: Roper, Matthew D <[email protected]>
Sent: Friday, May 1, 2020 10:37 PM
To: [email protected]
Cc: Roper, Matthew D <[email protected]>; Srivatsa, Anusha <[email protected]>
Subject: [PATCH 03/23] drm/i915/rkl: Re-use TGL GuC/HuC firmware
Quoted 5 lines
RKL uses the same GuC and HuC as TGL and should load the same firmwares.
Bspec: 50668
Cc Anusha Srivatsa <[email protected]>Signed-off-by Matt Roper <[email protected]>
Quoted 24 lines
--- drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 3 +++ 1 file changed, 3 insertions(+)drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c +0
-0@@ -47,8 +47,11 @@ void intel_uc_fw_change_status(struct intel_uc_fw *uc_fw, * TGL 35.2 is interface-compatible with 33.0 for previous Gens. The deltas * between 33.0 and 35.2 are only related to new additions to support newGen12
* features.
+ *
+ * Note that RKL uses the same firmware as TGL. */
#defineINTEL_UC_FIRMWARE_DEFS(fw_def, guc_def, huc_def)\drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c +1
-1+ fw_def(ROCKETLAKE, 0, guc_def(tgl, 35, 2, 0), huc_def(tgl, 7, 0, 12)) \ fw_def(TIGERLAKE, 0, guc_def(tgl, 35, 2, 0), huc_def(tgl, 7, 0, 12)) \ fw_def(ELKHARTLAKE, 0, guc_def(ehl, 33, 0, 4), huc_def(ehl, 9, 0, 0)) \fw_def (ICELAKE ,0 ,guc_def (icl,33 ,0 ,0 ),huc_def (icl,9 ,0 ,0 )) \ --
Quoted 1 line
2.24.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 4/23 drm/i915/rkl: Load DMC firmware for Rocket Lake
In reply to Matt Roper--- drivers/gpu/drm/i915/display/intel_csr.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/display/intel_csr.c +9 -1
@@ -40,6 +40,10 @@#define GEN12_CSR_MAX_FW_SIZE ICL_CSR_MAX_FW_SIZE +#define RKL_CSR_PATH "i915/rkl_dmc_ver2_01.bin" +#define RKL_CSR_VERSION_REQUIRED CSR_VERSION(2, 1) +MODULE_FIRMWARE (RKL_CSR_PATH ); +#define TGL_CSR_PATH "i915/tgl_dmc_ver2_06.bin"#define TGL_CSR_VERSION_REQUIRED CSR_VERSION(2, 6)#define TGL_CSR_MAX_FW_SIZE 0x6000
@@ -682,7 +686,11 @@ void intel_csr_ucode_init(struct drm_i915_private *dev_priv)*/ intel_csr_runtime_pm_get (dev_priv); -if (INTEL_GEN (dev_priv) >=12 ) { +if (IS_ROCKETLAKE (dev_priv)) { + csr->fw_path =RKL_CSR_PATH ; + csr->required_version =RKL_CSR_VERSION_REQUIRED ; + csr->max_fw_size =GEN12_CSR_MAX_FW_SIZE ; + }else if (INTEL_GEN (dev_priv) >=12 ) { csr->fw_path =TGL_CSR_PATH ; csr->required_version =TGL_CSR_VERSION_REQUIRED ;/* Allow to load fw via parameter using the last known size */
Signature · 6 lines
2.24.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH 04/23] drm/i915/rkl: Load DMC firmware for Rocket Lake
Quoted 10 lines
-----Original Message-----
From: Roper, Matthew D <[email protected]>
Sent: Friday, May 1, 2020 10:37 PM
To: [email protected]
Cc: Roper, Matthew D <[email protected]>; Srivatsa, Anusha <[email protected]>
Subject: [PATCH 04/23] drm/i915/rkl: Load DMC firmware for Rocket Lake
Quoted 2 lines
Cc Anusha Srivatsa <[email protected]>Signed-off-by Matt Roper <[email protected]>
Quoted 33 lines
--- drivers/gpu/drm/i915/display/intel_csr.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/display/intel_csr.c +9
-1@@ -40,6 +40,10 @@#define GEN12_CSR_MAX_FW_SIZE ICL_CSR_MAX_FW_SIZE +#define RKL_CSR_PATH "i915/rkl_dmc_ver2_01.bin" +#define RKL_CSR_VERSION_REQUIRED CSR_VERSION(2, 1) +MODULE_FIRMWARE (RKL_CSR_PATH ); +#define TGL_CSR_PATH "i915/tgl_dmc_ver2_06.bin"#define TGL_CSR_VERSION_REQUIRED CSR_VERSION(2, 6)#define TGL_CSR_MAX_FW_SIZE 0x6000@@ -682,7 +686,11 @@ void intel_csr_ucode_init(struct drm_i915_private*dev_priv) */ intel_csr_runtime_pm_get (dev_priv); -if (INTEL_GEN (dev_priv) >=12 ) { +if (IS_ROCKETLAKE (dev_priv)) { + csr->fw_path =RKL_CSR_PATH ; + csr->required_version =RKL_CSR_VERSION_REQUIRED ; + csr->max_fw_size =GEN12_CSR_MAX_FW_SIZE ; + }else if (INTEL_GEN (dev_priv) >=12 ) { csr->fw_path =TGL_CSR_PATH ; csr->required_version =TGL_CSR_VERSION_REQUIRED ;
Quoted 3 lines
/* Allow to load fw via parameter using the last known size */
--
2.24.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 5/23 drm/i915/rkl: Add PCH support
In reply to Matt RoperRocket Lake can pair with either TGP or CMP.
--- drivers/gpu/drm/i915/intel_pch.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_pch.c +5 -3
@@ -88,7 +88,8 @@ intel_pch_type(const struct drm_i915_private *dev_priv, unsigned short id)case INTEL_PCH_CMP_DEVICE_ID_TYPE :case INTEL_PCH_CMP2_DEVICE_ID_TYPE :drm_dbg_kms (&dev_priv->drm,"Found Comet Lake PCH (CMP)\n" ); -drm_WARN_ON (&dev_priv->drm, !IS_COFFEELAKE (dev_priv)); +drm_WARN_ON (&dev_priv->drm, !IS_COFFEELAKE (dev_priv) && + !IS_ROCKETLAKE (dev_priv));/* CometPoint is CNP Compatible */ return PCH_CNP ;case INTEL_PCH_CMP_V_DEVICE_ID_TYPE :
@@ -107,7 +108,8 @@ intel_pch_type(const struct drm_i915_private *dev_priv, unsigned short id)case INTEL_PCH_TGP_DEVICE_ID_TYPE :case INTEL_PCH_TGP2_DEVICE_ID_TYPE :drm_dbg_kms (&dev_priv->drm,"Found Tiger Lake LP PCH\n" ); -drm_WARN_ON (&dev_priv->drm, !IS_TIGERLAKE (dev_priv)); +drm_WARN_ON (&dev_priv->drm, !IS_TIGERLAKE (dev_priv) && + !IS_ROCKETLAKE (dev_priv));return PCH_TGP ;case INTEL_PCH_JSP_DEVICE_ID_TYPE :case INTEL_PCH_JSP2_DEVICE_ID_TYPE :
@@ -141,7 +143,7 @@ intel_virt_detect_pch(const struct drm_i915_private *dev_priv)* make an educated guess as to which PCH is really there. */ -if (IS_TIGERLAKE (dev_priv)) +if (IS_TIGERLAKE (dev_priv) ||IS_ROCKETLAKE (dev_priv)) id =INTEL_PCH_TGP_DEVICE_ID_TYPE ;else if (IS_ELKHARTLAKE (dev_priv)) id =INTEL_PCH_MCC_DEVICE_ID_TYPE ;
Signature · 6 lines
2.24.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 6/23 drm/i915/rkl: Update memory bandwidth parameters
In reply to Matt RoperThe RKL platform has different memory characteristics from past platforms. Update the values used by our memory bandwidth calculations accordingly.
Bspec: 53998
--- drivers/gpu/drm/i915/display/intel_bw.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/display/intel_bw.c +9 -1
@@ -176,6 +176,12 @@ static const struct intel_sa_info tgl_sa_info = { .displayrtids = 256, }; +static const struct intel_sa_info rkl_sa_info = { + .deburst =16 , + .deprogbwlimit =20 ,/* GB/s */ + .displayrtids =128 , +}; +static int icl_get_bw_info (struct drm_i915_private *dev_priv,const struct intel_sa_info *sa) {struct intel_qgv_info qi = {};
@@ -271,7 +277,9 @@ void intel_bw_init_hw(struct drm_i915_private *dev_priv)if (!HAS_DISPLAY (dev_priv))return ; -if (IS_GEN (dev_priv,12 )) +if (IS_ROCKETLAKE (dev_priv)) +icl_get_bw_info (dev_priv, &rkl_sa_info); +else if (IS_GEN (dev_priv,12 ))icl_get_bw_info (dev_priv, &tgl_sa_info);else if (IS_GEN (dev_priv,11 ))icl_get_bw_info (dev_priv, &icl_sa_info);
Signature · 6 lines
2.24.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 7/23 drm/i915/rkl: Limit number of universal planes to 5
In reply to Matt RoperRKL only has five universal planes, plus a cursor. Since the bottom-most universal plane is considered the primary plane, set the number of sprites available on this platform to 4.
In general, the plane capabilities of the remaining planes stay the same as TGL. However the NV12 Y-plane support moves down to the new top two planes and now only the bottom three planes can be used for NV12 UV.
Bspec: 49181
Bspec: 49251
--- drivers/gpu/drm/i915/display/intel_display.c | 6 +++++- drivers/gpu/drm/i915/display/intel_sprite.c | 17 ++++++++++++++++- drivers/gpu/drm/i915/display/intel_sprite.h | 11 ++--------- drivers/gpu/drm/i915/i915_irq.c | 4 +++- drivers/gpu/drm/i915/i915_reg.h | 5 +++++ drivers/gpu/drm/i915/intel_device_info.c | 5 ++++- 6 files changed, 35 insertions(+), 13 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +5 -1
@@ -12500,7 +12500,7 @@ static int icl_check_nv12_planes(struct intel_crtc_state *crtc_state)continue ;for_each_intel_plane_on_crtc (&dev_priv->drm, crtc, linked) { -if (!icl_is_nv12_y_plane (linked->id)) +if (!icl_is_nv12_y_plane (dev_priv, linked->id))continue ;if (crtc_state->active_planes &BIT (linked->id))
@@ -12546,6 +12546,10 @@ static int icl_check_nv12_planes(struct intel_crtc_state *crtc_state) plane_state->cus_ctl |=PLANE_CUS_PLANE_7 ; else if (linked->id == PLANE_SPRITE4) plane_state->cus_ctl |= PLANE_CUS_PLANE_6; + else if (linked->id == PLANE_SPRITE3) + plane_state->cus_ctl |= PLANE_CUS_PLANE_5_RKL; + else if (linked->id == PLANE_SPRITE2) + plane_state->cus_ctl |= PLANE_CUS_PLANE_4_RKL; else MISSING_CASE(linked->id); }
drivers/gpu/drm/i915/display/intel_sprite.c +16 -1
@@ -333,6 +333,21 @@ int intel_plane_check_src_coordinates(struct intel_plane_state *plane_state)return 0 ; } +static u8 icl_nv12_y_plane_mask (struct drm_i915_private *i915) +{ +if (IS_ROCKETLAKE (i915)) +return BIT (PLANE_SPRITE2 ) |BIT (PLANE_SPRITE3 ); +else +return BIT (PLANE_SPRITE4 ) |BIT (PLANE_SPRITE5 ); +} + +bool icl_is_nv12_y_plane (struct drm_i915_private *dev_priv, +enum plane_id plane_id) +{ +return INTEL_GEN (dev_priv) >=11 && +icl_nv12_y_plane_mask (dev_priv) &BIT (plane_id); +} +bool icl_is_hdr_plane (struct drm_i915_private *dev_priv,enum plane_id plane_id) { return INTEL_GEN(dev_priv) >= 11 &&
@@ -3003,7 +3018,7 @@ static const u32 *icl_get_plane_formats(struct drm_i915_private *dev_priv,if (icl_is_hdr_plane (dev_priv, plane_id)) { *num_formats =ARRAY_SIZE (icl_hdr_plane_formats);return icl_hdr_plane_formats; - }else if (icl_is_nv12_y_plane (plane_id)) { + }else if (icl_is_nv12_y_plane (dev_priv, plane_id)) { *num_formats =ARRAY_SIZE (icl_sdr_y_plane_formats);return icl_sdr_y_plane_formats; }else {
drivers/gpu/drm/i915/display/intel_sprite.h +2 -9
@@ -32,21 +32,14 @@ struct intel_plane * skl_universal_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe, enum plane_id plane_id); -static inline bool icl_is_nv12_y_plane (enum plane_id id) -{ -/* Don't need to do a gen check, these planes are only available on gen11 */ -if (id ==PLANE_SPRITE4 || id ==PLANE_SPRITE5 ) -return true; - -return false; -} -static inline u8 icl_hdr_plane_mask (void ) {return BIT (PLANE_PRIMARY ) |BIT (PLANE_SPRITE0 ) |BIT (PLANE_SPRITE1 ); } +bool icl_is_nv12_y_plane (struct drm_i915_private *dev_priv, +enum plane_id plane_id);bool icl_is_hdr_plane (struct drm_i915_private *dev_priv,enum plane_id plane_id); int ivb_plane_min_cdclk(const struct intel_crtc_state *crtc_state,
drivers/gpu/drm/i915/i915_irq.c +3 -1
@@ -2221,7 +2221,9 @@ static u32 gen8_de_port_aux_mask(struct drm_i915_private *dev_priv)static u32 gen8_de_pipe_fault_mask (struct drm_i915_private *dev_priv) { -if (INTEL_GEN (dev_priv) >=11 ) +if (IS_ROCKETLAKE (dev_priv)) +return RKL_DE_PIPE_IRQ_FAULT_ERRORS ; +else if (INTEL_GEN (dev_priv) >=11 )return GEN11_DE_PIPE_IRQ_FAULT_ERRORS ;else if (INTEL_GEN (dev_priv) >=9 )return GEN9_DE_PIPE_IRQ_FAULT_ERRORS ;
drivers/gpu/drm/i915/i915_reg.h +5 -0
@@ -6907,6 +6907,8 @@ enum {#define _PLANE_CUS_CTL_1_A 0x701c8#define _PLANE_CUS_CTL_2_A 0x702c8#define PLANE_CUS_ENABLE (1 << 31) +#define PLANE_CUS_PLANE_4_RKL (0 << 30) +#define PLANE_CUS_PLANE_5_RKL (1 << 30)#define PLANE_CUS_PLANE_6 (0 << 30)#define PLANE_CUS_PLANE_7 (1 << 30)#define PLANE_CUS_HPHASE_SIGN_NEGATIVE (1 << 19)
@@ -7573,6 +7575,9 @@ enum { GEN11_PIPE_PLANE7_FAULT | \ GEN11_PIPE_PLANE6_FAULT | \ GEN11_PIPE_PLANE5_FAULT) +#define RKL_DE_PIPE_IRQ_FAULT_ERRORS \ + (GEN9_DE_PIPE_IRQ_FAULT_ERRORS | \ + GEN11_PIPE_PLANE5_FAULT)#define GEN8_DE_PORT_ISR _MMIO(0x44440)#define GEN8_DE_PORT_IMR _MMIO(0x44444)
drivers/gpu/drm/i915/intel_device_info.c +4 -1
@@ -934,7 +934,10 @@ void intel_device_info_runtime_init(struct drm_i915_private *dev_priv)BUILD_BUG_ON (BITS_PER_TYPE (intel_engine_mask_t) <I915_NUM_ENGINES ); -if (INTEL_GEN (dev_priv) >=11 ) +if (IS_ROCKETLAKE (dev_priv)) +for_each_pipe (dev_priv, pipe) + runtime->num_sprites[pipe] =4 ; +else if (INTEL_GEN (dev_priv) >=11 )for_each_pipe (dev_priv, pipe) runtime->num_sprites[pipe] =6 ;else if (IS_GEN (dev_priv,10 ) ||IS_GEMINILAKE (dev_priv))
Signature · 6 lines
2.24.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 8/23 drm/i915/rkl: Add power well support
In reply to Matt RoperRKL power wells are similar to TGL power wells, but have some important differences:
* PG1 now has pipe A's VDSC (rather than sticking it in PG2)
* PG2 no longer exists
* DDI-C (aka TC-1) moves from PG1 -> PG3
* PG5 no longer exists due to the lack of a fourth pipe
Also note that what we refer to as 'DDI-C' and 'DDI-D' need to actually be programmed as TC-1 and TC-2 even though this platform doesn't have TC outputs.
Bspec: 49234
--- .../drm/i915/display/intel_display_power.c | 185 +++++++++++++++++- drivers/gpu/drm/i915/display/intel_vdsc.c | 4 +- 2 files changed, 186 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/display/intel_display_power.c +184 -1
@@ -2913,6 +2913,53 @@ void intel_display_power_put(struct drm_i915_private *dev_priv, BIT_ULL(POWER_DOMAIN_AUX_I_TBT) | \ BIT_ULL(POWER_DOMAIN_TC_COLD_OFF)) +#define RKL_PW_4_POWER_DOMAINS ( \ + BIT_ULL(POWER_DOMAIN_PIPE_C) | \ + BIT_ULL(POWER_DOMAIN_PIPE_C_PANEL_FITTER) | \ + BIT_ULL(POWER_DOMAIN_TRANSCODER_C) | \ + BIT_ULL(POWER_DOMAIN_INIT)) + +#define RKL_PW_3_POWER_DOMAINS ( \ + RKL_PW_4_POWER_DOMAINS | \ + BIT_ULL(POWER_DOMAIN_PIPE_B) | \ + BIT_ULL(POWER_DOMAIN_PIPE_B_PANEL_FITTER) | \ + BIT_ULL(POWER_DOMAIN_AUDIO) | \ + BIT_ULL(POWER_DOMAIN_VGA) | \ + BIT_ULL(POWER_DOMAIN_TRANSCODER_B) | \ + BIT_ULL(POWER_DOMAIN_PORT_DDI_D_LANES) | \ + BIT_ULL(POWER_DOMAIN_PORT_DDI_E_LANES) | \ + BIT_ULL(POWER_DOMAIN_AUX_D) | \ + BIT_ULL(POWER_DOMAIN_AUX_E) | \ + BIT_ULL(POWER_DOMAIN_INIT)) + +/* +* There is no PW_2/PG_2 on RKL. +* +* RKL PW_1/PG_1 domains (under HW/DMC control): +* - DBUF function (note: registers are in PW0) +* - PIPE_A and its planes and VDSC/joining, except VGA +* - transcoder A +* - DDI_A and DDI_B +* - FBC +* +* RKL PW_0/PG_0 domains (under HW/DMC control): +* - PCI +* - clocks except port PLL +* - shared functions: +* * interrupts except pipe interrupts +* * MBus except PIPE_MBUS_DBOX_CTL +* * DBUF registers +* - central power except FBC +* - top-level GTC (DDI-level GTC is in the well associated with the DDI) +*/ + +#define RKL_DISPLAY_DC_OFF_POWER_DOMAINS ( \ + RKL_PW_3_POWER_DOMAINS | \ + BIT_ULL(POWER_DOMAIN_MODESET) | \ + BIT_ULL(POWER_DOMAIN_AUX_A) | \ + BIT_ULL(POWER_DOMAIN_AUX_B) | \ + BIT_ULL(POWER_DOMAIN_INIT)) +static const struct i915_power_well_ops i9xx_always_on_power_well_ops = { .sync_hw = i9xx_power_well_sync_hw_noop, .enable = i9xx_always_on_power_well_noop,
@@ -4283,6 +4330,140 @@ static const struct i915_power_well_desc tgl_power_wells[] = { }, }; +static const struct i915_power_well_desc rkl_power_wells[] = { + { + .name ="always-on" , + .always_on = true, + .domains =POWER_DOMAIN_MASK , + .ops = &i9xx_always_on_power_well_ops, + .id =DISP_PW_ID_NONE , + }, + { + .name ="power well 1" , +/* Handled by the DMC firmware */ + .always_on = true, + .domains =0 , + .ops = &hsw_power_well_ops, + .id =SKL_DISP_PW_1 , + { + .hsw.regs = &hsw_power_well_regs, + .hsw.idx =ICL_PW_CTL_IDX_PW_1 , + .hsw.has_fuses = true, + }, + }, + { + .name ="DC off" , + .domains =RKL_DISPLAY_DC_OFF_POWER_DOMAINS , + .ops = &gen9_dc_off_power_well_ops, + .id =SKL_DISP_DC_OFF , + }, + { + .name ="power well 3" , + .domains =RKL_PW_3_POWER_DOMAINS , + .ops = &hsw_power_well_ops, + .id =ICL_DISP_PW_3 , + { + .hsw.regs = &hsw_power_well_regs, + .hsw.idx =ICL_PW_CTL_IDX_PW_3 , + .hsw.irq_pipe_mask =BIT (PIPE_B ), + .hsw.has_vga = true, + .hsw.has_fuses = true, + }, + }, + { + .name ="power well 4" , + .domains =RKL_PW_4_POWER_DOMAINS , + .ops = &hsw_power_well_ops, + .id =DISP_PW_ID_NONE , + { + .hsw.regs = &hsw_power_well_regs, + .hsw.idx =ICL_PW_CTL_IDX_PW_4 , + .hsw.has_fuses = true, + .hsw.irq_pipe_mask =BIT (PIPE_C ), + } + }, + { + .name ="DDI A IO" , + .domains =ICL_DDI_IO_A_POWER_DOMAINS , + .ops = &hsw_power_well_ops, + .id =DISP_PW_ID_NONE , + { + .hsw.regs = &icl_ddi_power_well_regs, + .hsw.idx =ICL_PW_CTL_IDX_DDI_A , + } + }, + { + .name ="DDI B IO" , + .domains =ICL_DDI_IO_B_POWER_DOMAINS , + .ops = &hsw_power_well_ops, + .id =DISP_PW_ID_NONE , + { + .hsw.regs = &icl_ddi_power_well_regs, + .hsw.idx =ICL_PW_CTL_IDX_DDI_B , + } + }, + { + .name ="DDI D TC1 IO" , + .domains =TGL_DDI_IO_D_TC1_POWER_DOMAINS , + .ops = &hsw_power_well_ops, + .id =DISP_PW_ID_NONE , + { + .hsw.regs = &icl_ddi_power_well_regs, + .hsw.idx =TGL_PW_CTL_IDX_DDI_TC1 , + }, + }, + { + .name ="DDI E TC2 IO" , + .domains =TGL_DDI_IO_E_TC2_POWER_DOMAINS , + .ops = &hsw_power_well_ops, + .id =DISP_PW_ID_NONE , + { + .hsw.regs = &icl_ddi_power_well_regs, + .hsw.idx =TGL_PW_CTL_IDX_DDI_TC2 , + }, + }, + { + .name ="AUX A" , + .domains =ICL_AUX_A_IO_POWER_DOMAINS , + .ops = &icl_aux_power_well_ops, + .id =DISP_PW_ID_NONE , + { + .hsw.regs = &icl_aux_power_well_regs, + .hsw.idx =ICL_PW_CTL_IDX_AUX_A , + }, + }, + { + .name ="AUX B" , + .domains =ICL_AUX_B_IO_POWER_DOMAINS , + .ops = &icl_aux_power_well_ops, + .id =DISP_PW_ID_NONE , + { + .hsw.regs = &icl_aux_power_well_regs, + .hsw.idx =ICL_PW_CTL_IDX_AUX_B , + }, + }, + { + .name ="AUX D TC1" , + .domains =TGL_AUX_D_TC1_IO_POWER_DOMAINS , + .ops = &icl_aux_power_well_ops, + .id =DISP_PW_ID_NONE , + { + .hsw.regs = &icl_aux_power_well_regs, + .hsw.idx =TGL_PW_CTL_IDX_AUX_TC1 , + }, + }, + { + .name ="AUX E TC2" , + .domains =TGL_AUX_E_TC2_IO_POWER_DOMAINS , + .ops = &icl_aux_power_well_ops, + .id =DISP_PW_ID_NONE , + { + .hsw.regs = &icl_aux_power_well_regs, + .hsw.idx =TGL_PW_CTL_IDX_AUX_TC2 , + }, + }, +}; +static int sanitize_disable_power_well_option (const struct drm_i915_private *dev_priv,int disable_power_well)
@@ -4428,7 +4609,9 @@ int intel_power_domains_init(struct drm_i915_private *dev_priv)* The enabling order will be from lower to higher indexed wells, * the disabling order is reversed. */ -if (IS_GEN (dev_priv,12 )) { +if (IS_ROCKETLAKE (dev_priv)) { + err =set_power_wells (power_domains, rkl_power_wells); + }else if (IS_GEN (dev_priv,12 )) { err =set_power_wells (power_domains, tgl_power_wells); }else if (IS_GEN (dev_priv,11 )) { err =set_power_wells (power_domains, icl_power_wells);
drivers/gpu/drm/i915/display/intel_vdsc.c +2 -2
@@ -476,13 +476,13 @@ intel_dsc_power_domain(const struct intel_crtc_state *crtc_state)* POWER_DOMAIN_TRANSCODER_VDSC_PW2 power domain in two cases: * * - ICL eDP/DSI transcoder -* - TGL pipe A +* - Gen12+ (except RKL) pipe A * * For any other pipe, VDSC/joining uses the power well associated with * the pipe in use. Hence another reference on the pipe power domain * will suffice. (Except no VDSC/joining on ICL pipe A.) */ -if (INTEL_GEN (i915) >=12 && pipe ==PIPE_A ) +if (INTEL_GEN (i915) >=12 && !IS_ROCKETLAKE (i915) && pipe ==PIPE_A )return POWER_DOMAIN_TRANSCODER_VDSC_PW2 ;else if (is_pipe_dsc (crtc_state))return POWER_DOMAIN_PIPE (pipe);
Signature · 6 lines
2.24.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 9/23 drm/i915/rkl: Program BW_BUDDY0 registers instead of BW_BUDDY1/2
In reply to Matt RoperRKL uses the same BW_BUDDY programming table as TGL, but programs the values into a single set BUDDY0 set of registers rather than the BUDDY1/BUDDY2 sets used by TGL.
Bspec: 49218
--- .../drm/i915/display/intel_display_power.c | 44 +++++++++++-------- drivers/gpu/drm/i915/i915_reg.h | 14 ++++-- 2 files changed, 35 insertions(+), 23 deletions(-)
drivers/gpu/drm/i915/display/intel_display_power.c +25 -19
@@ -5249,7 +5249,7 @@ static void tgl_bw_buddy_init(struct drm_i915_private *dev_priv)enum intel_dram_type type = dev_priv->dram_info.type;u8 num_channels = dev_priv->dram_info.num_channels;const struct buddy_page_mask *table; -int i; +int config, min_buddy, max_buddy, i;if (IS_TGL_REVID (dev_priv,TGL_REVID_A0 ,TGL_REVID_B0 ))/* Wa_1409767108: tgl */
@@ -5257,29 +5257,35 @@ static void tgl_bw_buddy_init(struct drm_i915_private *dev_priv)else table = tgl_buddy_page_masks; -for (i =0 ; table[i].page_mask !=0 ; i++) -if (table[i].num_channels == num_channels && - table[i].type == type) +if (IS_ROCKETLAKE (dev_priv)) { + min_buddy = max_buddy =0 ; + }else { + min_buddy =1 ; + max_buddy =2 ; + } + +for (config =0 ; table[config].page_mask !=0 ; config++) +if (table[config].num_channels == num_channels && + table[config].type == type)break ; -if (table[i].page_mask ==0 ) { +if (table[config].page_mask ==0 ) {drm_dbg (&dev_priv->drm,"Unknown memory configuration; disabling address buddy logic.\n" ); -intel_de_write (dev_priv,BW_BUDDY1_CTL ,BW_BUDDY_DISABLE ); -intel_de_write (dev_priv,BW_BUDDY2_CTL ,BW_BUDDY_DISABLE ); +for (i = min_buddy; i <= max_buddy; i++) +intel_de_write (dev_priv,BW_BUDDY_CTL (i), +BW_BUDDY_DISABLE ); }else { -intel_de_write (dev_priv,BW_BUDDY1_PAGE_MASK , - table[i].page_mask); -intel_de_write (dev_priv,BW_BUDDY2_PAGE_MASK , - table[i].page_mask); - -/* Wa_22010178259:tgl */ -intel_de_rmw (dev_priv,BW_BUDDY1_CTL , -BW_BUDDY_TLB_REQ_TIMER_MASK , -REG_FIELD_PREP (BW_BUDDY_TLB_REQ_TIMER_MASK ,0x8 )); -intel_de_rmw (dev_priv,BW_BUDDY2_CTL , -BW_BUDDY_TLB_REQ_TIMER_MASK , -REG_FIELD_PREP (BW_BUDDY_TLB_REQ_TIMER_MASK ,0x8 )); +for (i = min_buddy; i <= max_buddy; i++) { +intel_de_write (dev_priv,BW_BUDDY_PAGE_MASK (i), + table[config].page_mask); + +/* Wa_22010178259:tgl,rkl */ +intel_de_rmw (dev_priv,BW_BUDDY_CTL (i), +BW_BUDDY_TLB_REQ_TIMER_MASK , +REG_FIELD_PREP (BW_BUDDY_TLB_REQ_TIMER_MASK , +0x8 )); + } } }
drivers/gpu/drm/i915/i915_reg.h +10 -4
@@ -7832,13 +7832,19 @@ enum {#define WAIT_FOR_PCH_RESET_ACK (1 << 1)#define WAIT_FOR_PCH_FLR_ACK (1 << 0) -#define BW_BUDDY1_CTL _MMIO(0x45140) -#define BW_BUDDY2_CTL _MMIO(0x45150) +#define _BW_BUDDY0_CTL 0x45130 +#define _BW_BUDDY1_CTL 0x45140 +#define BW_BUDDY_CTL (x) _MMIO(_PICK_EVEN(x, \ + _BW_BUDDY0_CTL, \ + _BW_BUDDY1_CTL))#define BW_BUDDY_DISABLE REG_BIT(31)#define BW_BUDDY_TLB_REQ_TIMER_MASK REG_GENMASK(21, 16) -#define BW_BUDDY1_PAGE_MASK _MMIO(0x45144) -#define BW_BUDDY2_PAGE_MASK _MMIO(0x45154) +#define _BW_BUDDY0_PAGE_MASK 0x45134 +#define _BW_BUDDY1_PAGE_MASK 0x45144 +#define BW_BUDDY_PAGE_MASK (x) _MMIO(_PICK_EVEN(x, \ + _BW_BUDDY0_PAGE_MASK, \ + _BW_BUDDY1_PAGE_MASK))#define HSW_NDE_RSTWRN_OPT _MMIO(0x46408)#define RESET_PCH_HANDSHAKE_ENABLE (1 << 4)
Signature · 6 lines
2.24.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 10/23 drm/i915/rkl: RKL only uses PHY_MISC for PHY's A and B
In reply to Matt RoperSince the number of platforms with this restriction are growing, let's separate out the platform logic into a has_phy_misc() function.
Bspec: 50107
--- .../gpu/drm/i915/display/intel_combo_phy.c | 30 +++++++++++-------- 1 file changed, 17 insertions(+), 13 deletions(-)
drivers/gpu/drm/i915/display/intel_combo_phy.c +17 -13
@@ -181,11 +181,25 @@ static void cnl_combo_phys_uninit(struct drm_i915_private *dev_priv)intel_de_write (dev_priv,CHICKEN_MISC_2 , val); } +static bool has_phy_misc (struct drm_i915_private *i915,enum phy phy) +{ +/* +* Some platforms only expect PHY_MISC to be programmed for PHY-A and +* PHY-B and may not even have instances of the register for the +* other combo PHY's. +*/ +if (IS_ELKHARTLAKE (i915) || +IS_ROCKETLAKE (i915)) +return phy <PHY_C ; + +return true; +} +static bool icl_combo_phy_enabled (struct drm_i915_private *dev_priv,enum phy phy) {/* The PHY C added by EHL has no PHY_MISC register */ -if (IS_ELKHARTLAKE (dev_priv) && phy ==PHY_C ) +if (!has_phy_misc (dev_priv, phy))return intel_de_read (dev_priv,ICL_PORT_COMP_DW0 (phy)) &COMP_INIT ;else return !(intel_de_read(dev_priv, ICL_PHY_MISC(phy)) &
@@ -317,12 +331,7 @@ static void icl_combo_phys_init(struct drm_i915_private *dev_priv)continue ; } -/* -* Although EHL adds a combo PHY C, there's no PHY_MISC -* register for it and no need to program the -* DE_IO_COMP_PWR_DOWN setting on PHY C. -*/ -if (IS_ELKHARTLAKE (dev_priv) && phy ==PHY_C ) +if (!has_phy_misc (dev_priv, phy)) goto skip_phy_misc;/*
@@ -376,12 +385,7 @@ static void icl_combo_phys_uninit(struct drm_i915_private *dev_priv)"Combo PHY %c HW state changed unexpectedly\n" , phy_name(phy)); -/* -* Although EHL adds a combo PHY C, there's no PHY_MISC -* register for it and no need to program the -* DE_IO_COMP_PWR_DOWN setting on PHY C. -*/ -if (IS_ELKHARTLAKE (dev_priv) && phy ==PHY_C ) +if (!has_phy_misc (dev_priv, phy)) goto skip_phy_misc; val =intel_de_read (dev_priv,ICL_PHY_MISC (phy));
Signature · 6 lines
2.24.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 11/23 drm/i915/rkl: Add cdclk support
In reply to Matt RoperNote that the 192000 clock frequencies can be achieved with different pairs of ratio+divider, which is something we haven't encountered before. If any of those ratios were common with other legal cdclk values, then it would mean we could avoid triggering full modesets if we just needed to change the divider. However at the moment there don't appear to be any valid cdclks that share the same ratio so we can't take advantage of this and it doesn't really matter which approach we use to achieve the 192000 cdclk. For now our driver functions that operate on the table will just always pick the first entry (lower ratio + lower divider).
Bspec: 49202
--- drivers/gpu/drm/i915/display/intel_cdclk.c | 54 +++++++++++++++++++--- 1 file changed, 48 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/display/intel_cdclk.c +48 -6
@@ -1230,6 +1230,40 @@ static const struct intel_cdclk_vals icl_cdclk_table[] = { {} }; +/* +* RKL has multiple divider+ratio pairs that can hit cdclk=192000. Our +* functions to read these tables will just always pick the first one which +* should be fine since there's no other valid cdclk value that can be achieved +* via the same ratio with a different divider (i.e., no opportunity to avoid a +* full modeset). +*/ +static const struct intel_cdclk_vals rkl_cdclk_table[] = { + { .refclk =19200 , .cdclk =172800 , .divider =3 , .ratio =27 }, + { .refclk =19200 , .cdclk =192000 , .divider =2 , .ratio =20 }, + { .refclk =19200 , .cdclk =192000 , .divider =3 , .ratio =15 }, + { .refclk =19200 , .cdclk =307200 , .divider =2 , .ratio =32 }, + { .refclk =19200 , .cdclk =326400 , .divider =4 , .ratio =68 }, + { .refclk =19200 , .cdclk =556800 , .divider =2 , .ratio =58 }, + { .refclk =19200 , .cdclk =652800 , .divider =2 , .ratio =68 }, + + { .refclk =24000 , .cdclk =176000 , .divider =3 , .ratio =22 }, + { .refclk =24000 , .cdclk =192000 , .divider =2 , .ratio =16 }, + { .refclk =24000 , .cdclk =192000 , .divider =3 , .ratio =24 }, + { .refclk =24000 , .cdclk =312000 , .divider =2 , .ratio =26 }, + { .refclk =24000 , .cdclk =324000 , .divider =4 , .ratio =54 }, + { .refclk =24000 , .cdclk =552000 , .divider =2 , .ratio =45 }, + { .refclk =24000 , .cdclk =648000 , .divider =2 , .ratio =54 }, + + { .refclk =38400 , .cdclk =179200 , .divider =3 , .ratio =14 }, + { .refclk =38400 , .cdclk =192000 , .divider =2 , .ratio =10 }, + { .refclk =38400 , .cdclk =192000 , .divider =3 , .ratio =15 }, + { .refclk =38400 , .cdclk =307200 , .divider =2 , .ratio =16 }, + { .refclk =38400 , .cdclk =326400 , .divider =4 , .ratio =34 }, + { .refclk =38400 , .cdclk =556800 , .divider =2 , .ratio =29 }, + { .refclk =38400 , .cdclk =652800 , .divider =2 , .ratio =34 }, + {} +}; +static int bxt_calc_cdclk (struct drm_i915_private *dev_priv,int min_cdclk) {const struct intel_cdclk_vals *table = dev_priv->cdclk.table;
@@ -1405,8 +1439,8 @@ static void bxt_get_cdclk(struct drm_i915_private *dev_priv, div =2 ;break ;case BXT_CDCLK_CD2X_DIV_SEL_1_5 : -drm_WARN (&dev_priv->drm, -IS_GEMINILAKE (dev_priv) ||INTEL_GEN (dev_priv) >=10 , +drm_WARN (&dev_priv->drm,IS_GEMINILAKE (dev_priv) || + (INTEL_GEN (dev_priv) >=10 && !IS_ROCKETLAKE (dev_priv)),"Unsupported divider\n" ); div =3 ;break ;
@@ -1414,7 +1448,8 @@ static void bxt_get_cdclk(struct drm_i915_private *dev_priv, div =4 ;break ;case BXT_CDCLK_CD2X_DIV_SEL_4 : -drm_WARN (&dev_priv->drm,INTEL_GEN (dev_priv) >=10 , +drm_WARN (&dev_priv->drm, +INTEL_GEN (dev_priv) >=10 && !IS_ROCKETLAKE (dev_priv),"Unsupported divider\n" ); div =8 ;break ;
@@ -1564,7 +1599,8 @@ static void bxt_set_cdclk(struct drm_i915_private *dev_priv,break ;case 3 :drm_WARN (&dev_priv->drm, -IS_GEMINILAKE (dev_priv) ||INTEL_GEN (dev_priv) >=10 , +IS_GEMINILAKE (dev_priv) || + (INTEL_GEN (dev_priv) >=10 && !IS_ROCKETLAKE (dev_priv)),"Unsupported divider\n" ); divider =BXT_CDCLK_CD2X_DIV_SEL_1_5 ;break ;
@@ -1572,7 +1608,8 @@ static void bxt_set_cdclk(struct drm_i915_private *dev_priv, divider =BXT_CDCLK_CD2X_DIV_SEL_2 ;break ;case 8 : -drm_WARN (&dev_priv->drm,INTEL_GEN (dev_priv) >=10 , +drm_WARN (&dev_priv->drm, +INTEL_GEN (dev_priv) >=10 && !IS_ROCKETLAKE (dev_priv),"Unsupported divider\n" ); divider =BXT_CDCLK_CD2X_DIV_SEL_4 ;break ;
@@ -2758,7 +2795,12 @@ u32 intel_read_rawclk(struct drm_i915_private *dev_priv)*/ void intel_init_cdclk_hooks (struct drm_i915_private *dev_priv) { -if (INTEL_GEN (dev_priv) >=12 ) { +if (IS_ROCKETLAKE (dev_priv)) { + dev_priv->display.set_cdclk = bxt_set_cdclk; + dev_priv->display.modeset_calc_cdclk = bxt_modeset_calc_cdclk; + dev_priv->display.calc_voltage_level = tgl_calc_voltage_level; + dev_priv->cdclk.table = rkl_cdclk_table; + }else if (INTEL_GEN (dev_priv) >=12 ) { dev_priv->display.set_cdclk = bxt_set_cdclk; dev_priv->display.modeset_calc_cdclk = bxt_modeset_calc_cdclk; dev_priv->display.calc_voltage_level = tgl_calc_voltage_level;
Signature · 6 lines
2.24.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH 11/23] drm/i915/rkl: Add cdclk support
Hi Matt,
The follow cdclk doesn't looked right, isn’t it should be 96000 and 540000 according to their respective divider and ratio?
....
+ { .refclk = 19200, .cdclk = 192000, .divider = 3, .ratio = 15 },
....
+ { .refclk = 24000, .cdclk = 552000, .divider = 2, .ratio = 45 },
....
Regards,
SweeAun
-----Original Message-----
From: Intel-gfx <[email protected]> On Behalf Of Matt Roper
Sent: Saturday, May 2, 2020 1:08 AM
To: [email protected]
Subject: [Intel-gfx] [PATCH 11/23] drm/i915/rkl: Add cdclk support
Note that the 192000 clock frequencies can be achieved with different pairs of ratio+divider, which is something we haven't encountered before. If any of those ratios were common with other legal cdclk values, then it would mean we could avoid triggering full modesets if we just needed to change the divider. However at the moment there don't appear to be any valid cdclks that share the same ratio so we can't take advantage of this and it doesn't really matter which approach we use to achieve the 192000 cdclk. For now our driver functions that operate on the table will just always pick the first entry (lower ratio + lower divider).
Bspec: 49202
--- drivers/gpu/drm/i915/display/intel_cdclk.c | 54 +++++++++++++++++++--- 1 file changed, 48 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/display/intel_cdclk.c +37 -0
@@ -1230,6 +1230,40 @@ static const struct intel_cdclk_vals icl_cdclk_table[] = { {} }; +/* +* RKL has multiple divider+ratio pairs that can hit cdclk=192000. Our +* functions to read these tables will just always pick the first one +which +* should be fine since there's no other valid cdclk value that can be +achieved +* via the same ratio with a different divider (i.e., no opportunity to +avoid a +* full modeset). +*/ +static const struct intel_cdclk_vals rkl_cdclk_table[] = { + { .refclk =19200 , .cdclk =172800 , .divider =3 , .ratio =27 }, + { .refclk =19200 , .cdclk =192000 , .divider =2 , .ratio =20 }, + { .refclk =19200 , .cdclk =192000 , .divider =3 , .ratio =15 }, + { .refclk =19200 , .cdclk =307200 , .divider =2 , .ratio =32 }, + { .refclk =19200 , .cdclk =326400 , .divider =4 , .ratio =68 }, + { .refclk =19200 , .cdclk =556800 , .divider =2 , .ratio =58 }, + { .refclk =19200 , .cdclk =652800 , .divider =2 , .ratio =68 }, + + { .refclk =24000 , .cdclk =176000 , .divider =3 , .ratio =22 }, + { .refclk =24000 , .cdclk =192000 , .divider =2 , .ratio =16 }, + { .refclk =24000 , .cdclk =192000 , .divider =3 , .ratio =24 }, + { .refclk =24000 , .cdclk =312000 , .divider =2 , .ratio =26 }, + { .refclk =24000 , .cdclk =324000 , .divider =4 , .ratio =54 }, + { .refclk =24000 , .cdclk =552000 , .divider =2 , .ratio =45 }, + { .refclk =24000 , .cdclk =648000 , .divider =2 , .ratio =54 }, + + { .refclk =38400 , .cdclk =179200 , .divider =3 , .ratio =14 }, + { .refclk =38400 , .cdclk =192000 , .divider =2 , .ratio =10 }, + { .refclk =38400 , .cdclk =192000 , .divider =3 , .ratio =15 }, + { .refclk =38400 , .cdclk =307200 , .divider =2 , .ratio =16 }, + { .refclk =38400 , .cdclk =326400 , .divider =4 , .ratio =34 }, + { .refclk =38400 , .cdclk =556800 , .divider =2 , .ratio =29 }, + { .refclk =38400 , .cdclk =652800 , .divider =2 , .ratio =34 }, + {} +}; +
static int bxt_calc_cdclk(struct drm_i915_private *dev_priv, int min_cdclk) {
const struct intel_cdclk_vals *table = dev_priv->cdclk.table; @@ -1405,8 +1439,8 @@ static void bxt_get_cdclk(struct drm_i915_private *dev_priv,
div = 2;
break;
case BXT_CDCLK_CD2X_DIV_SEL_1_5:
- drm_WARN(&dev_priv->drm,
- IS_GEMINILAKE(dev_priv) || INTEL_GEN(dev_priv) >= 10,
+ drm_WARN(&dev_priv->drm, IS_GEMINILAKE(dev_priv) ||
+ (INTEL_GEN(dev_priv) >= 10 && !IS_ROCKETLAKE(dev_priv)),
"Unsupported divider\n");
div = 3;
break;
@@ -1414,7 +1448,8 @@ static void bxt_get_cdclk(struct drm_i915_private *dev_priv,
div = 4;
break;
case BXT_CDCLK_CD2X_DIV_SEL_4:
- drm_WARN(&dev_priv->drm, INTEL_GEN(dev_priv) >= 10,
+ drm_WARN(&dev_priv->drm,
+ INTEL_GEN(dev_priv) >= 10 && !IS_ROCKETLAKE(dev_priv),
"Unsupported divider\n");
div = 8;
break;
@@ -1564,7 +1599,8 @@ static void bxt_set_cdclk(struct drm_i915_private *dev_priv,
break;
case 3:
drm_WARN(&dev_priv->drm,
- IS_GEMINILAKE(dev_priv) || INTEL_GEN(dev_priv) >= 10, + IS_GEMINILAKE(dev_priv) ||
+ (INTEL_GEN(dev_priv) >= 10 && !IS_ROCKETLAKE(dev_priv)),
"Unsupported divider\n");
divider = BXT_CDCLK_CD2X_DIV_SEL_1_5;
break;
@@ -1572,7 +1608,8 @@ static void bxt_set_cdclk(struct drm_i915_private *dev_priv,
divider = BXT_CDCLK_CD2X_DIV_SEL_2;
break;
case 8:
- drm_WARN(&dev_priv->drm, INTEL_GEN(dev_priv) >= 10,
+ drm_WARN(&dev_priv->drm,
+ INTEL_GEN(dev_priv) >= 10 && !IS_ROCKETLAKE(dev_priv),
"Unsupported divider\n");
divider = BXT_CDCLK_CD2X_DIV_SEL_4;
break;
@@ -2758,7 +2795,12 @@ u32 intel_read_rawclk(struct drm_i915_private *dev_priv)
*/
void intel_init_cdclk_hooks(struct drm_i915_private *dev_priv) {
- if (INTEL_GEN(dev_priv) >= 12) {
+ if (IS_ROCKETLAKE(dev_priv)) {
+ dev_priv->display.set_cdclk = bxt_set_cdclk;
+ dev_priv->display.modeset_calc_cdclk = bxt_modeset_calc_cdclk;
+ dev_priv->display.calc_voltage_level = tgl_calc_voltage_level;
+ dev_priv->cdclk.table = rkl_cdclk_table;
+ } else if (INTEL_GEN(dev_priv) >= 12) {
dev_priv->display.set_cdclk = bxt_set_cdclk; dev_priv->display.modeset_calc_cdclk = bxt_modeset_calc_cdclk; dev_priv->display.calc_voltage_level = tgl_calc_voltage_level;
--
2.24.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH 11/23] drm/i915/rkl: Add cdclk support
drivers/gpu/drm/i915/display/intel_cdclk.c static const struct intel_cdclk_vals icl_cdclk_table[] = { · line 1257
Quoted 7 lines · Swee Aun
Hi Matt,
The follow cdclk doesn't looked right, isn’t it should be 96000 and 540000 according to their respective divider and ratio?
....drivers/gpu/drm/i915/display/intel_cdclk.c +2
-0+{ .refclk = 19200, .cdclk = 192000, .divider = 3, .ratio = 15 }, +{ .refclk = 24000, .cdclk = 552000, .divider = 2, .ratio = 45 },
Yeah, you're right. The first one appears to have been removed from the bspec now and the second one appears to be a typo on my part (ratio should be 46 instead of 45).
Looks like there have been a couple other recent modifications to the bspec as well that I should update this patch to capture. Thanks for pointing that out!
Matt
Quoted 126 lines
Regards,
SweeAun-----Original Message-----
From: Intel-gfx <[email protected]> On Behalf Of Matt Roper
Sent: Saturday, May 2, 2020 1:08 AM
To: [email protected]
Subject: [Intel-gfx] [PATCH 11/23] drm/i915/rkl: Add cdclk supportNote that the 192000 clock frequencies can be achieved with different pairs of ratio+divider, which is something we haven't encountered before. If any of those ratios were common with other legal cdclk values, then it would mean we could avoid triggering full modesets if we just needed to change the divider. However at the moment there don't appear to be any valid cdclks that share the same ratio so we can't take advantage of this and it doesn't really matter which approach we use to achieve the 192000 cdclk. For now our driver functions that operate on the table will just always pick the first entry (lower ratio + lower divider).
Bspec: 49202
Cc Ville Syrjälä <[email protected]>Signed-off-by Matt Roper <[email protected]>--- drivers/gpu/drm/i915/display/intel_cdclk.c | 54 +++++++++++++++++++--- 1 file changed, 48 insertions(+), 6 deletions(-)drivers/gpu/drm/i915/display/intel_cdclk.c +51
-7@@ -1230,6 +1230,40 @@ static const struct intel_cdclk_vals icl_cdclk_table[] = { {} }; +/* +* RKL has multiple divider+ratio pairs that can hit cdclk=192000. Our +* functions to read these tables will just always pick the first one +which +* should be fine since there's no other valid cdclk value that can be +achieved +* via the same ratio with a different divider (i.e., no opportunity to +avoid a +* full modeset). +*/ +static const struct intel_cdclk_vals rkl_cdclk_table[] = { +{ .refclk =19200 , .cdclk =172800 , .divider =3 , .ratio =27 }, +{ .refclk =19200 , .cdclk =192000 , .divider =2 , .ratio =20 }, +{ .refclk =19200 , .cdclk =192000 , .divider =3 , .ratio =15 }, +{ .refclk =19200 , .cdclk =307200 , .divider =2 , .ratio =32 }, +{ .refclk =19200 , .cdclk =326400 , .divider =4 , .ratio =68 }, +{ .refclk =19200 , .cdclk =556800 , .divider =2 , .ratio =58 }, +{ .refclk =19200 , .cdclk =652800 , .divider =2 , .ratio =68 }, + +{ .refclk =24000 , .cdclk =176000 , .divider =3 , .ratio =22 }, +{ .refclk =24000 , .cdclk =192000 , .divider =2 , .ratio =16 }, +{ .refclk =24000 , .cdclk =192000 , .divider =3 , .ratio =24 }, +{ .refclk =24000 , .cdclk =312000 , .divider =2 , .ratio =26 }, +{ .refclk =24000 , .cdclk =324000 , .divider =4 , .ratio =54 }, +{ .refclk =24000 , .cdclk =552000 , .divider =2 , .ratio =45 }, +{ .refclk =24000 , .cdclk =648000 , .divider =2 , .ratio =54 }, + +{ .refclk =38400 , .cdclk =179200 , .divider =3 , .ratio =14 }, +{ .refclk =38400 , .cdclk =192000 , .divider =2 , .ratio =10 }, +{ .refclk =38400 , .cdclk =192000 , .divider =3 , .ratio =15 }, +{ .refclk =38400 , .cdclk =307200 , .divider =2 , .ratio =16 }, +{ .refclk =38400 , .cdclk =326400 , .divider =4 , .ratio =34 }, +{ .refclk =38400 , .cdclk =556800 , .divider =2 , .ratio =29 }, +{ .refclk =38400 , .cdclk =652800 , .divider =2 , .ratio =34 }, +{} +}; +static int bxt_calc_cdclk (struct drm_i915_private *dev_priv,int min_cdclk) { const struct intel_cdclk_vals *table = dev_priv->cdclk.table; @@ -1405,8 +1439,8 @@ static void bxt_get_cdclk(struct drm_i915_private *dev_priv, div = 2;break ;case BXT_CDCLK_CD2X_DIV_SEL_1_5 : -drm_WARN (&dev_priv->drm, -IS_GEMINILAKE (dev_priv) ||INTEL_GEN (dev_priv) >=10 , +drm_WARN (&dev_priv->drm,IS_GEMINILAKE (dev_priv) || + (INTEL_GEN (dev_priv) >=10 && !IS_ROCKETLAKE (dev_priv)),"Unsupported divider\n" ); div =3 ;break ;@@ -1414,7 +1448,8 @@ static void bxt_get_cdclk(struct drm_i915_private *dev_priv, div =4 ;break ;case BXT_CDCLK_CD2X_DIV_SEL_4 : -drm_WARN (&dev_priv->drm,INTEL_GEN (dev_priv) >=10 , +drm_WARN (&dev_priv->drm, +INTEL_GEN (dev_priv) >=10 && !IS_ROCKETLAKE (dev_priv),"Unsupported divider\n" ); div =8 ;break ;@@ -1564,7 +1599,8 @@ static void bxt_set_cdclk(struct drm_i915_private *dev_priv,break ;case 3 :drm_WARN (&dev_priv->drm, -IS_GEMINILAKE (dev_priv) ||INTEL_GEN (dev_priv) >=10 , +IS_GEMINILAKE (dev_priv) || + (INTEL_GEN (dev_priv) >=10 && !IS_ROCKETLAKE (dev_priv)),"Unsupported divider\n" ); divider =BXT_CDCLK_CD2X_DIV_SEL_1_5 ;break ;@@ -1572,7 +1608,8 @@ static void bxt_set_cdclk(struct drm_i915_private *dev_priv, divider =BXT_CDCLK_CD2X_DIV_SEL_2 ;break ;case 8 : -drm_WARN (&dev_priv->drm,INTEL_GEN (dev_priv) >=10 , +drm_WARN (&dev_priv->drm, +INTEL_GEN (dev_priv) >=10 && !IS_ROCKETLAKE (dev_priv),"Unsupported divider\n" ); divider =BXT_CDCLK_CD2X_DIV_SEL_4 ;break ;@@ -2758,7 +2795,12 @@ u32 intel_read_rawclk(struct drm_i915_private *dev_priv)*/ void intel_init_cdclk_hooks (struct drm_i915_private *dev_priv) { -if (INTEL_GEN (dev_priv) >=12 ) { +if (IS_ROCKETLAKE (dev_priv)) { +dev_priv->display.set_cdclk = bxt_set_cdclk; +dev_priv->display.modeset_calc_cdclk = bxt_modeset_calc_cdclk; +dev_priv->display.calc_voltage_level = tgl_calc_voltage_level; +dev_priv->cdclk.table = rkl_cdclk_table; +}else if (INTEL_GEN (dev_priv) >=12 ) { dev_priv->display.set_cdclk = bxt_set_cdclk; dev_priv->display.modeset_calc_cdclk = bxt_modeset_calc_cdclk; dev_priv->display.calc_voltage_level = tgl_calc_voltage_level; --2.24.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 9 lines
Matt Roper Graphics Software Engineer VTT-OSGC Platform Enablement Intel Corporation (916) 356-2795 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH 11/23] drm/i915/rkl: Add cdclk support
Quoted 13 lines · Matt Roper
drivers/gpu/drm/i915/display/intel_cdclk.c static const struct intel_cdclk_vals icl_cdclk_table[] = { · line 1257
Quoted 7 lines · Swee Aun
Hi Matt,
The follow cdclk doesn't looked right, isn’t it should be 96000 and 540000 according to their respective divider and ratio?
....drivers/gpu/drm/i915/display/intel_cdclk.c +2
-0+{ .refclk = 19200, .cdclk = 192000, .divider = 3, .ratio = 15 }, +{ .refclk = 24000, .cdclk = 552000, .divider = 2, .ratio = 45 },Yeah, you're right. The first one appears to have been removed from the bspec now and the second one appears to be a typo on my part (ratio should be 46 instead of 45).
Quoted 3 lines
Looks like there have been a couple other recent modifications to the bspec as well that I should update this patch to capture. Thanks for pointing that out!
Actually, it looks like the latest updates in the bspec have now made the RKL cdclk table identical to the TGL/ICL table. So we should be able to drop this patch completely now.
Matt
Quoted 137 lines
Matt
Quoted 126 lines
Regards,
SweeAun-----Original Message-----
From: Intel-gfx <[email protected]> On Behalf Of Matt Roper
Sent: Saturday, May 2, 2020 1:08 AM
To: [email protected]
Subject: [Intel-gfx] [PATCH 11/23] drm/i915/rkl: Add cdclk supportNote that the 192000 clock frequencies can be achieved with different pairs of ratio+divider, which is something we haven't encountered before. If any of those ratios were common with other legal cdclk values, then it would mean we could avoid triggering full modesets if we just needed to change the divider. However at the moment there don't appear to be any valid cdclks that share the same ratio so we can't take advantage of this and it doesn't really matter which approach we use to achieve the 192000 cdclk. For now our driver functions that operate on the table will just always pick the first entry (lower ratio + lower divider).
Bspec: 49202
Cc Ville Syrjälä <[email protected]>Signed-off-by Matt Roper <[email protected]>--- drivers/gpu/drm/i915/display/intel_cdclk.c | 54 +++++++++++++++++++--- 1 file changed, 48 insertions(+), 6 deletions(-)drivers/gpu/drm/i915/display/intel_cdclk.c +51
-7@@ -1230,6 +1230,40 @@ static const struct intel_cdclk_vals icl_cdclk_table[] = { {} }; +/* +* RKL has multiple divider+ratio pairs that can hit cdclk=192000. Our +* functions to read these tables will just always pick the first one +which +* should be fine since there's no other valid cdclk value that can be +achieved +* via the same ratio with a different divider (i.e., no opportunity to +avoid a +* full modeset). +*/ +static const struct intel_cdclk_vals rkl_cdclk_table[] = { +{ .refclk =19200 , .cdclk =172800 , .divider =3 , .ratio =27 }, +{ .refclk =19200 , .cdclk =192000 , .divider =2 , .ratio =20 }, +{ .refclk =19200 , .cdclk =192000 , .divider =3 , .ratio =15 }, +{ .refclk =19200 , .cdclk =307200 , .divider =2 , .ratio =32 }, +{ .refclk =19200 , .cdclk =326400 , .divider =4 , .ratio =68 }, +{ .refclk =19200 , .cdclk =556800 , .divider =2 , .ratio =58 }, +{ .refclk =19200 , .cdclk =652800 , .divider =2 , .ratio =68 }, + +{ .refclk =24000 , .cdclk =176000 , .divider =3 , .ratio =22 }, +{ .refclk =24000 , .cdclk =192000 , .divider =2 , .ratio =16 }, +{ .refclk =24000 , .cdclk =192000 , .divider =3 , .ratio =24 }, +{ .refclk =24000 , .cdclk =312000 , .divider =2 , .ratio =26 }, +{ .refclk =24000 , .cdclk =324000 , .divider =4 , .ratio =54 }, +{ .refclk =24000 , .cdclk =552000 , .divider =2 , .ratio =45 }, +{ .refclk =24000 , .cdclk =648000 , .divider =2 , .ratio =54 }, + +{ .refclk =38400 , .cdclk =179200 , .divider =3 , .ratio =14 }, +{ .refclk =38400 , .cdclk =192000 , .divider =2 , .ratio =10 }, +{ .refclk =38400 , .cdclk =192000 , .divider =3 , .ratio =15 }, +{ .refclk =38400 , .cdclk =307200 , .divider =2 , .ratio =16 }, +{ .refclk =38400 , .cdclk =326400 , .divider =4 , .ratio =34 }, +{ .refclk =38400 , .cdclk =556800 , .divider =2 , .ratio =29 }, +{ .refclk =38400 , .cdclk =652800 , .divider =2 , .ratio =34 }, +{} +}; +static int bxt_calc_cdclk (struct drm_i915_private *dev_priv,int min_cdclk) { const struct intel_cdclk_vals *table = dev_priv->cdclk.table; @@ -1405,8 +1439,8 @@ static void bxt_get_cdclk(struct drm_i915_private *dev_priv, div = 2;break ;case BXT_CDCLK_CD2X_DIV_SEL_1_5 : -drm_WARN (&dev_priv->drm, -IS_GEMINILAKE (dev_priv) ||INTEL_GEN (dev_priv) >=10 , +drm_WARN (&dev_priv->drm,IS_GEMINILAKE (dev_priv) || + (INTEL_GEN (dev_priv) >=10 && !IS_ROCKETLAKE (dev_priv)),"Unsupported divider\n" ); div =3 ;break ;@@ -1414,7 +1448,8 @@ static void bxt_get_cdclk(struct drm_i915_private *dev_priv, div =4 ;break ;case BXT_CDCLK_CD2X_DIV_SEL_4 : -drm_WARN (&dev_priv->drm,INTEL_GEN (dev_priv) >=10 , +drm_WARN (&dev_priv->drm, +INTEL_GEN (dev_priv) >=10 && !IS_ROCKETLAKE (dev_priv),"Unsupported divider\n" ); div =8 ;break ;@@ -1564,7 +1599,8 @@ static void bxt_set_cdclk(struct drm_i915_private *dev_priv,break ;case 3 :drm_WARN (&dev_priv->drm, -IS_GEMINILAKE (dev_priv) ||INTEL_GEN (dev_priv) >=10 , +IS_GEMINILAKE (dev_priv) || + (INTEL_GEN (dev_priv) >=10 && !IS_ROCKETLAKE (dev_priv)),"Unsupported divider\n" ); divider =BXT_CDCLK_CD2X_DIV_SEL_1_5 ;break ;@@ -1572,7 +1608,8 @@ static void bxt_set_cdclk(struct drm_i915_private *dev_priv, divider =BXT_CDCLK_CD2X_DIV_SEL_2 ;break ;case 8 : -drm_WARN (&dev_priv->drm,INTEL_GEN (dev_priv) >=10 , +drm_WARN (&dev_priv->drm, +INTEL_GEN (dev_priv) >=10 && !IS_ROCKETLAKE (dev_priv),"Unsupported divider\n" ); divider =BXT_CDCLK_CD2X_DIV_SEL_4 ;break ;@@ -2758,7 +2795,12 @@ u32 intel_read_rawclk(struct drm_i915_private *dev_priv)*/ void intel_init_cdclk_hooks (struct drm_i915_private *dev_priv) { -if (INTEL_GEN (dev_priv) >=12 ) { +if (IS_ROCKETLAKE (dev_priv)) { +dev_priv->display.set_cdclk = bxt_set_cdclk; +dev_priv->display.modeset_calc_cdclk = bxt_modeset_calc_cdclk; +dev_priv->display.calc_voltage_level = tgl_calc_voltage_level; +dev_priv->cdclk.table = rkl_cdclk_table; +}else if (INTEL_GEN (dev_priv) >=12 ) { dev_priv->display.set_cdclk = bxt_set_cdclk; dev_priv->display.modeset_calc_cdclk = bxt_modeset_calc_cdclk; dev_priv->display.calc_voltage_level = tgl_calc_voltage_level; --2.24.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfxSignature · 5 lines
Matt Roper Graphics Software Engineer VTT-OSGC Platform Enablement Intel Corporation (916) 356-2795
Signature · 9 lines
Matt Roper Graphics Software Engineer VTT-OSGC Platform Enablement Intel Corporation (916) 356-2795 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 12/23 drm/i915/rkl: Handle new DPCLKA_CFGCR0 layout
In reply to Matt RoperRKL uses a slightly different bit layout for the DPCLKA_CFGCR0 register.
Bspec: 50287
--- drivers/gpu/drm/i915/display/intel_ddi.c | 18 +++++++++++++++--- drivers/gpu/drm/i915/display/intel_display.c | 15 ++++++++++++--- drivers/gpu/drm/i915/i915_reg.h | 4 ++++ 3 files changed, 31 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/display/intel_ddi.c +15 -3
@@ -2732,7 +2732,9 @@ hsw_set_signal_levels(struct intel_dp *intel_dp)static u32 icl_dpclka_cfgcr0_clk_off (struct drm_i915_private *dev_priv,enum phy phy) { -if (intel_phy_is_combo (dev_priv, phy)) { +if (IS_ROCKETLAKE (dev_priv)) { +return RKL_DPCLKA_CFGCR0_DDI_CLK_OFF (phy); + }else if (intel_phy_is_combo (dev_priv, phy)) {return ICL_DPCLKA_CFGCR0_DDI_CLK_OFF (phy); }else if (intel_phy_is_tc (dev_priv, phy)) { enum tc_port tc_port = intel_port_to_tc(dev_priv,
@@ -2759,6 +2761,16 @@ static void icl_map_plls_to_ports(struct intel_encoder *encoder, (val & icl_dpclka_cfgcr0_clk_off(dev_priv, phy)) == 0);if (intel_phy_is_combo (dev_priv, phy)) { +u32 mask, sel; + +if (IS_ROCKETLAKE (dev_priv)) { + mask =RKL_DPCLKA_CFGCR0_DDI_CLK_SEL_MASK (phy); + sel =RKL_DPCLKA_CFGCR0_DDI_CLK_SEL (pll->info->id, phy); + }else { + mask =ICL_DPCLKA_CFGCR0_DDI_CLK_SEL_MASK (phy); + sel =ICL_DPCLKA_CFGCR0_DDI_CLK_SEL (pll->info->id, phy); + } +/* * Even though this register references DDIs, note that we * want to pass the PHY rather than the port (DDI). For
@@ -2769,8 +2781,8 @@ static void icl_map_plls_to_ports(struct intel_encoder *encoder,* Clock Select chooses the PLL for both DDIA and DDID and * drives port A in all cases." */ - val &= ~ICL_DPCLKA_CFGCR0_DDI_CLK_SEL_MASK (phy); - val |=ICL_DPCLKA_CFGCR0_DDI_CLK_SEL (pll->info->id, phy); + val &= mask; + val |= sel;intel_de_write (dev_priv,ICL_DPCLKA_CFGCR0 , val);intel_de_posting_read (dev_priv,ICL_DPCLKA_CFGCR0 ); }
drivers/gpu/drm/i915/display/intel_display.c +12 -3
@@ -10773,9 +10773,18 @@ static void icl_get_ddi_pll(struct drm_i915_private *dev_priv, enum port port,u32 temp;if (intel_phy_is_combo (dev_priv, phy)) { - temp =intel_de_read (dev_priv,ICL_DPCLKA_CFGCR0 ) & -ICL_DPCLKA_CFGCR0_DDI_CLK_SEL_MASK (phy); - id = temp >>ICL_DPCLKA_CFGCR0_DDI_CLK_SEL_SHIFT (phy); +u32 mask, shift; + +if (IS_ROCKETLAKE (dev_priv)) { + mask =RKL_DPCLKA_CFGCR0_DDI_CLK_SEL_MASK (phy); + shift =RKL_DPCLKA_CFGCR0_DDI_CLK_SEL_SHIFT (phy); + }else { + mask =ICL_DPCLKA_CFGCR0_DDI_CLK_SEL_MASK (phy); + shift =ICL_DPCLKA_CFGCR0_DDI_CLK_SEL_SHIFT (phy); + } + + temp =intel_de_read (dev_priv,ICL_DPCLKA_CFGCR0 ) & mask; + id = temp >> shift; port_dpll_id =ICL_PORT_DPLL_DEFAULT ; }else if (intel_phy_is_tc (dev_priv, phy)) {u32 clk_sel =intel_de_read (dev_priv,DDI_CLK_SEL (port)) &DDI_CLK_SEL_MASK ;
drivers/gpu/drm/i915/i915_reg.h +4 -0
@@ -10163,12 +10163,16 @@ enum skl_power_gate {#define ICL_DPCLKA_CFGCR0 _MMIO(0x164280)#define ICL_DPCLKA_CFGCR0_DDI_CLK_OFF (phy) (1 << _PICK(phy, 10, 11, 24)) +#define RKL_DPCLKA_CFGCR0_DDI_CLK_OFF (phy) REG_BIT(phy + 10)#define ICL_DPCLKA_CFGCR0_TC_CLK_OFF (tc_port) (1 << ((tc_port) < PORT_TC4 ? \ (tc_port) + 12 : \ (tc_port) - PORT_TC4 + 21))#define ICL_DPCLKA_CFGCR0_DDI_CLK_SEL_SHIFT (phy) ((phy) * 2)#define ICL_DPCLKA_CFGCR0_DDI_CLK_SEL_MASK (phy) (3 << ICL_DPCLKA_CFGCR0_DDI_CLK_SEL_SHIFT(phy))#define ICL_DPCLKA_CFGCR0_DDI_CLK_SEL (pll, phy) ((pll) << ICL_DPCLKA_CFGCR0_DDI_CLK_SEL_SHIFT(phy)) +#define RKL_DPCLKA_CFGCR0_DDI_CLK_SEL_SHIFT (phy) _PICK(phy, 0, 2, 4, 27) +#define RKL_DPCLKA_CFGCR0_DDI_CLK_SEL_MASK (phy) (3 << RKL_DPCLKA_CFGCR0_DDI_CLK_SEL_SHIFT(phy)) +#define RKL_DPCLKA_CFGCR0_DDI_CLK_SEL (pll, phy) ((pll) << RKL_DPCLKA_CFGCR0_DDI_CLK_SEL_SHIFT(phy))/* CNL PLL */ #define DPLL0_ENABLE 0x46010
Signature · 6 lines
2.24.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 1/1 drm/i915/rkl: Handle new DPCLKA_CFGCR0 layout
RKL uses a slightly different bit layout for the DPCLKA_CFGCR0 register.
v2:
- Fix inverted mask application when updating ICL_DPCLKA_CFGCR0
- Checkpatch style fixes
Bspec: 50287
--- drivers/gpu/drm/i915/display/intel_ddi.c | 18 +++++++++++++++--- drivers/gpu/drm/i915/display/intel_display.c | 15 ++++++++++++--- drivers/gpu/drm/i915/i915_reg.h | 6 ++++++ 3 files changed, 33 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/display/intel_ddi.c +15 -3
@@ -2732,7 +2732,9 @@ hsw_set_signal_levels(struct intel_dp *intel_dp)static u32 icl_dpclka_cfgcr0_clk_off (struct drm_i915_private *dev_priv,enum phy phy) { -if (intel_phy_is_combo (dev_priv, phy)) { +if (IS_ROCKETLAKE (dev_priv)) { +return RKL_DPCLKA_CFGCR0_DDI_CLK_OFF (phy); + }else if (intel_phy_is_combo (dev_priv, phy)) {return ICL_DPCLKA_CFGCR0_DDI_CLK_OFF (phy); }else if (intel_phy_is_tc (dev_priv, phy)) { enum tc_port tc_port = intel_port_to_tc(dev_priv,
@@ -2759,6 +2761,16 @@ static void icl_map_plls_to_ports(struct intel_encoder *encoder, (val & icl_dpclka_cfgcr0_clk_off(dev_priv, phy)) == 0);if (intel_phy_is_combo (dev_priv, phy)) { +u32 mask, sel; + +if (IS_ROCKETLAKE (dev_priv)) { + mask =RKL_DPCLKA_CFGCR0_DDI_CLK_SEL_MASK (phy); + sel =RKL_DPCLKA_CFGCR0_DDI_CLK_SEL (pll->info->id, phy); + }else { + mask =ICL_DPCLKA_CFGCR0_DDI_CLK_SEL_MASK (phy); + sel =ICL_DPCLKA_CFGCR0_DDI_CLK_SEL (pll->info->id, phy); + } +/* * Even though this register references DDIs, note that we * want to pass the PHY rather than the port (DDI). For
@@ -2769,8 +2781,8 @@ static void icl_map_plls_to_ports(struct intel_encoder *encoder,* Clock Select chooses the PLL for both DDIA and DDID and * drives port A in all cases." */ - val &= ~ICL_DPCLKA_CFGCR0_DDI_CLK_SEL_MASK (phy); - val |=ICL_DPCLKA_CFGCR0_DDI_CLK_SEL (pll->info->id, phy); + val &= ~mask; + val |= sel;intel_de_write (dev_priv,ICL_DPCLKA_CFGCR0 , val);intel_de_posting_read (dev_priv,ICL_DPCLKA_CFGCR0 ); }
drivers/gpu/drm/i915/display/intel_display.c +12 -3
@@ -10773,9 +10773,18 @@ static void icl_get_ddi_pll(struct drm_i915_private *dev_priv, enum port port,u32 temp;if (intel_phy_is_combo (dev_priv, phy)) { - temp =intel_de_read (dev_priv,ICL_DPCLKA_CFGCR0 ) & -ICL_DPCLKA_CFGCR0_DDI_CLK_SEL_MASK (phy); - id = temp >>ICL_DPCLKA_CFGCR0_DDI_CLK_SEL_SHIFT (phy); +u32 mask, shift; + +if (IS_ROCKETLAKE (dev_priv)) { + mask =RKL_DPCLKA_CFGCR0_DDI_CLK_SEL_MASK (phy); + shift =RKL_DPCLKA_CFGCR0_DDI_CLK_SEL_SHIFT (phy); + }else { + mask =ICL_DPCLKA_CFGCR0_DDI_CLK_SEL_MASK (phy); + shift =ICL_DPCLKA_CFGCR0_DDI_CLK_SEL_SHIFT (phy); + } + + temp =intel_de_read (dev_priv,ICL_DPCLKA_CFGCR0 ) & mask; + id = temp >> shift; port_dpll_id =ICL_PORT_DPLL_DEFAULT ; }else if (intel_phy_is_tc (dev_priv, phy)) {u32 clk_sel =intel_de_read (dev_priv,DDI_CLK_SEL (port)) &DDI_CLK_SEL_MASK ;
drivers/gpu/drm/i915/i915_reg.h +6 -0
@@ -10163,12 +10163,18 @@ enum skl_power_gate {#define ICL_DPCLKA_CFGCR0 _MMIO(0x164280)#define ICL_DPCLKA_CFGCR0_DDI_CLK_OFF (phy) (1 << _PICK(phy, 10, 11, 24)) +#define RKL_DPCLKA_CFGCR0_DDI_CLK_OFF (phy) REG_BIT((phy) + 10)#define ICL_DPCLKA_CFGCR0_TC_CLK_OFF (tc_port) (1 << ((tc_port) < PORT_TC4 ? \ (tc_port) + 12 : \ (tc_port) - PORT_TC4 + 21))#define ICL_DPCLKA_CFGCR0_DDI_CLK_SEL_SHIFT (phy) ((phy) * 2)#define ICL_DPCLKA_CFGCR0_DDI_CLK_SEL_MASK (phy) (3 << ICL_DPCLKA_CFGCR0_DDI_CLK_SEL_SHIFT(phy))#define ICL_DPCLKA_CFGCR0_DDI_CLK_SEL (pll, phy) ((pll) << ICL_DPCLKA_CFGCR0_DDI_CLK_SEL_SHIFT(phy)) +#define RKL_DPCLKA_CFGCR0_DDI_CLK_SEL_SHIFT (phy) _PICK(phy, 0, 2, 4, 27) +#define RKL_DPCLKA_CFGCR0_DDI_CLK_SEL_MASK (phy) \ + (3 << RKL_DPCLKA_CFGCR0_DDI_CLK_SEL_SHIFT(phy)) +#define RKL_DPCLKA_CFGCR0_DDI_CLK_SEL (pll, phy) \ + ((pll) << RKL_DPCLKA_CFGCR0_DDI_CLK_SEL_SHIFT(phy))/* CNL PLL */ #define DPLL0_ENABLE 0x46010
Signature · 6 lines
2.24.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 13/23 drm/i915/rkl: Check proper SDEISR bits for TC1 and TC2 outputs
In reply to Matt RoperWhen Rocket Lake is paired with a TGP PCH, the last two outputs utilize the TC1 and TC2 hpd pins, even though these are combo outputs.
Bspec: 49181
--- drivers/gpu/drm/i915/display/intel_dp.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/display/intel_dp.c +6 -2
@@ -6172,8 +6172,12 @@ static bool bxt_digital_port_connected(struct intel_encoder *encoder)static bool intel_combo_phy_connected (struct drm_i915_private *dev_priv,enum phy phy) { -if (HAS_PCH_MCC (dev_priv) && phy ==PHY_C ) -return intel_de_read (dev_priv,SDEISR ) &SDE_TC_HOTPLUG_ICP (PORT_TC1 ); +if (IS_ROCKETLAKE (dev_priv) && phy >=PHY_C ) +return intel_de_read (dev_priv,SDEISR ) & +SDE_TC_HOTPLUG_ICP (phy -PHY_C ); +else if (HAS_PCH_MCC (dev_priv) && phy ==PHY_C ) +return intel_de_read (dev_priv,SDEISR ) & +SDE_TC_HOTPLUG_ICP (PORT_TC1 );return intel_de_read (dev_priv,SDEISR ) &SDE_DDI_HOTPLUG_ICP (phy); }
Signature · 6 lines
2.24.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 14/23 drm/i915/rkl: Setup ports/phys
In reply to Matt RoperRKL uses DDI's A, B, TC1, and TC2 which need to map to combo PHY's A-D.
Bspec: 49181
--- drivers/gpu/drm/i915/display/intel_display.c | 34 ++++++++++++-------- drivers/gpu/drm/i915/i915_reg.h | 4 ++- 2 files changed, 24 insertions(+), 14 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +21 -13
@@ -7212,30 +7212,33 @@ bool intel_phy_is_combo(struct drm_i915_private *dev_priv, enum phy phy) {if (phy ==PHY_NONE )return false; - -if (IS_ELKHARTLAKE (dev_priv)) +else if (IS_ROCKETLAKE (dev_priv)) +return phy <=PHY_D ; +else if (IS_ELKHARTLAKE (dev_priv))return phy <=PHY_C ; - -if (INTEL_GEN (dev_priv) >=11 ) +else if (INTEL_GEN (dev_priv) >=11 )return phy <=PHY_B ; - -return false; +else +return false; }bool intel_phy_is_tc (struct drm_i915_private *dev_priv,enum phy phy) { -if (INTEL_GEN (dev_priv) >=12 ) +if (IS_ROCKETLAKE (dev_priv)) +return false; +else if (INTEL_GEN (dev_priv) >=12 )return phy >=PHY_D && phy <=PHY_I ; - -if (INTEL_GEN (dev_priv) >=11 && !IS_ELKHARTLAKE (dev_priv)) +else if (INTEL_GEN (dev_priv) >=11 && !IS_ELKHARTLAKE (dev_priv))return phy >=PHY_C && phy <=PHY_F ; - -return false; +else +return false; }enum phy intel_port_to_phy (struct drm_i915_private *i915,enum port port) { -if (IS_ELKHARTLAKE (i915) && port ==PORT_D ) +if (IS_ROCKETLAKE (i915) && port >=PORT_D ) +return (enum phy )port -1 ; +else if (IS_ELKHARTLAKE (i915) && port ==PORT_D )return PHY_A ;return (enum phy )port;
@@ -16692,7 +16695,12 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv)if (!HAS_DISPLAY (dev_priv) || !INTEL_DISPLAY_ENABLED (dev_priv))return ; -if (INTEL_GEN (dev_priv) >=12 ) { +if (IS_ROCKETLAKE (dev_priv)) { +intel_ddi_init (dev_priv,PORT_A ); +intel_ddi_init (dev_priv,PORT_B ); +intel_ddi_init (dev_priv,PORT_D );/* DDI TC1 */ +intel_ddi_init (dev_priv,PORT_E );/* DDI TC2 */ + }else if (INTEL_GEN (dev_priv) >=12 ) {intel_ddi_init (dev_priv,PORT_A );intel_ddi_init (dev_priv,PORT_B );intel_ddi_init (dev_priv,PORT_D );
drivers/gpu/drm/i915/i915_reg.h +3 -1
@@ -1869,9 +1869,11 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define _ICL_COMBOPHY_A 0x162000#define _ICL_COMBOPHY_B 0x6C000#define _EHL_COMBOPHY_C 0x160000 +#define _RKL_COMBOPHY_D 0x161000#define _ICL_COMBOPHY (phy) _PICK(phy, _ICL_COMBOPHY_A, \ _ICL_COMBOPHY_B, \ - _EHL_COMBOPHY_C) + _EHL_COMBOPHY_C, \ + _RKL_COMBOPHY_D)/* CNL/ICL Port CL_DW registers */ #define _ICL_PORT_CL_DW (dw, phy) (_ICL_COMBOPHY(phy) + \
Signature · 6 lines
2.24.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 15/23 drm/i915/rkl: provide port/phy mapping for vbt
In reply to Matt RoperFrom: Lucas De Marchi <[email protected]>
RKL uses the DDI A, DDI B, DDI USBC1, DDI USBC2 from the DE point of view, so all DDI/pipe/transcoder register use these indexes to refer to them. Combo phy and IO functions follow another namespace that we keep as "enum phy". The VBT in theory would use the DE point of view, but that does not happen in practice.
Provide a table to convert the child devices to the "correct" port numbering we use. Now this is the output we get while reading the VBT:
DDIA:
[drm:intel_bios_port_aux_ch [i915]] using AUX A for port A (VBT) [drm:intel_dp_init_connector [i915]] Adding DP connector on [ENCODER:275:DDI A] [drm:intel_hdmi_init_connector [i915]] Adding HDMI connector on [ENCODER:275:DDI A] [drm:intel_hdmi_init_connector [i915]] Using DDC pin 0x1 for port A (VBT)
DDIB:
[drm:intel_bios_port_aux_ch [i915]] using AUX B for port B (platform default) [drm:intel_hdmi_init_connector [i915]] Adding HDMI connector on [ENCODER:291:DDI B] [drm:intel_hdmi_init_connector [i915]] Using DDC pin 0x2 for port B (VBT)
DDI USBC1:
[drm:intel_bios_port_aux_ch [i915]] using AUX D for port D (VBT) [drm:intel_dp_init_connector [i915]] Adding DP connector on [ENCODER:295:DDI D] [drm:intel_hdmi_init_connector [i915]] Adding HDMI connector on [ENCODER:295:DDI D] [drm:intel_hdmi_init_connector [i915]] Using DDC pin 0x3 for port D (VBT)
DDI USBC2:
[drm:intel_bios_port_aux_ch [i915]] using AUX E for port E (VBT) [drm:intel_dp_init_connector [i915]] Adding DP connector on [ENCODER:306:DDI E] [drm:intel_hdmi_init_connector [i915]] Adding HDMI connector on [ENCODER:306:DDI E] [drm:intel_hdmi_init_connector [i915]] Using DDC pin 0x9 for port E (VBT)
--- drivers/gpu/drm/i915/display/intel_bios.c | 72 ++++++++++++++++------- 1 file changed, 51 insertions(+), 21 deletions(-)
drivers/gpu/drm/i915/display/intel_bios.c +51 -21
@@ -1619,30 +1619,18 @@ static u8 map_ddc_pin(struct drm_i915_private *dev_priv, u8 vbt_pin)return 0 ; } -static enum port dvo_port_to_port (u8 dvo_port) +static enum port __dvo_port_to_port (int n_ports,int n_dvo, +const int port_mapping[][3 ],u8 dvo_port) { -/* -* Each DDI port can have more than one value on the "DVO Port" field, -* so look for all the possible values for each port. -*/ -static const int dvo_ports[][3 ] = { - [PORT_A ] = {DVO_PORT_HDMIA ,DVO_PORT_DPA ,-1 }, - [PORT_B ] = {DVO_PORT_HDMIB ,DVO_PORT_DPB ,-1 }, - [PORT_C ] = {DVO_PORT_HDMIC ,DVO_PORT_DPC ,-1 }, - [PORT_D ] = {DVO_PORT_HDMID ,DVO_PORT_DPD ,-1 }, - [PORT_E ] = {DVO_PORT_CRT ,DVO_PORT_HDMIE ,DVO_PORT_DPE }, - [PORT_F ] = {DVO_PORT_HDMIF ,DVO_PORT_DPF ,-1 }, - [PORT_G ] = {DVO_PORT_HDMIG ,DVO_PORT_DPG ,-1 }, - };enum port port;int i; -for (port =PORT_A ; port <ARRAY_SIZE (dvo_ports); port++) { -for (i =0 ; i <ARRAY_SIZE (dvo_ports[port]); i++) { -if (dvo_ports[port][i] ==-1 ) +for (port =PORT_A ; port < n_ports; port++) { +for (i =0 ; i < n_dvo; i++) { +if (port_mapping[port][i] ==-1 )break ; -if (dvo_port == dvo_ports[port][i]) +if (dvo_port == port_mapping[port][i])return port; } }
@@ -1650,6 +1638,48 @@ static enum port dvo_port_to_port(u8 dvo_port)return PORT_NONE ; } +static enum port dvo_port_to_port (struct drm_i915_private *dev_priv, +u8 dvo_port) +{ +/* +* Each DDI port can have more than one value on the "DVO Port" field, +* so look for all the possible values for each port. +*/ +static const int port_mapping[][3 ] = { + [PORT_A ] = {DVO_PORT_HDMIA ,DVO_PORT_DPA ,-1 }, + [PORT_B ] = {DVO_PORT_HDMIB ,DVO_PORT_DPB ,-1 }, + [PORT_C ] = {DVO_PORT_HDMIC ,DVO_PORT_DPC ,-1 }, + [PORT_D ] = {DVO_PORT_HDMID ,DVO_PORT_DPD ,-1 }, + [PORT_E ] = {DVO_PORT_CRT ,DVO_PORT_HDMIE ,-1 }, + [PORT_F ] = {DVO_PORT_HDMIF ,DVO_PORT_DPF ,-1 }, + [PORT_G ] = {DVO_PORT_HDMIG ,DVO_PORT_DPG ,-1 }, + }; +/* +* Bspec lists the ports as A, B, C, D - however internally in our +* driver we keep them as PORT_A, PORT_B, PORT_D and PORT_E so the +* registers in Display Engine match the right offsets. Apply the +* mapping here to translate from VBT to internal convention. +*/ +static const int rkl_port_mapping[][3 ] = { + [PORT_A ] = {DVO_PORT_HDMIA ,DVO_PORT_DPA ,-1 }, + [PORT_B ] = {DVO_PORT_HDMIB ,DVO_PORT_DPB ,-1 }, + [PORT_C ] = {-1 }, + [PORT_D ] = {DVO_PORT_HDMIC ,DVO_PORT_DPC ,-1 }, + [PORT_E ] = {DVO_PORT_HDMID ,DVO_PORT_DPD ,-1 }, + }; + +if (IS_ROCKETLAKE (dev_priv)) +return __dvo_port_to_port (ARRAY_SIZE (rkl_port_mapping), +ARRAY_SIZE (rkl_port_mapping[0 ]), + rkl_port_mapping, + dvo_port); +else +return __dvo_port_to_port (ARRAY_SIZE (port_mapping), +ARRAY_SIZE (port_mapping[0 ]), + port_mapping, + dvo_port); +} +static void parse_ddi_port (struct drm_i915_private *dev_priv,struct display_device_data *devdata,u8 bdb_version)
@@ -1659,7 +1689,7 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv,bool is_dvi, is_hdmi, is_dp, is_edp, is_crt;enum port port; - port =dvo_port_to_port (child->dvo_port); + port =dvo_port_to_port (dev_priv, child->dvo_port);if (port ==PORT_NONE )return ;
@@ -2603,10 +2633,10 @@ enum aux_ch intel_bios_port_aux_ch(struct drm_i915_private *dev_priv, aux_ch =AUX_CH_B ;break ;case DP_AUX_C : - aux_ch =AUX_CH_C ; + aux_ch =IS_ROCKETLAKE (dev_priv) ?AUX_CH_D :AUX_CH_C ;break ;case DP_AUX_D : - aux_ch =AUX_CH_D ; + aux_ch =IS_ROCKETLAKE (dev_priv) ?AUX_CH_E :AUX_CH_D ;break ;case DP_AUX_E : aux_ch =AUX_CH_E ;
Signature · 6 lines
2.24.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 16/23 drm/i915/rkl: Add DDC pin mapping
In reply to Matt RoperThe pin mapping for the final two outputs varies according to which PCH is present on the platform: with TGP the pins are remapped into the TC range, whereas with CMP they stay in the traditional combo output range.
Bspec: 49181
--- drivers/gpu/drm/i915/display/intel_hdmi.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/display/intel_hdmi.c +21 -1
@@ -3082,6 +3082,24 @@ static u8 mcc_port_to_ddc_pin(struct drm_i915_private *dev_priv, enum port port)return ddc_pin; } +static u8 rkl_port_to_ddc_pin (struct drm_i915_private *dev_priv,enum port port) +{ +enum phy phy =intel_port_to_phy (dev_priv, port); + +WARN_ON (port ==PORT_C ); + +/* +* Pin mapping for RKL depends on which PCH is present. With TGP, the +* final two outputs use type-c pins, even though they're actually +* combo outputs. With CMP, the traditional DDI A-D pins are used for +* all outputs. +*/ +if (INTEL_PCH_TYPE (dev_priv) >=PCH_TGP && phy >=PHY_C ) +return GMBUS_PIN_9_TC1_ICP + phy -PHY_C ; + +return GMBUS_PIN_1_BXT + phy; +} +static u8 g4x_port_to_ddc_pin (struct drm_i915_private *dev_priv,enum port port) {
@@ -3119,7 +3137,9 @@ static u8 intel_hdmi_ddc_pin(struct intel_encoder *encoder)return ddc_pin; } -if (HAS_PCH_MCC (dev_priv)) +if (IS_ROCKETLAKE (dev_priv)) + ddc_pin =rkl_port_to_ddc_pin (dev_priv, port); +else if (HAS_PCH_MCC (dev_priv)) ddc_pin =mcc_port_to_ddc_pin (dev_priv, port);else if (INTEL_PCH_TYPE (dev_priv) >=PCH_ICP ) ddc_pin =icl_port_to_ddc_pin (dev_priv, port);
Signature · 6 lines
2.24.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 17/23 drm/i915/rkl: Don't try to access transcoder D
In reply to Matt RoperThere are a couple places in our driver that loop over transcoders A..D for gen11+; since RKL only has three pipes/transcoders, this can lead to unclaimed register reads/writes. We should add checks for transcoder existence where appropriate.
--- drivers/gpu/drm/i915/display/intel_display.c | 3 +++ drivers/gpu/drm/i915/i915_irq.c | 6 ++++++ 2 files changed, 9 insertions(+)
drivers/gpu/drm/i915/display/intel_display.c +3 -0
@@ -11007,6 +11007,9 @@ static bool bxt_get_dsi_transcoder_state(struct intel_crtc *crtc,else cpu_transcoder =TRANSCODER_DSI_C ; +if (!HAS_TRANSCODER (dev_priv, cpu_transcoder)) +continue ; + power_domain =POWER_DOMAIN_TRANSCODER (cpu_transcoder);drm_WARN_ON (dev, *power_domain_mask &BIT_ULL (power_domain));
drivers/gpu/drm/i915/i915_irq.c +6 -0
@@ -2849,6 +2849,9 @@ static void gen11_display_irq_reset(struct drm_i915_private *dev_priv)for (trans =TRANSCODER_A ; trans <=TRANSCODER_D ; trans++) {enum intel_display_power_domain domain; +if (!HAS_TRANSCODER (dev_priv, trans)) +continue ; + domain =POWER_DOMAIN_TRANSCODER (trans);if (!intel_display_power_is_enabled (dev_priv, domain))continue ;
@@ -3399,6 +3402,9 @@ static void gen8_de_irq_postinstall(struct drm_i915_private *dev_priv)for (trans =TRANSCODER_A ; trans <=TRANSCODER_D ; trans++) {enum intel_display_power_domain domain; +if (!HAS_TRANSCODER (dev_priv, trans)) +continue ; + domain =POWER_DOMAIN_TRANSCODER (trans);if (!intel_display_power_is_enabled (dev_priv, domain))continue ;
Signature · 6 lines
2.24.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 18/23 drm/i915/rkl: Don't try to read out DSI transcoders
In reply to Matt RoperFrom: Aditya Swarup <[email protected]>
RKL doesn't have DSI outputs, so we shouldn't try to read out the DSI transcoder registers.
--- drivers/gpu/drm/i915/display/intel_display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/display/intel_display.c +1 -1
@@ -10901,7 +10901,7 @@ static bool hsw_get_transcoder_state(struct intel_crtc *crtc,intel_wakeref_t wf;u32 tmp; -if (INTEL_GEN (dev_priv) >=11 ) +if (!IS_ROCKETLAKE (dev_priv) &&INTEL_GEN (dev_priv) >=11 ) panel_transcoder_mask |=BIT (TRANSCODER_DSI_0 ) |BIT (TRANSCODER_DSI_1 );
Signature · 6 lines
2.24.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 19/23 drm/i915/rkl: Handle comp master/slave relationships for PHYs
In reply to Matt RoperCertain combo PHYs act as a compensation master to other PHYs and need to be initialized with a special irefgen bit in the PORT_COMP_DW8 register. Previously PHY A was the only compensation master (for PHYs B & C), but RKL adds a fourth PHY which is slaved to PHY C instead.
Bspec: 49291
--- .../gpu/drm/i915/display/intel_combo_phy.c | 25 +++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/display/intel_combo_phy.c +23 -2
@@ -234,6 +234,27 @@ static bool ehl_vbt_ddi_d_present(struct drm_i915_private *i915)return false; } +static bool phy_is_master (struct drm_i915_private *dev_priv,enum phy phy) +{ +/* +* Certain PHYs are connected to compensation resistors and act +* as masters to other PHYs. +* +* ICL,TGL: +* A(master) -> B(slave), C(slave) +* RKL: +* A(master) -> B(slave) +* C(master) -> D(slave) +* +* We must set the IREFGEN bit for any PHY acting as a master +* to another PHY. +*/ +if (IS_ROCKETLAKE (dev_priv) && phy ==PHY_C ) +return true; + +return phy ==PHY_A ; +} +static bool icl_combo_phy_verify_state (struct drm_i915_private *dev_priv,enum phy phy) {
@@ -245,7 +266,7 @@ static bool icl_combo_phy_verify_state(struct drm_i915_private *dev_priv, ret =cnl_verify_procmon_ref_values (dev_priv, phy); -if (phy ==PHY_A ) { +if (phy_is_master (dev_priv, phy)) { ret &=check_phy_reg (dev_priv, phy,ICL_PORT_COMP_DW8 (phy),IREFGEN ,IREFGEN );
@@ -356,7 +377,7 @@ static void icl_combo_phys_init(struct drm_i915_private *dev_priv) skip_phy_misc:cnl_set_procmon_ref_values (dev_priv, phy); -if (phy ==PHY_A ) { +if (phy_is_master (dev_priv, phy)) { val =intel_de_read (dev_priv,ICL_PORT_COMP_DW8 (phy)); val |=IREFGEN ;intel_de_write (dev_priv,ICL_PORT_COMP_DW8 (phy), val);
Signature · 6 lines
2.24.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 20/23 drm/i915/rkl: Add DPLL4 support
In reply to Matt RoperRocket Lake has a third DPLL (called 'DPLL4') that must be used to enable a third display. Unlike EHL's variant of DPLL4, the RKL variant behaves the same as DPLL0/1. And despite its name, the DPLL4 registers are offset as if it were DPLL2, so no extra offset handling is needed either.
Bspec: 49202
Bspec: 49443
Bspec: 50288
Bspec: 50289
--- drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 28 +++++++++++++++++-- 1 file changed, 25 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/display/intel_dpll_mgr.c +25 -3
@@ -3506,13 +3506,19 @@ static bool icl_get_combo_phy_dpll(struct intel_atomic_state *state,return false; } -if (IS_ELKHARTLAKE (dev_priv) && port !=PORT_A ) +if (IS_ROCKETLAKE (dev_priv)) { dpll_mask =BIT (DPLL_ID_EHL_DPLL4 ) |BIT (DPLL_ID_ICL_DPLL1 ) |BIT (DPLL_ID_ICL_DPLL0 ); -else + }else if (IS_ELKHARTLAKE (dev_priv) && port !=PORT_A ) { + dpll_mask = +BIT (DPLL_ID_EHL_DPLL4 ) | +BIT (DPLL_ID_ICL_DPLL1 ) | +BIT (DPLL_ID_ICL_DPLL0 ); + }else { dpll_mask =BIT (DPLL_ID_ICL_DPLL1 ) |BIT (DPLL_ID_ICL_DPLL0 ); + } port_dpll->pll = intel_find_shared_dpll(state, crtc, &port_dpll->hw_state,
@@ -4275,6 +4281,20 @@ static const struct intel_dpll_mgr tgl_pll_mgr = { .dump_hw_state = icl_dump_hw_state, }; +static const struct dpll_info rkl_plls[] = { + {"DPLL 0" , &combo_pll_funcs,DPLL_ID_ICL_DPLL0 ,0 }, + {"DPLL 1" , &combo_pll_funcs,DPLL_ID_ICL_DPLL1 ,0 }, + {"DPLL 4" , &combo_pll_funcs,DPLL_ID_EHL_DPLL4 ,0 }, + { }, +}; + +static const struct intel_dpll_mgr rkl_pll_mgr = { + .dpll_info = rkl_plls, + .get_dplls = icl_get_dplls, + .put_dplls = icl_put_dplls, + .dump_hw_state = icl_dump_hw_state, +}; +/** * intel_shared_dpll_init - Initialize shared DPLLs * @dev: drm device
@@ -4288,7 +4308,9 @@ void intel_shared_dpll_init(struct drm_device *dev)const struct dpll_info *dpll_info;int i; -if (INTEL_GEN (dev_priv) >=12 ) +if (IS_ROCKETLAKE (dev_priv)) + dpll_mgr = &rkl_pll_mgr; +else if (INTEL_GEN (dev_priv) >=12 ) dpll_mgr = &tgl_pll_mgr;else if (IS_ELKHARTLAKE (dev_priv)) dpll_mgr = &ehl_pll_mgr;
Signature · 6 lines
2.24.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 21/23 drm/i915/rkl: Handle HTI
In reply to Matt RoperIf HTI (also sometimes called HDPORT) is enabled at startup, it may be using some of the PHYs and DPLLs making them unavailable for general usage. Let's read out the HDPORT_STATE register and avoid making use of resources that HTI is already using.
Bspec: 49189
Bspec: 53707
--- drivers/gpu/drm/i915/display/intel_display.c | 30 ++++++++++++++++--- drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 22 ++++++++++++++ drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 1 + drivers/gpu/drm/i915/i915_drv.h | 3 ++ drivers/gpu/drm/i915/i915_reg.h | 6 ++++ 5 files changed, 58 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +26 -4
@@ -46,6 +46,7 @@#include "display/intel_ddi.h" #include "display/intel_dp.h" #include "display/intel_dp_mst.h" +#include "display/intel_dpll_mgr.h" #include "display/intel_dsi.h" #include "display/intel_dvo.h" #include "display/intel_gmbus.h"
@@ -16688,6 +16689,13 @@ static void intel_pps_init(struct drm_i915_private *dev_priv)intel_pps_unlock_regs_wa (dev_priv); } +static bool hti_uses_phy (u32 hdport_state,enum phy phy) +{ +return hdport_state &HDPORT_ENABLED && + (hdport_state &HDPORT_PHY_USED_DP (phy) || + hdport_state &HDPORT_PHY_USED_HDMI (phy)); +} +static void intel_setup_outputs (struct drm_i915_private *dev_priv) {struct intel_encoder *encoder;
@@ -16699,10 +16707,22 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv)return ;if (IS_ROCKETLAKE (dev_priv)) { -intel_ddi_init (dev_priv,PORT_A ); -intel_ddi_init (dev_priv,PORT_B ); -intel_ddi_init (dev_priv,PORT_D );/* DDI TC1 */ -intel_ddi_init (dev_priv,PORT_E );/* DDI TC2 */ +/* +* If HTI (aka HDPORT) is enabled at boot, it may have taken +* over some of the PHYs and made them unavailable to the +* driver. In that case we should skip initializing the +* corresponding outputs. +*/ +u32 hdport_state =intel_de_read (dev_priv,HDPORT_STATE ); + +if (!hti_uses_phy (hdport_state,PHY_A )) +intel_ddi_init (dev_priv,PORT_A ); +if (!hti_uses_phy (hdport_state,PHY_B )) +intel_ddi_init (dev_priv,PORT_B ); +if (!hti_uses_phy (hdport_state,PHY_C )) +intel_ddi_init (dev_priv,PORT_D );/* DDI TC1 */ +if (!hti_uses_phy (hdport_state,PHY_D )) +intel_ddi_init (dev_priv,PORT_E );/* DDI TC2 */ }else if (INTEL_GEN (dev_priv) >=12 ) {intel_ddi_init (dev_priv,PORT_A );intel_ddi_init (dev_priv,PORT_B );
@@ -18221,6 +18241,8 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)intel_dpll_readout_hw_state (dev_priv); + dev_priv->hti_pll_mask =intel_get_hti_plls (dev_priv); +for_each_intel_encoder (dev, encoder) { pipe =0 ;
drivers/gpu/drm/i915/display/intel_dpll_mgr.c +22 -0
@@ -265,6 +265,25 @@ void intel_disable_shared_dpll(const struct intel_crtc_state *crtc_state)mutex_unlock (&dev_priv->dpll.lock); } +/* +* HTI (aka HDPORT) may be using some of the platform's PLL's, making them +* unavailable for use. +*/ +u32 intel_get_hti_plls (struct drm_i915_private *dev_priv) +{ + +u32 hdport_state; + +if (!IS_ROCKETLAKE (dev_priv)) +return 0 ; + + hdport_state =intel_de_read (dev_priv,HDPORT_STATE ); +if (!(hdport_state &HDPORT_ENABLED )) +return 0 ; + +return REG_FIELD_GET (HDPORT_DPLL_USED_MASK , hdport_state); +} +static struct intel_shared_dpll * intel_find_shared_dpll(struct intel_atomic_state *state, const struct intel_crtc *crtc,
@@ -280,6 +299,9 @@ intel_find_shared_dpll(struct intel_atomic_state *state,drm_WARN_ON (&dev_priv->drm, dpll_mask & ~(BIT (I915_NUM_PLLS ) -1 )); +/* Eliminate DPLLs from consideration if reserved by HTI */ + dpll_mask &= ~dev_priv->hti_pll_mask; +for_each_set_bit (i, &dpll_mask,I915_NUM_PLLS ) { pll = &dev_priv->dpll.shared_dplls[i];
drivers/gpu/drm/i915/display/intel_dpll_mgr.h +1 -0
@@ -390,6 +390,7 @@ void intel_shared_dpll_swap_state(struct intel_atomic_state *state);void intel_shared_dpll_init (struct drm_device *dev);void intel_dpll_readout_hw_state (struct drm_i915_private *dev_priv);void intel_dpll_sanitize_state (struct drm_i915_private *dev_priv); +u32 intel_get_hti_plls (struct drm_i915_private *dev_priv);void intel_dpll_dump_hw_state (struct drm_i915_private *dev_priv,const struct intel_dpll_hw_state *hw_state);
drivers/gpu/drm/i915/i915_drv.h +3 -0
@@ -1025,6 +1025,9 @@ struct drm_i915_private {struct intel_l3_parity l3_parity; +/* Mask of PLLs reserved for use by HTI and unavailable to driver. */ +u32 hti_pll_mask; +/* * edram size in MB. * Cannot be determined by PCIID. You must always read a register.
drivers/gpu/drm/i915/i915_reg.h +6 -0
@@ -2898,6 +2898,12 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define MBUS_BBOX_CTL_S1 _MMIO(0x45040)#define MBUS_BBOX_CTL_S2 _MMIO(0x45044) +#define HDPORT_STATE _MMIO(0x45050) +#define HDPORT_DPLL_USED_MASK REG_GENMASK(14, 12) +#define HDPORT_PHY_USED_DP (phy) REG_BIT(2*phy + 2) +#define HDPORT_PHY_USED_HDMI (phy) REG_BIT(2*phy + 1) +#define HDPORT_ENABLED REG_BIT(0) +/* Make render/texture TLB fetches lower priorty than associated data * fetches. This is not turned on by default */
Signature · 6 lines
2.24.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 22/23 drm/i915/rkl: Disable PSR2
In reply to Matt RoperFrom: José Roberto de Souza <[email protected]>
RKL doesn't have PSR2 HW tracking, it was replaced by software/manual tracking. The driver is required to track the areas that needs update and program hardware to send selective updates.
So until the software tracking is implemented, PSR2 needs to be disabled for platforms without PSR2 HW tracking.
BSpec: 50422
BSpec: 50424
--- drivers/gpu/drm/i915/display/intel_psr.c | 15 +++++++++++++++ drivers/gpu/drm/i915/i915_drv.h | 2 ++ drivers/gpu/drm/i915/i915_pci.c | 3 +++ drivers/gpu/drm/i915/intel_device_info.h | 1 + 4 files changed, 21 insertions(+)
drivers/gpu/drm/i915/display/intel_psr.c +15 -0
@@ -678,6 +678,21 @@ static bool intel_psr2_config_valid(struct intel_dp *intel_dp,return false; } +/* +* Some platforms lack PSR2 HW tracking and instead require manual +* tracking by software. In this case, the driver is required to track +* the areas that need updates and program hardware to send selective +* updates. +* +* So until the software tracking is implemented, PSR2 needs to be +* disabled for platforms without PSR2 HW tracking. +*/ +if (!HAS_PSR_HW_TRACKING (dev_priv)) { +drm_dbg_kms (&dev_priv->drm, +"No PSR2 HW tracking in the platform\n" ); +return false; + } +/* * DSC and PSR2 cannot be enabled simultaneously. If a requested * resolution requires DSC to be enabled, priority is given to DSC
drivers/gpu/drm/i915/i915_drv.h +2 -0
@@ -1618,6 +1618,8 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define HAS_DDI (dev_priv) (INTEL_INFO(dev_priv)->display.has_ddi)#define HAS_FPGA_DBG_UNCLAIMED (dev_priv) (INTEL_INFO(dev_priv)->has_fpga_dbg)#define HAS_PSR (dev_priv) (INTEL_INFO(dev_priv)->display.has_psr) +#define HAS_PSR_HW_TRACKING (dev_priv) \ + (INTEL_INFO(dev_priv)->display.has_psr_hw_tracking)#define HAS_TRANSCODER (dev_priv, trans) ((INTEL_INFO(dev_priv)->cpu_transcoder_mask & BIT(trans)) != 0)#define HAS_RC6 (dev_priv) (INTEL_INFO(dev_priv)->has_rc6)
drivers/gpu/drm/i915/i915_pci.c +3 -0
@@ -536,6 +536,7 @@ static const struct intel_device_info vlv_info = { .display.has_ddi = 1, \ .has_fpga_dbg = 1, \ .display.has_psr = 1, \ + .display.has_psr_hw_tracking = 1, \ .display.has_dp_mst = 1, \ .has_rc6p =0 /* RC6p removed-by HSW */ , \ HSW_PIPE_OFFSETS, \
@@ -690,6 +691,7 @@ static const struct intel_device_info skl_gt4_info = { .display.has_fbc = 1, \ .display.has_hdcp = 1, \ .display.has_psr = 1, \ + .display.has_psr_hw_tracking = 1, \ .has_runtime_pm = 1, \ .display.has_csr = 1, \ .has_rc6 = 1, \
@@ -868,6 +870,7 @@ static const struct intel_device_info rkl_info = { PLATFORM(INTEL_ROCKETLAKE), .pipe_mask = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C), .require_force_probe = 1, + .display.has_psr_hw_tracking = 0, .engine_mask = BIT(RCS0) | BIT(BCS0) | BIT(VECS0) | BIT(VCS0), };
drivers/gpu/drm/i915/intel_device_info.h +1 -0
@@ -147,6 +147,7 @@ enum intel_ppgtt_type {func (has_modular_fia); \func (has_overlay); \func (has_psr); \ +func (has_psr_hw_tracking); \func (overlay_needs_physical); \func (supports_tv);
Signature · 6 lines
2.24.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 23/23 drm/i915/rkl: Add initial workarounds
In reply to Matt RoperRKL and TGL share some general gen12 workarounds, but each platform also has its own platform-specific workarounds.
--- drivers/gpu/drm/i915/display/intel_sprite.c | 5 +- drivers/gpu/drm/i915/gt/intel_workarounds.c | 88 +++++++++++++-------- 2 files changed, 59 insertions(+), 34 deletions(-)
drivers/gpu/drm/i915/display/intel_sprite.c +3 -2
@@ -2842,8 +2842,9 @@ static bool skl_plane_format_mod_supported(struct drm_plane *_plane,static bool gen12_plane_supports_mc_ccs (struct drm_i915_private *dev_priv,enum plane_id plane_id) { -/* Wa_14010477008:tgl[a0..c0] */ -if (IS_TGL_REVID (dev_priv,TGL_REVID_A0 ,TGL_REVID_C0 )) +/* Wa_14010477008:tgl[a0..c0],rkl[all] */ +if (IS_ROCKETLAKE (dev_priv) || +IS_TGL_REVID (dev_priv,TGL_REVID_A0 ,TGL_REVID_C0 ))return false;return plane_id <PLANE_SPRITE4 ;
drivers/gpu/drm/i915/gt/intel_workarounds.c +56 -32
154 lines not on this page · raw message
Signature · 6 lines
2.24.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Introduce Rocket Lake
In reply to Matt Roper== Series Details ==
== Series Details ==
Series: Introduce Rocket Lake
URL : https://patchwork.freedesktop.org/series/76826/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip e0c54705a263 drm/i915/rkl: Add RKL platform info and PCI ids -:34: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'p' - possible side-effects? #34: FILE: drivers/gpu/drm/i915/i915_drv.h:1522: +#define IS_RKL_REVID(p, since, until) \ + (IS_ROCKETLAKE(p) && IS_REVID(p, since, until))
-:101: ERROR:COMPLEX_MACRO: Macros with complex values should be enclosed in parentheses #101: FILE: include/drm/i915_pciids.h:609:
+#define INTEL_RKL_IDS(info) \
+ INTEL_VGA_DEVICE(0x4C80, info), \
+ INTEL_VGA_DEVICE(0x4C8A, info), \
+ INTEL_VGA_DEVICE(0x4C8B, info), \
+ INTEL_VGA_DEVICE(0x4C8C, info), \
+ INTEL_VGA_DEVICE(0x4C90, info), \
+ INTEL_VGA_DEVICE(0x4C9A, info)
-:101: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'info' - possible side-effects? #101: FILE: include/drm/i915_pciids.h:609:
+#define INTEL_RKL_IDS(info) \
+ INTEL_VGA_DEVICE(0x4C80, info), \
+ INTEL_VGA_DEVICE(0x4C8A, info), \
+ INTEL_VGA_DEVICE(0x4C8B, info), \
+ INTEL_VGA_DEVICE(0x4C8C, info), \
+ INTEL_VGA_DEVICE(0x4C90, info), \
+ INTEL_VGA_DEVICE(0x4C9A, info)
total: 1 errors, 0 warnings, 2 checks, 69 lines checked 247cb564856c x86/gpu: add RKL stolen memory support75406d425834 drm/i915/rkl: Re-use TGL GuC/HuC firmware 9ba10f2f55eb drm/i915/rkl: Load DMC firmware for Rocket Lake d3ee665e5a73 drm/i915/rkl: Add PCH support02738c459099 drm/i915/rkl: Update memory bandwidth parameters bebb0e020bdd drm/i915/rkl: Limit number of universal planes to 5 57e6334efb40 drm/i915/rkl: Add power well supportee76ad50fef4 drm/i915/rkl: Program BW_BUDDY0 registers instead of BW_BUDDY1/2 -:36: CHECK:MULTIPLE_ASSIGNMENTS: multiple assignments should be avoided #36: FILE: drivers/gpu/drm/i915/display/intel_display_power.c:5261:
+ min_buddy = max_buddy = 0;
total: 0 errors, 0 warnings, 1 checks, 84 lines checked549a5ab2d68d drm/i915/rkl: RKL only uses PHY_MISC for PHY's A and B882fcf0349c1 drm/i915/rkl: Add cdclk support843c377d0d43 drm/i915/rkl: Handle new DPCLKA_CFGCR0 layout
-:89: CHECK:MACRO_ARG_PRECEDENCE: Macro argument 'phy' may be better as '(phy)' to avoid precedence issues #89: FILE: drivers/gpu/drm/i915/i915_reg.h:10166:
+#define RKL_DPCLKA_CFGCR0_DDI_CLK_OFF(phy) REG_BIT(phy + 10)
-:97: WARNING:LONG_LINE: line over 100 characters
#97: FILE: drivers/gpu/drm/i915/i915_reg.h:10174:
+#define RKL_DPCLKA_CFGCR0_DDI_CLK_SEL_MASK(phy) (3 << RKL_DPCLKA_CFGCR0_DDI_CLK_SEL_SHIFT(phy))
-:98: WARNING:LONG_LINE: line over 100 characters
#98: FILE: drivers/gpu/drm/i915/i915_reg.h:10175:
+#define RKL_DPCLKA_CFGCR0_DDI_CLK_SEL(pll, phy) ((pll) << RKL_DPCLKA_CFGCR0_DDI_CLK_SEL_SHIFT(phy))
total: 0 errors, 2 warnings, 1 checks, 73 lines checked4ae77e0bd298 drm/i915/rkl: Check proper SDEISR bits for TC1 and TC2 outputs83600292a992 drm/i915/rkl: Setup ports/phys456084d5a557 drm/i915/rkl: provide port/phy mapping for vbt
-:17: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line) #17:
[drm:intel_dp_init_connector [i915]] Adding DP connector on [ENCODER:275:DDI A]
total: 0 errors, 1 warnings, 0 checks, 104 lines checked a1cda3c475a6 drm/i915/rkl: Add DDC pin mapping07088eeab0a1 drm/i915/rkl: Don't try to access transcoder D 3a7da186ddd7 drm/i915/rkl: Don't try to read out DSI transcoders 501c237f151d drm/i915/rkl: Handle comp master/slave relationships for PHYs 936464f47f15 drm/i915/rkl: Add DPLL4 support24c8c479a130 drm/i915/rkl: Handle HTI
-:92: CHECK:BRACES: Blank lines aren't necessary after an open brace '{' #92: FILE: drivers/gpu/drm/i915/display/intel_dpll_mgr.c:274:
+{
+
-:154: CHECK:SPACING: spaces preferred around that '*' (ctx:VxV) #154: FILE: drivers/gpu/drm/i915/i915_reg.h:2903:
+#define HDPORT_PHY_USED_DP(phy) REG_BIT(2*phy + 2)
^
-:154: CHECK:MACRO_ARG_PRECEDENCE: Macro argument 'phy' may be better as '(phy)' to avoid precedence issues #154: FILE: drivers/gpu/drm/i915/i915_reg.h:2903:
+#define HDPORT_PHY_USED_DP(phy) REG_BIT(2*phy + 2)
-:155: CHECK:SPACING: spaces preferred around that '*' (ctx:VxV) #155: FILE: drivers/gpu/drm/i915/i915_reg.h:2904:
+#define HDPORT_PHY_USED_HDMI(phy) REG_BIT(2*phy + 1)
^
-:155: CHECK:MACRO_ARG_PRECEDENCE: Macro argument 'phy' may be better as '(phy)' to avoid precedence issues #155: FILE: drivers/gpu/drm/i915/i915_reg.h:2904:
+#define HDPORT_PHY_USED_HDMI(phy) REG_BIT(2*phy + 1)
total: 0 errors, 0 warnings, 5 checks, 116 lines checked aa6f5ef1a546 drm/i915/rkl: Disable PSR2 65c6f79b9f54 drm/i915/rkl: Add initial workarounds
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✓ Fi.CI.BAT: success for Introduce Rocket Lake
In reply to Matt Roper== Series Details ==
== Series Details ==
Series: Introduce Rocket Lake
URL : https://patchwork.freedesktop.org/series/76826/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_8407 -> Patchwork_17545
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17545/index.html
Known issues
------------
Here are the changes found in Patchwork_17545 that come from known issues:
### IGT changes ###
#### Warnings ####
* igt@i915_pm_rpm@module-reload:
- fi-kbl-x1275: [SKIP][1] ([fdo#109271]) -> [FAIL][2] ([i915#62] / [i915#95])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8407/fi-kbl-x1275/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17545/fi-kbl-x1275/igt@[email protected]
* igt@runner@aborted:
- fi-skl-guc: [FAIL][3] ([i915#1423] / [i915#69]) -> [FAIL][4] ([i915#69])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8407/fi-skl-guc/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17545/fi-skl-guc/igt@[email protected]
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[i915#1423]: https://gitlab.freedesktop.org/drm/intel/issues/1423
[i915#62]: https://gitlab.freedesktop.org/drm/intel/issues/62
[i915#69]: https://gitlab.freedesktop.org/drm/intel/issues/69
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95
Participating hosts (50 -> 44)
------------------------------
Additional (1): fi-kbl-7560u
Missing (7): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-byt-clapper fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_8407 -> Patchwork_17545
CI-20190529: 20190529
CI_DRM_8407: ecb91f743598d9d646fa046c7341058e48494e7c @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5626: f27fdfff026276ac75c69e487c929a843f66f6ca @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_17545: 65c6f79b9f54d8e3fe159bd111961bd9a10e98eb @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
65c6f79b9f54 drm/i915/rkl: Add initial workaroundsaa6f5ef1a546 drm/i915/rkl: Disable PSR224c8c479a130 drm/i915/rkl: Handle HTI936464f47f15 drm/i915/rkl: Add DPLL4 support501c237f151d drm/i915/rkl: Handle comp master/slave relationships for PHYs 3a7da186ddd7 drm/i915/rkl: Don't try to read out DSI transcoders 07088eeab0a1 drm/i915/rkl: Don't try to access transcoder D a1cda3c475a6 drm/i915/rkl: Add DDC pin mapping456084d5a557 drm/i915/rkl: provide port/phy mapping for vbt 83600292a992 drm/i915/rkl: Setup ports/phys4ae77e0bd298 drm/i915/rkl: Check proper SDEISR bits for TC1 and TC2 outputs 843c377d0d43 drm/i915/rkl: Handle new DPCLKA_CFGCR0 layout 882fcf0349c1 drm/i915/rkl: Add cdclk support549a5ab2d68d drm/i915/rkl: RKL only uses PHY_MISC for PHY's A and B ee76ad50fef4 drm/i915/rkl: Program BW_BUDDY0 registers instead of BW_BUDDY1/2 57e6334efb40 drm/i915/rkl: Add power well supportbebb0e020bdd drm/i915/rkl: Limit number of universal planes to 5 02738c459099 drm/i915/rkl: Update memory bandwidth parameters d3ee665e5a73 drm/i915/rkl: Add PCH support9ba10f2f55eb drm/i915/rkl: Load DMC firmware for Rocket Lake 75406d425834 drm/i915/rkl: Re-use TGL GuC/HuC firmware 247cb564856c x86/gpu: add RKL stolen memory supporte0c54705a263 drm/i915/rkl: Add RKL platform info and PCI ids
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17545/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.IGT: failure for Introduce Rocket Lake
In reply to Matt Roper== Series Details ==
== Series Details ==
Series: Introduce Rocket Lake
URL : https://patchwork.freedesktop.org/series/76826/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_8407_full -> Patchwork_17545_full
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_17545_full absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_17545_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_17545_full:
### IGT changes ###
#### Possible regressions ####
* igt@kms_3d:
- shard-tglb: [PASS][1] -> [DMESG-FAIL][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8407/shard-tglb6/igt@kms_3d.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17545/shard-tglb3/igt@kms_3d.html
- shard-iclb: [PASS][3] -> [DMESG-FAIL][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8407/shard-iclb8/igt@kms_3d.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17545/shard-iclb2/igt@kms_3d.html
* igt@kms_hdmi_inject@inject-4k:
- shard-tglb: [PASS][5] -> [INCOMPLETE][6] +1 similar issue
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8407/shard-tglb8/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17545/shard-tglb1/igt@[email protected]
- shard-iclb: [PASS][7] -> [INCOMPLETE][8] +1 similar issue
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8407/shard-iclb5/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17545/shard-iclb6/igt@[email protected]
* igt@runner@aborted:
- shard-iclb: NOTRUN -> ([FAIL][9], [FAIL][10], [FAIL][11])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17545/shard-iclb1/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17545/shard-iclb2/igt@[email protected]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17545/shard-iclb6/igt@[email protected]
- shard-tglb: NOTRUN -> ([FAIL][12], [FAIL][13], [FAIL][14])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17545/shard-tglb3/igt@[email protected]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17545/shard-tglb1/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17545/shard-tglb1/igt@[email protected]
Known issues
------------
Here are the changes found in Patchwork_17545_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_whisper@basic-queues:
- shard-iclb: [PASS][15] -> [FAIL][16] ([i915#1596] / [i915#1772])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8407/shard-iclb3/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17545/shard-iclb6/igt@[email protected]
* igt@kms_cursor_legacy@cursor-vs-flip-toggle:
- shard-hsw: [PASS][17] -> [FAIL][18] ([i915#57])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8407/shard-hsw6/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17545/shard-hsw6/igt@[email protected]
* igt@kms_hdr@bpc-switch-dpms:
- shard-skl: [PASS][19] -> [FAIL][20] ([i915#1188]) +1 similar issue
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8407/shard-skl7/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17545/shard-skl4/igt@[email protected]
* igt@kms_hdr@bpc-switch-suspend:
- shard-kbl: [PASS][21] -> [DMESG-WARN][22] ([i915#180]) +4 similar issues
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8407/shard-kbl6/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17545/shard-kbl3/igt@[email protected]
* igt@kms_plane@plane-panning-bottom-right-suspend-pipe-b-planes:
- shard-apl: [PASS][23] -> [DMESG-WARN][24] ([i915#180]) +5 similar issues
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8407/shard-apl7/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17545/shard-apl4/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min:
- shard-skl: [PASS][25] -> [FAIL][26] ([fdo#108145] / [i915#265])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8407/shard-skl5/igt@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17545/shard-skl6/igt@[email protected]
* igt@kms_psr@psr2_cursor_mmap_cpu:
- shard-iclb: [PASS][27] -> [SKIP][28] ([fdo#109441]) +1 similar issue
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8407/shard-iclb2/igt@kms_psr@psr2_cursor_mmap_cpu.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17545/shard-iclb1/igt@kms_psr@psr2_cursor_mmap_cpu.html
#### Possible fixes ####
* igt@gen9_exec_parse@allowed-all:
- shard-apl: [DMESG-WARN][29] ([i915#716]) -> [PASS][30]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8407/shard-apl6/igt@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17545/shard-apl1/igt@[email protected]
* igt@kms_cursor_crc@pipe-b-cursor-suspend:
- shard-skl: [INCOMPLETE][31] ([i915#300]) -> [PASS][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8407/shard-skl10/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17545/shard-skl5/igt@[email protected]
* igt@kms_cursor_legacy@pipe-b-torture-bo:
- shard-snb: [DMESG-WARN][33] ([i915#128]) -> [PASS][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8407/shard-snb6/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17545/shard-snb6/igt@[email protected]
* {igt@kms_flip@flip-vs-suspend@a-edp1}:
- shard-skl: [INCOMPLETE][35] ([i915#198]) -> [PASS][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8407/shard-skl9/igt@kms_flip@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17545/shard-skl10/igt@kms_flip@[email protected]
* igt@kms_frontbuffer_tracking@fbc-1p-pri-indfb-multidraw:
- shard-snb: [SKIP][37] ([fdo#109271]) -> [PASS][38] +1 similar issue
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8407/shard-snb2/igt@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17545/shard-snb4/igt@[email protected]
* igt@kms_frontbuffer_tracking@psr-1p-primscrn-indfb-msflip-blt:
- shard-skl: [FAIL][39] ([i915#49]) -> [PASS][40]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8407/shard-skl1/igt@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17545/shard-skl10/igt@[email protected]
* igt@kms_hdr@bpc-switch-suspend:
- shard-skl: [FAIL][41] ([i915#1188]) -> [PASS][42]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8407/shard-skl4/igt@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17545/shard-skl8/igt@[email protected]
* igt@kms_plane@plane-panning-bottom-right-suspend-pipe-a-planes:
- shard-apl: [DMESG-WARN][43] ([i915#180]) -> [PASS][44] +1 similar issue
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8407/shard-apl2/igt@[email protected]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17545/shard-apl6/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-a-coverage-7efc:
- shard-skl: [FAIL][45] ([fdo#108145] / [i915#265]) -> [PASS][46]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8407/shard-skl1/igt@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17545/shard-skl10/igt@[email protected]
* igt@kms_psr@psr2_cursor_render:
- shard-iclb: [SKIP][47] ([fdo#109441]) -> [PASS][48] +2 similar issues
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8407/shard-iclb8/igt@kms_psr@psr2_cursor_render.html
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17545/shard-iclb2/igt@kms_psr@psr2_cursor_render.html
* igt@kms_vblank@pipe-a-ts-continuation-suspend:
- shard-kbl: [DMESG-WARN][49] ([i915#180]) -> [PASS][50] +3 similar issues
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8407/shard-kbl4/igt@[email protected]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17545/shard-kbl3/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[i915#1188]: https://gitlab.freedesktop.org/drm/intel/issues/1188
[i915#128]: https://gitlab.freedesktop.org/drm/intel/issues/128
[i915#1596]: https://gitlab.freedesktop.org/drm/intel/issues/1596
[i915#1772]: https://gitlab.freedesktop.org/drm/intel/issues/1772
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#198]: https://gitlab.freedesktop.org/drm/intel/issues/198
[i915#265]: https://gitlab.freedesktop.org/drm/intel/issues/265
[i915#300]: https://gitlab.freedesktop.org/drm/intel/issues/300
[i915#49]: https://gitlab.freedesktop.org/drm/intel/issues/49
[i915#57]: https://gitlab.freedesktop.org/drm/intel/issues/57
[i915#716]: https://gitlab.freedesktop.org/drm/intel/issues/716
[i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79
Participating hosts (10 -> 10)
------------------------------
No changes in participating hosts
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_8407 -> Patchwork_17545
CI-20190529: 20190529
CI_DRM_8407: ecb91f743598d9d646fa046c7341058e48494e7c @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5626: f27fdfff026276ac75c69e487c929a843f66f6ca @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_17545: 65c6f79b9f54d8e3fe159bd111961bd9a10e98eb @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17545/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BUILD: failure for Introduce Rocket Lake (rev2)
In reply to Matt Roper== Series Details ==
== Series Details ==
Series: Introduce Rocket Lake (rev2)
URL : https://patchwork.freedesktop.org/series/76826/
State : failure
== Summary ==
Applying: drm/i915/rkl: Add RKL platform info and PCI ids
Applying: x86/gpu: add RKL stolen memory support
Applying: drm/i915/rkl: Re-use TGL GuC/HuC firmware
Applying: drm/i915/rkl: Load DMC firmware for Rocket Lake
Applying: drm/i915/rkl: Add PCH support
Applying: drm/i915/rkl: Update memory bandwidth parameters
Applying: drm/i915/rkl: Limit number of universal planes to 5
Applying: drm/i915/rkl: Add power well support
Applying: drm/i915/rkl: Program BW_BUDDY0 registers instead of BW_BUDDY1/2
Applying: drm/i915/rkl: RKL only uses PHY_MISC for PHY's A and B
Applying: drm/i915/rkl: Add cdclk support
error: patch fragment without header at line 14: @@ -1414,7 +1448,8 @@ static void bxt_get_cdclk(struct drm_i915_private *dev_priv,
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0011 drm/i915/rkl: Add cdclk support
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BUILD: failure for Introduce Rocket Lake (rev3)
In reply to Matt Roper== Series Details ==
== Series Details ==
Series: Introduce Rocket Lake (rev3)
URL : https://patchwork.freedesktop.org/series/76826/
State : failure
== Summary ==
Applying: drm/i915/rkl: Add RKL platform info and PCI ids
Applying: x86/gpu: add RKL stolen memory support
Applying: drm/i915/rkl: Re-use TGL GuC/HuC firmware
Applying: drm/i915/rkl: Load DMC firmware for Rocket Lake
Applying: drm/i915/rkl: Add PCH support
Applying: drm/i915/rkl: Update memory bandwidth parameters
Applying: drm/i915/rkl: Limit number of universal planes to 5
Applying: drm/i915/rkl: Add power well support
Applying: drm/i915/rkl: Program BW_BUDDY0 registers instead of BW_BUDDY1/2
Applying: drm/i915/rkl: RKL only uses PHY_MISC for PHY's A and B
Applying: drm/i915/rkl: Add cdclk support
error: patch fragment without header at line 14: @@ -1414,7 +1448,8 @@ static void bxt_get_cdclk(struct drm_i915_private *dev_priv,
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0011 drm/i915/rkl: Add cdclk support
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx