From: "Souza, Jose" <jose.souza@intel.com>
To: "intel-gfx@lists.freedesktop.org"
<intel-gfx@lists.freedesktop.org>,
"chris@chris-wilson.co.uk" <chris@chris-wilson.co.uk>
Cc: "Nikula, Jani" <jani.nikula@intel.com>
Subject: Re: [Intel-gfx] [PATCH] drm/i915: Flush async power domains on probe failure
Date: Fri, 10 Apr 2020 19:41:57 +0000 [thread overview]
Message-ID: <02af48873c1c1b4f5331215f5ed6ae61170cbf5c.camel@intel.com> (raw)
In-Reply-To: <20200410144328.15286-1-chris@chris-wilson.co.uk>
On Fri, 2020-04-10 at 15:43 +0100, Chris Wilson wrote:
> Flush the async power domain work after aborting the module probe:
>
> <3> [307.785552] ODEBUG: free active (active state 0) object type:
> timer_list hint: intel_display_power_put_async_work+0x0/0xf0 [i915]
>
> Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/1647
> Fixes: b664259f3fe2 ("drm/i915: split i915_driver_modeset_probe() to
> pre/post irq install")
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Jani Nikula <jani.nikula@intel.com>
> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Cc: Imre Deak <imre.deak@intel.com>
> ---
> drivers/gpu/drm/i915/i915_drv.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.c
> b/drivers/gpu/drm/i915/i915_drv.c
> index a7a3b4b98572..13c1ce244092 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -996,6 +996,7 @@ int i915_driver_probe(struct pci_dev *pdev, const
> struct pci_device_id *ent)
> out_cleanup_modeset:
> /* FIXME */
> out_cleanup_hw:
> + intel_power_domains_driver_remove(i915);
If the failure happened in the first two returns of
i915_driver_modeset_probe_noirq() no call to
intel_power_domains_init_hw() would be made.
I'm also working on this, will send to ML after a round on trybot:
https://patchwork.freedesktop.org/patch/361053/?series=75816&rev=1
> i915_driver_hw_remove(i915);
> intel_memory_regions_driver_release(i915);
> i915_ggtt_driver_release(i915);
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2020-04-10 19:42 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-10 14:43 [Intel-gfx] [PATCH] drm/i915: Flush async power domains on probe failure Chris Wilson
2020-04-10 15:16 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
2020-04-10 15:40 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2020-04-10 19:09 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
2020-04-10 19:41 ` Souza, Jose [this message]
2020-04-14 12:32 ` [Intel-gfx] [PATCH] " Jani Nikula
2020-04-14 13:17 ` Chris Wilson
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=02af48873c1c1b4f5331215f5ed6ae61170cbf5c.camel@intel.com \
--to=jose.souza@intel.com \
--cc=chris@chris-wilson.co.uk \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@intel.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.