Pipe DMC Support
Subsystems (3)
cover Pipe DMC Support
With all DMC cleanup patches merged, sending the rebased version of actual Pipe DMC bits.
One change from previous verison is a fix of SKL regression. Corner cases for stepping-substepping combination was missing from fw_info_matches_stepping() helper. Luckily SKL was the only platform in CI that came under this category and DMC refused to load.
This fix is tested on SKL.
Anusha Srivatsa (4):
drm/i915/dmc: Introduce DMC_FW_MAIN
xdrm/i915/xelpd: Pipe A DMC plugging
drm/i915/adl_p: Pipe B DMC Support
drm/i915/adl_p: Load DMC
.../drm/i915/display/intel_display_debugfs.c | 6 +- .../drm/i915/display/intel_display_power.c | 5 +- drivers/gpu/drm/i915/display/intel_dmc.c | 170 ++++++++++-------- drivers/gpu/drm/i915/display/intel_dmc.h | 23 ++- drivers/gpu/drm/i915/i915_reg.h | 2 +- 5 files changed, 127 insertions(+), 79 deletions(-)
Signature · 6 lines
2.25.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/4 drm/i915/dmc: Introduce DMC_FW_MAIN
This is a prep patch for Pipe DMC plugging.
Add dmc_info struct in intel_dmc to have all common fields shared between all DMC's in the package.
Add DMC_FW_MAIN(dmc_id 0) to refer to the blob.
v2: Remove dmc_offset and start_mmioaddr from dmc_info struct (Jose)
--- drivers/gpu/drm/i915/display/intel_dmc.c | 44 +++++++++++------------- drivers/gpu/drm/i915/display/intel_dmc.h | 18 +++++++--- 2 files changed, 33 insertions(+), 29 deletions(-)
drivers/gpu/drm/i915/display/intel_dmc.c +20 -24
@@ -239,7 +239,7 @@ struct stepping_info {bool intel_dmc_has_payload (struct drm_i915_private *i915) { -return i915->dmc.dmc_payload; +return i915->dmc.dmc_info[DMC_FW_MAIN ].payload; }static const struct stepping_info skl_stepping_info[] = {
@@ -316,7 +316,8 @@ static void gen9_set_dc_state_debugmask(struct drm_i915_private *dev_priv)*/ void intel_dmc_load_program (struct drm_i915_private *dev_priv) { -u32 *payload = dev_priv->dmc.dmc_payload; +struct intel_dmc *dmc = &dev_priv->dmc; +struct dmc_fw_info *dmc_info = &dmc->dmc_info[DMC_FW_MAIN ];u32 i, fw_size;if (!HAS_DMC (dev_priv)) {
@@ -325,26 +326,26 @@ void intel_dmc_load_program(struct drm_i915_private *dev_priv)return ; } -if (!intel_dmc_has_payload (dev_priv)) { +if (!dev_priv->dmc.dmc_info[DMC_FW_MAIN ].payload) {drm_err (&dev_priv->drm,"Tried to program CSR with empty payload\n" );return ; } - fw_size = dev_priv->dmc.dmc_fw_size; + fw_size = dmc_info->dmc_fw_size;assert_rpm_wakelock_held (&dev_priv->runtime_pm);preempt_disable ();for (i =0 ; i < fw_size; i++)intel_uncore_write_fw (&dev_priv->uncore,DMC_PROGRAM (i), - payload[i]); + dmc_info->payload[i]);preempt_enable (); -for (i =0 ; i < dev_priv->dmc.mmio_count; i++) { -intel_de_write (dev_priv, dev_priv->dmc.mmioaddr[i], - dev_priv->dmc.mmiodata[i]); +for (i =0 ; i < dmc_info->mmio_count; i++) { +intel_de_write (dev_priv, dmc_info->mmioaddr[i], + dmc_info->mmiodata[i]); } dev_priv->dmc.dc_state =0 ;
@@ -401,13 +402,14 @@ static u32 parse_dmc_fw_header(struct intel_dmc *dmc, size_t rem_size) {struct drm_i915_private *i915 =container_of (dmc,typeof (*i915), dmc); +struct dmc_fw_info *dmc_info = &dmc->dmc_info[DMC_FW_MAIN ];unsigned int header_len_bytes, dmc_header_size, payload_size, i;const u32 *mmioaddr, *mmiodata;u32 mmio_count, mmio_count_max;u8 *payload; -BUILD_BUG_ON (ARRAY_SIZE (dmc->mmioaddr) <DMC_V3_MAX_MMIO_COUNT || -ARRAY_SIZE (dmc->mmioaddr) <DMC_V1_MAX_MMIO_COUNT ); +BUILD_BUG_ON (ARRAY_SIZE (dmc_info->mmioaddr) <DMC_V3_MAX_MMIO_COUNT || +ARRAY_SIZE (dmc_info->mmioaddr) <DMC_V1_MAX_MMIO_COUNT );/* * Check if we can access common fields, we will checkc again below
@@ -463,16 +465,10 @@ static u32 parse_dmc_fw_header(struct intel_dmc *dmc, }for (i =0 ; i < mmio_count; i++) { -if (mmioaddr[i] <DMC_MMIO_START_RANGE || - mmioaddr[i] >DMC_MMIO_END_RANGE ) { -drm_err (&i915->drm,"DMC firmware has wrong mmio address 0x%x\n" , - mmioaddr[i]); -return 0 ; - } - dmc->mmioaddr[i] =_MMIO (mmioaddr[i]); - dmc->mmiodata[i] = mmiodata[i]; + dmc_info->mmioaddr[i] =_MMIO (mmioaddr[i]); + dmc_info->mmiodata[i] = mmiodata[i]; } - dmc->mmio_count = mmio_count; + dmc_info->mmio_count = mmio_count; rem_size -= header_len_bytes;
@@ -485,14 +481,14 @@ static u32 parse_dmc_fw_header(struct intel_dmc *dmc,drm_err (&i915->drm,"DMC FW too big (%u bytes)\n" , payload_size);return 0 ; } - dmc->dmc_fw_size = dmc_header->fw_size; + dmc_info->dmc_fw_size = dmc_header->fw_size; - dmc->dmc_payload =kmalloc (payload_size,GFP_KERNEL ); -if (!dmc->dmc_payload) + dmc_info->payload =kmalloc (payload_size,GFP_KERNEL ); +if (!dmc_info->payload)return 0 ; payload = (u8 *)(dmc_header) + header_len_bytes; -memcpy (dmc->dmc_payload, payload, payload_size); +memcpy (dmc_info->payload, payload, payload_size);return header_len_bytes + payload_size;
@@ -827,5 +823,5 @@ void intel_dmc_ucode_fini(struct drm_i915_private *dev_priv)intel_dmc_ucode_suspend (dev_priv);drm_WARN_ON (&dev_priv->drm, dev_priv->dmc.wakeref); -kfree (dev_priv->dmc.dmc_payload); +kfree (dev_priv->dmc.dmc_info[DMC_FW_MAIN ].payload); }
drivers/gpu/drm/i915/display/intel_dmc.h +13 -5
@@ -16,17 +16,25 @@ struct drm_i915_private;#define DMC_VERSION_MAJOR (version) ((version) >> 16)#define DMC_VERSION_MINOR (version) ((version) & 0xffff) +enum { +DMC_FW_MAIN =0 , +DMC_FW_MAX +}; +struct intel_dmc {struct work_struct work;const char *fw_path;u32 required_version;u32 max_fw_size;/* bytes */ -u32 *dmc_payload; -u32 dmc_fw_size;/* dwords */ u32 version; -u32 mmio_count; -i915_reg_t mmioaddr[20 ]; -u32 mmiodata[20 ]; +struct dmc_fw_info { +u32 mmio_count; +i915_reg_t mmioaddr[20 ]; +u32 mmiodata[20 ]; +u32 dmc_fw_size;/*dwords */ +u32 *payload; + } dmc_info[DMC_FW_MAX ]; +u32 dc_state;u32 target_dc_state;u32 allowed_dc_mask;
Signature · 6 lines
2.25.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/4 drm/i915/xelpd: Pipe A DMC plugging
In reply to Anusha SrivatsaThis patch adds Pipe A plumbing to the already existing parsing and loading functions which is taken care of in the prep patches. Adding MAX_DMC_FW to keep track for both Main and Pipe A DMC while loading the respective blobs.
Also adding present field in dmc_info. s/find_dmc_fw_offset/csr_set_dmc_fw_offset. While at it add fw_info_matches_stepping() helper. CSR_PROGRAM() should now take the starting address of the particular blob (Main or Pipe) and not hardcode it.
v2: Add dmc_offset and start_mmioaddr fields for dmc_info struct.
v3: Add a missing corner cases of stepping-substepping combination in fw_info_matches_stepping() helper.
--- .../drm/i915/display/intel_display_debugfs.c | 4 +- .../drm/i915/display/intel_display_power.c | 5 +- drivers/gpu/drm/i915/display/intel_dmc.c | 130 +++++++++++------- drivers/gpu/drm/i915/display/intel_dmc.h | 4 + drivers/gpu/drm/i915/i915_reg.h | 2 +- 5 files changed, 89 insertions(+), 56 deletions(-)
drivers/gpu/drm/i915/display/intel_display_debugfs.c +3 -1
@@ -544,6 +544,8 @@ static int i915_dmc_info(struct seq_file *m, void *unused)seq_printf (m,"fw loaded: %s\n" ,yesno (intel_dmc_has_payload (dev_priv)));seq_printf (m,"path: %s\n" , dmc->fw_path); +seq_printf (m,"Pipe A fw support: %s\n" ,yesno (INTEL_GEN (dev_priv) >=12 )); +seq_printf (m,"Pipe A fw loaded: %s\n" ,yesno (dmc->dmc_info[DMC_FW_PIPEA ].payload));if (!intel_dmc_has_payload (dev_priv)) goto out;
@@ -582,7 +584,7 @@ static int i915_dmc_info(struct seq_file *m, void *unused) out:seq_printf (m,"program base: 0x%08x\n" , -intel_de_read (dev_priv,DMC_PROGRAM (0 ))); +intel_de_read (dev_priv,DMC_PROGRAM (dmc->dmc_info[DMC_FW_MAIN ].start_mmioaddr,0 )));seq_printf (m,"ssp base: 0x%08x\n" ,intel_de_read (dev_priv,DMC_SSP_BASE ));seq_printf (m,"htp: 0x%08x\n" ,intel_de_read (dev_priv,DMC_HTP_SKL ));
drivers/gpu/drm/i915/display/intel_display_power.c +3 -2
@@ -961,8 +961,9 @@ static void bxt_disable_dc9(struct drm_i915_private *dev_priv)static void assert_dmc_loaded (struct drm_i915_private *dev_priv) {drm_WARN_ONCE (&dev_priv->drm, - !intel_de_read (dev_priv,DMC_PROGRAM (0 )), -"DMC program storage start is NULL\n" ); + !intel_de_read (dev_priv, +DMC_PROGRAM (dev_priv->dmc.dmc_info[DMC_FW_MAIN ].start_mmioaddr,0 )), +"DMC program storage start is NULL\n" );drm_WARN_ONCE (&dev_priv->drm, !intel_de_read (dev_priv,DMC_SSP_BASE ),"DMC SSP Base Not fine\n" ); drm_WARN_ONCE(&dev_priv->drm, !intel_de_read(dev_priv, DMC_HTP_SKL),
drivers/gpu/drm/i915/display/intel_dmc.c +78 -52
222 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_dmc.h +4 -0
@@ -18,6 +18,7 @@ struct drm_i915_private;enum {DMC_FW_MAIN =0 , +DMC_FW_PIPEA ,DMC_FW_MAX };
@@ -31,8 +32,11 @@ struct intel_dmc {u32 mmio_count;i915_reg_t mmioaddr[20 ];u32 mmiodata[20 ]; +u32 dmc_offset; +u32 start_mmioaddr;u32 dmc_fw_size;/*dwords */ u32 *payload; +bool present; } dmc_info[DMC_FW_MAX ];u32 dc_state;
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -7751,7 +7751,7 @@ enum {#define GAMMA_MODE_MODE_12BIT_MULTI_SEGMENTED (3 << 0)/* icl + */ /* DMC */ -#define DMC_PROGRAM (i) _MMIO(0x80000 + (i) * 4) +#define DMC_PROGRAM (addr, i) _MMIO((addr) + (i) * 4)#define DMC_SSP_BASE_ADDR_GEN9 0x00002FC0#define DMC_HTP_ADDR_SKL 0x00500034#define DMC_SSP_BASE _MMIO(0x8F074)
Signature · 6 lines
2.25.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/4 drm/i915/adl_p: Pipe B DMC Support
In reply to Anusha SrivatsaADLP requires us to load both Pipe A and Pipe B.
Plug Pipe B loading support.
--- drivers/gpu/drm/i915/display/intel_display_debugfs.c | 2 ++ drivers/gpu/drm/i915/display/intel_dmc.h | 1 + 2 files changed, 3 insertions(+)
drivers/gpu/drm/i915/display/intel_display_debugfs.c +2 -0
@@ -546,6 +546,8 @@ static int i915_dmc_info(struct seq_file *m, void *unused)seq_printf (m,"path: %s\n" , dmc->fw_path);seq_printf (m,"Pipe A fw support: %s\n" ,yesno (INTEL_GEN (dev_priv) >=12 ));seq_printf (m,"Pipe A fw loaded: %s\n" ,yesno (dmc->dmc_info[DMC_FW_PIPEA ].payload)); +seq_printf (m,"Pipe B fw support: %s\n" ,yesno (IS_ALDERLAKE_P (dev_priv))); +seq_printf (m,"Pipe B fw loaded: %s\n" ,yesno (dmc->dmc_info[DMC_FW_PIPEB ].payload));if (!intel_dmc_has_payload (dev_priv)) goto out;
drivers/gpu/drm/i915/display/intel_dmc.h +1 -0
@@ -19,6 +19,7 @@ struct drm_i915_private;enum {DMC_FW_MAIN =0 ,DMC_FW_PIPEA , +DMC_FW_PIPEB ,DMC_FW_MAX };
Signature · 6 lines
2.25.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 4/4 drm/i915/adl_p: Load DMC
In reply to Anusha SrivatsaLoad DMC v2.06 on ADLP. The release notes mention that this version enables few power savings features.
--- drivers/gpu/drm/i915/display/intel_dmc.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/display/intel_dmc.c +9 -1
@@ -45,6 +45,10 @@#define GEN12_DMC_MAX_FW_SIZE ICL_DMC_MAX_FW_SIZE +#define ADLP_DMC_PATH "i915/adlp_dmc_ver2_10.bin" +#define ADLP_DMC_VERSION_REQUIRED DMC_VERSION(2, 10) +MODULE_FIRMWARE (ADLP_DMC_PATH ); +#define ADLS_DMC_PATH DMC_PATH(adls, 2, 01)#define ADLS_DMC_VERSION_REQUIRED DMC_VERSION(2, 1)MODULE_FIRMWARE (ADLS_DMC_PATH );
@@ -727,7 +731,11 @@ void intel_dmc_ucode_init(struct drm_i915_private *dev_priv)*/ intel_dmc_runtime_pm_get (dev_priv); -if (IS_ALDERLAKE_S (dev_priv)) { +if (IS_ALDERLAKE_P (dev_priv)) { + dmc->fw_path =ADLP_DMC_PATH ; + dmc->required_version =ADLP_DMC_VERSION_REQUIRED ; + dmc->max_fw_size =GEN12_DMC_MAX_FW_SIZE ; + }else if (IS_ALDERLAKE_S (dev_priv)) { dmc->fw_path =ADLS_DMC_PATH ; dmc->required_version =ADLS_DMC_VERSION_REQUIRED ; dmc->max_fw_size =GEN12_DMC_MAX_FW_SIZE ;
Signature · 6 lines
2.25.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx