Skip to contentSkip to conversation

nouveau, ACPI: fix regression caused by b072e53

PATCH In review Jiang Liu 3 participants 4 messages Feb 20, 2014 – Feb 21, 2014

Subsystems (3)
lore
Share & tools
lore

Jiang Liu

author
#0 lore raw

PATCH 1/1 nouveau, ACPI: fix regression caused by b072e53

Fix regression caused by commit b072e53, which breaks loading nouveau driver on optimus laptops.

On some platforms, ACPI _DSM method (nouveau_op_dsm_muid, function 0) has special requirements on the fourth parameter, which is different from ACPI specifications. So revert to the private implementation to check availability of _DSM functions instead of using common acpi_check_dsm() interface.

---
 drivers/gpu/drm/nouveau/nouveau_acpi.c |   26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)
drivers/gpu/drm/nouveau/nouveau_acpi.c +24 -2
index 4ef83df..83face3 100644
@@ -106,6 +106,29 @@ static int nouveau_optimus_dsm(acpi_handle handle, int func, int arg, uint32_t *
 	return 0;
 }
 
+/*
+ * On some platforms, _DSM(nouveau_op_dsm_muid, func0) has special
+ * requirements on the fourth parameter, so a private implementation
+ * instead of using acpi_check_dsm().
+ */
+static int nouveau_check_optimus_dsm(acpi_handle handle)
+{
+	int result;
+
+	/*
+	 * Function 0 returns a Buffer containing available functions.
+	 * The args parameter is ignored for function 0, so just put 0 in it
+	 */
+	if (nouveau_optimus_dsm(handle, 0, 0, &result))
+		return 0;
+
+	/*
+	 * ACPI Spec v4 9.14.1: if bit 0 is zero, no function is supported.
+	 * If the n-th bit is enabled, function n is supported
+	 */
+	return result & 1 && result & (1 << NOUVEAU_DSM_OPTIMUS_CAPS);
+}
+
 static int nouveau_dsm(acpi_handle handle, int func, int arg)
 {
 	int ret = 0;
@@ -207,8 +230,7 @@ static int nouveau_dsm_pci_probe(struct pci_dev *pdev)
 			   1 << NOUVEAU_DSM_POWER))
 		retval |= NOUVEAU_DSM_HAS_MUX;
 
-	if (acpi_check_dsm(dhandle, nouveau_op_dsm_muid, 0x00000100,
-			   1 << NOUVEAU_DSM_OPTIMUS_CAPS))
+	if (nouveau_check_optimus_dsm(dhandle))
 		retval |= NOUVEAU_DSM_HAS_OPT;
 
 	if (retval & NOUVEAU_DSM_HAS_OPT) {
Signature · 1 line
1.7.10.4
#1 lore raw
Quoted 11 lines · Jiang Liu

Fix regression caused by commit b072e53, which breaks loading nouveau driver on optimus laptops.

On some platforms, ACPI _DSM method (nouveau_op_dsm_muid, function 0) has special requirements on the fourth parameter, which is different from ACPI specifications. So revert to the private implementation to check availability of _DSM functions instead of using common acpi_check_dsm() interface.

I'm taking this, because the commit that introduced the regression went in through my tree.

In the future I'll appreciate CCing ACPI-related patches to linux-acpi, however.

Thanks,
Rafael

Quoted 48 lines
---
  drivers/gpu/drm/nouveau/nouveau_acpi.c |   26 ++++++++++++++++++++++++--
  1 file changed, 24 insertions(+), 2 deletions(-)
drivers/gpu/drm/nouveau/nouveau_acpi.c +24 -2
index 4ef83df..83face3 100644
@@ -106,6 +106,29 @@ static int nouveau_optimus_dsm(acpi_handle handle, int func, int arg, uint32_t *
  	return 0;
  }
 
+/*
+ * On some platforms, _DSM(nouveau_op_dsm_muid, func0) has special
+ * requirements on the fourth parameter, so a private implementation
+ * instead of using acpi_check_dsm().
+ */
+static int nouveau_check_optimus_dsm(acpi_handle handle)
+{
+	int result;
+
+	/*
+	 * Function 0 returns a Buffer containing available functions.
+	 * The args parameter is ignored for function 0, so just put 0 in it
+	 */
+	if (nouveau_optimus_dsm(handle, 0, 0, &result))
+		return 0;
+
+	/*
+	 * ACPI Spec v4 9.14.1: if bit 0 is zero, no function is supported.
+	 * If the n-th bit is enabled, function n is supported
+	 */
+	return result & 1 && result & (1 << NOUVEAU_DSM_OPTIMUS_CAPS);
+}
+
  static int nouveau_dsm(acpi_handle handle, int func, int arg)
  {
  	int ret = 0;
@@ -207,8 +230,7 @@ static int nouveau_dsm_pci_probe(struct pci_dev *pdev)
  			   1 << NOUVEAU_DSM_POWER))
  		retval |= NOUVEAU_DSM_HAS_MUX;
 
-	if (acpi_check_dsm(dhandle, nouveau_op_dsm_muid, 0x00000100,
-			   1 << NOUVEAU_DSM_OPTIMUS_CAPS))
+	if (nouveau_check_optimus_dsm(dhandle))
  		retval |= NOUVEAU_DSM_HAS_OPT;
 
  	if (retval & NOUVEAU_DSM_HAS_OPT) {
author
#2 lore raw

Thanks, Rafael.
Will cc ACPI maillist next time.

Quoted 79 lines · Rafael J. Wysocki
Quoted 9 lines · Jiang Liu

Fix regression caused by commit b072e53, which breaks loading nouveau driver on optimus laptops.

On some platforms, ACPI _DSM method (nouveau_op_dsm_muid, function 0) has special requirements on the fourth parameter, which is different from ACPI specifications. So revert to the private implementation to check availability of _DSM functions instead of using common acpi_check_dsm() interface.

Quoted 3 lines

Reported-and-Tested-by: Maarten Lankhorst
<[email protected]>

I'm taking this, because the commit that introduced the regression went in through my tree.

In the future I'll appreciate CCing ACPI-related patches to linux-acpi, however.

Thanks,
Rafael

Quoted 49 lines
---
  drivers/gpu/drm/nouveau/nouveau_acpi.c |   26
++++++++++++++++++++++++--
  1 file changed, 24 insertions(+), 2 deletions(-)
drivers/gpu/drm/nouveau/nouveau_acpi.c +0 -0
index 4ef83df..83face3 100644
@@ -106,6 +106,29 @@ static int nouveau_optimus_dsm(acpi_handle

handle, int func, int arg, uint32_t *

      return 0;

}
+/*
+ * On some platforms, _DSM(nouveau_op_dsm_muid, func0) has special
+ * requirements on the fourth parameter, so a private implementation
+ * instead of using acpi_check_dsm().
+ */

drivers/gpu/drm/nouveau/nouveau_acpi.c +19 -1
+static int nouveau_check_optimus_dsm(acpi_handle handle)
+{
+    int result;
+
+    /*
+     * Function 0 returns a Buffer containing available functions.
+     * The args parameter is ignored for function 0, so just put 0 in it
+     */
+    if (nouveau_optimus_dsm(handle, 0, 0, &result))
+        return 0;
+
+    /*
+     * ACPI Spec v4 9.14.1: if bit 0 is zero, no function is supported.
+     * If the n-th bit is enabled, function n is supported
+     */
+    return result & 1 && result & (1 << NOUVEAU_DSM_OPTIMUS_CAPS);
+}
+
  static int nouveau_dsm(acpi_handle handle, int func, int arg)
  {
      int ret = 0;
@@ -207,8 +230,7 @@ static int nouveau_dsm_pci_probe(struct pci_dev
 *pdev)
                 1 << NOUVEAU_DSM_POWER))
          retval |= NOUVEAU_DSM_HAS_MUX;
  -    if (acpi_check_dsm(dhandle, nouveau_op_dsm_muid, 0x00000100,
-               1 << NOUVEAU_DSM_OPTIMUS_CAPS))
+    if (nouveau_check_optimus_dsm(dhandle))
          retval |= NOUVEAU_DSM_HAS_OPT;
        if (retval & NOUVEAU_DSM_HAS_OPT) {
Signature · 4 lines
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/
maintainer Acked-by
#3 lore raw
In reply to Rafael J. Wysocki
Quoted 16 lines · Rafael J. Wysocki
Quoted 10 lines · Jiang Liu

Fix regression caused by commit b072e53, which breaks loading nouveau driver on optimus laptops.

On some platforms, ACPI _DSM method (nouveau_op_dsm_muid, function 0) has special requirements on the fourth parameter, which is different from ACPI specifications. So revert to the private implementation to check availability of _DSM functions instead of using common acpi_check_dsm() interface.

Quoted 3 lines

Reported-and-Tested-by: Maarten Lankhorst
<[email protected]>

Quoted 5 lines

I'm taking this, because the commit that introduced the regression went in through my tree.

In the future I'll appreciate CCing ACPI-related patches to linux-acpi, however.

Thanks,

Dave.