From: Imre Deak <imre.deak@intel.com>
To: Chris Wilson <chris@chris-wilson.co.uk>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH 4/4] drm/i915/gen9: Fix runtime PM refcounting in case DMC firmware isn't loaded
Date: Mon, 18 Apr 2016 10:59:13 +0300 [thread overview]
Message-ID: <1460966353.3172.0.camel@intel.com> (raw)
In-Reply-To: <20160418074938.GB10708@nuc-i3427.alporthouse.com>
On ma, 2016-04-18 at 08:49 +0100, Chris Wilson wrote:
> On Mon, Apr 18, 2016 at 10:04:22AM +0300, Imre Deak wrote:
> > diff --git a/drivers/gpu/drm/i915/intel_csr.c
> > b/drivers/gpu/drm/i915/intel_csr.c
> > index d57b00e..fd9f5b3 100644
> > --- a/drivers/gpu/drm/i915/intel_csr.c
> > +++ b/drivers/gpu/drm/i915/intel_csr.c
>
> > +void intel_csr_ucode_suspend(struct drm_i915_private *dev_priv)
> > +{
> > + if (!HAS_CSR(dev_priv))
> > + return;
> > +
> > + flush_work(&dev_priv->csr.work);
> > +
> > + /* Drop the reference held in case DMC isn't loaded. */
> > + if (!dev_priv->csr.dmc_payload)
> > + intel_display_power_put(dev_priv,
> > POWER_DOMAIN_INIT);
> > +}
>
> > @@ -480,5 +480,34 @@ void intel_csr_ucode_fini(struct
> > drm_i915_private *dev_priv)
> >
> > flush_work(&dev_priv->csr.work);
> >
> > + /* Drop the reference held in case DMC isn't loaded. */
> > + if (!dev_priv->csr.dmc_payload)
> > + intel_display_power_put(dev_priv,
> > POWER_DOMAIN_INIT);
> > +
> > kfree(dev_priv->csr.dmc_payload);
> > }
>
> Should fini just be calling suspend first?
Yep didn't notice, will do that.
--Imre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2016-04-18 7:59 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-18 7:04 [PATCH 0/4] drm/i915: Fix a few suspend/resume and driver unload bugs Imre Deak
2016-04-18 7:04 ` [PATCH 1/4] drm/i915: Fix error path in i915_drm_resume_early Imre Deak
2016-04-18 8:00 ` Chris Wilson
2016-04-18 8:06 ` Imre Deak
2016-04-18 7:04 ` [PATCH 2/4] drm/i915: Fix system resume if PCI device remained enabled Imre Deak
2016-04-18 8:06 ` [Intel-gfx] " Chris Wilson
2016-04-18 8:16 ` Imre Deak
2016-04-18 8:24 ` [Intel-gfx] " Chris Wilson
2016-04-18 8:37 ` Imre Deak
2016-04-18 8:52 ` Chris Wilson
2016-04-18 11:05 ` Imre Deak
2016-04-18 8:28 ` Ville Syrjälä
2016-04-18 8:32 ` Imre Deak
2016-04-18 8:44 ` Ville Syrjälä
2016-04-18 8:54 ` Imre Deak
2016-04-18 9:04 ` Ville Syrjälä
2016-04-18 11:45 ` [PATCH v2 " Imre Deak
2016-04-18 14:59 ` Ville Syrjälä
2016-04-18 7:04 ` [PATCH 3/4] drm/i915/ddi: Fix eDP VDD handling during booting and suspend/resume Imre Deak
2016-04-18 11:05 ` Ville Syrjälä
2016-04-18 7:04 ` [PATCH 4/4] drm/i915/gen9: Fix runtime PM refcounting in case DMC firmware isn't loaded Imre Deak
2016-04-18 7:49 ` Chris Wilson
2016-04-18 7:59 ` Imre Deak [this message]
2016-04-18 11:48 ` [PATCH v2 " Imre Deak
2016-04-18 12:07 ` Chris Wilson
2016-04-20 13:02 ` Daniel Vetter
2016-04-20 13:13 ` Imre Deak
2016-04-20 13:16 ` Daniel Vetter
2016-04-20 13:35 ` Imre Deak
2016-04-20 14:11 ` Daniel Vetter
2016-04-18 7:24 ` ✓ Fi.CI.BAT: success for drm/i915: Fix a few suspend/resume and driver unload bugs Patchwork
2016-04-18 13:57 ` ✗ Fi.CI.BAT: failure for drm/i915: Fix a few suspend/resume and driver unload bugs (rev3) Patchwork
2016-04-18 15:45 ` Imre Deak
2016-04-19 9:42 ` Imre Deak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1460966353.3172.0.camel@intel.com \
--to=imre.deak@intel.com \
--cc=chris@chris-wilson.co.uk \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox