Attachment 32984 Details for Bug 26349 – Fix nouveau state detection

[patch] Fix nouveau state detection

nouveau_state_detection.diff (text/plain), 1.74 KB, created by Matthew Garrett on 2010-02-01 15:30:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthew Garrett

Created: 2010-02-01 15:30:56 UTC

Size: 1.74 KB

patch

obsolete

>commit fbf635cdb8b320fcbc55b3d0483c32b583e7fc62
>Author: Matthew Garrett <mjg@redhat.com>
>Date:   Mon Feb 1 18:28:26 2010 -0500
>
>    nouveau: Fix up device state detection
>    
>    It seems that the nouveau mechanism for determining which GPU should
>    currently be active is incorrect, resulting in state being misdetected on
>    some hardware. Change from using the 0x1 command to 0x3 instead, which
>    looks like it should give valid results on all hardware.
>    
>    Signed-off-by: Matthew Garrett <mjg@redhat.com>
>
>diff --git a/drivers/gpu/drm/nouveau/nouveau_acpi.c b/drivers/gpu/drm/nouveau/nouveau_acpi.c
>index 1cf4882..48227e7 100644
>--- a/drivers/gpu/drm/nouveau/nouveau_acpi.c
>+++ b/drivers/gpu/drm/nouveau/nouveau_acpi.c
>@@ -90,21 +90,21 @@ int nouveau_hybrid_setup(struct drm_device *dev)
> {
> 	int result;
> 
>-	if (nouveau_dsm(dev, NOUVEAU_DSM_ACTIVE, NOUVEAU_DSM_ACTIVE_QUERY,
>+	if (nouveau_dsm(dev, NOUVEAU_DSM_POWER, NOUVEAU_DSM_POWER_STATE,
> 								&result))
> 		return -ENODEV;
> 
> 	NV_INFO(dev, "_DSM hardware status gave 0x%x\n", result);
> 
>-	if (result & 0x1) {	/* Stamina mode - disable the external GPU */
>+	if (result) { /* Ensure that the external GPU is enabled */
>+		nouveau_dsm(dev, NOUVEAU_DSM_LED, NOUVEAU_DSM_LED_SPEED, NULL);
>+		nouveau_dsm(dev, NOUVEAU_DSM_POWER, NOUVEAU_DSM_POWER_SPEED,
>+									NULL);
>+	} else { /* Stamina mode - disable the external GPU */
> 		nouveau_dsm(dev, NOUVEAU_DSM_LED, NOUVEAU_DSM_LED_STAMINA,
> 									NULL);
> 		nouveau_dsm(dev, NOUVEAU_DSM_POWER, NOUVEAU_DSM_POWER_STAMINA,
> 									NULL);
>-	} else {		/* Ensure that the external GPU is enabled */
>-		nouveau_dsm(dev, NOUVEAU_DSM_LED, NOUVEAU_DSM_LED_SPEED, NULL);
>-		nouveau_dsm(dev, NOUVEAU_DSM_POWER, NOUVEAU_DSM_POWER_SPEED,
>-									NULL);
> 	}
> 
> 	return 0;

Actions: View | Splinter Review

Attachments on bug 26349: 32966 | 32967 | 32969 | 32984

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.