| Message ID | 1438701606-28752-3-git-send-email-animesh.manna@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Aug 04, 2015 at 08:49:56PM +0530, Animesh Manna wrote: > 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_init call after runtime pm enable. > > Cc: Daniel Vetter <daniel.vetter@intel.com> > Cc: Damien Lespiau <damien.lespiau@intel.com> > Cc: Imre Deak <imre.deak@intel.com> > Cc: Sunil Kamath <sunil.kamath@intel.com> > Signed-off-by: Animesh Manna <animesh.manna@intel.com> > --- > drivers/gpu/drm/i915/i915_dma.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c > index b1f9e55..a41246e 100644 > --- a/drivers/gpu/drm/i915/i915_dma.c > +++ b/drivers/gpu/drm/i915/i915_dma.c > @@ -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); Don't we need this patch before patch 1 to avoid breakage when booting? -Daniel > + > return 0; > > out_power_well: > -- > 2.0.2 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index b1f9e55..a41246e 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -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:
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_init call after runtime pm enable. Cc: Daniel Vetter <daniel.vetter@intel.com> Cc: Damien Lespiau <damien.lespiau@intel.com> Cc: Imre Deak <imre.deak@intel.com> Cc: Sunil Kamath <sunil.kamath@intel.com> Signed-off-by: Animesh Manna <animesh.manna@intel.com> --- drivers/gpu/drm/i915/i915_dma.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)