Redesign dmc firmware loading.
Subsystems (2)
cover Redesign dmc firmware loading.
This patch series has the changes done to redesign the dmc firmware loading flow. This is continuation of the below patch series after addressing review comments from Daniel.
http://lists.freedesktop.org/archives/intel-gfx/2015-July/072331.html
Few patches from the above patch series are seperated out to make it simple. PC10 entry related bugfix already sent and is under-review. Below link for your reference.
http://lists.freedesktop.org/archives/intel-gfx/2015-August/072870.html
Broxton related changes will be sent in subsequent patch series.
Animesh Manna (3):
drm/i915/gen9: csr_init after runtime pm enable drm/i915/bxt: release rpm reference if csr firmware failed to load. drm/i915/gen9: Use flush_work to synchronize with dmc loader
Daniel Vetter (9):
drm/i915: use correct power domain for csr loading drm/i915/gen9: move assert_csr_loaded into intel_rpm.c drm/i915/gen9: Remove csr.state, csr_lock and related code. drm/i915/gen9: Align line continuations in intel_csr.c. drm/i915/gen9: Simplify csr loading failure printing. drm/i915/gen9: extract parse_csr_fw
drm/i915/gen9: Don't try to load garbage dmc firmware on resume drm/i915/gen9: Use dev_priv in csr functions drm/i915: Use request_firmware and our own async work
drivers/gpu/drm/i915/i915_dma.c | 11 +- drivers/gpu/drm/i915/i915_drv.c | 28 +---- drivers/gpu/drm/i915/i915_drv.h | 12 +- drivers/gpu/drm/i915/i915_reg.h | 16 +++ drivers/gpu/drm/i915/intel_csr.c | 210 ++++++++++++-------------------- drivers/gpu/drm/i915/intel_drv.h | 10 +- drivers/gpu/drm/i915/intel_runtime_pm.c | 11 +- 7 files changed, 113 insertions(+), 185 deletions(-)
Signature · 6 lines
2.0.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/12 drm/i915: use correct power domain for csr loading
From: Daniel Vetter <[email protected]>
Grabbing a runtime pm reference with intel_runtime_pm_get will only prevent device D3. But dmc firmware is required even earlier (namely for the skl power well 2).
Hence we need to grab a rpm reference higher up in the hierarchy. For simplicity just grab the _INIT display power well. That's a bit too much, but since the firmware loading task should completely fairly quickly this won't be a real problem really.
--- drivers/gpu/drm/i915/intel_csr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_csr.c +2 -2
@@ -384,7 +384,7 @@ static void finish_csr_load(const struct firmware *fw, void *context)DRM_DEBUG_KMS ("Finished loading %s\n" , dev_priv->csr.fw_path); out:if (fw_loaded) -intel_runtime_pm_put (dev_priv); +intel_display_power_put (dev_priv,POWER_DOMAIN_INIT );else intel_csr_load_status_set (dev_priv,FW_FAILED );
@@ -421,7 +421,7 @@ void intel_csr_ucode_init(struct drm_device *dev)* Obtain a runtime pm reference, until CSR is loaded, * to avoid entering runtime-suspend. */ -intel_runtime_pm_get (dev_priv); +intel_display_power_get (dev_priv,POWER_DOMAIN_INIT );/* CSR supported for platform, load firmware */ ret = request_firmware_nowait(THIS_MODULE, true, csr->fw_path,
Signature · 6 lines
2.0.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/12 drm/i915/gen9: csr_init after runtime pm enable
In reply to Animesh MannaAs skl is fully dependent on dmc to go to low power state (dc5/dc6) which requires a trigger from rpm and to ensure the dmc firmware is available for runtime pm support rpm-reference-count is used by not releasing the rpm reference acquire when starting the firmware loader work.
So moved the intel_csr_ucode_init call after runtime pm enable.
--- drivers/gpu/drm/i915/i915_dma.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/i915_dma.c +3 -3
@@ -877,9 +877,6 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)intel_uncore_init (dev); -/* Load CSR Firmware for SKL */ -intel_csr_ucode_init (dev); - ret =i915_gem_gtt_init (dev);if (ret) goto out_freecsr;
@@ -1027,6 +1024,9 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)i915_audio_component_init (dev_priv); +/* Load CSR Firmware for SKL */ +intel_csr_ucode_init (dev); +return 0 ; out_power_well:
Signature · 6 lines
2.0.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [DMC-REDESIGN-PATCHES 02/12] drm/i915/gen9: csr_init after runtime pm enable
Quoted 32 lines · Animesh Manna
As skl is fully dependent on dmc to go to low power state (dc5/dc6) which requires a trigger from rpm and to ensure the dmc firmware is available for runtime pm support rpm-reference-count is used by not releasing the rpm reference acquire when starting the firmware loader work.
So moved the
intel_csr_ucode_initcall after runtime pm enable.Cc Daniel Vetter <[email protected]>Cc Damien Lespiau <[email protected]>Cc Imre Deak <[email protected]>Cc Sunil Kamath <[email protected]>Signed-off-by Animesh Manna <[email protected]>--- drivers/gpu/drm/i915/i915_dma.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/i915_dma.c +0
-3@@ -877,9 +877,6 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)intel_uncore_init (dev); -/* Load CSR Firmware for SKL */ -intel_csr_ucode_init (dev); - ret =i915_gem_gtt_init (dev);if (ret) goto out_freecsr;
drivers/gpu/drm/i915/i915_dma.c int i915_driver_load(struct drm_device *dev, unsigned long flags) · line 1028
Quoted 5 lines
drivers/gpu/drm/i915/i915_dma.c +2
-0@@ -1027,6 +1024,9 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)i915_audio_component_init (dev_priv); +/* Load CSR Firmware for SKL */ +intel_csr_ucode_init (dev);
Don't we need this patch before patch 1 to avoid breakage when booting? -Daniel
Quoted 11 lines
drivers/gpu/drm/i915/i915_dma.c +1
-0+return 0 ; out_power_well:Signature · 6 lines
2.0.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/12 drm/i915/bxt: release rpm reference if csr firmware failed to load.
In reply to Animesh MannaNote that for bxt without dmc, display engine can go to lowest possible state (dc9), so releasing the rpm reference.
--- drivers/gpu/drm/i915/intel_csr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_csr.c +1 -1
@@ -383,7 +383,7 @@ static void finish_csr_load(const struct firmware *fw, void *context)DRM_DEBUG_KMS ("Finished loading %s\n" , dev_priv->csr.fw_path); out: -if (fw_loaded) +if (fw_loaded ||IS_BROXTON (dev))intel_display_power_put (dev_priv,POWER_DOMAIN_INIT );else intel_csr_load_status_set (dev_priv,FW_FAILED );
Signature · 6 lines
2.0.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 4/12 drm/i915/gen9: move assert_csr_loaded into intel_rpm.c
In reply to Animesh MannaFrom: Daniel Vetter <[email protected]>
Avoids non-static functions since all the callers are in intel_rpm.c. Only thing we need for that is to move the register definitions into i915_reg.h.
--- drivers/gpu/drm/i915/i915_reg.h | 16 ++++++++++++++++ drivers/gpu/drm/i915/intel_csr.c | 25 ------------------------- drivers/gpu/drm/i915/intel_drv.h | 1 - drivers/gpu/drm/i915/intel_runtime_pm.c | 8 ++++++++ 4 files changed, 24 insertions(+), 26 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +16 -0
@@ -7367,6 +7367,22 @@ enum skl_disp_power_wells {#define DC_STATE_DEBUG 0x45520#define DC_STATE_DEBUG_MASK_MEMORY_UP (1<<1) +/* +* SKL CSR registers for DC5 and DC6 +*/ +#define CSR_PROGRAM_BASE 0x80000 +#define CSR_SSP_BASE_ADDR_GEN9 0x00002FC0 +#define CSR_HTP_ADDR_SKL 0x00500034 +#define CSR_SSP_BASE 0x8F074 +#define CSR_HTP_SKL 0x8F004 +#define CSR_LAST_WRITE 0x8F034 +#define CSR_LAST_WRITE_VALUE 0xc003b400 +/* MMIO address range for CSR program (0x80000 - 0x82FFF) */ +#define CSR_MAX_FW_SIZE 0x2FFF +#define CSR_DEFAULT_FW_OFFSET 0xFFFFFFFF +#define CSR_MMIO_START_RANGE 0x80000 +#define CSR_MMIO_END_RANGE 0x8FFFF +/* Please see hsw_read_dcomp() and hsw_write_dcomp() before using this register, * since on HSW we can't write to it using I915_WRITE. */ #define D_COMP_HSW (MCHBAR_MIRROR_BASE_SNB + 0x5F0C)
drivers/gpu/drm/i915/intel_csr.c +0 -25
@@ -45,22 +45,6 @@MODULE_FIRMWARE (I915_CSR_SKL ); -/* -* SKL CSR registers for DC5 and DC6 -*/ -#define CSR_PROGRAM_BASE 0x80000 -#define CSR_SSP_BASE_ADDR_GEN9 0x00002FC0 -#define CSR_HTP_ADDR_SKL 0x00500034 -#define CSR_SSP_BASE 0x8F074 -#define CSR_HTP_SKL 0x8F004 -#define CSR_LAST_WRITE 0x8F034 -#define CSR_LAST_WRITE_VALUE 0xc003b400 -/* MMIO address range for CSR program (0x80000 - 0x82FFF) */ -#define CSR_MAX_FW_SIZE 0x2FFF -#define CSR_DEFAULT_FW_OFFSET 0xFFFFFFFF -#define CSR_MMIO_START_RANGE 0x80000 -#define CSR_MMIO_END_RANGE 0x8FFFF -struct intel_css_header {/* 0x09 for DMC */ uint32_t module_type;
@@ -452,12 +436,3 @@ void intel_csr_ucode_fini(struct drm_device *dev)kfree (dev_priv->csr.dmc_payload); } -void assert_csr_loaded (struct drm_i915_private *dev_priv) -{ -WARN (intel_csr_load_status_get (dev_priv) !=FW_LOADED , -"CSR is not loaded.\n" ); -WARN (!I915_READ (CSR_PROGRAM_BASE ), -"CSR program storage start is NULL\n" ); -WARN (!I915_READ (CSR_SSP_BASE ),"CSR SSP Base Not fine\n" ); -WARN (!I915_READ (CSR_HTP_SKL ),"CSR HTP Not fine\n" ); -}
drivers/gpu/drm/i915/intel_drv.h +0 -1
@@ -1156,7 +1156,6 @@ void intel_csr_load_status_set(struct drm_i915_private *dev_priv, enum csr_state state);void intel_csr_load_program (struct drm_device *dev);void intel_csr_ucode_fini (struct drm_device *dev); -void assert_csr_loaded (struct drm_i915_private *dev_priv);/* intel_dp.c */ void intel_dp_init (struct drm_device *dev,int output_reg,enum port port);
drivers/gpu/drm/i915/intel_runtime_pm.c +8 -0
@@ -439,6 +439,14 @@ static void gen9_set_dc_state_debugmask_memory_up( } } +static void assert_csr_loaded (struct drm_i915_private *dev_priv) +{ +WARN (!I915_READ (CSR_PROGRAM_BASE ), +"CSR program storage start is NULL\n" ); +WARN (!I915_READ (CSR_SSP_BASE ),"CSR SSP Base Not fine\n" ); +WARN (!I915_READ (CSR_HTP_SKL ),"CSR HTP Not fine\n" ); +} +static void assert_can_enable_dc5 (struct drm_i915_private *dev_priv) {struct drm_device *dev = dev_priv->dev;
Signature · 6 lines
2.0.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 5/12 drm/i915/gen9: Remove csr.state, csr_lock and related code.
In reply to Animesh MannaFrom: Daniel Vetter <[email protected]>
This removes two anti-patterns:
- Locking shouldn't be used to synchronize with async work (of any form, whether callbacks, workers or other threads). This is what the mutex_lock/unlock seems to have been for in intel_csr_load_program. Instead ordering should be ensured with the generic wait_for_completion()/complete(). Or more specific functions provided by the core kernel like e.g. flush_work()/cancel_work_sync() in the case of synchronizing with a work item.
- Don't invent own completion like the following code did with the (already removed) wait_for(csr_load_status_get()) pattern - it's really hard to get these right when you want them to be _really_ correct (and be fast) in all cases. Furthermore it's easier to read code using the well-known primitives than new ones using non-standard names.
--- drivers/gpu/drm/i915/i915_dma.c | 1 - drivers/gpu/drm/i915/i915_drv.c | 6 ++--- drivers/gpu/drm/i915/i915_drv.h | 10 ------- drivers/gpu/drm/i915/intel_csr.c | 46 +-------------------------------- drivers/gpu/drm/i915/intel_drv.h | 3 --- drivers/gpu/drm/i915/intel_runtime_pm.c | 3 +-- 6 files changed, 4 insertions(+), 65 deletions(-)
drivers/gpu/drm/i915/i915_dma.c +0 -1
@@ -831,7 +831,6 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)spin_lock_init (&dev_priv->mmio_flip_lock);mutex_init (&dev_priv->sb_lock);mutex_init (&dev_priv->modeset_restore_lock); -mutex_init (&dev_priv->csr_lock);intel_pm_setup (dev);
drivers/gpu/drm/i915/i915_drv.c +2 -4
@@ -1019,8 +1019,7 @@ static int skl_suspend_complete(struct drm_i915_private *dev_priv)skl_uninit_cdclk (dev_priv); -if (intel_csr_load_status_get (dev_priv) ==FW_LOADED ) -skl_enable_dc6 (dev_priv); +skl_enable_dc6 (dev_priv);return 0 ; }
@@ -1066,8 +1065,7 @@ static int bxt_resume_prepare(struct drm_i915_private *dev_priv)static int skl_resume_prepare (struct drm_i915_private *dev_priv) { -if (intel_csr_load_status_get (dev_priv) ==FW_LOADED ) -skl_disable_dc6 (dev_priv); +skl_disable_dc6 (dev_priv);skl_init_cdclk (dev_priv);
drivers/gpu/drm/i915/i915_drv.h +0 -10
@@ -734,12 +734,6 @@ struct intel_uncore {#define for_each_fw_domain (domain__, dev_priv__, i__) \ for_each_fw_domain_mask(domain__, FORCEWAKE_ALL, dev_priv__, i__) -enum csr_state { -FW_UNINITIALIZED =0 , -FW_LOADED , -FW_FAILED -}; -struct intel_csr {const char *fw_path;uint32_t *dmc_payload;
@@ -747,7 +741,6 @@ struct intel_csr {uint32_t mmio_count;uint32_t mmioaddr[8 ];uint32_t mmiodata[8 ]; -enum csr_state state; };#define DEV_INFO_FOR_EACH_FLAG (func, sep) \
@@ -1699,9 +1692,6 @@ struct drm_i915_private {struct intel_csr csr; -/* Display CSR-related protection */ -struct mutex csr_lock; -struct intel_gmbus gmbus[GMBUS_NUM_PINS ];/** gmbus_mutex protects against concurrent usage of the single hw gmbus
drivers/gpu/drm/i915/intel_csr.c +1 -45
89 lines not on this page · raw message
drivers/gpu/drm/i915/intel_drv.h +0 -3
@@ -1151,9 +1151,6 @@ u32 skl_plane_ctl_rotation(unsigned int rotation);/* intel_csr.c */ void intel_csr_ucode_init (struct drm_device *dev); -enum csr_state intel_csr_load_status_get (struct drm_i915_private *dev_priv); -void intel_csr_load_status_set (struct drm_i915_private *dev_priv, -enum csr_state state);void intel_csr_load_program (struct drm_device *dev);void intel_csr_ucode_fini (struct drm_device *dev);
drivers/gpu/drm/i915/intel_runtime_pm.c +1 -2
@@ -645,8 +645,7 @@ static void skl_set_power_well(struct drm_i915_private *dev_priv, }else {if (enable_requested) {if (IS_SKYLAKE (dev) && - (power_well->data ==SKL_DISP_PW_1 ) && - (intel_csr_load_status_get (dev_priv) ==FW_LOADED )) + (power_well->data ==SKL_DISP_PW_1 ))DRM_DEBUG_KMS ("Not Disabling PW1, dmc will handle\n" );else {I915_WRITE (HSW_PWR_WELL_DRIVER , tmp & ~req_mask);
Signature · 6 lines
2.0.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 6/12 drm/i915/gen9: Align line continuations in intel_csr.c.
In reply to Animesh MannaFrom: Daniel Vetter <[email protected]>
Standard is to align continuations of parameter lists and if conditions to the opening ( in i915 and drm code.
Apply this across the entire file since it was sticking out a bit too much.
Also align register definitions while at it.
--- drivers/gpu/drm/i915/i915_reg.h | 2 +- drivers/gpu/drm/i915/intel_csr.c | 42 ++++++++++++++++++++-------------------- 2 files changed, 22 insertions(+), 22 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -7380,7 +7380,7 @@ enum skl_disp_power_wells {/* MMIO address range for CSR program (0x80000 - 0x82FFF) */ #define CSR_MAX_FW_SIZE 0x2FFF#define CSR_DEFAULT_FW_OFFSET 0xFFFFFFFF -#define CSR_MMIO_START_RANGE 0x80000 +#define CSR_MMIO_START_RANGE 0x80000#define CSR_MMIO_END_RANGE 0x8FFFF/* Please see hsw_read_dcomp() and hsw_write_dcomp() before using this register,
drivers/gpu/drm/i915/intel_csr.c +21 -21
119 lines not on this page · raw message
Signature · 6 lines
2.0.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 7/12 drm/i915/gen9: Simplify csr loading failure printing.
In reply to Animesh MannaFrom: Daniel Vetter <[email protected]>
If we really want to we can be more verbose here, but we really don't need an entire function for this.
--- drivers/gpu/drm/i915/i915_drv.c | 20 -------------------- drivers/gpu/drm/i915/i915_drv.h | 1 - drivers/gpu/drm/i915/intel_csr.c | 8 +++----- 3 files changed, 3 insertions(+), 26 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +0 -20
@@ -537,26 +537,6 @@ bool i915_semaphore_is_enabled(struct drm_device *dev)return true; } -void i915_firmware_load_error_print (const char *fw_path,int err) -{ -DRM_ERROR ("failed to load firmware %s (%d)\n" , fw_path, err); - -/* -* If the reason is not known assume -ENOENT since that's the most -* usual failure mode. -*/ -if (!err) - err = -ENOENT ; - -if (!(IS_BUILTIN (CONFIG_DRM_I915 ) && err == -ENOENT )) -return ; - -DRM_ERROR ( -"The driver is built-in, so to load the firmware you need to\n" -"include it either in the kernel (see CONFIG_EXTRA_FIRMWARE) or\n" -"in your initrd/initramfs image.\n" ); -} -static void intel_suspend_encoders (struct drm_i915_private *dev_priv) {struct drm_device *dev = dev_priv->dev;
drivers/gpu/drm/i915/i915_drv.h +0 -1
@@ -2631,7 +2631,6 @@ extern unsigned long i915_mch_val(struct drm_i915_private *dev_priv);extern unsigned long i915_gfx_val (struct drm_i915_private *dev_priv);extern void i915_update_gfx_val (struct drm_i915_private *dev_priv);int vlv_force_gfx_clock (struct drm_i915_private *dev_priv,bool on); -void i915_firmware_load_error_print (const char *fw_path,int err);/* intel_hotplug.c */ void intel_hpd_irq_handler (struct drm_device *dev,u32 pin_mask,u32 long_mask);
drivers/gpu/drm/i915/intel_csr.c +3 -5
@@ -228,10 +228,8 @@ static void finish_csr_load(const struct firmware *fw, void *context)uint32_t *dmc_payload;bool fw_loaded = false; -if (!fw) { -i915_firmware_load_error_print (csr->fw_path,0 ); +if (!fw) goto out; - }if ((stepping == -ENODATA ) || (substepping == -ENODATA )) {DRM_ERROR ("Unknown stepping info, firmware loading failed\n" );
@@ -331,6 +329,8 @@ static void finish_csr_load(const struct firmware *fw, void *context) out:if (fw_loaded ||IS_BROXTON (dev))intel_display_power_put (dev_priv,POWER_DOMAIN_INIT ); +else +DRM_ERROR ("Failed to load DMC firmware, disabling rpm\n" );release_firmware (fw); }
@@ -371,8 +371,6 @@ void intel_csr_ucode_init(struct drm_device *dev) &dev_priv->dev->pdev->dev,GFP_KERNEL , dev_priv, finish_csr_load); -if (ret) -i915_firmware_load_error_print (csr->fw_path, ret); }/**
Signature · 6 lines
2.0.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 8/12 drm/i915/gen9: extract parse_csr_fw
In reply to Animesh MannaFrom: Daniel Vetter <[email protected]>
The loader function will get a bit more complicated soon, extract the parsing code to make the control flow clearer. While doing that just use dev_priv->csr.dmc_payload as the indicator for whether it all suceeded or not.
Also restrict the forced big-edian casting to just one place.
--- drivers/gpu/drm/i915/intel_csr.c | 48 +++++++++++++++++++++++++--------------- 1 file changed, 30 insertions(+), 18 deletions(-)
drivers/gpu/drm/i915/intel_csr.c +30 -18
@@ -213,9 +213,9 @@ void intel_csr_load_program(struct drm_device *dev) } } -static void finish_csr_load (const struct firmware *fw,void *context) +static uint32_t *parse_csr_fw (struct drm_i915_private *dev_priv, +const struct firmware *fw) { -struct drm_i915_private *dev_priv = context;struct drm_device *dev = dev_priv->dev;struct intel_css_header *css_header;struct intel_package_header *package_header;
@@ -226,14 +226,13 @@ static void finish_csr_load(const struct firmware *fw, void *context)uint32_t dmc_offset =CSR_DEFAULT_FW_OFFSET , readcount =0 , nbytes;uint32_t i;uint32_t *dmc_payload; -bool fw_loaded = false;if (!fw) - goto out; +return NULL ;if ((stepping == -ENODATA ) || (substepping == -ENODATA )) {DRM_ERROR ("Unknown stepping info, firmware loading failed\n" ); - goto out; +return NULL ; }/* Extract CSS Header information*/
@@ -242,7 +241,7 @@ static void finish_csr_load(const struct firmware *fw, void *context) (css_header->header_len * 4)) {DRM_ERROR ("Firmware has wrong CSS header length %u bytes\n" , (css_header->header_len *4 )); - goto out; +return NULL ; } readcount +=sizeof (struct intel_css_header );
@@ -253,7 +252,7 @@ static void finish_csr_load(const struct firmware *fw, void *context) (package_header->header_len * 4)) {DRM_ERROR ("Firmware has wrong package header length %u bytes\n" , (package_header->header_len *4 )); - goto out; +return NULL ; } readcount +=sizeof (struct intel_package_header );
@@ -273,7 +272,7 @@ static void finish_csr_load(const struct firmware *fw, void *context) }if (dmc_offset ==CSR_DEFAULT_FW_OFFSET ) {DRM_ERROR ("Firmware not supported for %c stepping\n" , stepping); - goto out; +return NULL ; } readcount += dmc_offset;
@@ -282,7 +281,7 @@ static void finish_csr_load(const struct firmware *fw, void *context)if (sizeof (struct intel_dmc_header ) != (dmc_header->header_len)) {DRM_ERROR ("Firmware has wrong dmc header length %u bytes\n" , (dmc_header->header_len)); - goto out; +return NULL ; } readcount +=sizeof (struct intel_dmc_header );
@@ -290,7 +289,7 @@ static void finish_csr_load(const struct firmware *fw, void *context)if (dmc_header->mmio_count >ARRAY_SIZE (csr->mmioaddr)) {DRM_ERROR ("Firmware has wrong mmio count %u\n" , dmc_header->mmio_count); - goto out; +return NULL ; } csr->mmio_count = dmc_header->mmio_count;for (i =0 ; i < dmc_header->mmio_count; i++) {
@@ -298,7 +297,7 @@ static void finish_csr_load(const struct firmware *fw, void *context) dmc_header->mmioaddr[i] > CSR_MMIO_END_RANGE) {DRM_ERROR (" Firmware has wrong mmio address 0x%x\n" , dmc_header->mmioaddr[i]); - goto out; +return NULL ; } csr->mmioaddr[i] = dmc_header->mmioaddr[i]; csr->mmiodata[i] = dmc_header->mmiodata[i];
@@ -308,26 +307,39 @@ static void finish_csr_load(const struct firmware *fw, void *context) nbytes = dmc_header->fw_size *4 ;if (nbytes >CSR_MAX_FW_SIZE ) {DRM_ERROR ("CSR firmware too big (%u) bytes\n" , nbytes); - goto out; +return NULL ; } csr->dmc_fw_size = dmc_header->fw_size; - csr->dmc_payload =kmalloc (nbytes,GFP_KERNEL ); -if (!csr->dmc_payload) { + dmc_payload =kmalloc (nbytes,GFP_KERNEL ); +if (!dmc_payload) {DRM_ERROR ("Memory allocation failed for dmc payload\n" ); - goto out; +return NULL ; } - dmc_payload = csr->dmc_payload;memcpy (dmc_payload, &fw->data[readcount], nbytes); +return dmc_payload; +} + +static void finish_csr_load (const struct firmware *fw,void *context) +{ +struct drm_i915_private *dev_priv = context; +struct drm_device *dev = dev_priv->dev; + +if (!fw) + goto out; + + dev_priv->csr.dmc_payload =parse_csr_fw (dev_priv, fw); +if (!dev_priv->csr.dmc_payload) + goto out; +/* load csr program during system boot, as needed for DC states */ intel_csr_load_program (dev); - fw_loaded = true;DRM_DEBUG_KMS ("Finished loading %s\n" , dev_priv->csr.fw_path); out: -if (fw_loaded ||IS_BROXTON (dev)) +if (dev_priv->csr.dmc_payload ||IS_BROXTON (dev))intel_display_power_put (dev_priv,POWER_DOMAIN_INIT );else DRM_ERROR ("Failed to load DMC firmware, disabling rpm\n" );
Signature · 6 lines
2.0.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 9/12 drm/i915/gen9: Don't try to load garbage dmc firmware on resume
In reply to Animesh MannaFrom: Daniel Vetter <[email protected]>
We need to make sure we don't put garbage into the hw if dmc firmware loading failed mid-thru.
--- drivers/gpu/drm/i915/intel_csr.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/i915/intel_csr.c +3 -0
@@ -202,6 +202,9 @@ void intel_csr_load_program(struct drm_device *dev)return ; } +if (!dev_priv->csr.dmc_payload) +return ; + fw_size = dev_priv->csr.dmc_fw_size;for (i =0 ; i < fw_size; i++) I915_WRITE(CSR_PROGRAM_BASE + i * 4,
Signature · 6 lines
2.0.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 10/12 drm/i915/gen9: Use dev_priv in csr functions
In reply to Animesh MannaFrom: Daniel Vetter <[email protected]>
As all csr firmware related opertion are not using any any data structures of drm framework level, so better to use dev_priv instead of dev. it's a new style! :)
--- drivers/gpu/drm/i915/i915_dma.c | 6 +++--- drivers/gpu/drm/i915/intel_csr.c | 29 ++++++++++++----------------- drivers/gpu/drm/i915/intel_drv.h | 6 +++--- 3 files changed, 18 insertions(+), 23 deletions(-)
drivers/gpu/drm/i915/i915_dma.c +3 -3
@@ -1024,7 +1024,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)i915_audio_component_init (dev_priv);/* Load CSR Firmware for SKL */ -intel_csr_ucode_init (dev); +intel_csr_ucode_init (dev_priv);return 0 ;
@@ -1052,7 +1052,7 @@ out_mtrrfree: out_gtt:i915_global_gtt_cleanup (dev); out_freecsr: -intel_csr_ucode_fini (dev); +intel_csr_ucode_fini (dev_priv);intel_uncore_fini (dev);pci_iounmap (dev->pdev, dev_priv->regs); put_bridge:
@@ -1133,7 +1133,7 @@ int i915_driver_unload(struct drm_device *dev)intel_fbc_cleanup_cfb (dev_priv);i915_gem_cleanup_stolen (dev); -intel_csr_ucode_fini (dev); +intel_csr_ucode_fini (dev_priv);intel_teardown_gmbus (dev);intel_teardown_mchbar (dev);
drivers/gpu/drm/i915/intel_csr.c +12 -17
@@ -185,19 +185,18 @@ static char intel_get_substepping(struct drm_device *dev)/** * intel_csr_load_program() - write the firmware from memory to register. -* @dev: drm device. +* @dev_priv: i915 drm device. * * CSR firmware is read from a .bin file and kept in internal memory one time. * Everytime display comes back from low power state this function is called to * copy the firmware from internal memory to registers. */ -void intel_csr_load_program (struct drm_device *dev) +void intel_csr_load_program (struct drm_i915_private *dev_priv) { -struct drm_i915_private *dev_priv = dev->dev_private;u32 *payload = dev_priv->csr.dmc_payload;uint32_t i, fw_size; -if (!IS_GEN9 (dev)) { +if (!IS_GEN9 (dev_priv)) {DRM_ERROR ("No CSR support available for this platform\n" );return ; }
@@ -328,7 +327,6 @@ static uint32_t *parse_csr_fw(struct drm_i915_private *dev_priv,static void finish_csr_load (const struct firmware *fw,void *context) {struct drm_i915_private *dev_priv = context; -struct drm_device *dev = dev_priv->dev;if (!fw) goto out;
@@ -338,11 +336,11 @@ static void finish_csr_load(const struct firmware *fw, void *context) goto out;/* load csr program during system boot, as needed for DC states */ -intel_csr_load_program (dev); +intel_csr_load_program (dev_priv);DRM_DEBUG_KMS ("Finished loading %s\n" , dev_priv->csr.fw_path); out: -if (dev_priv->csr.dmc_payload ||IS_BROXTON (dev)) +if (dev_priv->csr.dmc_payload ||IS_BROXTON (dev_priv))intel_display_power_put (dev_priv,POWER_DOMAIN_INIT );else DRM_ERROR ("Failed to load DMC firmware, disabling rpm\n" );
@@ -352,21 +350,20 @@ out:/** * intel_csr_ucode_init() - initialize the firmware loading. -* @dev: drm device. +* @dev_priv: i915 drm device. * * This function is called at the time of loading the display driver to read * firmware from a .bin file and copied into a internal memory. */ -void intel_csr_ucode_init (struct drm_device *dev) +void intel_csr_ucode_init (struct drm_i915_private *dev_priv) { -struct drm_i915_private *dev_priv = dev->dev_private;struct intel_csr *csr = &dev_priv->csr;int ret; -if (!HAS_CSR (dev)) +if (!HAS_CSR (dev_priv))return ; -if (IS_SKYLAKE (dev)) +if (IS_SKYLAKE (dev_priv)) csr->fw_path =I915_CSR_SKL ;else {DRM_ERROR ("Unexpected: no known CSR firmware for platform\n" );
@@ -390,16 +387,14 @@ void intel_csr_ucode_init(struct drm_device *dev)/** * intel_csr_ucode_fini() - unload the CSR firmware. -* @dev: drm device. +* @dev_priv: i915 drm device. * * Firmmware unloading includes freeing the internal momory and reset the * firmware loading status. */ -void intel_csr_ucode_fini (struct drm_device *dev) +void intel_csr_ucode_fini (struct drm_i915_private *dev_priv) { -struct drm_i915_private *dev_priv = dev->dev_private; - -if (!HAS_CSR (dev)) +if (!HAS_CSR (dev_priv))return ;kfree (dev_priv->csr.dmc_payload);
drivers/gpu/drm/i915/intel_drv.h +3 -3
@@ -1150,9 +1150,9 @@ u32 skl_plane_ctl_tiling(uint64_t fb_modifier);u32 skl_plane_ctl_rotation (unsigned int rotation);/* intel_csr.c */ -void intel_csr_ucode_init (struct drm_device *dev); -void intel_csr_load_program (struct drm_device *dev); -void intel_csr_ucode_fini (struct drm_device *dev); +void intel_csr_ucode_init (struct drm_i915_private *); +void intel_csr_load_program (struct drm_i915_private *); +void intel_csr_ucode_fini (struct drm_i915_private *);/* intel_dp.c */ void intel_dp_init (struct drm_device *dev,int output_reg,enum port port);
Signature · 6 lines
2.0.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 11/12 drm/i915: Use request_firmware and our own async work
In reply to Animesh MannaFrom: Daniel Vetter <[email protected]>
Two benefits:
- We can use FW_LOADER_USERSPACE_FALLBACK.
- We can use flush_work to synchronize with the oustanding worker, which is a notch more obvious what it does than having a special completion.
The next patch will properly synchronize against the async loader in the resume and unload code.
--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_csr.c | 19 +++++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -735,6 +735,7 @@ struct intel_uncore {for_each_fw_domain_mask (domain__,FORCEWAKE_ALL , dev_priv__, i__) struct intel_csr { +struct work_struct work;const char *fw_path;uint32_t *dmc_payload;uint32_t dmc_fw_size;
drivers/gpu/drm/i915/intel_csr.c +11 -8
@@ -324,10 +324,16 @@ static uint32_t *parse_csr_fw(struct drm_i915_private *dev_priv,return dmc_payload; } -static void finish_csr_load (const struct firmware *fw,void *context) +static void csr_load_work_fn (struct work_struct *work) { -struct drm_i915_private *dev_priv = context; +struct drm_i915_private *dev_priv; +const struct firmware *fw; +int ret; + + dev_priv =container_of (work,typeof (*dev_priv), csr.work); + ret =request_firmware (&fw, dev_priv->csr.fw_path, + &dev_priv->dev->pdev->dev);if (!fw) goto out;
@@ -358,7 +364,8 @@ out:void intel_csr_ucode_init (struct drm_i915_private *dev_priv) {struct intel_csr *csr = &dev_priv->csr; -int ret; + +INIT_WORK (&dev_priv->csr.work, csr_load_work_fn);if (!HAS_CSR (dev_priv))return ;
@@ -378,11 +385,7 @@ void intel_csr_ucode_init(struct drm_i915_private *dev_priv)*/ intel_display_power_get (dev_priv,POWER_DOMAIN_INIT ); -/* CSR supported for platform, load firmware */ - ret =request_firmware_nowait (THIS_MODULE , true, csr->fw_path, - &dev_priv->dev->pdev->dev, -GFP_KERNEL , dev_priv, - finish_csr_load); +schedule_work (&dev_priv->csr.work); }/**
Signature · 6 lines
2.0.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 12/12 drm/i915/gen9: Use flush_work to synchronize with dmc loader
In reply to Animesh MannaDuring driver unload to ensure we dont have any pending task, flush_work added to complete firmware loading task.
v1: Initial version.
v2: As per review comments from Daniel,
Removed flush_work from skl_set_power_well. As we have taken power well refernece and rpm count during firmware loading by using display_power_domain_get/put - this will always ensure rpm will be blocked if firmware is not loaded.
--- drivers/gpu/drm/i915/i915_drv.c | 2 -- drivers/gpu/drm/i915/intel_csr.c | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +0 -2
@@ -995,8 +995,6 @@ static int i915_pm_resume(struct device *dev)static int skl_suspend_complete (struct drm_i915_private *dev_priv) { -/* Enabling DC6 is not a hard requirement to enter runtime D3 */ -skl_uninit_cdclk (dev_priv);skl_enable_dc6 (dev_priv);
drivers/gpu/drm/i915/intel_csr.c +2 -0
@@ -400,6 +400,8 @@ void intel_csr_ucode_fini(struct drm_i915_private *dev_priv)if (!HAS_CSR (dev_priv))return ; +flush_work (&dev_priv->csr.work); +kfree (dev_priv->csr.dmc_payload); }
Signature · 6 lines
2.0.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx