drm/nouveau/acpi: return supported DSM functions

commit a12e78dd3e727094e449ee4e3b752ea9b6f8db01 upstream.

Return the set of supported functions to the caller. No functional
changes.

Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Peter Wu <peter@lekensteyn.nl>
Acked-by: Dave Airlie <airlied@redhat.com
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>

diff --git a/drivers/gpu/drm/nouveau/nouveau_acpi.c b/drivers/gpu/drm/nouveau/nouveau_acpi.c
index 5d39018249986df2abc8faea299bdbd3c67c19d3..f76e805dfc3a7f78ce114591a28fed3bf29a86f0 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_acpi.c
+++ b/drivers/gpu/drm/nouveau/nouveau_acpi.c
@@ -108,7 +108,7 @@ static int nouveau_optimus_dsm(acpi_handle handle, int func, int arg, uint32_t *
  * requirements on the fourth parameter, so a private implementation
  * instead of using acpi_check_dsm().
  */
-static int nouveau_check_optimus_dsm(acpi_handle handle)
+static int nouveau_dsm_get_optimus_functions(acpi_handle handle)
 {
        int result;
 
@@ -123,7 +123,9 @@ static int nouveau_check_optimus_dsm(acpi_handle handle)
         * 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);
+       if (result & 1 && result & (1 << NOUVEAU_DSM_OPTIMUS_CAPS))
+               return result;
+       return 0;
 }
 
 static int nouveau_dsm(acpi_handle handle, int func, int arg)
@@ -215,7 +217,7 @@ static void nouveau_dsm_pci_probe(struct pci_dev *pdev, acpi_handle *dhandle_out
 {
        acpi_handle dhandle;
        bool supports_mux;
-       bool supports_opt;
+       int optimus_funcs;
 
        dhandle = ACPI_HANDLE(&pdev->dev);
        if (!dhandle)
@@ -227,17 +229,17 @@ static void nouveau_dsm_pci_probe(struct pci_dev *pdev, acpi_handle *dhandle_out
        }
        supports_mux = acpi_check_dsm(dhandle, nouveau_dsm_muid, 0x00000102,
                                      1 << NOUVEAU_DSM_POWER);
-       supports_opt = nouveau_check_optimus_dsm(dhandle);
+       optimus_funcs = nouveau_dsm_get_optimus_functions(dhandle);
 
        /* Does not look like a Nvidia device. */
-       if (!supports_mux && !supports_opt)
+       if (!supports_mux && !optimus_funcs)
                return;
 
        *dhandle_out = dhandle;
        *has_mux = supports_mux;
-       *has_opt = supports_opt;
+       *has_opt = !!optimus_funcs;
 
-       if (supports_opt) {
+       if (optimus_funcs) {
                uint32_t result;
                nouveau_optimus_dsm(dhandle, NOUVEAU_DSM_OPTIMUS_CAPS, 0,
                                    &result);