This is a note to let you know that I've just added the patch titled
drm/nouveau/runpm: fix module unload
to the 3.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-nouveau-runpm-fix-module-unload.patch
and it can be found in the queue-3.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From 53beaa01e0fe8e4202f43485a03b32fcf5dfea74 Mon Sep 17 00:00:00 2001
From: Alex Deucher <[email protected]>
Date: Fri, 12 Sep 2014 18:06:56 -0400
Subject: drm/nouveau/runpm: fix module unload
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Alex Deucher <[email protected]>
commit 53beaa01e0fe8e4202f43485a03b32fcf5dfea74 upstream.
Use the new vga_switcheroo_fini_domain_pm_ops function
to unregister the pm ops.
Based on a patch from:
Pali Rohár <[email protected]>
bug:
https://bugzilla.kernel.org/show_bug.cgi?id=84431
Reviewed-by: Ben Skeggs <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>
Cc: Ben Skeggs <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/gpu/drm/nouveau/nouveau_vga.c | 9 +++++++++
1 file changed, 9 insertions(+)
--- a/drivers/gpu/drm/nouveau/nouveau_vga.c
+++ b/drivers/gpu/drm/nouveau/nouveau_vga.c
@@ -100,7 +100,16 @@ void
nouveau_vga_fini(struct nouveau_drm *drm)
{
struct drm_device *dev = drm->dev;
+ bool runtime = false;
+
+ if (nouveau_runtime_pm == 1)
+ runtime = true;
+ if ((nouveau_runtime_pm == -1) && (nouveau_is_optimus() ||
nouveau_is_v1_dsm()))
+ runtime = true;
+
vga_switcheroo_unregister_client(dev->pdev);
+ if (runtime && nouveau_is_v1_dsm() && !nouveau_is_optimus())
+ vga_switcheroo_fini_domain_pm_ops(drm->dev->dev);
vga_client_register(dev->pdev, NULL, NULL, NULL);
}
Patches currently in stable-queue which might be from [email protected]
are
queue-3.14/drm-radeon-tweak-accel_working2-query-for-hawaii.patch
queue-3.14/drm-radeon-atom-add-new-voltage-fetch-function-for-hawaii.patch
queue-3.14/drm-radeon-don-t-reset-dma-on-ni-si-init.patch
queue-3.14/drm-radeon-don-t-reset-sdma-on-cik-init.patch
queue-3.14/drm-radeon-enable-bapm-by-default-on-desktop-tn-rl-boards.patch
queue-3.14/drm-radeon-fix-pm-handling-in-radeon_gpu_reset.patch
queue-3.14/drm-radeon-fix-semaphore-value-init.patch
queue-3.14/drm-radeon-add-missing-lines-to-ci_set_thermal_temperature_range.patch
queue-3.14/drm-radeon-dpm-handle-voltage-info-fetching-on-hawaii.patch
queue-3.14/drm-radeon-px-fix-module-unload.patch
queue-3.14/drm-radeon-re-enable-dpm-by-default-on-btc.patch
queue-3.14/drm-radeon-tn-only-enable-bapm-on-msi-systems.patch
queue-3.14/vgaswitcheroo-add-vga_switcheroo_fini_domain_pm_ops.patch
queue-3.14/drm-nouveau-runpm-fix-module-unload.patch
queue-3.14/drm-radeon-re-enable-dpm-by-default-on-cayman.patch
queue-3.14/drm-radeon-set-vm-base-addr-using-the-pfp-v2.patch
queue-3.14/drm-radeon-add-connector-quirk-for-fujitsu-board.patch
queue-3.14/drm-radeon-add-ability-to-get-and-change-dpm-state-when-radeon-px-card-is-turned-off.patch
queue-3.14/drm-radeon-cik-use-a-separate-counter-for-cp-init-timeout.patch
queue-3.14/drm-radeon-load-the-lm63-driver-for-an-lm64-thermal-chip.patch
queue-3.14/drm-radeon-dpm-set-the-thermal-type-properly-for-special-configs.patch
queue-3.14/drm-radeon-don-t-reset-dma-on-r6xx-evergreen-init.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
