Initial Meteorlake Support
Subsystems (3)
v3 cover Initial Meteorlake Support
The PCI Id's and platform definition are posted earlier. This series adds handful of early enablement patches including support for display power wells, VBT and AUX Channel mapping, PCH and gmbus support, dbus, mbus, sagv and memory bandwidth support.
This series also add the support for a new way to read Graphics, Media and Display versions
This is based out of the earlier series posted at [1]. Several of the patches from the earlier series got merged. This version is rebased on top of the earlier patches that got merged.
[1] https://patchwork.freedesktop.org/series/106786/
Imre Deak (2):
drm/i915/mtl: Add display power wells
drm/i915/mtl: Add DP AUX support on TypeC ports
José Roberto de Souza (1):
drm/i915: Parse and set stepping for platforms with GMD
Madhumitha Tolakanahalli Pradeep (1):
drm/i915/mtl: Update CHICKEN_TRANS* register addresses
Matt Roper (2):
drm/i915: Read graphics/media/display arch version from hw drm/i915/mtl: Define engine context layouts
Radhakrishna Sripada (5):
drm/i915: Move display and media IP version to runtime info drm/i915/mtl: Add gmbus and gpio support
drm/i915/mtl: Obtain SAGV values from MMIO instead of GT pcode mailbox drm/i915/mtl: Update MBUS_DBOX credits
drm/i915/mtl: Do not update GV point, mask value
drivers/gpu/drm/i915/display/intel_bw.c | 42 ++++++- drivers/gpu/drm/i915/display/intel_display.c | 14 ++- .../i915/display/intel_display_power_map.c | 115 +++++++++++++++++- .../i915/display/intel_display_power_well.c | 44 +++++++ .../i915/display/intel_display_power_well.h | 4 + drivers/gpu/drm/i915/display/intel_dp_aux.c | 53 +++++++- drivers/gpu/drm/i915/display/intel_dp_mst.c | 5 +- drivers/gpu/drm/i915/display/intel_gmbus.c | 15 +++ drivers/gpu/drm/i915/display/intel_gmbus.h | 1 + drivers/gpu/drm/i915/display/intel_psr.c | 6 +- drivers/gpu/drm/i915/gt/intel_gt_regs.h | 2 + drivers/gpu/drm/i915/gt/intel_lrc.c | 81 +++++++++++- drivers/gpu/drm/i915/i915_driver.c | 2 + drivers/gpu/drm/i915/i915_drv.h | 10 +- drivers/gpu/drm/i915/i915_pci.c | 21 ++-- drivers/gpu/drm/i915/i915_reg.h | 83 ++++++++++++- drivers/gpu/drm/i915/intel_device_info.c | 85 ++++++++++++- drivers/gpu/drm/i915/intel_device_info.h | 18 ++- drivers/gpu/drm/i915/intel_dram.c | 41 ++++++- drivers/gpu/drm/i915/intel_pm.c | 73 ++++++++++- drivers/gpu/drm/i915/intel_step.c | 60 +++++++++ 21 files changed, 723 insertions(+), 52 deletions(-)
Signature · 1 line
2.25.1
PATCH v3 1/11 drm/i915: Move display and media IP version to runtime info
Future platforms can read the IP version from a register and the IP version numbers need not be hard coded in device info. Move the ip version for media and display to runtime info.
On platforms where hard coding of IP version is required, update the IP version in __runtime under device_info.
--- drivers/gpu/drm/i915/i915_drv.h | 8 ++++---- drivers/gpu/drm/i915/i915_pci.c | 20 ++++++++++---------- drivers/gpu/drm/i915/intel_device_info.c | 12 ++++++------ drivers/gpu/drm/i915/intel_device_info.h | 15 ++++++++++----- 4 files changed, 30 insertions(+), 25 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +4 -4
@@ -475,13 +475,13 @@ static inline struct intel_gt *to_gt(struct drm_i915_private *i915)#define IS_GRAPHICS_VER (i915, from, until) \ (GRAPHICS_VER(i915) >= (from) && GRAPHICS_VER(i915) <= (until)) -#define MEDIA_VER (i915) (INTEL_INFO(i915)->media.ver) -#define MEDIA_VER_FULL (i915) IP_VER(INTEL_INFO(i915)->media.ver, \ - INTEL_INFO(i915)->media.rel) +#define MEDIA_VER (i915) (RUNTIME_INFO(i915)->media.ver) +#define MEDIA_VER_FULL (i915) IP_VER(RUNTIME_INFO(i915)->media.ver, \ + RUNTIME_INFO(i915)->media.rel)#define IS_MEDIA_VER (i915, from, until) \ (MEDIA_VER(i915) >= (from) && MEDIA_VER(i915) <= (until)) -#define DISPLAY_VER (i915) (INTEL_INFO(i915)->display.ver) +#define DISPLAY_VER (i915) (RUNTIME_INFO(i915)->display.ver)#define IS_DISPLAY_VER (i915, from, until) \ (DISPLAY_VER(i915) >= (from) && DISPLAY_VER(i915) <= (until))
drivers/gpu/drm/i915/i915_pci.c +10 -10
@@ -35,8 +35,8 @@#define PLATFORM (x) .platform = (x)#define GEN (x) \ .__runtime.graphics.ver = (x), \ - .media.ver = (x), \ - .display.ver = (x) + .__runtime.media.ver = (x), \ + .__runtime.display.ver = (x)#define I845_PIPE_OFFSETS \ .display.pipe_offsets = { \
@@ -740,7 +740,7 @@ static const struct intel_device_info bxt_info = {static const struct intel_device_info glk_info = {GEN9_LP_FEATURES ,PLATFORM (INTEL_GEMINILAKE ), - .display.ver =10 , + .__runtime.display.ver =10 , .display.dbuf.size =1024 -4 ,/* 4 blocks for bypass path allocation */ GLK_COLORS , };
@@ -962,7 +962,7 @@ static const struct intel_device_info adl_s_info = { .display.has_hotplug = 1, \ .display.has_ipc = 1, \ .display.has_psr = 1, \ - .display.ver = 13, \ + .__runtime.display.ver = 13, \ .__runtime.pipe_mask = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C) | BIT(PIPE_D), \ .display.pipe_offsets = { \ [TRANSCODER_A] = PIPE_A_OFFSET, \
@@ -1027,8 +1027,8 @@ static const struct intel_device_info adl_p_info = { .__runtime.ppgtt_type = INTEL_PPGTT_FULL#define XE_HPM_FEATURES \ - .media.ver = 12, \ - .media.rel = 50 + .__runtime.media.ver = 12, \ + .__runtime.media.rel = 50__maybe_unused static const struct intel_device_info xehpsdv_info = {
@@ -1054,7 +1054,7 @@ static const struct intel_device_info xehpsdv_info = {XE_HPM_FEATURES , \DGFX_FEATURES , \ .__runtime.graphics.rel = 55, \ - .media.rel = 55, \ + .__runtime.media.rel = 55, \PLATFORM (INTEL_DG2 ), \ .has_4tile = 1, \ .has_64k_pages = 1, \
@@ -1098,7 +1098,7 @@ static const struct intel_device_info pvc_info = {XE_HPM_FEATURES ,DGFX_FEATURES , .__runtime.graphics.rel = 60, - .media.rel = 60, + .__runtime.media.rel = 60,PLATFORM (INTEL_PONTEVECCHIO ), .display = { 0 }, .has_flat_ccs = 0,
@@ -1111,7 +1111,7 @@ static const struct intel_device_info pvc_info = {#define XE_LPDP_FEATURES \ XE_LPD_FEATURES, \ - .display.ver = 14, \ + .__runtime.display.ver = 14, \ .display.has_cdclk_crawl = 1, \ .__runtime.fbc_mask = BIT(INTEL_FBC_A) | BIT(INTEL_FBC_B)
@@ -1125,7 +1125,7 @@ static const struct intel_device_info mtl_info = {*/ .__runtime.graphics.ver = 12, .__runtime.graphics.rel = 70, - .media.ver =13 , + .__runtime.media.ver =13 ,PLATFORM (INTEL_METEORLAKE ), .display.has_modular_fia = 1, .has_flat_ccs = 0,
drivers/gpu/drm/i915/intel_device_info.c +6 -6
@@ -98,15 +98,15 @@ void intel_device_info_print(const struct intel_device_info *info,else drm_printf (p,"graphics version: %u\n" , runtime->graphics.ver); -if (info->media.rel) -drm_printf (p,"media version: %u.%02u\n" , info->media.ver, info->media.rel); +if (runtime->media.rel) +drm_printf (p,"media version: %u.%02u\n" , runtime->media.ver, runtime->media.rel);else -drm_printf (p,"media version: %u\n" , info->media.ver); +drm_printf (p,"media version: %u\n" , runtime->media.ver); -if (info->display.rel) -drm_printf (p,"display version: %u.%02u\n" , info->display.ver, info->display.rel); +if (runtime->display.rel) +drm_printf (p,"display version: %u.%02u\n" , runtime->display.ver, runtime->display.rel);else -drm_printf (p,"display version: %u\n" , info->display.ver); +drm_printf (p,"display version: %u\n" , runtime->display.ver);drm_printf (p,"gt: %d\n" , info->gt);drm_printf (p,"memory-regions: %x\n" , runtime->memory_regions);
drivers/gpu/drm/i915/intel_device_info.h +10 -5
@@ -200,7 +200,17 @@ struct ip_version { };struct intel_runtime_info { +/* +* On modern platforms, the architecture major.minor version numbers +* and stepping are read directly from the hardware rather than derived +* from the PCI device and revision ID's. +* +* Note that the hardware gives us a single "graphics" number that +* should represent render, compute, and copy behavior. +*/ struct ip_version graphics; +struct ip_version media; +struct ip_version display;/* * Platform mask is used for optimizing or-ed IS_PLATFORM calls into
@@ -246,8 +256,6 @@ struct intel_runtime_info { };struct intel_device_info { -struct ip_version media; -enum intel_platform platform;unsigned int dma_mask_size;/* available DMA address bits */
@@ -259,9 +267,6 @@ struct intel_device_info {#undef DEFINE_FLAGstruct { -u8 ver; -u8 rel; -u8 abox_mask;struct {
Signature · 1 line
2.25.1
Jani Nikula
maintainerRe: [PATCH v3 01/11] drm/i915: Move display and media IP version to runtime info
Quoted 151 lines · Radhakrishna Sripada
Future platforms can read the IP version from a register and the IP version numbers need not be hard coded in device info. Move the ip version for media and display to runtime info.
On platforms where hard coding of IP version is required, update the IP version in
__runtimeunderdevice_info.Suggested-by Jani Nikula <[email protected]>Cc Matt Roper <[email protected]>Signed-off-by Radhakrishna Sripada <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 8 ++++---- drivers/gpu/drm/i915/i915_pci.c | 20 ++++++++++---------- drivers/gpu/drm/i915/intel_device_info.c | 12 ++++++------ drivers/gpu/drm/i915/intel_device_info.h | 15 ++++++++++----- 4 files changed, 30 insertions(+), 25 deletions(-)drivers/gpu/drm/i915/i915_drv.h +4
-4@@ -475,13 +475,13 @@ static inline struct intel_gt *to_gt(struct drm_i915_private *i915)#define IS_GRAPHICS_VER (i915, from, until) \ (GRAPHICS_VER(i915) >= (from) && GRAPHICS_VER(i915) <= (until)) -#define MEDIA_VER (i915) (INTEL_INFO(i915)->media.ver) -#define MEDIA_VER_FULL (i915) IP_VER(INTEL_INFO(i915)->media.ver, \ - INTEL_INFO(i915)->media.rel) +#define MEDIA_VER (i915) (RUNTIME_INFO(i915)->media.ver) +#define MEDIA_VER_FULL (i915) IP_VER(RUNTIME_INFO(i915)->media.ver, \ + RUNTIME_INFO(i915)->media.rel)#define IS_MEDIA_VER (i915, from, until) \ (MEDIA_VER(i915) >= (from) && MEDIA_VER(i915) <= (until)) -#define DISPLAY_VER (i915) (INTEL_INFO(i915)->display.ver) +#define DISPLAY_VER (i915) (RUNTIME_INFO(i915)->display.ver)#define IS_DISPLAY_VER (i915, from, until) \ (DISPLAY_VER(i915) >= (from) && DISPLAY_VER(i915) <= (until))drivers/gpu/drm/i915/i915_pci.c +10
-10@@ -35,8 +35,8 @@#define PLATFORM (x) .platform = (x)#define GEN (x) \ .__runtime.graphics.ver = (x), \ - .media.ver = (x), \ - .display.ver = (x) + .__runtime.media.ver = (x), \ + .__runtime.display.ver = (x)#define I845_PIPE_OFFSETS \ .display.pipe_offsets = { \@@ -740,7 +740,7 @@ static const struct intel_device_info bxt_info = {static const struct intel_device_info glk_info = {GEN9_LP_FEATURES ,PLATFORM (INTEL_GEMINILAKE ), - .display.ver =10 , + .__runtime.display.ver =10 , .display.dbuf.size =1024 -4 ,/* 4 blocks for bypass path allocation */ GLK_COLORS , };@@ -962,7 +962,7 @@ static const struct intel_device_info adl_s_info = { .display.has_hotplug = 1, \ .display.has_ipc = 1, \ .display.has_psr = 1, \ - .display.ver = 13, \ + .__runtime.display.ver = 13, \ .__runtime.pipe_mask = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C) | BIT(PIPE_D), \ .display.pipe_offsets = { \ [TRANSCODER_A] = PIPE_A_OFFSET, \@@ -1027,8 +1027,8 @@ static const struct intel_device_info adl_p_info = { .__runtime.ppgtt_type = INTEL_PPGTT_FULL#define XE_HPM_FEATURES \ - .media.ver = 12, \ - .media.rel = 50 + .__runtime.media.ver = 12, \ + .__runtime.media.rel = 50__maybe_unused static const struct intel_device_info xehpsdv_info = {@@ -1054,7 +1054,7 @@ static const struct intel_device_info xehpsdv_info = {XE_HPM_FEATURES , \DGFX_FEATURES , \ .__runtime.graphics.rel = 55, \ - .media.rel = 55, \ + .__runtime.media.rel = 55, \PLATFORM (INTEL_DG2 ), \ .has_4tile = 1, \ .has_64k_pages = 1, \@@ -1098,7 +1098,7 @@ static const struct intel_device_info pvc_info = {XE_HPM_FEATURES ,DGFX_FEATURES , .__runtime.graphics.rel = 60, - .media.rel = 60, + .__runtime.media.rel = 60,PLATFORM (INTEL_PONTEVECCHIO ), .display = { 0 }, .has_flat_ccs = 0,@@ -1111,7 +1111,7 @@ static const struct intel_device_info pvc_info = {#define XE_LPDP_FEATURES \ XE_LPD_FEATURES, \ - .display.ver = 14, \ + .__runtime.display.ver = 14, \ .display.has_cdclk_crawl = 1, \ .__runtime.fbc_mask = BIT(INTEL_FBC_A) | BIT(INTEL_FBC_B)@@ -1125,7 +1125,7 @@ static const struct intel_device_info mtl_info = {*/ .__runtime.graphics.ver = 12, .__runtime.graphics.rel = 70, - .media.ver =13 , + .__runtime.media.ver =13 ,PLATFORM (INTEL_METEORLAKE ), .display.has_modular_fia = 1, .has_flat_ccs = 0,drivers/gpu/drm/i915/intel_device_info.c +6
-6@@ -98,15 +98,15 @@ void intel_device_info_print(const struct intel_device_info *info,else drm_printf (p,"graphics version: %u\n" , runtime->graphics.ver); -if (info->media.rel) -drm_printf (p,"media version: %u.%02u\n" , info->media.ver, info->media.rel); +if (runtime->media.rel) +drm_printf (p,"media version: %u.%02u\n" , runtime->media.ver, runtime->media.rel);else -drm_printf (p,"media version: %u\n" , info->media.ver); +drm_printf (p,"media version: %u\n" , runtime->media.ver); -if (info->display.rel) -drm_printf (p,"display version: %u.%02u\n" , info->display.ver, info->display.rel); +if (runtime->display.rel) +drm_printf (p,"display version: %u.%02u\n" , runtime->display.ver, runtime->display.rel);else -drm_printf (p,"display version: %u\n" , info->display.ver); +drm_printf (p,"display version: %u\n" , runtime->display.ver);drm_printf (p,"gt: %d\n" , info->gt);drm_printf (p,"memory-regions: %x\n" , runtime->memory_regions);drivers/gpu/drm/i915/intel_device_info.h +0
-0@@ -200,7 +200,17 @@ struct ip_version { };
drivers/gpu/drm/i915/intel_device_info.h struct ip_version { · line 210
Quoted 10 lines
drivers/gpu/drm/i915/intel_device_info.h +8
-0struct intel_runtime_info { +/* +* On modern platforms, the architecture major.minor version numbers +* and stepping are read directly from the hardware rather than derived +* from the PCI device and revision ID's. +* +* Note that the hardware gives us a single "graphics" number that +* should represent render, compute, and copy behavior. +*/
The comment really belongs in the next patch.
drivers/gpu/drm/i915/intel_device_info.h struct ip_version { · line 213
Quoted 3 lines
drivers/gpu/drm/i915/intel_device_info.h +2
-0struct ip_version graphics; +struct ip_version media; +struct ip_version display;
The runtime display info is now in an unnamed struct under struct intel_runtime_info below, and this belongs there.
There's also some pressure to name it, and "display" would be the name, so this would collide.
Seems like all of the above are overly generic names, including the pre-existing "graphics". Something to consider.
Otherwise, LGTM.
BR,
Jani.
Quoted 22 lines
drivers/gpu/drm/i915/intel_device_info.h +0
-5/* * Platform mask is used for optimizing or-ed IS_PLATFORM calls into @@ -246,8 +256,6 @@ struct intel_runtime_info { };struct intel_device_info { -struct ip_version media; -enum intel_platform platform;unsigned int dma_mask_size;/* available DMA address bits */ @@ -259,9 +267,6 @@ struct intel_device_info {#undef DEFINE_FLAGstruct { -u8 ver; -u8 rel; -u8 abox_mask;struct {
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
Re: [PATCH v3 01/11] drm/i915: Move display and media IP version to runtime info
Quoted 1 line · Jani Nikula
On Wed, 31 Aug 2022, Radhakrishna Sripada <[email protected]> wrote:
...
Quoted 7 lines
drivers/gpu/drm/i915/intel_device_info.h struct ip_version { · line 213
Quoted 3 lines
drivers/gpu/drm/i915/intel_device_info.h +2
-0struct ip_version graphics; +struct ip_version media; +struct ip_version display;The runtime display info is now in an unnamed struct under struct
intel_runtime_infobelow, and this belongs there.
Quoted 5 lines
There's also some pressure to name it, and "display" would be the name, so this would collide.
Seems like all of the above are overly generic names, including the pre-existing "graphics". Something to consider.
maybe
struct {
struct {
struct ip_version version;
...
} graphics;
struct {
struct ip_version version;
...
} media;
struct {
struct ip_version version;
...
} display;
} runtime;then
drm_printf(p, "display version: %u.%02u\n",
runtime->display.version.ver, runtime->display.version.rel);
...
Michal
Jani Nikula
maintainerRe: [PATCH v3 01/11] drm/i915: Move display and media IP version to runtime info
Quoted 37 lines · Michal Wajdeczko
Quoted 1 line · Jani Nikula
On Wed, 31 Aug 2022, Radhakrishna Sripada <[email protected]> wrote:
...
Quoted 7 lines
drivers/gpu/drm/i915/intel_device_info.h struct ip_version { · line 213
Quoted 3 lines
drivers/gpu/drm/i915/intel_device_info.h +2
-0struct ip_version graphics; +struct ip_version media; +struct ip_version display;The runtime display info is now in an unnamed struct under struct
intel_runtime_infobelow, and this belongs there.Quoted 5 lines
There's also some pressure to name it, and "display" would be the name, so this would collide.
Seems like all of the above are overly generic names, including the pre-existing "graphics". Something to consider.
maybe
struct { struct { struct ip_version version; ... } graphics; struct { struct ip_version version; ... } media; struct { struct ip_version version; ... } display; } runtime;
Quoted 5 lines
then
drm_printf(p, "display version: %u.%02u\n",
runtime->display.version.ver, runtime->display.version.rel);
Looks good to me. The other display related stuff can be moved later.
BR,
Jani.
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
PATCH v3 2/11 drm/i915: Read graphics/media/display arch version from hw
In reply to Radhakrishna SripadaFrom: Matt Roper <[email protected]>
Going forward, the hardware teams no longer consider new platforms to have a "generation" in the way we've defined it for past platforms. Instead, each IP block (graphics, media, display) will have their own architecture major.minor versions and stepping ID's which should be read directly from a register in the MMIO space. New hardware programming styles, features, and workarounds should be conditional solely on the architecture version, and should no longer be derived from the PCI device ID, revision ID, or platform-specific feature flags.
Bspec: 63361, 64111
v2:
- Move the IP version readout to intel_device_info.c
- Convert the macro into a function
--- drivers/gpu/drm/i915/gt/intel_gt_regs.h | 2 + drivers/gpu/drm/i915/i915_driver.c | 2 + drivers/gpu/drm/i915/i915_drv.h | 2 + drivers/gpu/drm/i915/i915_pci.c | 1 + drivers/gpu/drm/i915/i915_reg.h | 6 ++ drivers/gpu/drm/i915/intel_device_info.c | 73 ++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_device_info.h | 3 + 7 files changed, 89 insertions(+)
drivers/gpu/drm/i915/gt/intel_gt_regs.h +2 -0
@@ -39,6 +39,8 @@#define FORCEWAKE_ACK_RENDER_GEN9 _MMIO(0xd84)#define FORCEWAKE_ACK_MEDIA_GEN9 _MMIO(0xd88) +#define GMD_ID_GRAPHICS _MMIO(0xd8c) +#define MCFG_MCR_SELECTOR _MMIO(0xfd0)#define SF_MCR_SELECTOR _MMIO(0xfd8)#define GEN8_MCR_SELECTOR _MMIO(0xfdc)
drivers/gpu/drm/i915/i915_driver.c +2 -0
@@ -323,6 +323,8 @@ static int i915_driver_early_probe(struct drm_i915_private *dev_priv)if (i915_inject_probe_failure (dev_priv))return -ENODEV ; +intel_device_info_runtime_init_early (dev_priv); +intel_device_info_subplatform_init (dev_priv);intel_step_init (dev_priv);
drivers/gpu/drm/i915/i915_drv.h +2 -0
@@ -936,6 +936,8 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define HAS_GMCH (dev_priv) (INTEL_INFO(dev_priv)->display.has_gmch) +#define HAS_GMD_ID (i915) INTEL_INFO(i915)->has_gmd_id +#define HAS_LSPCON (dev_priv) (IS_DISPLAY_VER(dev_priv, 9, 10))#define HAS_L3_CCS_READ (i915) (INTEL_INFO(i915)->has_l3_ccs_read)
drivers/gpu/drm/i915/i915_pci.c +1 -0
@@ -1129,6 +1129,7 @@ static const struct intel_device_info mtl_info = {PLATFORM (INTEL_METEORLAKE ), .display.has_modular_fia = 1, .has_flat_ccs = 0, + .has_gmd_id = 1, .has_snoop = 1, .__runtime.memory_regions = REGION_SMEM | REGION_STOLEN_LMEM, .__runtime.platform_engine_mask = BIT(RCS0) | BIT(BCS0) | BIT(CCS0),
drivers/gpu/drm/i915/i915_reg.h +6 -0
@@ -5798,6 +5798,11 @@#define ICL_DSSM_CDCLK_PLL_REFCLK_19_2MHz (1 << 29)#define ICL_DSSM_CDCLK_PLL_REFCLK_38_4MHz (2 << 29) +#define GMD_ID_DISPLAY _MMIO(0x510a0) +#define GMD_ID_ARCH_MASK REG_GENMASK(31, 22) +#define GMD_ID_RELEASE_MASK REG_GENMASK(21, 14) +#define GMD_ID_STEP REG_GENMASK(5, 0) +/*GEN11 chicken */ #define _PIPEA_CHICKEN 0x70038#define _PIPEB_CHICKEN 0x71038
@@ -8298,4 +8303,5 @@ enum skl_power_gate {#define MTL_LATENCY_LEVEL_EVEN_MASK REG_GENMASK(12, 0)#define MTL_LATENCY_LEVEL_ODD_MASK REG_GENMASK(28, 16) +#define MTL_MEDIA_GSI_BASE 0x380000#endif /* _I915_REG_H_ */
drivers/gpu/drm/i915/intel_device_info.c +73 -0
85 lines not on this page · raw message
drivers/gpu/drm/i915/intel_device_info.h +3 -0
@@ -152,6 +152,7 @@ enum intel_ppgtt_type {func (has_4tile); \func (has_flat_ccs); \func (has_global_mocs); \ +func (has_gmd_id); \func (has_gt_uc); \func (has_heci_pxp); \func (has_heci_gscfi); \
@@ -197,6 +198,7 @@ enum intel_ppgtt_type {struct ip_version {u8 ver;u8 rel; +u8 step; };struct intel_runtime_info {
@@ -307,6 +309,7 @@ struct intel_driver_caps {const char *intel_platform_name (enum intel_platform platform); +void intel_device_info_runtime_init_early (struct drm_i915_private *dev_priv);void intel_device_info_subplatform_init (struct drm_i915_private *dev_priv);void intel_device_info_runtime_init (struct drm_i915_private *dev_priv);
Signature · 1 line
2.25.1
Jani Nikula
maintainerRe: [Intel-gfx] [PATCH v3 02/11] drm/i915: Read graphics/media/display arch version from hw
Quoted 48 lines · Radhakrishna Sripada
From: Matt Roper <[email protected]>
Going forward, the hardware teams no longer consider new platforms to have a "generation" in the way we've defined it for past platforms. Instead, each IP block (graphics, media, display) will have their own architecture major.minor versions and stepping ID's which should be read directly from a register in the MMIO space. New hardware programming styles, features, and workarounds should be conditional solely on the architecture version, and should no longer be derived from the PCI device ID, revision ID, or platform-specific feature flags.
Bspec: 63361, 64111
v2:
- Move the IP version readout tointel_device_info.c
- Convert the macro into a functionSigned-off-by Matt Roper <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>Signed-off-by Radhakrishna Sripada <[email protected]>--- drivers/gpu/drm/i915/gt/intel_gt_regs.h | 2 + drivers/gpu/drm/i915/i915_driver.c | 2 + drivers/gpu/drm/i915/i915_drv.h | 2 + drivers/gpu/drm/i915/i915_pci.c | 1 + drivers/gpu/drm/i915/i915_reg.h | 6 ++ drivers/gpu/drm/i915/intel_device_info.c | 73 ++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_device_info.h | 3 + 7 files changed, 89 insertions(+)drivers/gpu/drm/i915/gt/intel_gt_regs.h +2
-0@@ -39,6 +39,8 @@#define FORCEWAKE_ACK_RENDER_GEN9 _MMIO(0xd84)#define FORCEWAKE_ACK_MEDIA_GEN9 _MMIO(0xd88) +#define GMD_ID_GRAPHICS _MMIO(0xd8c) +#define MCFG_MCR_SELECTOR _MMIO(0xfd0)#define SF_MCR_SELECTOR _MMIO(0xfd8)#define GEN8_MCR_SELECTOR _MMIO(0xfdc)drivers/gpu/drm/i915/i915_driver.c +0
-0
drivers/gpu/drm/i915/i915_driver.c static int i915_driver_early_probe(struct drm_i915_private *dev_priv) · line 328
Quoted 6 lines
drivers/gpu/drm/i915/i915_driver.c +2
-0@@ -323,6 +323,8 @@ static int i915_driver_early_probe(struct drm_i915_private *dev_priv)if (i915_inject_probe_failure (dev_priv))return -ENODEV ; +intel_device_info_runtime_init_early (dev_priv); +intel_device_info_subplatform_init (dev_priv);
Hmm, so why not move the subplatform init call to runtime init early?
Quoted 44 lines
drivers/gpu/drm/i915/i915_driver.c +0
-0intel_step_init (dev_priv);drivers/gpu/drm/i915/i915_drv.h +2
-0@@ -936,6 +936,8 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define HAS_GMCH (dev_priv) (INTEL_INFO(dev_priv)->display.has_gmch) +#define HAS_GMD_ID (i915) INTEL_INFO(i915)->has_gmd_id +#define HAS_LSPCON (dev_priv) (IS_DISPLAY_VER(dev_priv, 9, 10))#define HAS_L3_CCS_READ (i915) (INTEL_INFO(i915)->has_l3_ccs_read)drivers/gpu/drm/i915/i915_pci.c +1
-0@@ -1129,6 +1129,7 @@ static const struct intel_device_info mtl_info = {PLATFORM (INTEL_METEORLAKE ), .display.has_modular_fia = 1, .has_flat_ccs = 0, + .has_gmd_id = 1, .has_snoop = 1, .__runtime.memory_regions = REGION_SMEM | REGION_STOLEN_LMEM, .__runtime.platform_engine_mask = BIT(RCS0) | BIT(BCS0) | BIT(CCS0),drivers/gpu/drm/i915/i915_reg.h +5
-0@@ -5798,6 +5798,11 @@#define ICL_DSSM_CDCLK_PLL_REFCLK_19_2MHz (1 << 29)#define ICL_DSSM_CDCLK_PLL_REFCLK_38_4MHz (2 << 29) +#define GMD_ID_DISPLAY _MMIO(0x510a0) +#define GMD_ID_ARCH_MASK REG_GENMASK(31, 22) +#define GMD_ID_RELEASE_MASK REG_GENMASK(21, 14) +#define GMD_ID_STEP REG_GENMASK(5, 0) +/*GEN11 chicken */ #define _PIPEA_CHICKEN 0x70038#define _PIPEB_CHICKEN 0x71038
drivers/gpu/drm/i915/i915_reg.h enum skl_power_gate { · line 8306
Quoted 4 lines
drivers/gpu/drm/i915/i915_reg.h +1
-0@@ -8298,4 +8303,5 @@ enum skl_power_gate {#define MTL_LATENCY_LEVEL_EVEN_MASK REG_GENMASK(12, 0)#define MTL_LATENCY_LEVEL_ODD_MASK REG_GENMASK(28, 16) +#define MTL_MEDIA_GSI_BASE 0x380000
Blank line here.
Quoted 30 lines
drivers/gpu/drm/i915/i915_reg.h +0
-0#endif /* _I915_REG_H_ */ drivers/gpu/drm/i915/intel_device_info.c +14
-0@@ -29,6 +29,7 @@#include "display/intel_cdclk.h" #include "display/intel_de.h" +#include "gt/intel_gt_regs.h" #include "intel_device_info.h" #include "i915_drv.h" #include "i915_utils.h" @@ -133,6 +134,78 @@ void intel_device_info_print(const struct intel_device_info *info,drm_printf (p,"rawclk rate: %u kHz\n" , runtime->rawclk_freq); } +static void ip_ver_read (struct drm_i915_private *i915,u32 offset,struct ip_version *ip, +const struct ip_version *dr_ip) +{ +struct pci_dev *pdev =to_pci_dev (i915->drm.dev); +void __iomem *addr; +u32 ver; + + addr =pci_iomap_range (pdev,0 , offset,sizeof (u32)); +if (drm_WARN_ON (&i915->drm, !addr)) +return ; + + ver =ioread32 (addr); +pci_iounmap (pdev, addr);
drivers/gpu/drm/i915/intel_device_info.c void intel_device_info_print(const struct intel_device_info *info, · line 159
Quoted 10 lines
drivers/gpu/drm/i915/intel_device_info.c +10
-0+ + ip->ver =REG_FIELD_GET (GMD_ID_ARCH_MASK , ver); + ip->rel =REG_FIELD_GET (GMD_ID_RELEASE_MASK , ver); + ip->step =REG_FIELD_GET (GMD_ID_STEP , ver); + +/* Sanity check against expected versions from device info */ +if (ip->ver != dr_ip->ver || ip->rel > dr_ip->rel) +drm_dbg (&i915->drm, +"Hardware reports GMD IP version %u.%u but minimum expected is %u.%u\n" , + ip->ver, ip->rel, dr_ip->ver, dr_ip->rel);
So this doesn't work because you pass in the same pointer in both ip and dr_ip, and you overwrite it above. These will always match. I think just drop the 2nd pointer from parameters, and make a local copy. Or read the values to a local copy, check them, and assign.
drivers/gpu/drm/i915/intel_device_info.c void intel_device_info_print(const struct intel_device_info *info, · line 164
Quoted 5 lines
drivers/gpu/drm/i915/intel_device_info.c +5
-0+} + +/** +* intel_ipver_early_init - setup IP version values +* @dev_priv: device private
We don't need (or want) kernel-doc for static functions. It just pollutes the generated documentation. The informative part can stay as a regular comment.
Quoted 4 lines
drivers/gpu/drm/i915/intel_device_info.c +4
-0+* +* Setup the graphics version for the current device. This must be done before +* any code that performs checks on GRAPHICS_VER or DISPLAY_VER, so this +* function should be called very early in the driver initialization sequence.
drivers/gpu/drm/i915/intel_device_info.c void intel_device_info_print(const struct intel_device_info *info, · line 178
Quoted 10 lines
drivers/gpu/drm/i915/intel_device_info.c +10
-0+* +* Regular MMIO access is not yet setup at the point this function is called so +* we peek at the appropriate MMIO offset directly. The GMD_ID register is +* part of an 'always on' power well by design, so we don't need to worry about +* forcewake while reading it. +*/ +static void intel_ipver_early_init (struct drm_i915_private *i915) +{ +struct intel_runtime_info *rtime =RUNTIME_INFO (i915); +const struct intel_runtime_info *drinfo = &INTEL_INFO (i915)->__runtime;
"runtime" and "info" have been used elsewhere as the variable names. Whether they are good is debatable, but better to stick to one naming.
Quoted 5 lines
drivers/gpu/drm/i915/intel_device_info.c +5
-0+ +if (!HAS_GMD_ID (i915)) +return ; + + ip_ver_read(i915, i915_mmio_reg_offset(GMD_ID_GRAPHICS), &rtime->graphics,
drivers/gpu/drm/i915/intel_device_info.c void intel_device_info_print(const struct intel_device_info *info, · line 193
Quoted 10 lines
drivers/gpu/drm/i915/intel_device_info.c +10
-0+ &drinfo->graphics); +ip_ver_read (i915,i915_mmio_reg_offset (GMD_ID_DISPLAY ), &rtime->display, + &drinfo->display); +ip_ver_read (i915,MTL_MEDIA_GSI_BASE +i915_mmio_reg_offset (GMD_ID_GRAPHICS ), + &rtime->media, &drinfo->media); +} + +/** +* intel_device_info_runtime_init_early - initialize early runtime info +* @i915: the i915 device
Even if this isn't a static function, I think it does beg the question does it need to be part of the generated documentation?
Quoted 5 lines
drivers/gpu/drm/i915/intel_device_info.c +5
-0+* +* Determine early intel_device_info fields at runtime. +* +* Use it when: +* - Early init of certain runtime info fields are to be initialized
drivers/gpu/drm/i915/intel_device_info.c void intel_device_info_print(const struct intel_device_info *info, · line 208
Quoted 10 lines
drivers/gpu/drm/i915/intel_device_info.c +10
-0+* +* This function needs to be called: +* - before the MMIO has been setup as we are reading registers, +* - before the PCH has been detected, +* - before the first usage of the fields it can tweak. +*/ +void intel_device_info_runtime_init_early (struct drm_i915_private *i915) +{ +intel_ipver_early_init (i915); +}
Blank line here.
Quoted 30 lines
drivers/gpu/drm/i915/intel_device_info.c +0
-0#undef INTEL_VGA_DEVICE#define INTEL_VGA_DEVICE (id, info) (id)drivers/gpu/drm/i915/intel_device_info.h +3
-0@@ -152,6 +152,7 @@ enum intel_ppgtt_type {func (has_4tile); \func (has_flat_ccs); \func (has_global_mocs); \ +func (has_gmd_id); \func (has_gt_uc); \func (has_heci_pxp); \func (has_heci_gscfi); \@@ -197,6 +198,7 @@ enum intel_ppgtt_type {struct ip_version {u8 ver;u8 rel; +u8 step; };struct intel_runtime_info {@@ -307,6 +309,7 @@ struct intel_driver_caps {const char *intel_platform_name (enum intel_platform platform); +void intel_device_info_runtime_init_early (struct drm_i915_private *dev_priv);void intel_device_info_subplatform_init (struct drm_i915_private *dev_priv);void intel_device_info_runtime_init (struct drm_i915_private *dev_priv);
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
RE: [Intel-gfx] [PATCH v3 02/11] drm/i915: Read graphics/media/display arch version from hw
Hi Jani,
Quoted 62 lines
-----Original Message-----
From: Jani Nikula <[email protected]>
Sent: Thursday, September 1, 2022 12:58 AM
To: Sripada, Radhakrishna <[email protected]>; intel- [email protected]
Cc: [email protected]
Subject: Re: [Intel-gfx] [PATCH v3 02/11] drm/i915: Read graphics/media/display arch version from hwQuoted 30 lines · Radhakrishna Sripada
From: Matt Roper <[email protected]>
Going forward, the hardware teams no longer consider new platforms to have a "generation" in the way we've defined it for past platforms. Instead, each IP block (graphics, media, display) will have their own architecture major.minor versions and stepping ID's which should be read directly from a register in the MMIO space. New hardware programming styles, features, and workarounds should be conditional solely on the architecture version, and should no longer be derived from the PCI device ID, revision ID, or platform-specific feature flags.
Bspec: 63361, 64111
v2:
- Move the IP version readout tointel_device_info.c
- Convert the macro into a functionSigned-off-by Matt Roper <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>Signed-off-by Radhakrishna Sripada <[email protected]>--- drivers/gpu/drm/i915/gt/intel_gt_regs.h | 2 + drivers/gpu/drm/i915/i915_driver.c | 2 + drivers/gpu/drm/i915/i915_drv.h | 2 + drivers/gpu/drm/i915/i915_pci.c | 1 + drivers/gpu/drm/i915/i915_reg.h | 6 ++ drivers/gpu/drm/i915/intel_device_info.c | 73 ++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_device_info.h | 3 + 7 files changed, 89 insertions(+)Review
Quoted 1 line
(quoted diff) +0
-0
b/drivers/gpu/drm/i915/gt/intel_gt_regs.hReview
Quoted 13 lines
index
d414785003cc..579da62158c4100644drivers/gpu/drm/i915/gt/intel_gt_regs.h +2
-0@@ -39,6 +39,8 @@#define FORCEWAKE_ACK_RENDER_GEN9 _MMIO(0xd84)#define FORCEWAKE_ACK_MEDIA_GEN9 _MMIO(0xd88) +#define GMD_ID_GRAPHICS _MMIO(0xd8c) +#define MCFG_MCR_SELECTOR _MMIO(0xfd0)#define SF_MCR_SELECTOR _MMIO(0xfd8)#define GEN8_MCR_SELECTOR _MMIO(0xfdc)(quoted diff) +0
-0
b/drivers/gpu/drm/i915/i915_driver.cdrivers/gpu/drm/i915/i915_driver.c static int i915_driver_early_probe(struct
Quoted 4 lines
index
3aedc33ded57..5826c70d6fa5100644drivers/gpu/drm/i915/i915_driver.c +0
-0@@ -323,6 +323,8 @@ static int i915_driver_early_probe(struct
drm_i915_private*dev_priv)
Quoted 8 lines
drivers/gpu/drm/i915/i915_driver.c static int i915_driver_early_probe(struct drm_i915_private *dev_priv) · line 328
Quoted 6 lines
drivers/gpu/drm/i915/i915_driver.c +2
-0if (i915_inject_probe_failure (dev_priv))return -ENODEV ; +intel_device_info_runtime_init_early (dev_priv); +intel_device_info_subplatform_init (dev_priv);Hmm, so why not move the subplatform init call to runtime init early?
Will move in next rev.
Quoted 100 lines
Review
Quoted 4 lines
drivers/gpu/drm/i915/i915_driver.c +0
-0intel_step_init (dev_priv);(quoted diff) +0
-0
b/drivers/gpu/drm/i915/i915_drv.hdrivers/gpu/drm/i915/i915_drv.h IS_SUBPLATFORM(const struct drm_i915_private
Quoted 4 lines
index
bf60593a4ce5..935ff3486fef100644drivers/gpu/drm/i915/i915_drv.h +0
-0@@ -936,6 +936,8 @@ IS_SUBPLATFORM(const struct drm_i915_private*i915,
Review
Quoted 9 lines
drivers/gpu/drm/i915/i915_drv.h +2
-0#define HAS_GMCH (dev_priv) (INTEL_INFO(dev_priv)->display.has_gmch) +#define HAS_GMD_ID (i915) INTEL_INFO(i915)->has_gmd_id +#define HAS_LSPCON (dev_priv) (IS_DISPLAY_VER(dev_priv, 9, 10))#define HAS_L3_CCS_READ (i915) (INTEL_INFO(i915)->has_l3_ccs_read)(quoted diff) +0
-0
b/drivers/gpu/drm/i915/i915_pci.cdrivers/gpu/drm/i915/i915_pci.c static const struct intel_device_info mtl_info = { · line 1134
Quoted 10 lines
index
72577e327c71..9772c315185d100644drivers/gpu/drm/i915/i915_pci.c +1
-0@@ -1129,6 +1129,7 @@ static const struct intel_device_info mtl_info = {PLATFORM (INTEL_METEORLAKE ), .display.has_modular_fia = 1, .has_flat_ccs = 0, + .has_gmd_id = 1, .has_snoop = 1, .__runtime.memory_regions = REGION_SMEM |
REGION_STOLEN_LMEM,Review
Quoted 2 lines
drivers/gpu/drm/i915/i915_pci.c +0
-0.__runtime.platform_engine_mask = BIT(RCS0) | BIT(BCS0) | BIT(CCS0),(quoted diff) +0
-0
b/drivers/gpu/drm/i915/i915_reg.hQuoted 16 lines
index
5e6239864c35..f52ed6d00030100644drivers/gpu/drm/i915/i915_reg.h +5
-0@@ -5798,6 +5798,11 @@#define ICL_DSSM_CDCLK_PLL_REFCLK_19_2MHz (1 << 29)#define ICL_DSSM_CDCLK_PLL_REFCLK_38_4MHz (2 << 29) +#define GMD_ID_DISPLAY _MMIO(0x510a0) +#define GMD_ID_ARCH_MASK REG_GENMASK(31, 22) +#define GMD_ID_RELEASE_MASK REG_GENMASK(21, 14) +#define GMD_ID_STEP REG_GENMASK(5, 0) +/*GEN11 chicken */ #define _PIPEA_CHICKEN 0x70038#define _PIPEB_CHICKEN 0x71038drivers/gpu/drm/i915/i915_reg.h enum skl_power_gate { · line 8306
Quoted 4 lines
drivers/gpu/drm/i915/i915_reg.h +1
-0@@ -8298,4 +8303,5 @@ enum skl_power_gate {#define MTL_LATENCY_LEVEL_EVEN_MASK REG_GENMASK(12, 0)#define MTL_LATENCY_LEVEL_ODD_MASK REG_GENMASK(28, 16) +#define MTL_MEDIA_GSI_BASE 0x380000Blank line here.
Review
Quoted 2 lines
drivers/gpu/drm/i915/i915_reg.h +0
-0#endif /* _I915_REG_H_ */ (quoted diff) +0
-0
b/drivers/gpu/drm/i915/intel_device_info.cdrivers/gpu/drm/i915/intel_device_info.c void intel_device_info_print(const struct
Quoted 12 lines
index
8ff66b4e11c1..e36ba0520be7100644drivers/gpu/drm/i915/intel_device_info.c +1
-0@@ -29,6 +29,7 @@#include "display/intel_cdclk.h" #include "display/intel_de.h" +#include "gt/intel_gt_regs.h" #include "intel_device_info.h" #include "i915_drv.h" #include "i915_utils.h" @@ -133,6 +134,78 @@ void intel_device_info_print(const struct
intel_device_info*info,drivers/gpu/drm/i915/intel_device_info.c void intel_device_info_print(const struct intel_device_info *info,
Quoted 4 lines
drivers/gpu/drm/i915/intel_device_info.c +1
-0drm_printf (p,"rawclk rate: %u kHz\n" , runtime->rawclk_freq); } +static void ip_ver_read(struct drm_i915_private *i915, u32 offset, struct
ip_version*ip,Quoted 11 lines
drivers/gpu/drm/i915/intel_device_info.c +11
-0+ const struct ip_version *dr_ip) +{ +struct pci_dev *pdev =to_pci_dev (i915->drm.dev); +void __iomem *addr; +u32 ver; + + addr =pci_iomap_range (pdev,0 , offset,sizeof (u32)); +if (drm_WARN_ON (&i915->drm, !addr)) +return ; + + ver =ioread32 (addr);drivers/gpu/drm/i915/intel_device_info.c void intel_device_info_print(const struct intel_device_info *info,
Quoted 10 lines
drivers/gpu/drm/i915/intel_device_info.c +10
-0+pci_iounmap (pdev, addr); + + ip->ver =REG_FIELD_GET (GMD_ID_ARCH_MASK , ver); + ip->rel =REG_FIELD_GET (GMD_ID_RELEASE_MASK , ver); + ip->step =REG_FIELD_GET (GMD_ID_STEP , ver); + +/* Sanity check against expected versions from device info */ +if (ip->ver != dr_ip->ver || ip->rel > dr_ip->rel) + drm_dbg(&i915->drm, + "Hardware reports GMD IP version %u.%u but minimumexpected is %u.%u\n",
Quoted 6 lines
drivers/gpu/drm/i915/intel_device_info.c void intel_device_info_print(const struct intel_device_info *info, · line 159
Quoted 1 line
drivers/gpu/drm/i915/intel_device_info.c +1
-0+ ip->ver, ip->rel, dr_ip->ver, dr_ip->rel);So this doesn't work because you pass in the same pointer in both ip and
dr_ip, and you overwrite it above. These will always match. I think just drop the 2nd pointer from parameters, and make a local copy. Or read the values to a local copy, check them, and assign.
We pass 2 different pointers here. Ip obtained from RUNTIME_INFO is &dev_priv->__runtime.{display,graphics,media} and dr_ip obtained from INTEL_INFO is &dev_priv->__info.__runtime.
So the original hardcoded values in match info would be in dr_ip.
Since we copy INTEL_INFO(dev_priv)->__runtime onto RUNTIME_INFO(dev_priv) During driver create, we can cache the values and skip passing 2 pointers.
Quoted 10 lines
drivers/gpu/drm/i915/intel_device_info.c void intel_device_info_print(const struct intel_device_info *info, · line 164
Quoted 6 lines
drivers/gpu/drm/i915/intel_device_info.c +5
-0+} + +/** +* intel_ipver_early_init - setup IP version values +* @dev_priv: device private We don't need (or want) kernel-doc for static functions. It just pollutes the generated documentation. The informative part can stay as a regular comment.
Will drop in next rev.
Quoted 11 lines
drivers/gpu/drm/i915/intel_device_info.c void intel_device_info_print(const struct · line 166
Quoted 3 lines
drivers/gpu/drm/i915/intel_device_info.c +2
-0+* +* Setup the graphics version for the current device. This must be done before
drivers/gpu/drm/i915/intel_device_info.c void intel_device_info_print(const struct intel_device_info *info,
Quoted 6 lines
drivers/gpu/drm/i915/intel_device_info.c +6
-0+* any code that performs checks on GRAPHICS_VER or DISPLAY_VER, so this +* function should be called very early in the driver initialization sequence. +* +* Regular MMIO access is not yet setup at the point this function is called so +* we peek at the appropriate MMIO offset directly. The GMD_ID register is +* part of an 'always on' power well by design, so we don't need to worry about
Quoted 11 lines
drivers/gpu/drm/i915/intel_device_info.c void intel_device_info_print(const struct intel_device_info *info,
Quoted 7 lines
drivers/gpu/drm/i915/intel_device_info.c +6
-0+* forcewake while reading it. +*/ +static void intel_ipver_early_init (struct drm_i915_private *i915) +{ +struct intel_runtime_info *rtime =RUNTIME_INFO (i915); +const struct intel_runtime_info *drinfo = &INTEL_INFO (i915)- __runtime;"runtime" and "info" have been used elsewhere as the variable names. Whether they are good is debatable, but better to stick to one naming.
If passing single pointer is sufficient, I will skip using drinfo and modify the variable in next rev.
Thanks,
RK Sripada
Quoted 13 lines
drivers/gpu/drm/i915/intel_device_info.c void intel_device_info_print(const struct intel_device_info *info,
Quoted 12 lines
drivers/gpu/drm/i915/intel_device_info.c +9
-0+ +if (!HAS_GMD_ID (i915)) +return ; + +ip_ver_read (i915,i915_mmio_reg_offset (GMD_ID_GRAPHICS ), &rtime- graphics, + &drinfo->graphics); +ip_ver_read (i915,i915_mmio_reg_offset (GMD_ID_DISPLAY ), &rtime- display, + &drinfo->display); + ip_ver_read(i915, MTL_MEDIA_GSI_BASE +
i915_mmio_reg_offset(GMD_ID_GRAPHICS),
Quoted 9 lines
drivers/gpu/drm/i915/intel_device_info.c void intel_device_info_print(const struct intel_device_info *info, · line 193
Quoted 6 lines
drivers/gpu/drm/i915/intel_device_info.c +6
-0+ &rtime->media, &drinfo->media); +} + +/** +* intel_device_info_runtime_init_early - initialize early runtime info +* @i915: the i915 device Even if this isn't a static function, I think it does beg the question does it need to be part of the generated documentation?
Will drop in next rev.
Quoted 54 lines
Quoted 6 lines
drivers/gpu/drm/i915/intel_device_info.c +5
-0+* +* Determine early intel_device_info fields at runtime. +* +* Use it when: +* - Early init of certain runtime info fields are to be initialized drivers/gpu/drm/i915/intel_device_info.c void intel_device_info_print(const struct intel_device_info *info, · line 208
Quoted 10 lines
drivers/gpu/drm/i915/intel_device_info.c +10
-0+* +* This function needs to be called: +* - before the MMIO has been setup as we are reading registers, +* - before the PCH has been detected, +* - before the first usage of the fields it can tweak. +*/ +void intel_device_info_runtime_init_early (struct drm_i915_private *i915) +{ +intel_ipver_early_init (i915); +}Blank line here.
Review
Quoted 4 lines
#undef
INTEL_VGA_DEVICE
#defineINTEL_VGA_DEVICE(id, info)(id)(quoted diff) +0
-0
b/drivers/gpu/drm/i915/intel_device_info.hQuoted 20 lines
index
6511b25277dc..6031e729714e100644drivers/gpu/drm/i915/intel_device_info.h +2
-0@@ -152,6 +152,7 @@ enum intel_ppgtt_type {func (has_4tile); \func (has_flat_ccs); \func (has_global_mocs); \ +func (has_gmd_id); \func (has_gt_uc); \func (has_heci_pxp); \func (has_heci_gscfi); \@@ -197,6 +198,7 @@ enum intel_ppgtt_type {struct ip_version {u8 ver;u8 rel; +u8 step; };struct intel_runtime_info {drivers/gpu/drm/i915/intel_device_info.h struct intel_driver_caps { · line 312
Quoted 4 lines
drivers/gpu/drm/i915/intel_device_info.h +1
-0@@ -307,6 +309,7 @@ struct intel_driver_caps {const char *intel_platform_name (enum intel_platform platform); +void intel_device_info_runtime_init_early(struct drm_i915_private
*dev_priv);drivers/gpu/drm/i915/intel_device_info.h struct intel_driver_caps { · line 314
Quoted 2 lines
drivers/gpu/drm/i915/intel_device_info.h +0
-0void intel_device_info_subplatform_init (struct drm_i915_private *dev_priv);void intel_device_info_runtime_init (struct drm_i915_private *dev_priv);--
Jani Nikula, Intel Open Source Graphics Center
PATCH v3 3/11 drm/i915: Parse and set stepping for platforms with GMD
In reply to Radhakrishna SripadaFrom: José Roberto de Souza <[email protected]>
The GMD step field do not properly match the current stepping convention that we use(STEP_A0, STEP_A1, STEP_B0...).
One platform could have { arch = 12, rel = 70, step = 1 } and the actual stepping is STEP_B0 but without the translation of the step field would mean STEP_A1.
That is why we will need to have gmd_to_intel_step tables for each IP.
--- drivers/gpu/drm/i915/intel_step.c | 60 +++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+)
drivers/gpu/drm/i915/intel_step.c +60 -0
@@ -135,6 +135,48 @@ static const struct intel_step_info adlp_n_revids[] = { [0x0] = { COMMON_GT_MEDIA_STEP(A0), .display_step = STEP_D0 }, }; +struct gmd_to_intel_step { +struct ip_version gmd; +enum intel_step step; +}; + +static const struct gmd_to_intel_step gmd_graphics_table[] = { + { .gmd.ver =12 , .gmd.rel =70 , .gmd.step =0 , .step =STEP_A0 }, + { .gmd.ver =12 , .gmd.rel =70 , .gmd.step =4 , .step =STEP_B0 }, + { .gmd.ver =12 , .gmd.rel =71 , .gmd.step =0 , .step =STEP_A0 }, + { .gmd.ver =12 , .gmd.rel =71 , .gmd.step =4 , .step =STEP_B0 }, + { .gmd.ver =12 , .gmd.rel =73 , .gmd.step =0 , .step =STEP_A0 }, + { .gmd.ver =12 , .gmd.rel =73 , .gmd.step =4 , .step =STEP_B0 }, +}; + +static const struct gmd_to_intel_step gmd_media_table[] = { + { .gmd.ver =13 , .gmd.rel =70 , .gmd.step =0 , .step =STEP_A0 }, + { .gmd.ver =13 , .gmd.rel =70 , .gmd.step =4 , .step =STEP_B0 }, +}; + +static const struct gmd_to_intel_step gmd_display_table[] = { + { .gmd.ver =14 , .gmd.rel =0 , .gmd.step =0 , .step =STEP_A0 }, + { .gmd.ver =14 , .gmd.rel =0 , .gmd.step =4 , .step =STEP_B0 }, +}; + +static u8 gmd_to_intel_step (struct drm_i915_private *i915, +struct ip_version *gmd, +const struct gmd_to_intel_step *table, +int len) +{ +int i; + +for (i =0 ; i < len; i++) { +if (table[i].gmd.ver == gmd->ver && + table[i].gmd.rel == gmd->rel && + table[i].gmd.step == gmd->step) +return table[i].step; + } + +drm_dbg (&i915->drm,"Using future steppings\n" ); +return STEP_FUTURE ; +} +static void pvc_step_init (struct drm_i915_private *i915,int pci_revid);void intel_step_init (struct drm_i915_private *i915)
@@ -144,6 +186,24 @@ void intel_step_init(struct drm_i915_private *i915)int revid =INTEL_REVID (i915);struct intel_step_info step = {}; +if (HAS_GMD_ID (i915)) { + step.graphics_step =gmd_to_intel_step (i915, + &RUNTIME_INFO (i915)->graphics, + gmd_graphics_table, +ARRAY_SIZE (gmd_graphics_table)); + step.media_step =gmd_to_intel_step (i915, + &RUNTIME_INFO (i915)->media, + gmd_media_table, +ARRAY_SIZE (gmd_media_table)); + step.display_step =gmd_to_intel_step (i915, + &RUNTIME_INFO (i915)->display, + gmd_display_table, +ARRAY_SIZE (gmd_display_table)); +RUNTIME_INFO (i915)->step = step; + +return ; + } +if (IS_PONTEVECCHIO (i915)) {pvc_step_init (i915, revid);return ;
Signature · 1 line
2.25.1
PATCH v3 4/11 drm/i915/mtl: Define engine context layouts
In reply to Radhakrishna SripadaFrom: Matt Roper <[email protected]>
The part of the media and blitter engine contexts that we care about for setting up an initial state are the same on MTL as they were on DG2 (and PVC), so we need to update the driver conditions to re-use the DG2 context table.
For render/compute engines, the part of the context images are nearly the same, although the layout had a very slight change --- one POSH register was removed and the placement of some LRI/noops adjusted slightly to compensate.
v2:
- Dg2, mtl xcs offsets slightly vary. Use a seperate offsets array(Bala)
- Drop unused registers in mtl rcs offsets.(Bala)
Bspec: 46261, 46260, 45585
--- drivers/gpu/drm/i915/gt/intel_lrc.c | 81 ++++++++++++++++++++++++++++- 1 file changed, 79 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/gt/intel_lrc.c +79 -2
@@ -264,6 +264,38 @@ static const u8 dg2_xcs_offsets[] = {END }; +static const u8 mtl_xcs_offsets[] = { +NOP (1 ), +LRI (13 ,POSTED ), +REG16 (0x244 ), +REG (0x034 ), +REG (0x030 ), +REG (0x038 ), +REG (0x03c ), +REG (0x168 ), +REG (0x140 ), +REG (0x110 ), +REG (0x1c0 ), +REG (0x1c4 ), +REG (0x1c8 ), +REG (0x180 ), +REG16 (0x2b4 ), + +NOP (1 ), +LRI (9 ,POSTED ), +REG16 (0x3a8 ), +REG16 (0x28c ), +REG16 (0x288 ), +REG16 (0x284 ), +REG16 (0x280 ), +REG16 (0x27c ), +REG16 (0x278 ), +REG16 (0x274 ), +REG16 (0x270 ), + +END +}; +static const u8 gen8_rcs_offsets[] = {NOP (1 ),LRI (14 ,POSTED ),
@@ -606,6 +638,47 @@ static const u8 dg2_rcs_offsets[] = { END }; +static const u8 mtl_rcs_offsets[] = { +NOP (1 ), +LRI (13 ,POSTED ), +REG16 (0x244 ), +REG (0x034 ), +REG (0x030 ), +REG (0x038 ), +REG (0x03c ), +REG (0x168 ), +REG (0x140 ), +REG (0x110 ), +REG (0x1c0 ), +REG (0x1c4 ), +REG (0x1c8 ), +REG (0x180 ), +REG16 (0x2b4 ), + +NOP (1 ), +LRI (9 ,POSTED ), +REG16 (0x3a8 ), +REG16 (0x28c ), +REG16 (0x288 ), +REG16 (0x284 ), +REG16 (0x280 ), +REG16 (0x27c ), +REG16 (0x278 ), +REG16 (0x274 ), +REG16 (0x270 ), + +NOP (2 ), +LRI (2 ,POSTED ), +REG16 (0x5a8 ), +REG16 (0x5ac ), + +NOP (6 ), +LRI (1 ,0 ), +REG (0x0c8 ), + +END +}; +#undef END#undef REG16#undef REG
@@ -624,7 +697,9 @@ static const u8 *reg_offsets(const struct intel_engine_cs *engine) !intel_engine_has_relative_mmio(engine));if (engine->flags &I915_ENGINE_HAS_RCS_REG_STATE ) { -if (GRAPHICS_VER_FULL (engine->i915) >=IP_VER (12 ,55 )) +if (GRAPHICS_VER_FULL (engine->i915) >=IP_VER (12 ,70 )) +return mtl_rcs_offsets; +else if (GRAPHICS_VER_FULL (engine->i915) >=IP_VER (12 ,55 ))return dg2_rcs_offsets;else if (GRAPHICS_VER_FULL (engine->i915) >=IP_VER (12 ,50 ))return xehp_rcs_offsets;
@@ -637,7 +712,9 @@ static const u8 *reg_offsets(const struct intel_engine_cs *engine)else return gen8_rcs_offsets; }else { -if (GRAPHICS_VER_FULL (engine->i915) >=IP_VER (12 ,55 )) +if (GRAPHICS_VER_FULL (engine->i915) >=IP_VER (12 ,70 )) +return mtl_xcs_offsets; +else if (GRAPHICS_VER_FULL (engine->i915) >=IP_VER (12 ,55 ))return dg2_xcs_offsets;else if (GRAPHICS_VER (engine->i915) >=12 )return gen12_xcs_offsets;
Signature · 1 line
2.25.1
PATCH v3 5/11 drm/i915/mtl: Add gmbus and gpio support
In reply to Radhakrishna SripadaAdd tables to map the GMBUS pin pairs to GPIO registers and port to DDC. From spec we have registers GPIO_CTL[1-5] mapped to native display phys and GPIO_CTL[9-12] are mapped to TC ports.
v2:
- Drop unused GPIO pins(MattR)
BSpec: 49306
Cc: Matt Roper <[email protected]>
Original Author: Brian J Lovin
--- drivers/gpu/drm/i915/display/intel_gmbus.c | 15 +++++++++++++++ drivers/gpu/drm/i915/display/intel_gmbus.h | 1 + 2 files changed, 16 insertions(+)
drivers/gpu/drm/i915/display/intel_gmbus.c +15 -0
@@ -117,6 +117,18 @@ static const struct gmbus_pin gmbus_pins_dg2[] = { [GMBUS_PIN_9_TC1_ICP] = { "tc1", GPIOJ }, }; +static const struct gmbus_pin gmbus_pins_mtp[] = { + [GMBUS_PIN_1_BXT ] = {"dpa" ,GPIOB }, + [GMBUS_PIN_2_BXT ] = {"dpb" ,GPIOC }, + [GMBUS_PIN_3_BXT ] = {"dpc" ,GPIOD }, + [GMBUS_PIN_4_CNP ] = {"dpd" ,GPIOE }, + [GMBUS_PIN_5_MTP ] = {"dpe" ,GPIOF }, + [GMBUS_PIN_9_TC1_ICP ] = {"tc1" ,GPIOJ }, + [GMBUS_PIN_10_TC2_ICP ] = {"tc2" ,GPIOK }, + [GMBUS_PIN_11_TC3_ICP ] = {"tc3" ,GPIOL }, + [GMBUS_PIN_12_TC4_ICP ] = {"tc4" ,GPIOM }, +}; +static const struct gmbus_pin *get_gmbus_pin (struct drm_i915_private *i915,unsigned int pin) {
@@ -129,6 +141,9 @@ static const struct gmbus_pin *get_gmbus_pin(struct drm_i915_private *i915, }else if (INTEL_PCH_TYPE (i915) >=PCH_DG1 ) { pins = gmbus_pins_dg1; size =ARRAY_SIZE (gmbus_pins_dg1); + }else if (INTEL_PCH_TYPE (i915) >=PCH_MTP ) { + pins = gmbus_pins_mtp; + size =ARRAY_SIZE (gmbus_pins_mtp); }else if (INTEL_PCH_TYPE (i915) >=PCH_ICP ) { pins = gmbus_pins_icp; size =ARRAY_SIZE (gmbus_pins_icp);
drivers/gpu/drm/i915/display/intel_gmbus.h +1 -0
@@ -24,6 +24,7 @@ struct i2c_adapter;#define GMBUS_PIN_2_BXT 2#define GMBUS_PIN_3_BXT 3#define GMBUS_PIN_4_CNP 4 +#define GMBUS_PIN_5_MTP 5#define GMBUS_PIN_9_TC1_ICP 9#define GMBUS_PIN_10_TC2_ICP 10#define GMBUS_PIN_11_TC3_ICP 11
Signature · 1 line
2.25.1
Re: [Intel-gfx] [PATCH v3 05/11] drm/i915/mtl: Add gmbus and gpio support
Quoted 9 lines · Radhakrishna Sripada
Add tables to map the GMBUS pin pairs to GPIO registers and port to DDC. From spec we have registers GPIO_CTL[1-5] mapped to native display phys and GPIO_CTL[9-12] are mapped to TC ports.
v2:
- Drop unused GPIO pins(MattR)BSpec: 49306
Quoted 7 lines
Cc: Matt Roper <[email protected]>
Original Author: Brian J LovinSigned-off-by Radhakrishna Sripada <[email protected]>--- drivers/gpu/drm/i915/display/intel_gmbus.c | 15 +++++++++++++++ drivers/gpu/drm/i915/display/intel_gmbus.h | 1 + 2 files changed, 16 insertions(+)
Quoted 9 lines
drivers/gpu/drm/i915/display/intel_gmbus.c +0
-0@@ -117,6 +117,18 @@ static const struct gmbus_pin gmbus_pins_dg2[] = { [GMBUS_PIN_9_TC1_ICP] = { "tc1", GPIOJ }, };
PATCH v3 6/11 drm/i915/mtl: Add display power wells
In reply to Radhakrishna SripadaFrom: Imre Deak <[email protected]>
Add support for display power wells on MTL. The differences from XE_LPD:
- The AUX HW block is moved to the PICA block, where the registers are on an always-on power well and the functionality needs to be powered on/off via the AUX_CH_CTL register: [1], [2]
- The DDI IO power on/off programming sequence is moved to the PHY PLL enable/disable sequence. [3], [4], [5]
Bspec: [1] 49233, [2] 65247, [3] 64568, [4] 65451, [5] 65450
v2:
- Update the comment in aux power well enable
- Reuse the noop sync fn for aux sync.
- Use REG_BIT for new register bit definitions
--- .../i915/display/intel_display_power_map.c | 115 +++++++++++++++++- .../i915/display/intel_display_power_well.c | 44 +++++++ .../i915/display/intel_display_power_well.h | 4 + drivers/gpu/drm/i915/display/intel_dp_aux.c | 8 ++ drivers/gpu/drm/i915/i915_reg.h | 21 ++++ 5 files changed, 191 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/display/intel_display_power_map.c +114 -1
@@ -1350,6 +1350,117 @@ static const struct i915_power_well_desc_list xelpd_power_wells[] = { I915_PW_DESCRIPTORS(xelpd_power_wells_main), }; +/* +* MTL is based on XELPD power domains with the exception of power gating for: +* - DDI_IO (moved to PLL logic) +* - AUX and AUX_IO functionality and register access for USBC1-4 (PICA always-on) +*/ +#define XELPDP_PW_2_POWER_DOMAINS \ + XELPD_PW_B_POWER_DOMAINS, \ + XELPD_PW_C_POWER_DOMAINS, \ + XELPD_PW_D_POWER_DOMAINS, \ + POWER_DOMAIN_AUDIO_PLAYBACK, \ + POWER_DOMAIN_VGA, \ + POWER_DOMAIN_PORT_DDI_LANES_TC1, \ + POWER_DOMAIN_PORT_DDI_LANES_TC2, \ + POWER_DOMAIN_PORT_DDI_LANES_TC3, \ + POWER_DOMAIN_PORT_DDI_LANES_TC4 + +I915_DECL_PW_DOMAINS (xelpdp_pwdoms_pw_2, +XELPDP_PW_2_POWER_DOMAINS , +POWER_DOMAIN_INIT ); + +I915_DECL_PW_DOMAINS (xelpdp_pwdoms_dc_off, +XELPDP_PW_2_POWER_DOMAINS , +POWER_DOMAIN_AUDIO_MMIO , +POWER_DOMAIN_MODESET , +POWER_DOMAIN_AUX_A , +POWER_DOMAIN_AUX_B , +POWER_DOMAIN_INIT ); + +I915_DECL_PW_DOMAINS (xelpdp_pwdoms_aux_tc1, +POWER_DOMAIN_AUX_USBC1 , +POWER_DOMAIN_AUX_TBT1 ); + +I915_DECL_PW_DOMAINS (xelpdp_pwdoms_aux_tc2, +POWER_DOMAIN_AUX_USBC2 , +POWER_DOMAIN_AUX_TBT2 ); + +I915_DECL_PW_DOMAINS (xelpdp_pwdoms_aux_tc3, +POWER_DOMAIN_AUX_USBC3 , +POWER_DOMAIN_AUX_TBT3 ); + +I915_DECL_PW_DOMAINS (xelpdp_pwdoms_aux_tc4, +POWER_DOMAIN_AUX_USBC4 , +POWER_DOMAIN_AUX_TBT4 ); + +static const struct i915_power_well_desc xelpdp_power_wells_main[] = { + { + .instances = &I915_PW_INSTANCES ( +I915_PW ("DC_off" , &xelpdp_pwdoms_dc_off, + .id = SKL_DISP_DC_OFF), + ), + .ops = &gen9_dc_off_power_well_ops, + }, { + .instances = &I915_PW_INSTANCES ( +I915_PW ("PW_2" , &xelpdp_pwdoms_pw_2, + .hsw.idx = ICL_PW_CTL_IDX_PW_2, + .id = SKL_DISP_PW_2), + ), + .ops = &hsw_power_well_ops, + .has_vga = true, + .has_fuses = true, + }, { + .instances = &I915_PW_INSTANCES ( +I915_PW ("PW_A" , &xelpd_pwdoms_pw_a, + .hsw.idx = XELPD_PW_CTL_IDX_PW_A), + ), + .ops = &hsw_power_well_ops, + .irq_pipe_mask =BIT (PIPE_A ), + .has_fuses = true, + }, { + .instances = &I915_PW_INSTANCES ( +I915_PW ("PW_B" , &xelpd_pwdoms_pw_b, + .hsw.idx = XELPD_PW_CTL_IDX_PW_B), + ), + .ops = &hsw_power_well_ops, + .irq_pipe_mask =BIT (PIPE_B ), + .has_fuses = true, + }, { + .instances = &I915_PW_INSTANCES ( +I915_PW ("PW_C" , &xelpd_pwdoms_pw_c, + .hsw.idx = XELPD_PW_CTL_IDX_PW_C), + ), + .ops = &hsw_power_well_ops, + .irq_pipe_mask =BIT (PIPE_C ), + .has_fuses = true, + }, { + .instances = &I915_PW_INSTANCES ( +I915_PW ("PW_D" , &xelpd_pwdoms_pw_d, + .hsw.idx = XELPD_PW_CTL_IDX_PW_D), + ), + .ops = &hsw_power_well_ops, + .irq_pipe_mask =BIT (PIPE_D ), + .has_fuses = true, + }, { + .instances = &I915_PW_INSTANCES ( + I915_PW("AUX_A", &icl_pwdoms_aux_a, .xelpdp.aux_ch = AUX_CH_A), + I915_PW("AUX_B", &icl_pwdoms_aux_b, .xelpdp.aux_ch = AUX_CH_B), + I915_PW("AUX_TC1", &xelpdp_pwdoms_aux_tc1, .xelpdp.aux_ch = AUX_CH_USBC1), + I915_PW("AUX_TC2", &xelpdp_pwdoms_aux_tc2, .xelpdp.aux_ch = AUX_CH_USBC2), + I915_PW("AUX_TC3", &xelpdp_pwdoms_aux_tc3, .xelpdp.aux_ch = AUX_CH_USBC3), + I915_PW("AUX_TC4", &xelpdp_pwdoms_aux_tc4, .xelpdp.aux_ch = AUX_CH_USBC4), + ), + .ops = &xelpdp_aux_power_well_ops, + }, +}; + +static const struct i915_power_well_desc_list xelpdp_power_wells[] = { +I915_PW_DESCRIPTORS (i9xx_power_wells_always_on), +I915_PW_DESCRIPTORS (icl_power_wells_pw_1), +I915_PW_DESCRIPTORS (xelpdp_power_wells_main), +}; +static void init_power_well_domains (const struct i915_power_well_instance *inst,struct i915_power_well *power_well) {
@@ -1457,7 +1568,9 @@ int intel_display_power_map_init(struct i915_power_domains *power_domains)return 0 ; } -if (DISPLAY_VER (i915) >=13 ) +if (DISPLAY_VER (i915) >=14 ) +return set_power_wells (power_domains, xelpdp_power_wells); +else if (DISPLAY_VER (i915) >=13 )return set_power_wells (power_domains, xelpd_power_wells);else if (IS_DG1 (i915))return set_power_wells (power_domains, dg1_power_wells);
drivers/gpu/drm/i915/display/intel_display_power_well.c +44 -0
53 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_display_power_well.h +4 -0
@@ -80,6 +80,9 @@ struct i915_power_well_instance {*/ u8 idx; } hsw; +struct { +u8 aux_ch; + } xelpdp; }; };
@@ -169,5 +172,6 @@ extern const struct i915_power_well_ops vlv_dpio_power_well_ops;extern const struct i915_power_well_ops icl_aux_power_well_ops;extern const struct i915_power_well_ops icl_ddi_power_well_ops;extern const struct i915_power_well_ops tgl_tc_cold_off_ops; +extern const struct i915_power_well_ops xelpdp_aux_power_well_ops;#endif
drivers/gpu/drm/i915/display/intel_dp_aux.c +8 -0
@@ -150,6 +150,7 @@ static u32 skl_get_aux_send_ctl(struct intel_dp *intel_dp, u32 unused) {struct intel_digital_port *dig_port =dp_to_dig_port (intel_dp); +struct drm_i915_private *i915 =to_i915 (dig_port->base.base.dev);u32 ret;/*
@@ -170,6 +171,13 @@ static u32 skl_get_aux_send_ctl(struct intel_dp *intel_dp,if (intel_tc_port_in_tbt_alt_mode (dig_port)) ret |=DP_AUX_CH_CTL_TBT_IO ; +/* +* Power request bit is already set during aux power well enable. +* Preserve the bit across aux transactions. +*/ +if (DISPLAY_VER (i915) >=14 ) + ret |=XELPDP_DP_AUX_CH_CTL_POWER_REQUEST ; +return ret; }
drivers/gpu/drm/i915/i915_reg.h +21 -0
@@ -3451,6 +3451,25 @@#define DP_AUX_CH_CTL (aux_ch) _MMIO_PORT(aux_ch, _DPA_AUX_CH_CTL, _DPB_AUX_CH_CTL)#define DP_AUX_CH_DATA (aux_ch, i) _MMIO(_PORT(aux_ch, _DPA_AUX_CH_DATA1, _DPB_AUX_CH_DATA1) + (i) * 4)/* 5 registers */ +#define _XELPDP_USBC1_AUX_CH_CTL 0x16F210 +#define _XELPDP_USBC2_AUX_CH_CTL 0x16F410 +#define _XELPDP_USBC3_AUX_CH_CTL 0x16F610 +#define _XELPDP_USBC4_AUX_CH_CTL 0x16F810 + +#define _XELPDP_USBC1_AUX_CH_DATA1 0x16F214 +#define _XELPDP_USBC2_AUX_CH_DATA1 0x16F414 +#define _XELPDP_USBC3_AUX_CH_DATA1 0x16F614 +#define _XELPDP_USBC4_AUX_CH_DATA1 0x16F814 + +#define XELPDP_DP_AUX_CH_CTL(aux_ch) _MMIO(_PICK(aux_ch, \ + _DPA_AUX_CH_CTL, \ + _DPB_AUX_CH_CTL, \ + 0, /* port/aux_ch C is non-existent */ \ + _XELPDP_USBC1_AUX_CH_CTL, \ + _XELPDP_USBC2_AUX_CH_CTL, \ + _XELPDP_USBC3_AUX_CH_CTL, \ + _XELPDP_USBC4_AUX_CH_CTL)) +#define DP_AUX_CH_CTL_SEND_BUSY (1 << 31)#define DP_AUX_CH_CTL_DONE (1 << 30)#define DP_AUX_CH_CTL_INTERRUPT (1 << 29)
@@ -3463,6 +3482,8 @@#define DP_AUX_CH_CTL_RECEIVE_ERROR (1 << 25)#define DP_AUX_CH_CTL_MESSAGE_SIZE_MASK (0x1f << 20)#define DP_AUX_CH_CTL_MESSAGE_SIZE_SHIFT 20 +#define XELPDP_DP_AUX_CH_CTL_POWER_REQUEST REG_BIT(19) +#define XELPDP_DP_AUX_CH_CTL_POWER_STATUS REG_BIT(18)#define DP_AUX_CH_CTL_PRECHARGE_2US_MASK (0xf << 16)#define DP_AUX_CH_CTL_PRECHARGE_2US_SHIFT 16#define DP_AUX_CH_CTL_AUX_AKSV_SELECT (1 << 15)
Signature · 1 line
2.25.1
PATCH v3 7/11 drm/i915/mtl: Add DP AUX support on TypeC ports
In reply to Radhakrishna SripadaFrom: Imre Deak <[email protected]>
On MTL TypeC ports the AUX_CH_CTL and AUX_CH_DATA addresses have changed wrt. previous platforms, adjust the code accordingly.
--- drivers/gpu/drm/i915/display/intel_dp_aux.c | 45 ++++++++++++++++++++- drivers/gpu/drm/i915/i915_reg.h | 9 +++++ 2 files changed, 53 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/display/intel_dp_aux.c +44 -1
@@ -637,6 +637,46 @@ static i915_reg_t tgl_aux_data_reg(struct intel_dp *intel_dp, int index) } } +static i915_reg_t xelpdp_aux_ctl_reg (struct intel_dp *intel_dp) +{ +struct drm_i915_private *dev_priv =dp_to_i915 (intel_dp); +struct intel_digital_port *dig_port =dp_to_dig_port (intel_dp); +enum aux_ch aux_ch = dig_port->aux_ch; + +switch (aux_ch) { +case AUX_CH_A : +case AUX_CH_B : +case AUX_CH_USBC1 : +case AUX_CH_USBC2 : +case AUX_CH_USBC3 : +case AUX_CH_USBC4 : +return XELPDP_DP_AUX_CH_CTL (aux_ch); +default : +MISSING_CASE (aux_ch); +return XELPDP_DP_AUX_CH_CTL (AUX_CH_A ); + } +} + +static i915_reg_t xelpdp_aux_data_reg (struct intel_dp *intel_dp,int index) +{ +struct drm_i915_private *dev_priv =dp_to_i915 (intel_dp); +struct intel_digital_port *dig_port =dp_to_dig_port (intel_dp); +enum aux_ch aux_ch = dig_port->aux_ch; + +switch (aux_ch) { +case AUX_CH_A : +case AUX_CH_B : +case AUX_CH_USBC1 : +case AUX_CH_USBC2 : +case AUX_CH_USBC3 : +case AUX_CH_USBC4 : +return XELPDP_DP_AUX_CH_DATA (aux_ch, index); +default : +MISSING_CASE (aux_ch); +return XELPDP_DP_AUX_CH_DATA (AUX_CH_A , index); + } +} +void intel_dp_aux_fini (struct intel_dp *intel_dp) {if (cpu_latency_qos_request_active (&intel_dp->pm_qos))
@@ -652,7 +692,10 @@ void intel_dp_aux_init(struct intel_dp *intel_dp)struct intel_encoder *encoder = &dig_port->base;enum aux_ch aux_ch = dig_port->aux_ch; -if (DISPLAY_VER (dev_priv) >=12 ) { +if (DISPLAY_VER (dev_priv) >=14 ) { + intel_dp->aux_ch_ctl_reg = xelpdp_aux_ctl_reg; + intel_dp->aux_ch_data_reg = xelpdp_aux_data_reg; + }else if (DISPLAY_VER (dev_priv) >=12 ) { intel_dp->aux_ch_ctl_reg = tgl_aux_ctl_reg; intel_dp->aux_ch_data_reg = tgl_aux_data_reg; }else if (DISPLAY_VER (dev_priv) >=9 ) {
drivers/gpu/drm/i915/i915_reg.h +9 -0
@@ -3470,6 +3470,15 @@ _XELPDP_USBC3_AUX_CH_CTL, \ _XELPDP_USBC4_AUX_CH_CTL)) +#define XELPDP_DP_AUX_CH_DATA(aux_ch, i) _MMIO(_PICK(aux_ch, \ + _DPA_AUX_CH_DATA1, \ + _DPB_AUX_CH_DATA1, \ + 0, /* port/aux_ch C is non-existent */ \ + _XELPDP_USBC1_AUX_CH_DATA1, \ + _XELPDP_USBC2_AUX_CH_DATA1, \ + _XELPDP_USBC3_AUX_CH_DATA1, \ + _XELPDP_USBC4_AUX_CH_DATA1) + (i) * 4) +#define DP_AUX_CH_CTL_SEND_BUSY (1 << 31)#define DP_AUX_CH_CTL_DONE (1 << 30)#define DP_AUX_CH_CTL_INTERRUPT (1 << 29)
Signature · 1 line
2.25.1
PATCH v3 8/11 drm/i915/mtl: Obtain SAGV values from MMIO instead of GT pcode mailbox
In reply to Radhakrishna SripadaFrom Meteorlake, Latency Level, SAGV bloack time are read from LATENCY_SAGV register instead of the GT driver pcode mailbox. DDR type and QGV information are also to be read from Mem SS registers.
v2:
- Simplify MTL_MEM_SS_INFO_QGV_POINT macro(MattR)
- Nit: Rearrange the bit def's from higher to lower(MattR)
- Restore platform definition for ADL-P(MattR)
- Move back intel_qgv_point def to intel_bw.c(Jani)
Bspec: 64636, 64608
Original Author: Caz Yokoyama
--- drivers/gpu/drm/i915/display/intel_bw.c | 42 ++++++++++++++++++++++--- drivers/gpu/drm/i915/i915_reg.h | 18 +++++++++++ drivers/gpu/drm/i915/intel_dram.c | 41 +++++++++++++++++++++++- drivers/gpu/drm/i915/intel_pm.c | 8 ++++- 4 files changed, 102 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/display/intel_bw.c +37 -5
@@ -137,6 +137,42 @@ int icl_pcode_restrict_qgv_points(struct drm_i915_private *dev_priv,return 0 ; } +static int mtl_read_qgv_point_info (struct drm_i915_private *dev_priv, +struct intel_qgv_point *sp,int point) +{ +u32 val, val2; +u16 dclk; + + val =intel_uncore_read (&dev_priv->uncore, +MTL_MEM_SS_INFO_QGV_POINT_LOW (point)); + val2 =intel_uncore_read (&dev_priv->uncore, +MTL_MEM_SS_INFO_QGV_POINT_HIGH (point)); + dclk =REG_FIELD_GET (MTL_DCLK_MASK , val); + sp->dclk =DIV_ROUND_UP ((16667 * dclk),1000 ); + sp->t_rp =REG_FIELD_GET (MTL_TRP_MASK , val); + sp->t_rcd =REG_FIELD_GET (MTL_TRCD_MASK , val); + + sp->t_rdpre =REG_FIELD_GET (MTL_TRDPRE_MASK , val2); + sp->t_ras =REG_FIELD_GET (MTL_TRAS_MASK , val2); + + sp->t_rc = sp->t_rp + sp->t_ras; + +return 0 ; +} + +static int +intel_read_qgv_point_info (struct drm_i915_private *dev_priv, +struct intel_qgv_point *sp, +int point) +{ +if (DISPLAY_VER (dev_priv) >=14 ) +return mtl_read_qgv_point_info (dev_priv, sp, point); +else if (IS_DG1 (dev_priv)) +return dg1_mchbar_read_qgv_point_info (dev_priv, sp, point); +else +return icl_pcode_read_qgv_point_info (dev_priv, sp, point); +} +static int icl_get_qgv_points (struct drm_i915_private *dev_priv,struct intel_qgv_info *qi,bool is_y_tile)
@@ -218,11 +254,7 @@ static int icl_get_qgv_points(struct drm_i915_private *dev_priv,for (i =0 ; i < qi->num_points; i++) {struct intel_qgv_point *sp = &qi->points[i]; -if (IS_DG1 (dev_priv)) - ret =dg1_mchbar_read_qgv_point_info (dev_priv, sp, i); -else - ret =icl_pcode_read_qgv_point_info (dev_priv, sp, i); - + ret =intel_read_qgv_point_info (dev_priv, sp, i);if (ret)return ret;
drivers/gpu/drm/i915/i915_reg.h +18 -0
@@ -8334,4 +8334,22 @@ enum skl_power_gate {#define MTL_LATENCY_LEVEL_ODD_MASK REG_GENMASK(28, 16)#define MTL_MEDIA_GSI_BASE 0x380000 + +#define MTL_LATENCY_SAGV _MMIO(0x4578c) +#define MTL_LATENCY_QCLK_SAGV REG_GENMASK(12, 0) + +#define MTL_MEM_SS_INFO_GLOBAL _MMIO(0x45700) +#define MTL_N_OF_ENABLED_QGV_POINTS_MASK REG_GENMASK(11, 8) +#define MTL_N_OF_POPULATED_CH_MASK REG_GENMASK(7, 4) +#define MTL_DDR_TYPE_MASK REG_GENMASK(3, 0) + +#define MTL_MEM_SS_INFO_QGV_POINT_LOW (point) _MMIO(0x45710 + (point) * 2) +#define MTL_TRCD_MASK REG_GENMASK(31, 24) +#define MTL_TRP_MASK REG_GENMASK(23, 16) +#define MTL_DCLK_MASK REG_GENMASK(15, 0) + +#define MTL_MEM_SS_INFO_QGV_POINT_HIGH (point) _MMIO(0x45714 + (point) * 2) +#define MTL_TRAS_MASK REG_GENMASK(16, 8) +#define MTL_TRDPRE_MASK REG_GENMASK(7, 0) +#endif /* _I915_REG_H_ */
drivers/gpu/drm/i915/intel_dram.c +40 -1
53 lines not on this page · raw message
drivers/gpu/drm/i915/intel_pm.c +7 -1
@@ -3697,7 +3697,13 @@ intel_has_sagv(struct drm_i915_private *dev_priv)static u32 intel_sagv_block_time (struct drm_i915_private *dev_priv) { -if (DISPLAY_VER (dev_priv) >=12 ) { +if (DISPLAY_VER (dev_priv) >=14 ) { +u32 val; + + val =intel_uncore_read (&dev_priv->uncore,MTL_LATENCY_SAGV ); + +return REG_FIELD_GET (MTL_LATENCY_QCLK_SAGV , val); + }else if (DISPLAY_VER (dev_priv) >=12 ) {u32 val =0 ;int ret;
Signature · 1 line
2.25.1
PATCH v3 9/11 drm/i915/mtl: Update MBUS_DBOX credits
In reply to Radhakrishna SripadaDisplay version 14 platforms have different credits values compared to ADL-P. Update the credits based on pipe usage.
v2: Simplify DBOX BW Credit definition(MattR)
Bspec: 49213
Cc: Jose Roberto de Souza <[email protected]>
Cc: Matt Roper <[email protected]>
Original Author: Caz Yokoyama
--- drivers/gpu/drm/i915/i915_reg.h | 4 +++ drivers/gpu/drm/i915/intel_pm.c | 47 ++++++++++++++++++++++++++++++--- 2 files changed, 47 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +4 -0
@@ -1125,8 +1125,12 @@#define MBUS_DBOX_REGULATE_B2B_TRANSACTIONS_EN REG_BIT(16)/* tgl+ */ #define MBUS_DBOX_BW_CREDIT_MASK REG_GENMASK(15, 14)#define MBUS_DBOX_BW_CREDIT (x) REG_FIELD_PREP(MBUS_DBOX_BW_CREDIT_MASK, x) +#define MBUS_DBOX_BW_4CREDITS_MTL REG_FIELD_PREP(MBUS_DBOX_BW_CREDIT_MASK, 0x2) +#define MBUS_DBOX_BW_8CREDITS_MTL REG_FIELD_PREP(MBUS_DBOX_BW_CREDIT_MASK, 0x3)#define MBUS_DBOX_B_CREDIT_MASK REG_GENMASK(12, 8)#define MBUS_DBOX_B_CREDIT (x) REG_FIELD_PREP(MBUS_DBOX_B_CREDIT_MASK, x) +#define MBUS_DBOX_I_CREDIT_MASK REG_GENMASK(7, 5) +#define MBUS_DBOX_I_CREDIT (x) REG_FIELD_PREP(MBUS_DBOX_I_CREDIT_MASK, x)#define MBUS_DBOX_A_CREDIT_MASK REG_GENMASK(3, 0)#define MBUS_DBOX_A_CREDIT (x) REG_FIELD_PREP(MBUS_DBOX_A_CREDIT_MASK, x)
drivers/gpu/drm/i915/intel_pm.c +43 -4
79 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH v3 10/11 drm/i915/mtl: Update CHICKEN_TRANS* register addresses
In reply to Radhakrishna SripadaFrom: Madhumitha Tolakanahalli Pradeep <[email protected]>
In Display version 14, Transcoder Chicken Registers are moved from DPRZ to DRPOS to reduce register signal crossings for Unit Interface Optimization.
This patch modifies the CHICKEN_TRANS macro to add a DISPLAY_VER check for calculating the correct platform offsets.
(And also updates existing CHICKEN_TRANS occurrences to the new definition)
v2: Omit display version check in i915_reg.h(Jani)
Bspec: 34387, 50054
--- drivers/gpu/drm/i915/display/intel_display.c | 14 ++++++++--- drivers/gpu/drm/i915/display/intel_dp_mst.c | 5 +++- drivers/gpu/drm/i915/display/intel_psr.c | 6 +++-- drivers/gpu/drm/i915/i915_reg.h | 25 +++++++++++++++----- 4 files changed, 38 insertions(+), 12 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +11 -3
@@ -618,7 +618,10 @@ void intel_disable_transcoder(const struct intel_crtc_state *old_crtc_state)if (!IS_I830 (dev_priv)) val &= ~PIPECONF_ENABLE ; -if (DISPLAY_VER (dev_priv) >=12 ) +if (DISPLAY_VER (dev_priv) >=14 ) +intel_de_rmw (dev_priv,MTL_CHICKEN_TRANS (cpu_transcoder), +FECSTALL_DIS_DPTSTREAM_DPTTG ,0 ); +else if (DISPLAY_VER (dev_priv) >=12 )intel_de_rmw (dev_priv,CHICKEN_TRANS (cpu_transcoder),FECSTALL_DIS_DPTSTREAM_DPTTG ,0 );
@@ -1838,7 +1841,9 @@ static void hsw_set_frame_start_delay(const struct intel_crtc_state *crtc_state) {struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); -i915_reg_t reg =CHICKEN_TRANS (crtc_state->cpu_transcoder); +enum transcoder transcoder = crtc_state->cpu_transcoder; +i915_reg_t reg =DISPLAY_VER (dev_priv) >=14 ?MTL_CHICKEN_TRANS (transcoder) : +CHICKEN_TRANS (transcoder);u32 val; val =intel_de_read (dev_priv, reg);
@@ -4033,6 +4038,7 @@ static bool hsw_get_pipe_config(struct intel_crtc *crtc, {struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);struct intel_display_power_domain_set power_domain_set = { }; +i915_reg_t reg;bool active;u32 tmp;
@@ -4124,7 +4130,9 @@ static bool hsw_get_pipe_config(struct intel_crtc *crtc, }if (!transcoder_is_dsi (pipe_config->cpu_transcoder)) { - tmp =intel_de_read (dev_priv,CHICKEN_TRANS (pipe_config->cpu_transcoder)); + reg =DISPLAY_VER (dev_priv) >=14 ?MTL_CHICKEN_TRANS (pipe_config->cpu_transcoder) : +CHICKEN_TRANS (pipe_config->cpu_transcoder); + tmp =intel_de_read (dev_priv, reg); pipe_config->framestart_delay =REG_FIELD_GET (HSW_FRAME_START_DELAY_MASK , tmp) +1 ; }else {
drivers/gpu/drm/i915/display/intel_dp_mst.c +4 -1
@@ -568,7 +568,10 @@ static void intel_mst_enable_dp(struct intel_atomic_state *state,drm_dp_add_payload_part2 (&intel_dp->mst_mgr, &state->base,drm_atomic_get_mst_payload_state (mst_state, connector->port)); -if (DISPLAY_VER (dev_priv) >=12 && pipe_config->fec_enable) +if (DISPLAY_VER (dev_priv) >=14 && pipe_config->fec_enable) +intel_de_rmw (dev_priv,MTL_CHICKEN_TRANS (trans),0 , +FECSTALL_DIS_DPTSTREAM_DPTTG ); +else if (DISPLAY_VER (dev_priv) >=12 && pipe_config->fec_enable)intel_de_rmw (dev_priv,CHICKEN_TRANS (trans),0 ,FECSTALL_DIS_DPTSTREAM_DPTTG );
drivers/gpu/drm/i915/display/intel_psr.c +4 -2
@@ -1139,7 +1139,8 @@ static void intel_psr_enable_source(struct intel_dp *intel_dp,if (intel_dp->psr.psr2_enabled) {if (DISPLAY_VER (dev_priv) ==9 ) -intel_de_rmw (dev_priv,CHICKEN_TRANS (cpu_transcoder),0 , +intel_de_rmw (dev_priv, +CHICKEN_TRANS (cpu_transcoder),0 ,PSR2_VSC_ENABLE_PROG_HEADER |PSR2_ADD_VERTICAL_LINE_COUNT );
@@ -1149,7 +1150,8 @@ static void intel_psr_enable_source(struct intel_dp *intel_dp,* cause issues if non-supported panels are used. */ if (IS_ALDERLAKE_P (dev_priv)) -intel_de_rmw (dev_priv,CHICKEN_TRANS (cpu_transcoder),0 , +intel_de_rmw (dev_priv, +CHICKEN_TRANS (cpu_transcoder),0 ,ADLP_1_BASED_X_GRANULARITY );/* Wa_16011168373:adl-p */
drivers/gpu/drm/i915/i915_reg.h +19 -6
@@ -5717,17 +5717,30 @@#define SKL_PLANE1_STRETCH_MAX_X1 REG_FIELD_PREP(SKL_PLANE1_STRETCH_MAX_MASK, 3)#define CHICKEN_PIPESL_1 (pipe) _MMIO_PIPE(pipe, _CHICKEN_PIPESL_1_A, _CHICKEN_PIPESL_1_B) +#define _MTL_CHICKEN_TRANS_A 0x604e0 +#define _MTL_CHICKEN_TRANS_B 0x614e0 +#define _MTL_CHICKEN_TRANS_C 0x624e0 +#define _MTL_CHICKEN_TRANS_D 0x634e0 +#define _CHICKEN_TRANS_A 0x420c0#define _CHICKEN_TRANS_B 0x420c4#define _CHICKEN_TRANS_C 0x420c8#define _CHICKEN_TRANS_EDP 0x420cc#define _CHICKEN_TRANS_D 0x420d8 -#define CHICKEN_TRANS (trans) _MMIO(_PICK((trans), \ - [TRANSCODER_EDP] = _CHICKEN_TRANS_EDP, \ - [TRANSCODER_A] = _CHICKEN_TRANS_A, \ - [TRANSCODER_B] = _CHICKEN_TRANS_B, \ - [TRANSCODER_C] = _CHICKEN_TRANS_C, \ - [TRANSCODER_D] = _CHICKEN_TRANS_D)) + +#define CHICKEN_TRANS (trans) _MMIO(_PICK((trans), \ + [TRANSCODER_EDP] = _CHICKEN_TRANS_EDP, \ + [TRANSCODER_A] = _CHICKEN_TRANS_A, \ + [TRANSCODER_B] = _CHICKEN_TRANS_B, \ + [TRANSCODER_C] = _CHICKEN_TRANS_C, \ + [TRANSCODER_D] = _CHICKEN_TRANS_D)) + +#define MTL_CHICKEN_TRANS (trans) _MMIO(_PICK((trans), \ + [TRANSCODER_A] = _MTL_CHICKEN_TRANS_A, \ + [TRANSCODER_B] = _MTL_CHICKEN_TRANS_B, \ + [TRANSCODER_C] = _MTL_CHICKEN_TRANS_C, \ + [TRANSCODER_D] = _MTL_CHICKEN_TRANS_D)) +#define HSW_FRAME_START_DELAY_MASK REG_GENMASK(28, 27)#define HSW_FRAME_START_DELAY (x) REG_FIELD_PREP(HSW_FRAME_START_DELAY_MASK, x)#define VSC_DATA_SEL_SOFTWARE_CONTROL REG_BIT(25)/* GLK */
Signature · 1 line
2.25.1
PATCH v3 11/11 drm/i915/mtl: Do not update GV point, mask value
In reply to Radhakrishna SripadaDisplay 14 and future platforms do not directly communicate to Pcode via mailbox the SAGV bandwidth information. PM Demand registers are used to communicate display power requirements to the PUnit which would include GV point and mask value.
Skip programming GV point and mask values through legacy pcode mailbox interface.
Bspec: 64636
Cc: Matt Roper <[email protected]>
Original Author: Caz Yokoyama
--- drivers/gpu/drm/i915/intel_pm.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
drivers/gpu/drm/i915/intel_pm.c +18 -0
@@ -3923,6 +3923,14 @@ void intel_sagv_pre_plane_update(struct intel_atomic_state *state) {struct drm_i915_private *i915 =to_i915 (state->base.dev); +/* +* No need to update mask value/restrict because +* "Pcode only wants to use GV bandwidth value, not the mask value." +* for DISPLAY_VER() >= 14. +*/ +if (DISPLAY_VER (i915) >=14 ) +return ; +/* * Just return if we can't control SAGV or don't have it. * This is different from situation when we have SAGV but just can't
@@ -3943,6 +3951,16 @@ void intel_sagv_post_plane_update(struct intel_atomic_state *state) {struct drm_i915_private *i915 =to_i915 (state->base.dev); +/* +* No need to update mask value/restrict because +* "Pcode only wants to use GV bandwidth value, not the mask value." +* for DISPLAY_VER() >= 14. +* +* GV bandwidth will be set by intel_pmdemand_post_plane_update() +*/ +if (DISPLAY_VER (i915) >=14 ) +return ; +/* * Just return if we can't control SAGV or don't have it. * This is different from situation when we have SAGV but just can't
Signature · 1 line
2.25.1
Patchwork
CI[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Initial Meteorlake Support (rev4)
In reply to Radhakrishna Sripada== Series Details ==
== Series Details ==
Series: Initial Meteorlake Support (rev4)
URL : https://patchwork.freedesktop.org/series/106786/
State : warning
== Summary ==
Error: dim checkpatch failedf0dff2f56c1d drm/i915: Move display and media IP version to runtime info -:29: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'i915' - possible side-effects? #29: FILE: drivers/gpu/drm/i915/i915_drv.h:479:
+#define MEDIA_VER_FULL(i915) IP_VER(RUNTIME_INFO(i915)->media.ver, \
+ RUNTIME_INFO(i915)->media.rel)
-:138: WARNING:LONG_LINE: line length of 104 exceeds 100 columns #138: FILE: drivers/gpu/drm/i915/intel_device_info.c:107:
+ drm_printf(p, "display version: %u.%02u\n", runtime->display.ver, runtime->display.rel);
total: 0 errors, 1 warnings, 1 checks, 140 lines checked 8453574f56d8 drm/i915: Read graphics/media/display arch version from hw dfbd430a56fb drm/i915: Parse and set stepping for platforms with GMD 440633cbcfbb drm/i915/mtl: Define engine context layouts
-:17: WARNING:TYPO_SPELLING: 'seperate' may be misspelled - perhaps 'separate'? #17:
- Dg2, mtl xcs offsets slightly vary. Use a seperate offsets array(Bala)
^^^^^^^^
-:73: WARNING:LEADING_SPACE: please, no spaces at the start of a line #73: FILE: drivers/gpu/drm/i915/gt/intel_lrc.c:642:
+ NOP(1),$
-:74: WARNING:LEADING_SPACE: please, no spaces at the start of a line #74: FILE: drivers/gpu/drm/i915/gt/intel_lrc.c:643:
+ LRI(13, POSTED),$
-:75: WARNING:LEADING_SPACE: please, no spaces at the start of a line #75: FILE: drivers/gpu/drm/i915/gt/intel_lrc.c:644:
+ REG16(0x244),$
-:76: WARNING:LEADING_SPACE: please, no spaces at the start of a line #76: FILE: drivers/gpu/drm/i915/gt/intel_lrc.c:645:
+ REG(0x034),$
-:77: WARNING:LEADING_SPACE: please, no spaces at the start of a line #77: FILE: drivers/gpu/drm/i915/gt/intel_lrc.c:646:
+ REG(0x030),$
-:78: WARNING:LEADING_SPACE: please, no spaces at the start of a line #78: FILE: drivers/gpu/drm/i915/gt/intel_lrc.c:647:
+ REG(0x038),$
-:79: WARNING:LEADING_SPACE: please, no spaces at the start of a line #79: FILE: drivers/gpu/drm/i915/gt/intel_lrc.c:648:
+ REG(0x03c),$
-:80: WARNING:LEADING_SPACE: please, no spaces at the start of a line #80: FILE: drivers/gpu/drm/i915/gt/intel_lrc.c:649:
+ REG(0x168),$
-:81: WARNING:LEADING_SPACE: please, no spaces at the start of a line #81: FILE: drivers/gpu/drm/i915/gt/intel_lrc.c:650:
+ REG(0x140),$
-:82: WARNING:LEADING_SPACE: please, no spaces at the start of a line #82: FILE: drivers/gpu/drm/i915/gt/intel_lrc.c:651:
+ REG(0x110),$
-:83: WARNING:LEADING_SPACE: please, no spaces at the start of a line #83: FILE: drivers/gpu/drm/i915/gt/intel_lrc.c:652:
+ REG(0x1c0),$
-:84: WARNING:LEADING_SPACE: please, no spaces at the start of a line #84: FILE: drivers/gpu/drm/i915/gt/intel_lrc.c:653:
+ REG(0x1c4),$
-:85: WARNING:LEADING_SPACE: please, no spaces at the start of a line #85: FILE: drivers/gpu/drm/i915/gt/intel_lrc.c:654:
+ REG(0x1c8),$
-:86: WARNING:LEADING_SPACE: please, no spaces at the start of a line #86: FILE: drivers/gpu/drm/i915/gt/intel_lrc.c:655:
+ REG(0x180),$
-:87: WARNING:LEADING_SPACE: please, no spaces at the start of a line #87: FILE: drivers/gpu/drm/i915/gt/intel_lrc.c:656:
+ REG16(0x2b4),$
-:89: WARNING:LEADING_SPACE: please, no spaces at the start of a line #89: FILE: drivers/gpu/drm/i915/gt/intel_lrc.c:658:
+ NOP(1),$
-:90: WARNING:LEADING_SPACE: please, no spaces at the start of a line #90: FILE: drivers/gpu/drm/i915/gt/intel_lrc.c:659:
+ LRI(9, POSTED),$
-:91: WARNING:LEADING_SPACE: please, no spaces at the start of a line #91: FILE: drivers/gpu/drm/i915/gt/intel_lrc.c:660:
+ REG16(0x3a8),$
-:92: WARNING:LEADING_SPACE: please, no spaces at the start of a line #92: FILE: drivers/gpu/drm/i915/gt/intel_lrc.c:661:
+ REG16(0x28c),$
-:93: WARNING:LEADING_SPACE: please, no spaces at the start of a line #93: FILE: drivers/gpu/drm/i915/gt/intel_lrc.c:662:
+ REG16(0x288),$
-:94: WARNING:LEADING_SPACE: please, no spaces at the start of a line #94: FILE: drivers/gpu/drm/i915/gt/intel_lrc.c:663:
+ REG16(0x284),$
-:95: WARNING:LEADING_SPACE: please, no spaces at the start of a line #95: FILE: drivers/gpu/drm/i915/gt/intel_lrc.c:664:
+ REG16(0x280),$
-:96: WARNING:LEADING_SPACE: please, no spaces at the start of a line #96: FILE: drivers/gpu/drm/i915/gt/intel_lrc.c:665:
+ REG16(0x27c),$
-:97: WARNING:LEADING_SPACE: please, no spaces at the start of a line #97: FILE: drivers/gpu/drm/i915/gt/intel_lrc.c:666:
+ REG16(0x278),$
-:98: WARNING:LEADING_SPACE: please, no spaces at the start of a line #98: FILE: drivers/gpu/drm/i915/gt/intel_lrc.c:667:
+ REG16(0x274),$
-:99: WARNING:LEADING_SPACE: please, no spaces at the start of a line #99: FILE: drivers/gpu/drm/i915/gt/intel_lrc.c:668:
+ REG16(0x270),$
-:101: WARNING:LEADING_SPACE: please, no spaces at the start of a line #101: FILE: drivers/gpu/drm/i915/gt/intel_lrc.c:670:
+ NOP(2),$
-:102: WARNING:LEADING_SPACE: please, no spaces at the start of a line #102: FILE: drivers/gpu/drm/i915/gt/intel_lrc.c:671:
+ LRI(2, POSTED),$
-:103: WARNING:LEADING_SPACE: please, no spaces at the start of a line #103: FILE: drivers/gpu/drm/i915/gt/intel_lrc.c:672:
+ REG16(0x5a8),$
-:104: WARNING:LEADING_SPACE: please, no spaces at the start of a line #104: FILE: drivers/gpu/drm/i915/gt/intel_lrc.c:673:
+ REG16(0x5ac),$
-:106: WARNING:LEADING_SPACE: please, no spaces at the start of a line #106: FILE: drivers/gpu/drm/i915/gt/intel_lrc.c:675:
+ NOP(6),$
-:107: WARNING:LEADING_SPACE: please, no spaces at the start of a line #107: FILE: drivers/gpu/drm/i915/gt/intel_lrc.c:676:
+ LRI(1, 0),$
-:108: WARNING:LEADING_SPACE: please, no spaces at the start of a line #108: FILE: drivers/gpu/drm/i915/gt/intel_lrc.c:677:
+ REG(0x0c8),$
-:110: WARNING:LEADING_SPACE: please, no spaces at the start of a line #110: FILE: drivers/gpu/drm/i915/gt/intel_lrc.c:679:
+ END$
total: 0 errors, 35 warnings, 0 checks, 105 lines checkedca0b285a00d0 drm/i915/mtl: Add gmbus and gpio supportf789eab7b613 drm/i915/mtl: Add display power wells
-:36: ERROR:COMPLEX_MACRO: Macros with complex values should be enclosed in parentheses #36: FILE: drivers/gpu/drm/i915/display/intel_display_power_map.c:1358:
+#define XELPDP_PW_2_POWER_DOMAINS \
+ XELPD_PW_B_POWER_DOMAINS, \
+ XELPD_PW_C_POWER_DOMAINS, \
+ XELPD_PW_D_POWER_DOMAINS, \
+ POWER_DOMAIN_AUDIO_PLAYBACK, \
+ POWER_DOMAIN_VGA, \
+ POWER_DOMAIN_PORT_DDI_LANES_TC1, \
+ POWER_DOMAIN_PORT_DDI_LANES_TC2, \
+ POWER_DOMAIN_PORT_DDI_LANES_TC3, \
+ POWER_DOMAIN_PORT_DDI_LANES_TC4
-:48: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #48: FILE: drivers/gpu/drm/i915/display/intel_display_power_map.c:1370:
+I915_DECL_PW_DOMAINS(xelpdp_pwdoms_pw_2,
+ XELPDP_PW_2_POWER_DOMAINS,
-:52: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #52: FILE: drivers/gpu/drm/i915/display/intel_display_power_map.c:1374:
+I915_DECL_PW_DOMAINS(xelpdp_pwdoms_dc_off,
+ XELPDP_PW_2_POWER_DOMAINS,
-:60: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #60: FILE: drivers/gpu/drm/i915/display/intel_display_power_map.c:1382:
+I915_DECL_PW_DOMAINS(xelpdp_pwdoms_aux_tc1,
+ POWER_DOMAIN_AUX_USBC1,
-:64: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #64: FILE: drivers/gpu/drm/i915/display/intel_display_power_map.c:1386:
+I915_DECL_PW_DOMAINS(xelpdp_pwdoms_aux_tc2,
+ POWER_DOMAIN_AUX_USBC2,
-:68: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #68: FILE: drivers/gpu/drm/i915/display/intel_display_power_map.c:1390:
+I915_DECL_PW_DOMAINS(xelpdp_pwdoms_aux_tc3,
+ POWER_DOMAIN_AUX_USBC3,
-:72: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #72: FILE: drivers/gpu/drm/i915/display/intel_display_power_map.c:1394:
+I915_DECL_PW_DOMAINS(xelpdp_pwdoms_aux_tc4,
+ POWER_DOMAIN_AUX_USBC4,
-:77: CHECK:OPEN_ENDED_LINE: Lines should not end with a '(' #77: FILE: drivers/gpu/drm/i915/display/intel_display_power_map.c:1399:
+ .instances = &I915_PW_INSTANCES(
-:83: CHECK:OPEN_ENDED_LINE: Lines should not end with a '(' #83: FILE: drivers/gpu/drm/i915/display/intel_display_power_map.c:1405:
+ .instances = &I915_PW_INSTANCES(
-:92: CHECK:OPEN_ENDED_LINE: Lines should not end with a '(' #92: FILE: drivers/gpu/drm/i915/display/intel_display_power_map.c:1414:
+ .instances = &I915_PW_INSTANCES(
-:100: CHECK:OPEN_ENDED_LINE: Lines should not end with a '(' #100: FILE: drivers/gpu/drm/i915/display/intel_display_power_map.c:1422:
+ .instances = &I915_PW_INSTANCES(
-:108: CHECK:OPEN_ENDED_LINE: Lines should not end with a '(' #108: FILE: drivers/gpu/drm/i915/display/intel_display_power_map.c:1430:
+ .instances = &I915_PW_INSTANCES(
-:116: CHECK:OPEN_ENDED_LINE: Lines should not end with a '(' #116: FILE: drivers/gpu/drm/i915/display/intel_display_power_map.c:1438:
+ .instances = &I915_PW_INSTANCES(
-:124: CHECK:OPEN_ENDED_LINE: Lines should not end with a '(' #124: FILE: drivers/gpu/drm/i915/display/intel_display_power_map.c:1446:
+ .instances = &I915_PW_INSTANCES(
total: 1 errors, 0 warnings, 13 checks, 248 lines checkedc1cb574e296d drm/i915/mtl: Add DP AUX support on TypeC portsd63d057f6a74 drm/i915/mtl: Obtain SAGV values from MMIO instead of GT pcode mailbox 677c09187b3e drm/i915/mtl: Update MBUS_DBOX credits
-:9: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line) #9:
Display version 14 platforms have different credits values compared to ADL-P.
total: 0 errors, 1 warnings, 0 checks, 91 lines checked2906aacc7099 drm/i915/mtl: Update CHICKEN_TRANS* register addresses
-:7: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line) #7:
In Display version 14, Transcoder Chicken Registers are moved from DPRZ to DRPOS
total: 0 errors, 1 warnings, 0 checks, 103 lines checked 0836ca36ec95 drm/i915/mtl: Do not update GV point, mask value
Patchwork
CI[Intel-gfx] ✗ Fi.CI.SPARSE: warning for Initial Meteorlake Support (rev4)
In reply to Radhakrishna Sripada== Series Details ==
== Series Details ==
Series: Initial Meteorlake Support (rev4)
URL : https://patchwork.freedesktop.org/series/106786/
State : warning
== Summary ==
Error: dim sparse failed
Sparse version: v0.6.2
Fast mode used, each commit won't be checked separately.
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BAT: failure for Initial Meteorlake Support (rev4)
In reply to Radhakrishna Sripada== Series Details ==
== Series Details ==
Series: Initial Meteorlake Support (rev4)
URL : https://patchwork.freedesktop.org/series/106786/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_12058 -> Patchwork_106786v4
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_106786v4 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_106786v4, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_106786v4/index.html
Participating hosts (37 -> 35)
------------------------------
Missing (2): fi-hsw-4770 fi-bdw-samus
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_106786v4:
### IGT changes ###
#### Possible regressions ####
* igt@gem_exec_suspend@basic-s0@smem:
- fi-skl-6600u: [PASS][1] -> [INCOMPLETE][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12058/fi-skl-6600u/igt@gem_exec_suspend@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_106786v4/fi-skl-6600u/igt@gem_exec_suspend@[email protected]
Known issues
------------
Here are the changes found in Patchwork_106786v4 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_selftest@live@requests:
- fi-pnv-d510: [PASS][3] -> [DMESG-FAIL][4] ([i915#4528])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12058/fi-pnv-d510/igt@i915_selftest@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_106786v4/fi-pnv-d510/igt@i915_selftest@[email protected]
* igt@i915_suspend@basic-s3-without-i915:
- fi-rkl-11600: [PASS][5] -> [INCOMPLETE][6] ([i915#5982])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12058/fi-rkl-11600/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_106786v4/fi-rkl-11600/igt@[email protected]
* igt@kms_chamelium@common-hpd-after-suspend:
- fi-hsw-g3258: NOTRUN -> [SKIP][7] ([fdo#109271] / [fdo#111827])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_106786v4/fi-hsw-g3258/igt@[email protected]
* igt@runner@aborted:
- fi-pnv-d510: NOTRUN -> [FAIL][8] ([fdo#109271] / [i915#2403] / [i915#4312])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_106786v4/fi-pnv-d510/igt@[email protected]
#### Possible fixes ####
* igt@gem_exec_suspend@basic-s0@smem:
- {bat-rplp-1}: [DMESG-WARN][9] ([i915#2867]) -> [PASS][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12058/bat-rplp-1/igt@gem_exec_suspend@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_106786v4/bat-rplp-1/igt@gem_exec_suspend@[email protected]
* igt@i915_selftest@live@hangcheck:
- fi-hsw-g3258: [INCOMPLETE][11] ([i915#3303] / [i915#4785]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12058/fi-hsw-g3258/igt@i915_selftest@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_106786v4/fi-hsw-g3258/igt@i915_selftest@[email protected]
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor@atomic-transitions:
- fi-bsw-kefka: [FAIL][13] ([i915#6298]) -> [PASS][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12058/fi-bsw-kefka/igt@kms_cursor_legacy@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_106786v4/fi-bsw-kefka/igt@kms_cursor_legacy@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#2403]: https://gitlab.freedesktop.org/drm/intel/issues/2403
[i915#2867]: https://gitlab.freedesktop.org/drm/intel/issues/2867
[i915#3303]: https://gitlab.freedesktop.org/drm/intel/issues/3303
[i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
[i915#4528]: https://gitlab.freedesktop.org/drm/intel/issues/4528
[i915#4785]: https://gitlab.freedesktop.org/drm/intel/issues/4785
[i915#5982]: https://gitlab.freedesktop.org/drm/intel/issues/5982
[i915#6257]: https://gitlab.freedesktop.org/drm/intel/issues/6257
[i915#6298]: https://gitlab.freedesktop.org/drm/intel/issues/6298
[i915#6380]: https://gitlab.freedesktop.org/drm/intel/issues/6380
Build changes
-------------
* Linux: CI_DRM_12058 -> Patchwork_106786v4
CI-20190529: 20190529
CI_DRM_12058: 2ef8278465adc6572e0d22dffbaa332d56b4b40c @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6639: ba61c48dba71d5597d7297a07dc3e307665f961b @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_106786v4: 2ef8278465adc6572e0d22dffbaa332d56b4b40c @ git://anongit.freedesktop.org/gfx-ci/linux
### Linux commits
e70b8265f1ca drm/i915/mtl: Do not update GV point, mask value 5e1456d11c65 drm/i915/mtl: Update CHICKEN_TRANS* register addresses 09101a330f99 drm/i915/mtl: Update MBUS_DBOX credits5a9e79daf441 drm/i915/mtl: Obtain SAGV values from MMIO instead of GT pcode mailbox 21a1ea4c5810 drm/i915/mtl: Add DP AUX support on TypeC ports 02c74488bb2d drm/i915/mtl: Add display power wells40867c9c89c1 drm/i915/mtl: Add gmbus and gpio supportadc2c3084fdf drm/i915/mtl: Define engine context layoutsd82173708641 drm/i915: Parse and set stepping for platforms with GMD dab36cccd007 drm/i915: Read graphics/media/display arch version from hw 1bf49323bcbc drm/i915: Move display and media IP version to runtime info
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_106786v4/index.html