From: Jani Nikula <jani.nikula@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: Chris@freedesktop.org
Subject: Re: [PATCH v2 1/6] drm/i915: add i915_driver_modeset_remove()
Date: Fri, 20 Sep 2019 22:01:07 +0300 [thread overview]
Message-ID: <87pnjuztak.fsf@intel.com> (raw)
In-Reply-To: <20190920185347.17760-1-jani.nikula@intel.com>
Please ignore the two patches here. Critical fumble.
BR,
Jani.
On Fri, 20 Sep 2019, Jani Nikula <jani.nikula@intel.com> wrote:
> For completeness, add counterpart to i915_driver_modeset_probe() and
> remove the asymmetry in the probe/remove parts. No functional changes.
>
> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
> drivers/gpu/drm/i915/i915_drv.c | 25 +++++++++++++++----------
> 1 file changed, 15 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index 9904f762f4bb..4cb95fd9b35d 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -422,6 +422,20 @@ static int i915_driver_modeset_probe(struct drm_device *dev)
> return ret;
> }
>
> +static void i915_driver_modeset_remove(struct drm_i915_private *i915)
> +{
> + struct pci_dev *pdev = i915->drm.pdev;
> +
> + intel_modeset_driver_remove(&i915->drm);
> +
> + intel_bios_driver_remove(i915);
> +
> + vga_switcheroo_unregister_client(pdev);
> + vga_client_register(pdev, NULL, NULL, NULL);
> +
> + intel_csr_ucode_fini(i915);
> +}
> +
> static void intel_init_dpio(struct drm_i915_private *dev_priv)
> {
> /*
> @@ -1586,8 +1600,6 @@ int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
>
> void i915_driver_remove(struct drm_i915_private *i915)
> {
> - struct pci_dev *pdev = i915->drm.pdev;
> -
> disable_rpm_wakeref_asserts(&i915->runtime_pm);
>
> i915_driver_unregister(i915);
> @@ -1608,14 +1620,7 @@ void i915_driver_remove(struct drm_i915_private *i915)
>
> intel_gvt_driver_remove(i915);
>
> - intel_modeset_driver_remove(&i915->drm);
> -
> - intel_bios_driver_remove(i915);
> -
> - vga_switcheroo_unregister_client(pdev);
> - vga_client_register(pdev, NULL, NULL, NULL);
> -
> - intel_csr_ucode_fini(i915);
> + i915_driver_modeset_remove(i915);
>
> /* Free error state after interrupts are fully disabled. */
> cancel_delayed_work_sync(&i915->gt.hangcheck.work);
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2019-09-20 19:01 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-20 18:53 [PATCH v2 1/6] drm/i915: add i915_driver_modeset_remove() Jani Nikula
2019-09-20 18:53 ` [PATCH v2 2/6] drm/i915: pass i915 to i915_driver_modeset_probe() Jani Nikula
2019-09-20 19:01 ` Jani Nikula [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-09-20 18:54 [PATCH v2 1/6] drm/i915: add i915_driver_modeset_remove() Jani Nikula
2019-09-23 8:04 ` Jani Nikula
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=87pnjuztak.fsf@intel.com \
--to=jani.nikula@intel.com \
--cc=Chris@freedesktop.org \
--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