18 files changed, 123 insertions, 276 deletions

diff --git a/drivers/gpu/drm/gma500/opregion.c b/drivers/gpu/drm/gma500/opregion.c
index ad0d6de938f3..13ec6283bf59 100644
--- a/drivers/gpu/drm/gma500/opregion.c
+++ b/drivers/gpu/drm/gma500/opregion.c
@@ -22,7 +22,6 @@
  *
  */
 #include <linux/acpi.h>
-#include <linux/acpi_io.h>
 #include "psb_drv.h"
 #include "psb_intel_reg.h"
 
diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
index 41838eaa799c..d4ae48b04cf2 100644
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@ -38,7 +38,6 @@ i915-y := i915_drv.o i915_dma.o i915_irq.o \
           intel_ringbuffer.o \
           intel_overlay.o \
           intel_sprite.o \
-          intel_opregion.o \
           intel_sideband.o \
           intel_uncore.o \
           dvo_ch7xxx.o \
@@ -51,7 +50,7 @@ i915-y := i915_drv.o i915_dma.o i915_irq.o \
 
 i915-$(CONFIG_COMPAT)   += i915_ioc32.o
 
-i915-$(CONFIG_ACPI)     += intel_acpi.o
+i915-$(CONFIG_ACPI)     += intel_acpi.o intel_opregion.o
 
 i915-$(CONFIG_DRM_I915_FBDEV) += intel_fbdev.o
 
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 90fcccba17b0..1caa5e34fbe3 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -2339,8 +2339,8 @@ extern void intel_i2c_reset(struct drm_device *dev);
 
 /* intel_opregion.c */
 struct intel_encoder;
-extern int intel_opregion_setup(struct drm_device *dev);
 #ifdef CONFIG_ACPI
+extern int intel_opregion_setup(struct drm_device *dev);
 extern void intel_opregion_init(struct drm_device *dev);
 extern void intel_opregion_fini(struct drm_device *dev);
 extern void intel_opregion_asle_intr(struct drm_device *dev);
@@ -2349,6 +2349,7 @@ extern int intel_opregion_notify_encoder(struct intel_encoder *intel_encoder,
 extern int intel_opregion_notify_adapter(struct drm_device *dev,
                                          pci_power_t state);
 #else
+static inline int intel_opregion_setup(struct drm_device *dev) { return 0; }
 static inline void intel_opregion_init(struct drm_device *dev) { return; }
 static inline void intel_opregion_fini(struct drm_device *dev) { return; }
 static inline void intel_opregion_asle_intr(struct drm_device *dev) { return; }
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index c79dd2b1f70e..d3c3b5b15824 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -906,14 +906,12 @@ static void gen8_ggtt_insert_entries(struct i915_address_space *vm,
                 WARN_ON(readq(&gtt_entries[i-1])
                         != gen8_pte_encode(addr, level, true));
 
-#if 0 /* TODO: Still needed on GEN8? */
         /* This next bit makes the above posting read even more important. We
          * want to flush the TLBs only after we're certain all the PTE updates
          * have finished.
          */
         I915_WRITE(GFX_FLSH_CNTL_GEN6, GFX_FLSH_CNTL_EN);
         POSTING_READ(GFX_FLSH_CNTL_GEN6);
-#endif
 }
 
 /*
diff --git a/drivers/gpu/drm/i915/intel_acpi.c b/drivers/gpu/drm/i915/intel_acpi.c
index dfff0907f70e..d96eee1ae9c5 100644
--- a/drivers/gpu/drm/i915/intel_acpi.c
+++ b/drivers/gpu/drm/i915/intel_acpi.c
@@ -6,14 +6,10 @@
 #include <linux/pci.h>
 #include <linux/acpi.h>
 #include <linux/vga_switcheroo.h>
-#include <acpi/acpi_drivers.h>
-
 #include <drm/drmP.h>
 #include "i915_drv.h"
 
 #define INTEL_DSM_REVISION_ID 1 /* For Calpella anyway... */
-
-#define INTEL_DSM_FN_SUPPORTED_FUNCTIONS 0 /* No args */
 #define INTEL_DSM_FN_PLATFORM_MUX_INFO 1 /* No args */
 
 static struct intel_dsm_priv {
@@ -28,61 +24,6 @@ static const u8 intel_dsm_guid[] = {
         0x0f, 0x13, 0x17, 0xb0, 0x1c, 0x2c
 };
 
-static int intel_dsm(acpi_handle handle, int func)
-{
-        struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL };
-        struct acpi_object_list input;
-        union acpi_object params[4];
-        union acpi_object *obj;
-        u32 result;
-        int ret = 0;
-
-        input.count = 4;
-        input.pointer = params;
-        params[0].type = ACPI_TYPE_BUFFER;
-        params[0].buffer.length = sizeof(intel_dsm_guid);
-        params[0].buffer.pointer = (char *)intel_dsm_guid;
-        params[1].type = ACPI_TYPE_INTEGER;
-        params[1].integer.value = INTEL_DSM_REVISION_ID;
-        params[2].type = ACPI_TYPE_INTEGER;
-        params[2].integer.value = func;
-        params[3].type = ACPI_TYPE_PACKAGE;
-        params[3].package.count = 0;
-        params[3].package.elements = NULL;
-
-        ret = acpi_evaluate_object(handle, "_DSM", &input, &output);
-        if (ret) {
-                DRM_DEBUG_DRIVER("failed to evaluate _DSM: %d\n", ret);
-                return ret;
-        }
-
-        obj = (union acpi_object *)output.pointer;
-
-        result = 0;
-        switch (obj->type) {
-        case ACPI_TYPE_INTEGER:
-                result = obj->integer.value;
-                break;
-
-        case ACPI_TYPE_BUFFER:
-                if (obj->buffer.length == 4) {
-                        result = (obj->buffer.pointer[0] |
-                                (obj->buffer.pointer[1] <<  8) |
-                                (obj->buffer.pointer[2] << 16) |
-                                (obj->buffer.pointer[3] << 24));
-                        break;
-                }
-        default:
-                ret = -EINVAL;
-                break;
-        }
-        if (result == 0x80000002)
-                ret = -ENODEV;
-
-        kfree(output.pointer);
-        return ret;
-}
-
 static char *intel_dsm_port_name(u8 id)
 {
         switch (id) {
@@ -137,83 +78,56 @@ static char *intel_dsm_mux_type(u8 type)
 
 static void intel_dsm_platform_mux_info(void)
 {
-        struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL };
-        struct acpi_object_list input;
-        union acpi_object params[4];
-        union acpi_object *pkg;
-        int i, ret;
-
-        input.count = 4;
-        input.pointer = params;
-        params[0].type = ACPI_TYPE_BUFFER;
-        params[0].buffer.length = sizeof(intel_dsm_guid);
-        params[0].buffer.pointer = (char *)intel_dsm_guid;
-        params[1].type = ACPI_TYPE_INTEGER;
-        params[1].integer.value = INTEL_DSM_REVISION_ID;
-        params[2].type = ACPI_TYPE_INTEGER;
-        params[2].integer.value = INTEL_DSM_FN_PLATFORM_MUX_INFO;
-        params[3].type = ACPI_TYPE_PACKAGE;
-        params[3].package.count = 0;
-        params[3].package.elements = NULL;
-
-        ret = acpi_evaluate_object(intel_dsm_priv.dhandle, "_DSM", &input,
-                                   &output);
-        if (ret) {
-                DRM_DEBUG_DRIVER("failed to evaluate _DSM: %d\n", ret);
-                goto out;
+        int i;
+        union acpi_object *pkg, *connector_count;
+
+        pkg = acpi_evaluate_dsm_typed(intel_dsm_priv.dhandle, intel_dsm_guid,
+                        INTEL_DSM_REVISION_ID, INTEL_DSM_FN_PLATFORM_MUX_INFO,
+                        NULL, ACPI_TYPE_PACKAGE);
+        if (!pkg) {
+                DRM_DEBUG_DRIVER("failed to evaluate _DSM\n");
+                return;
         }
 
-        pkg = (union acpi_object *)output.pointer;
-
-        if (pkg->type == ACPI_TYPE_PACKAGE) {
-                union acpi_object *connector_count = &pkg->package.elements[0];
-                DRM_DEBUG_DRIVER("MUX info connectors: %lld\n",
-                          (unsigned long long)connector_count->integer.value);
-                for (i = 1; i < pkg->package.count; i++) {
-                        union acpi_object *obj = &pkg->package.elements[i];
-                        union acpi_object *connector_id =
-                                &obj->package.elements[0];
-                        union acpi_object *info = &obj->package.elements[1];
-                        DRM_DEBUG_DRIVER("Connector id: 0x%016llx\n",
-                                  (unsigned long long)connector_id->integer.value);
-                        DRM_DEBUG_DRIVER("  port id: %s\n",
-                               intel_dsm_port_name(info->buffer.pointer[0]));
-                        DRM_DEBUG_DRIVER("  display mux info: %s\n",
-                               intel_dsm_mux_type(info->buffer.pointer[1]));
-                        DRM_DEBUG_DRIVER("  aux/dc mux info: %s\n",
-                               intel_dsm_mux_type(info->buffer.pointer[2]));
-                        DRM_DEBUG_DRIVER("  hpd mux info: %s\n",
-                               intel_dsm_mux_type(info->buffer.pointer[3]));
-                }
+        connector_count = &pkg->package.elements[0];
+        DRM_DEBUG_DRIVER("MUX info connectors: %lld\n",
+                  (unsigned long long)connector_count->integer.value);
+        for (i = 1; i < pkg->package.count; i++) {
+                union acpi_object *obj = &pkg->package.elements[i];
+                union acpi_object *connector_id = &obj->package.elements[0];
+                union acpi_object *info = &obj->package.elements[1];
+                DRM_DEBUG_DRIVER("Connector id: 0x%016llx\n",
+                          (unsigned long long)connector_id->integer.value);
+                DRM_DEBUG_DRIVER("  port id: %s\n",
+                       intel_dsm_port_name(info->buffer.pointer[0]));
+                DRM_DEBUG_DRIVER("  display mux info: %s\n",
+                       intel_dsm_mux_type(info->buffer.pointer[1]));
+                DRM_DEBUG_DRIVER("  aux/dc mux info: %s\n",
+                       intel_dsm_mux_type(info->buffer.pointer[2]));
+                DRM_DEBUG_DRIVER("  hpd mux info: %s\n",
+                       intel_dsm_mux_type(info->buffer.pointer[3]));
         }
 
-out:
-        kfree(output.pointer);
+        ACPI_FREE(pkg);
 }
 
 static bool intel_dsm_pci_probe(struct pci_dev *pdev)
 {
         acpi_handle dhandle;
-        int ret;
 
         dhandle = ACPI_HANDLE(&pdev->dev);
         if (!dhandle)
                 return false;
 
-        if (!acpi_has_method(dhandle, "_DSM")) {
+        if (!acpi_check_dsm(dhandle, intel_dsm_guid, INTEL_DSM_REVISION_ID,
+                            1 << INTEL_DSM_FN_PLATFORM_MUX_INFO)) {
                 DRM_DEBUG_KMS("no _DSM method for intel device\n");
                 return false;
         }
 
-        ret = intel_dsm(dhandle, INTEL_DSM_FN_SUPPORTED_FUNCTIONS);
-        if (ret < 0) {
-                DRM_DEBUG_KMS("failed to get supported _DSM functions\n");
-                return false;
-        }
-
         intel_dsm_priv.dhandle = dhandle;
-
         intel_dsm_platform_mux_info();
+
         return true;
 }
 
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 54e82a80cf50..769b864465a9 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -10541,11 +10541,20 @@ static struct intel_quirk intel_quirks[] = {
         /* Sony Vaio Y cannot use SSC on LVDS */
         { 0x0046, 0x104d, 0x9076, quirk_ssc_force_disable },
 
-        /*
-         * All GM45 Acer (and its brands eMachines and Packard Bell) laptops
-         * seem to use inverted backlight PWM.
-         */
-        { 0x2a42, 0x1025, PCI_ANY_ID, quirk_invert_brightness },
+        /* Acer Aspire 5734Z must invert backlight brightness */
+        { 0x2a42, 0x1025, 0x0459, quirk_invert_brightness },
+
+        /* Acer/eMachines G725 */
+        { 0x2a42, 0x1025, 0x0210, quirk_invert_brightness },
+
+        /* Acer/eMachines e725 */
+        { 0x2a42, 0x1025, 0x0212, quirk_invert_brightness },
+
+        /* Acer/Packard Bell NCL20 */
+        { 0x2a42, 0x1025, 0x034b, quirk_invert_brightness },
+
+        /* Acer Aspire 4736Z */
+        { 0x2a42, 0x1025, 0x0260, quirk_invert_brightness },
 
         /* Dell XPS13 HD Sandy Bridge */
         { 0x0116, 0x1028, 0x052e, quirk_no_pcm_pwm_enable },
diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c
index 6d69a9bad865..9a8804bee5cd 100644
--- a/drivers/gpu/drm/i915/intel_opregion.c
+++ b/drivers/gpu/drm/i915/intel_opregion.c
@@ -28,7 +28,6 @@
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <linux/acpi.h>
-#include <linux/acpi_io.h>
 #include <acpi/video.h>
 
 #include <drm/drmP.h>
diff --git a/drivers/gpu/drm/nouveau/core/core/subdev.c b/drivers/gpu/drm/nouveau/core/core/subdev.c
index 48f06378d3f9..2ea5568b6cf5 100644
--- a/drivers/gpu/drm/nouveau/core/core/subdev.c
+++ b/drivers/gpu/drm/nouveau/core/core/subdev.c
@@ -104,11 +104,8 @@ nouveau_subdev_create_(struct nouveau_object *parent,
 
         if (parent) {
                 struct nouveau_device *device = nv_device(parent);
-                int subidx = nv_hclass(subdev) & 0xff;
-
                 subdev->debug = nouveau_dbgopt(device->dbgopt, subname);
                 subdev->mmio  = nv_subdev(device)->mmio;
-                device->subdev[subidx] = *pobject;
         }
 
         return 0;
diff --git a/drivers/gpu/drm/nouveau/core/engine/device/base.c b/drivers/gpu/drm/nouveau/core/engine/device/base.c
index 9135b25a29d0..dd01c6c435d6 100644
--- a/drivers/gpu/drm/nouveau/core/engine/device/base.c
+++ b/drivers/gpu/drm/nouveau/core/engine/device/base.c
@@ -268,6 +268,8 @@ nouveau_devobj_ctor(struct nouveau_object *parent,
                 if (ret)
                         return ret;
 
+                device->subdev[i] = devobj->subdev[i];
+
                 /* note: can't init *any* subdevs until devinit has been run
                  * due to not knowing exactly what the vbios init tables will
                  * mess with.  devinit also can't be run until all of its
diff --git a/drivers/gpu/drm/nouveau/core/engine/device/nvc0.c b/drivers/gpu/drm/nouveau/core/engine/device/nvc0.c
index 8d06eef2b9ee..dbc5e33de94f 100644
--- a/drivers/gpu/drm/nouveau/core/engine/device/nvc0.c
+++ b/drivers/gpu/drm/nouveau/core/engine/device/nvc0.c
@@ -161,7 +161,7 @@ nvc0_identify(struct nouveau_device *device)
                 device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;
                 device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;
                 device->oclass[NVDEV_SUBDEV_DEVINIT] = &nvc0_devinit_oclass;
-                device->oclass[NVDEV_SUBDEV_MC     ] =  nvc3_mc_oclass;
+                device->oclass[NVDEV_SUBDEV_MC     ] =  nvc0_mc_oclass;
                 device->oclass[NVDEV_SUBDEV_BUS    ] =  nvc0_bus_oclass;
                 device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
                 device->oclass[NVDEV_SUBDEV_FB     ] =  nvc0_fb_oclass;
diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c b/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c
index 434bb4b0fa2e..5c8a63dc506a 100644
--- a/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c
@@ -334,7 +334,7 @@ nvc0_graph_mthd(struct nvc0_graph_priv *priv, struct nvc0_graph_mthd *mthds)
         while ((mthd = &mthds[i++]) && (init = mthd->init)) {
                 u32  addr = 0x80000000 | mthd->oclass;
                 for (data = 0; init->count; init++) {
-                        if (data != init->data) {
+                        if (init == mthd->init || data != init->data) {
                                 nv_wr32(priv, 0x40448c, init->data);
                                 data = init->data;
                         }
diff --git a/drivers/gpu/drm/nouveau/core/include/subdev/fb.h b/drivers/gpu/drm/nouveau/core/include/subdev/fb.h
index 8541aa382ff2..d89dbdf39b0d 100644
--- a/drivers/gpu/drm/nouveau/core/include/subdev/fb.h
+++ b/drivers/gpu/drm/nouveau/core/include/subdev/fb.h
@@ -75,6 +75,11 @@ struct nouveau_fb {
 static inline struct nouveau_fb *
 nouveau_fb(void *obj)
 {
+        /* fbram uses this before device subdev pointer is valid */
+        if (nv_iclass(obj, NV_SUBDEV_CLASS) &&
+            nv_subidx(obj) == NVDEV_SUBDEV_FB)
+                return obj;
+
         return (void *)nv_device(obj)->subdev[NVDEV_SUBDEV_FB];
 }
 
diff --git a/drivers/gpu/drm/nouveau/core/subdev/bios/init.c b/drivers/gpu/drm/nouveau/core/subdev/bios/init.c
index 420908cb82b6..df1b1b423093 100644
--- a/drivers/gpu/drm/nouveau/core/subdev/bios/init.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/bios/init.c
@@ -365,13 +365,13 @@ static u16
 init_script(struct nouveau_bios *bios, int index)
 {
         struct nvbios_init init = { .bios = bios };
-        u16 data;
+        u16 bmp_ver = bmp_version(bios), data;
 
-        if (bmp_version(bios) && bmp_version(bios) < 0x0510) {
-                if (index > 1)
+        if (bmp_ver && bmp_ver < 0x0510) {
+                if (index > 1 || bmp_ver < 0x0100)
                         return 0x0000;
 
-                data = bios->bmp_offset + (bios->version.major < 2 ? 14 : 18);
+                data = bios->bmp_offset + (bmp_ver < 0x0200 ? 14 : 18);
                 return nv_ro16(bios, data + (index * 2));
         }
 
@@ -1294,7 +1294,11 @@ init_jump(struct nvbios_init *init)
         u16 offset = nv_ro16(bios, init->offset + 1);
 
         trace("JUMP\t0x%04x\n", offset);
-        init->offset = offset;
+
+        if (init_exec(init))
+                init->offset = offset;
+        else
+                init->offset += 3;
 }
 
 /**
diff --git a/drivers/gpu/drm/nouveau/core/subdev/mxm/base.c b/drivers/gpu/drm/nouveau/core/subdev/mxm/base.c
index 129120473f6c..13c5af88a601 100644
--- a/drivers/gpu/drm/nouveau/core/subdev/mxm/base.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/mxm/base.c
@@ -87,55 +87,39 @@ mxm_shadow_dsm(struct nouveau_mxm *mxm, u8 version)
                 0xB8, 0x9C, 0x79, 0xB6, 0x2F, 0xD5, 0x56, 0x65
         };
         u32 mxms_args[] = { 0x00000000 };
-        union acpi_object args[4] = {
-                /* _DSM MUID */
-                { .buffer.type = 3,
-                  .buffer.length = sizeof(muid),
-                  .buffer.pointer = muid,
-                },
-                /* spec says this can be zero to mean "highest revision", but
-                 * of course there's at least one bios out there which fails
-                 * unless you pass in exactly the version it supports..
-                 */
-                { .integer.type = ACPI_TYPE_INTEGER,
-                  .integer.value = (version & 0xf0) << 4 | (version & 0x0f),
-                },
-                /* MXMS function */
-                { .integer.type = ACPI_TYPE_INTEGER,
-                  .integer.value = 0x00000010,
-                },
-                /* Pointer to MXMS arguments */
-                { .buffer.type = ACPI_TYPE_BUFFER,
-                  .buffer.length = sizeof(mxms_args),
-                  .buffer.pointer = (char *)mxms_args,
-                },
+        union acpi_object argv4 = {
+                .buffer.type = ACPI_TYPE_BUFFER,
+                .buffer.length = sizeof(mxms_args),
+                .buffer.pointer = (char *)mxms_args,
         };
-        struct acpi_object_list list = { ARRAY_SIZE(args), args };
-        struct acpi_buffer retn = { ACPI_ALLOCATE_BUFFER, NULL };
         union acpi_object *obj;
         acpi_handle handle;
-        int ret;
+        int rev;
 
         handle = ACPI_HANDLE(&device->pdev->dev);
         if (!handle)
                 return false;
 
-        ret = acpi_evaluate_object(handle, "_DSM", &list, &retn);
-        if (ret) {
-                nv_debug(mxm, "DSM MXMS failed: %d\n", ret);
+        /*
+         * spec says this can be zero to mean "highest revision", but
+         * of course there's at least one bios out there which fails
+         * unless you pass in exactly the version it supports..
+         */
+        rev = (version & 0xf0) << 4 | (version & 0x0f);
+        obj = acpi_evaluate_dsm(handle, muid, rev, 0x00000010, &argv4);
+        if (!obj) {
+                nv_debug(mxm, "DSM MXMS failed\n");
                 return false;
         }
 
-        obj = retn.pointer;
         if (obj->type == ACPI_TYPE_BUFFER) {
                 mxm->mxms = kmemdup(obj->buffer.pointer,
                                          obj->buffer.length, GFP_KERNEL);
-        } else
-        if (obj->type == ACPI_TYPE_INTEGER) {
+        } else if (obj->type == ACPI_TYPE_INTEGER) {
                 nv_debug(mxm, "DSM MXMS returned 0x%llx\n", obj->integer.value);
         }
 
-        kfree(obj);
+        ACPI_FREE(obj);
         return mxm->mxms != NULL;
 }
 #endif
diff --git a/drivers/gpu/drm/nouveau/nouveau_abi16.c b/drivers/gpu/drm/nouveau/nouveau_abi16.c
index 6828d81ed7b9..900fae01793e 100644
--- a/drivers/gpu/drm/nouveau/nouveau_abi16.c
+++ b/drivers/gpu/drm/nouveau/nouveau_abi16.c
@@ -447,6 +447,8 @@ nouveau_abi16_ioctl_notifierobj_alloc(ABI16_IOCTL_ARGS)
         if (ret)
                 goto done;
 
+        info->offset = ntfy->node->offset;
+
 done:
         if (ret)
                 nouveau_abi16_ntfy_fini(chan, ntfy);
diff --git a/drivers/gpu/drm/nouveau/nouveau_acpi.c b/drivers/gpu/drm/nouveau/nouveau_acpi.c
index ba0183fb84f3..3c149617cfcb 100644
--- a/drivers/gpu/drm/nouveau/nouveau_acpi.c
+++ b/drivers/gpu/drm/nouveau/nouveau_acpi.c
@@ -1,15 +1,10 @@
 #include <linux/pci.h>
 #include <linux/acpi.h>
 #include <linux/slab.h>
-#include <acpi/acpi_drivers.h>
-#include <acpi/acpi_bus.h>
-#include <acpi/video.h>
-#include <acpi/acpi.h>
 #include <linux/mxm-wmi.h>
-
 #include <linux/vga_switcheroo.h>
-
 #include <drm/drm_edid.h>
+#include <acpi/video.h>
 
 #include "nouveau_drm.h"
 #include "nouveau_acpi.h"
@@ -78,124 +73,66 @@ static const char nouveau_op_dsm_muid[] = {
 
 static int nouveau_optimus_dsm(acpi_handle handle, int func, int arg, uint32_t *result)
 {
-        struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL };
-        struct acpi_object_list input;
-        union acpi_object params[4];
+        int i;
         union acpi_object *obj;
-        int i, err;
         char args_buff[4];
+        union acpi_object argv4 = {
+                .buffer.type = ACPI_TYPE_BUFFER,
+                .buffer.length = 4,
+                .buffer.pointer = args_buff
+        };
 
-        input.count = 4;
-        input.pointer = params;
-        params[0].type = ACPI_TYPE_BUFFER;
-        params[0].buffer.length = sizeof(nouveau_op_dsm_muid);
-        params[0].buffer.pointer = (char *)nouveau_op_dsm_muid;
-        params[1].type = ACPI_TYPE_INTEGER;
-        params[1].integer.value = 0x00000100;
-        params[2].type = ACPI_TYPE_INTEGER;
-        params[2].integer.value = func;
-        params[3].type = ACPI_TYPE_BUFFER;
-        params[3].buffer.length = 4;
         /* ACPI is little endian, AABBCCDD becomes {DD,CC,BB,AA} */
         for (i = 0; i < 4; i++)
                 args_buff[i] = (arg >> i * 8) & 0xFF;
-        params[3].buffer.pointer = args_buff;
-
-        err = acpi_evaluate_object(handle, "_DSM", &input, &output);
-        if (err) {
-                printk(KERN_INFO "failed to evaluate _DSM: %d\n", err);
-                return err;
-        }
-
-        obj = (union acpi_object *)output.pointer;
 
-        if (obj->type == ACPI_TYPE_INTEGER)
-                if (obj->integer.value == 0x80000002) {
-                        return -ENODEV;
-                }
-
-        if (obj->type == ACPI_TYPE_BUFFER) {
-                if (obj->buffer.length == 4 && result) {
-                        *result = 0;
+        *result = 0;
+        obj = acpi_evaluate_dsm_typed(handle, nouveau_op_dsm_muid, 0x00000100,
+                                      func, &argv4, ACPI_TYPE_BUFFER);
+        if (!obj) {
+                acpi_handle_info(handle, "failed to evaluate _DSM\n");
+                return AE_ERROR;
+        } else {
+                if (obj->buffer.length == 4) {
                         *result |= obj->buffer.pointer[0];
                         *result |= (obj->buffer.pointer[1] << 8);
                         *result |= (obj->buffer.pointer[2] << 16);
                         *result |= (obj->buffer.pointer[3] << 24);
                 }
+                ACPI_FREE(obj);
         }
 
-        kfree(output.pointer);
         return 0;
 }
 
-static int nouveau_dsm(acpi_handle handle, int func, int arg, uint32_t *result)
+static int nouveau_dsm(acpi_handle handle, int func, int arg)
 {
-        struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL };
-        struct acpi_object_list input;
-        union acpi_object params[4];
+        int ret = 0;
         union acpi_object *obj;
-        int err;
-
-        input.count = 4;
-        input.pointer = params;
-        params[0].type = ACPI_TYPE_BUFFER;
-        params[0].buffer.length = sizeof(nouveau_dsm_muid);
-        params[0].buffer.pointer = (char *)nouveau_dsm_muid;
-        params[1].type = ACPI_TYPE_INTEGER;
-        params[1].integer.value = 0x00000102;
-        params[2].type = ACPI_TYPE_INTEGER;
-        params[2].integer.value = func;
-        params[3].type = ACPI_TYPE_INTEGER;
-        params[3].integer.value = arg;
-
-        err = acpi_evaluate_object(handle, "_DSM", &input, &output);
-        if (err) {
-                printk(KERN_INFO "failed to evaluate _DSM: %d\n", err);
-                return err;
-        }
-
-        obj = (union acpi_object *)output.pointer;
-
-        if (obj->type == ACPI_TYPE_INTEGER)
+        union acpi_object argv4 = {
+                .integer.type = ACPI_TYPE_INTEGER,
+                .integer.value = arg,
+        };
+
+        obj = acpi_evaluate_dsm_typed(handle, nouveau_dsm_muid, 0x00000102,
+                                      func, &argv4, ACPI_TYPE_INTEGER);
+        if (!obj) {
+                acpi_handle_info(handle, "failed to evaluate _DSM\n");
+                return AE_ERROR;
+        } else {
                 if (obj->integer.value == 0x80000002)
-                        return -ENODEV;
-
-        if (obj->type == ACPI_TYPE_BUFFER) {
-                if (obj->buffer.length == 4 && result) {
-                        *result = 0;
-                        *result |= obj->buffer.pointer[0];
-                        *result |= (obj->buffer.pointer[1] << 8);
-                        *result |= (obj->buffer.pointer[2] << 16);
-                        *result |= (obj->buffer.pointer[3] << 24);
-                }
+                        ret = -ENODEV;
+                ACPI_FREE(obj);
         }
 
-        kfree(output.pointer);
-        return 0;
-}
-
-/* Returns 1 if a DSM function is usable and 0 otherwise */
-static int nouveau_test_dsm(acpi_handle test_handle,
-        int (*dsm_func)(acpi_handle, int, int, uint32_t *),
-        int sfnc)
-{
-        u32 result = 0;
-
-        /* Function 0 returns a Buffer containing available functions. The args
-         * parameter is ignored for function 0, so just put 0 in it */
-        if (dsm_func(test_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 << sfnc);
+        return ret;
 }
 
 static int nouveau_dsm_switch_mux(acpi_handle handle, int mux_id)
 {
         mxm_wmi_call_mxmx(mux_id == NOUVEAU_DSM_LED_STAMINA ? MXM_MXDS_ADAPTER_IGD : MXM_MXDS_ADAPTER_0);
         mxm_wmi_call_mxds(mux_id == NOUVEAU_DSM_LED_STAMINA ? MXM_MXDS_ADAPTER_IGD : MXM_MXDS_ADAPTER_0);
-        return nouveau_dsm(handle, NOUVEAU_DSM_LED, mux_id, NULL);
+        return nouveau_dsm(handle, NOUVEAU_DSM_LED, mux_id);
 }
 
 static int nouveau_dsm_set_discrete_state(acpi_handle handle, enum vga_switcheroo_state state)
@@ -205,7 +142,7 @@ static int nouveau_dsm_set_discrete_state(acpi_handle handle, enum vga_switchero
                 arg = NOUVEAU_DSM_POWER_SPEED;
         else
                 arg = NOUVEAU_DSM_POWER_STAMINA;
-        nouveau_dsm(handle, NOUVEAU_DSM_POWER, arg, NULL);
+        nouveau_dsm(handle, NOUVEAU_DSM_POWER, arg);
         return 0;
 }
 
@@ -265,11 +202,12 @@ static int nouveau_dsm_pci_probe(struct pci_dev *pdev)
                 nouveau_dsm_priv.other_handle = dhandle;
                 return false;
         }
-        if (nouveau_test_dsm(dhandle, nouveau_dsm, NOUVEAU_DSM_POWER))
+        if (acpi_check_dsm(dhandle, nouveau_dsm_muid, 0x00000102,
+                           1 << NOUVEAU_DSM_POWER))
                 retval |= NOUVEAU_DSM_HAS_MUX;
 
-        if (nouveau_test_dsm(dhandle, nouveau_optimus_dsm,
-                NOUVEAU_DSM_OPTIMUS_CAPS))
+        if (acpi_check_dsm(dhandle, nouveau_op_dsm_muid, 0x00000100,
+                           1 << NOUVEAU_DSM_OPTIMUS_CAPS))
                 retval |= NOUVEAU_DSM_HAS_OPT;
 
         if (retval & NOUVEAU_DSM_HAS_OPT) {
diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c
index 29c3efdfc7dd..25ea82f8def3 100644
--- a/drivers/gpu/drm/nouveau/nouveau_display.c
+++ b/drivers/gpu/drm/nouveau/nouveau_display.c
@@ -610,7 +610,7 @@ nouveau_crtc_page_flip(struct drm_crtc *crtc, struct drm_framebuffer *fb,
         ret = nouveau_fence_sync(fence, chan);
         nouveau_fence_unref(&fence);
         if (ret)
-                return ret;
+                goto fail_free;
 
         if (new_bo != old_bo) {
                 ret = nouveau_bo_pin(new_bo, TTM_PL_FLAG_VRAM);
diff --git a/drivers/gpu/drm/radeon/radeon_acpi.c b/drivers/gpu/drm/radeon/radeon_acpi.c
index 98a9074b306b..77e9d07c55b6 100644
--- a/drivers/gpu/drm/radeon/radeon_acpi.c
+++ b/drivers/gpu/drm/radeon/radeon_acpi.c
@@ -25,18 +25,14 @@
 #include <linux/acpi.h>
 #include <linux/slab.h>
 #include <linux/power_supply.h>
-#include <acpi/acpi_drivers.h>
-#include <acpi/acpi_bus.h>
+#include <linux/vga_switcheroo.h>
 #include <acpi/video.h>
-
 #include <drm/drmP.h>
 #include <drm/drm_crtc_helper.h>
 #include "radeon.h"
 #include "radeon_acpi.h"
 #include "atom.h"
 
-#include <linux/vga_switcheroo.h>
-
 #define ACPI_AC_CLASS           "ac_adapter"
 
 extern void radeon_pm_acpi_event_handler(struct radeon_device *rdev);