2009-12-11 02:24:15 -07:00
|
|
|
#include <linux/pci.h>
|
|
|
|
#include <linux/acpi.h>
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 02:04:11 -06:00
|
|
|
#include <linux/slab.h>
|
2010-12-05 19:57:45 -07:00
|
|
|
#include <linux/mxm-wmi.h>
|
2010-01-31 22:38:10 -07:00
|
|
|
#include <linux/vga_switcheroo.h>
|
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
Pull drm merge (part 1) from Dave Airlie:
"So first of all my tree and uapi stuff has a conflict mess, its my
fault as the nouveau stuff didn't hit -next as were trying to rebase
regressions out of it before we merged.
Highlights:
- SH mobile modesetting driver and associated helpers
- some DRM core documentation
- i915 modesetting rework, haswell hdmi, haswell and vlv fixes, write
combined pte writing, ilk rc6 support,
- nouveau: major driver rework into a hw core driver, makes features
like SLI a lot saner to implement,
- psb: add eDP/DP support for Cedarview
- radeon: 2 layer page tables, async VM pte updates, better PLL
selection for > 2 screens, better ACPI interactions
The rest is general grab bag of fixes.
So why part 1? well I have the exynos pull req which came in a bit
late but was waiting for me to do something they shouldn't have and it
looks fairly safe, and David Howells has some more header cleanups
he'd like me to pull, that seem like a good idea, but I'd like to get
this merge out of the way so -next dosen't get blocked."
Tons of conflicts mostly due to silly include line changes, but mostly
mindless. A few other small semantic conflicts too, noted from Dave's
pre-merged branch.
* 'drm-next' of git://people.freedesktop.org/~airlied/linux: (447 commits)
drm/nv98/crypt: fix fuc build with latest envyas
drm/nouveau/devinit: fixup various issues with subdev ctor/init ordering
drm/nv41/vm: fix and enable use of "real" pciegart
drm/nv44/vm: fix and enable use of "real" pciegart
drm/nv04/dmaobj: fixup vm target handling in preparation for nv4x pcie
drm/nouveau: store supported dma mask in vmmgr
drm/nvc0/ibus: initial implementation of subdev
drm/nouveau/therm: add support for fan-control modes
drm/nouveau/hwmon: rename pwm0* to pmw1* to follow hwmon's rules
drm/nouveau/therm: calculate the pwm divisor on nv50+
drm/nouveau/fan: rewrite the fan tachometer driver to get more precision, faster
drm/nouveau/therm: move thermal-related functions to the therm subdev
drm/nouveau/bios: parse the pwm divisor from the perf table
drm/nouveau/therm: use the EXTDEV table to detect i2c monitoring devices
drm/nouveau/therm: rework thermal table parsing
drm/nouveau/gpio: expose the PWM/TOGGLE parameter found in the gpio vbios table
drm/nouveau: fix pm initialization order
drm/nouveau/bios: check that fixed tvdac gpio data is valid before using it
drm/nouveau: log channel debug/error messages from client object rather than drm client
drm/nouveau: have drm debugging macros build on top of core macros
...
2012-10-04 00:29:23 -06:00
|
|
|
#include <drm/drm_edid.h>
|
2013-12-02 17:49:16 -07:00
|
|
|
#include <acpi/video.h>
|
2012-07-25 16:51:21 -06:00
|
|
|
|
|
|
|
#include "nouveau_drm.h"
|
|
|
|
#include "nouveau_acpi.h"
|
|
|
|
|
2009-12-11 02:24:15 -07:00
|
|
|
#define NOUVEAU_DSM_LED 0x02
|
|
|
|
#define NOUVEAU_DSM_LED_STATE 0x00
|
|
|
|
#define NOUVEAU_DSM_LED_OFF 0x10
|
|
|
|
#define NOUVEAU_DSM_LED_STAMINA 0x11
|
|
|
|
#define NOUVEAU_DSM_LED_SPEED 0x12
|
|
|
|
|
|
|
|
#define NOUVEAU_DSM_POWER 0x03
|
|
|
|
#define NOUVEAU_DSM_POWER_STATE 0x00
|
|
|
|
#define NOUVEAU_DSM_POWER_SPEED 0x01
|
|
|
|
#define NOUVEAU_DSM_POWER_STAMINA 0x02
|
|
|
|
|
2012-09-09 22:20:51 -06:00
|
|
|
#define NOUVEAU_DSM_OPTIMUS_CAPS 0x1A
|
|
|
|
#define NOUVEAU_DSM_OPTIMUS_FLAGS 0x1B
|
|
|
|
|
|
|
|
#define NOUVEAU_DSM_OPTIMUS_POWERDOWN_PS3 (3 << 24)
|
|
|
|
#define NOUVEAU_DSM_OPTIMUS_NO_POWERDOWN_PS3 (2 << 24)
|
|
|
|
#define NOUVEAU_DSM_OPTIMUS_FLAGS_CHANGED (1)
|
|
|
|
|
|
|
|
#define NOUVEAU_DSM_OPTIMUS_SET_POWERDOWN (NOUVEAU_DSM_OPTIMUS_POWERDOWN_PS3 | NOUVEAU_DSM_OPTIMUS_FLAGS_CHANGED)
|
|
|
|
|
|
|
|
/* result of the optimus caps function */
|
|
|
|
#define OPTIMUS_ENABLED (1 << 0)
|
|
|
|
#define OPTIMUS_STATUS_MASK (3 << 3)
|
|
|
|
#define OPTIMUS_STATUS_OFF (0 << 3)
|
|
|
|
#define OPTIMUS_STATUS_ON_ENABLED (1 << 3)
|
|
|
|
#define OPTIMUS_STATUS_PWR_STABLE (3 << 3)
|
|
|
|
#define OPTIMUS_DISPLAY_HOTPLUG (1 << 6)
|
|
|
|
#define OPTIMUS_CAPS_MASK (7 << 24)
|
|
|
|
#define OPTIMUS_DYNAMIC_PWR_CAP (1 << 24)
|
|
|
|
|
|
|
|
#define OPTIMUS_AUDIO_CAPS_MASK (3 << 27)
|
|
|
|
#define OPTIMUS_HDA_CODEC_MASK (2 << 27) /* hda bios control */
|
2011-12-17 04:54:04 -07:00
|
|
|
|
2010-01-31 22:38:10 -07:00
|
|
|
static struct nouveau_dsm_priv {
|
|
|
|
bool dsm_detected;
|
2011-03-21 22:10:27 -06:00
|
|
|
bool optimus_detected;
|
2010-01-31 22:38:10 -07:00
|
|
|
acpi_handle dhandle;
|
ACPIPHP / radeon / nouveau: Fix VGA switcheroo problem related to hotplug
The changes in the ACPI-based PCI hotplug (ACPIPHP) subsystem made
during the 3.12 development cycle uncovered a problem with VGA
switcheroo that on some systems, when the device-specific method
(ATPX in the radeon case, _DSM in the nouveau case) is used to turn
off the discrete graphics, the BIOS generates ACPI hotplug events for
that device and those events cause ACPIPHP to attempt to remove the
device from the system (they are events for a device that was present
previously and is not present any more, so that's what should be done
according to the spec). Then, the system stops functioning correctly.
Since the hotplug events in question were simply silently ignored
previously, the least intrusive way to address that problem is to
make ACPIPHP ignore them again. For this purpose, introduce a new
ACPI device flag, no_hotplug, and modify ACPIPHP to ignore hotplug
events for PCI devices whose ACPI companions have that flag set.
Next, make the radeon and nouveau switcheroo detection code set the
no_hotplug flag for the discrete graphics' ACPI companion.
Fixes: bbd34fcdd1b2 (ACPI / hotplug / PCI: Register all devices under the given bridge)
References: https://bugzilla.kernel.org/show_bug.cgi?id=61891
References: https://bugzilla.kernel.org/show_bug.cgi?id=64891
Reported-and-tested-by: Mike Lothian <mike@fireburn.co.uk>
Reported-and-tested-by: <madcatx@atlas.cz>
Reported-and-tested-by: Joaquín Aramendía <samsagax@gmail.com>
Cc: Alex Deucher <alexdeucher@gmail.com>
Cc: Dave Airlie <airlied@linux.ie>
Cc: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: 3.12+ <stable@vger.kernel.org> # 3.12+
2013-12-31 05:39:42 -07:00
|
|
|
acpi_handle other_handle;
|
2010-04-06 21:55:09 -06:00
|
|
|
acpi_handle rom_handle;
|
2010-01-31 22:38:10 -07:00
|
|
|
} nouveau_dsm_priv;
|
|
|
|
|
2012-11-01 19:04:27 -06:00
|
|
|
bool nouveau_is_optimus(void) {
|
|
|
|
return nouveau_dsm_priv.optimus_detected;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool nouveau_is_v1_dsm(void) {
|
|
|
|
return nouveau_dsm_priv.dsm_detected;
|
|
|
|
}
|
|
|
|
|
2011-03-21 22:10:27 -06:00
|
|
|
#define NOUVEAU_DSM_HAS_MUX 0x1
|
|
|
|
#define NOUVEAU_DSM_HAS_OPT 0x2
|
|
|
|
|
2014-01-21 15:34:52 -07:00
|
|
|
#ifdef CONFIG_VGA_SWITCHEROO
|
2010-01-31 22:38:10 -07:00
|
|
|
static const char nouveau_dsm_muid[] = {
|
|
|
|
0xA0, 0xA0, 0x95, 0x9D, 0x60, 0x00, 0x48, 0x4D,
|
|
|
|
0xB3, 0x4D, 0x7E, 0x5F, 0xEA, 0x12, 0x9F, 0xD4,
|
|
|
|
};
|
2009-12-11 02:24:15 -07:00
|
|
|
|
2011-03-21 22:10:27 -06:00
|
|
|
static const char nouveau_op_dsm_muid[] = {
|
|
|
|
0xF8, 0xD8, 0x86, 0xA4, 0xDA, 0x0B, 0x1B, 0x47,
|
|
|
|
0xA7, 0x2B, 0x60, 0x42, 0xA6, 0xB5, 0xBE, 0xE0,
|
|
|
|
};
|
|
|
|
|
|
|
|
static int nouveau_optimus_dsm(acpi_handle handle, int func, int arg, uint32_t *result)
|
|
|
|
{
|
2013-12-19 05:38:22 -07:00
|
|
|
int i;
|
2011-03-21 22:10:27 -06:00
|
|
|
union acpi_object *obj;
|
2011-12-17 04:54:04 -07:00
|
|
|
char args_buff[4];
|
2013-12-19 05:38:22 -07:00
|
|
|
union acpi_object argv4 = {
|
|
|
|
.buffer.type = ACPI_TYPE_BUFFER,
|
|
|
|
.buffer.length = 4,
|
|
|
|
.buffer.pointer = args_buff
|
|
|
|
};
|
2011-03-21 22:10:27 -06:00
|
|
|
|
2011-12-17 04:54:04 -07:00
|
|
|
/* ACPI is little endian, AABBCCDD becomes {DD,CC,BB,AA} */
|
|
|
|
for (i = 0; i < 4; i++)
|
|
|
|
args_buff[i] = (arg >> i * 8) & 0xFF;
|
2011-03-21 22:10:27 -06:00
|
|
|
|
2013-12-19 05:38:22 -07:00
|
|
|
*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) {
|
2011-03-21 22:10:27 -06:00
|
|
|
*result |= obj->buffer.pointer[0];
|
|
|
|
*result |= (obj->buffer.pointer[1] << 8);
|
|
|
|
*result |= (obj->buffer.pointer[2] << 16);
|
|
|
|
*result |= (obj->buffer.pointer[3] << 24);
|
|
|
|
}
|
2013-12-19 05:38:22 -07:00
|
|
|
ACPI_FREE(obj);
|
2011-03-21 22:10:27 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-02-20 02:23:16 -07:00
|
|
|
/*
|
|
|
|
* 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);
|
|
|
|
}
|
|
|
|
|
2013-12-19 05:38:22 -07:00
|
|
|
static int nouveau_dsm(acpi_handle handle, int func, int arg)
|
2010-01-31 22:38:10 -07:00
|
|
|
{
|
2013-12-19 05:38:22 -07:00
|
|
|
int ret = 0;
|
2009-12-11 02:24:15 -07:00
|
|
|
union acpi_object *obj;
|
2013-12-19 05:38:22 -07:00
|
|
|
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 {
|
2009-12-11 02:24:15 -07:00
|
|
|
if (obj->integer.value == 0x80000002)
|
2013-12-19 05:38:22 -07:00
|
|
|
ret = -ENODEV;
|
|
|
|
ACPI_FREE(obj);
|
2009-12-11 02:24:15 -07:00
|
|
|
}
|
|
|
|
|
2013-12-19 05:38:22 -07:00
|
|
|
return ret;
|
2011-12-17 04:53:43 -07:00
|
|
|
}
|
|
|
|
|
2010-01-31 22:38:10 -07:00
|
|
|
static int nouveau_dsm_switch_mux(acpi_handle handle, int mux_id)
|
2009-12-11 02:24:15 -07:00
|
|
|
{
|
2011-05-08 19:40:25 -06:00
|
|
|
mxm_wmi_call_mxmx(mux_id == NOUVEAU_DSM_LED_STAMINA ? MXM_MXDS_ADAPTER_IGD : MXM_MXDS_ADAPTER_0);
|
2010-12-05 19:57:45 -07:00
|
|
|
mxm_wmi_call_mxds(mux_id == NOUVEAU_DSM_LED_STAMINA ? MXM_MXDS_ADAPTER_IGD : MXM_MXDS_ADAPTER_0);
|
2013-12-19 05:38:22 -07:00
|
|
|
return nouveau_dsm(handle, NOUVEAU_DSM_LED, mux_id);
|
2010-01-31 22:38:10 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
static int nouveau_dsm_set_discrete_state(acpi_handle handle, enum vga_switcheroo_state state)
|
|
|
|
{
|
|
|
|
int arg;
|
|
|
|
if (state == VGA_SWITCHEROO_ON)
|
|
|
|
arg = NOUVEAU_DSM_POWER_SPEED;
|
|
|
|
else
|
|
|
|
arg = NOUVEAU_DSM_POWER_STAMINA;
|
2013-12-19 05:38:22 -07:00
|
|
|
nouveau_dsm(handle, NOUVEAU_DSM_POWER, arg);
|
2010-01-31 22:38:10 -07:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int nouveau_dsm_switchto(enum vga_switcheroo_client_id id)
|
|
|
|
{
|
2012-11-01 19:04:27 -06:00
|
|
|
if (!nouveau_dsm_priv.dsm_detected)
|
2011-12-17 04:54:04 -07:00
|
|
|
return 0;
|
2010-01-31 22:38:10 -07:00
|
|
|
if (id == VGA_SWITCHEROO_IGD)
|
2010-05-31 01:10:52 -06:00
|
|
|
return nouveau_dsm_switch_mux(nouveau_dsm_priv.dhandle, NOUVEAU_DSM_LED_STAMINA);
|
2010-01-31 22:38:10 -07:00
|
|
|
else
|
2010-05-31 01:10:52 -06:00
|
|
|
return nouveau_dsm_switch_mux(nouveau_dsm_priv.dhandle, NOUVEAU_DSM_LED_SPEED);
|
2010-01-31 22:38:10 -07:00
|
|
|
}
|
2009-12-11 02:24:15 -07:00
|
|
|
|
2010-01-31 22:38:10 -07:00
|
|
|
static int nouveau_dsm_power_state(enum vga_switcheroo_client_id id,
|
|
|
|
enum vga_switcheroo_state state)
|
|
|
|
{
|
|
|
|
if (id == VGA_SWITCHEROO_IGD)
|
|
|
|
return 0;
|
|
|
|
|
2011-12-17 04:54:04 -07:00
|
|
|
/* Optimus laptops have the card already disabled in
|
|
|
|
* nouveau_switcheroo_set_state */
|
2012-11-01 19:04:27 -06:00
|
|
|
if (!nouveau_dsm_priv.dsm_detected)
|
2011-12-17 04:54:04 -07:00
|
|
|
return 0;
|
|
|
|
|
2010-05-31 01:10:52 -06:00
|
|
|
return nouveau_dsm_set_discrete_state(nouveau_dsm_priv.dhandle, state);
|
2010-01-31 22:38:10 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
static int nouveau_dsm_get_client_id(struct pci_dev *pdev)
|
2009-12-11 02:24:15 -07:00
|
|
|
{
|
2010-12-05 19:56:44 -07:00
|
|
|
/* easy option one - intel vendor ID means Integrated */
|
|
|
|
if (pdev->vendor == PCI_VENDOR_ID_INTEL)
|
2010-01-31 22:38:10 -07:00
|
|
|
return VGA_SWITCHEROO_IGD;
|
2010-12-05 19:56:44 -07:00
|
|
|
|
|
|
|
/* is this device on Bus 0? - this may need improving */
|
|
|
|
if (pdev->bus->number == 0)
|
|
|
|
return VGA_SWITCHEROO_IGD;
|
|
|
|
|
|
|
|
return VGA_SWITCHEROO_DIS;
|
2010-01-31 22:38:10 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
static struct vga_switcheroo_handler nouveau_dsm_handler = {
|
|
|
|
.switchto = nouveau_dsm_switchto,
|
|
|
|
.power_state = nouveau_dsm_power_state,
|
|
|
|
.get_client_id = nouveau_dsm_get_client_id,
|
|
|
|
};
|
2009-12-11 02:24:15 -07:00
|
|
|
|
2011-03-21 22:10:27 -06:00
|
|
|
static int nouveau_dsm_pci_probe(struct pci_dev *pdev)
|
2010-01-31 22:38:10 -07:00
|
|
|
{
|
2013-09-02 18:32:00 -06:00
|
|
|
acpi_handle dhandle;
|
2011-12-17 04:53:43 -07:00
|
|
|
int retval = 0;
|
2010-01-31 22:38:10 -07:00
|
|
|
|
2013-11-14 15:17:21 -07:00
|
|
|
dhandle = ACPI_HANDLE(&pdev->dev);
|
2010-01-31 22:38:10 -07:00
|
|
|
if (!dhandle)
|
|
|
|
return false;
|
2010-04-06 21:55:09 -06:00
|
|
|
|
ACPIPHP / radeon / nouveau: Fix VGA switcheroo problem related to hotplug
The changes in the ACPI-based PCI hotplug (ACPIPHP) subsystem made
during the 3.12 development cycle uncovered a problem with VGA
switcheroo that on some systems, when the device-specific method
(ATPX in the radeon case, _DSM in the nouveau case) is used to turn
off the discrete graphics, the BIOS generates ACPI hotplug events for
that device and those events cause ACPIPHP to attempt to remove the
device from the system (they are events for a device that was present
previously and is not present any more, so that's what should be done
according to the spec). Then, the system stops functioning correctly.
Since the hotplug events in question were simply silently ignored
previously, the least intrusive way to address that problem is to
make ACPIPHP ignore them again. For this purpose, introduce a new
ACPI device flag, no_hotplug, and modify ACPIPHP to ignore hotplug
events for PCI devices whose ACPI companions have that flag set.
Next, make the radeon and nouveau switcheroo detection code set the
no_hotplug flag for the discrete graphics' ACPI companion.
Fixes: bbd34fcdd1b2 (ACPI / hotplug / PCI: Register all devices under the given bridge)
References: https://bugzilla.kernel.org/show_bug.cgi?id=61891
References: https://bugzilla.kernel.org/show_bug.cgi?id=64891
Reported-and-tested-by: Mike Lothian <mike@fireburn.co.uk>
Reported-and-tested-by: <madcatx@atlas.cz>
Reported-and-tested-by: Joaquín Aramendía <samsagax@gmail.com>
Cc: Alex Deucher <alexdeucher@gmail.com>
Cc: Dave Airlie <airlied@linux.ie>
Cc: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: 3.12+ <stable@vger.kernel.org> # 3.12+
2013-12-31 05:39:42 -07:00
|
|
|
if (!acpi_has_method(dhandle, "_DSM")) {
|
|
|
|
nouveau_dsm_priv.other_handle = dhandle;
|
2009-12-11 02:24:15 -07:00
|
|
|
return false;
|
ACPIPHP / radeon / nouveau: Fix VGA switcheroo problem related to hotplug
The changes in the ACPI-based PCI hotplug (ACPIPHP) subsystem made
during the 3.12 development cycle uncovered a problem with VGA
switcheroo that on some systems, when the device-specific method
(ATPX in the radeon case, _DSM in the nouveau case) is used to turn
off the discrete graphics, the BIOS generates ACPI hotplug events for
that device and those events cause ACPIPHP to attempt to remove the
device from the system (they are events for a device that was present
previously and is not present any more, so that's what should be done
according to the spec). Then, the system stops functioning correctly.
Since the hotplug events in question were simply silently ignored
previously, the least intrusive way to address that problem is to
make ACPIPHP ignore them again. For this purpose, introduce a new
ACPI device flag, no_hotplug, and modify ACPIPHP to ignore hotplug
events for PCI devices whose ACPI companions have that flag set.
Next, make the radeon and nouveau switcheroo detection code set the
no_hotplug flag for the discrete graphics' ACPI companion.
Fixes: bbd34fcdd1b2 (ACPI / hotplug / PCI: Register all devices under the given bridge)
References: https://bugzilla.kernel.org/show_bug.cgi?id=61891
References: https://bugzilla.kernel.org/show_bug.cgi?id=64891
Reported-and-tested-by: Mike Lothian <mike@fireburn.co.uk>
Reported-and-tested-by: <madcatx@atlas.cz>
Reported-and-tested-by: Joaquín Aramendía <samsagax@gmail.com>
Cc: Alex Deucher <alexdeucher@gmail.com>
Cc: Dave Airlie <airlied@linux.ie>
Cc: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: 3.12+ <stable@vger.kernel.org> # 3.12+
2013-12-31 05:39:42 -07:00
|
|
|
}
|
2013-12-19 05:38:22 -07:00
|
|
|
if (acpi_check_dsm(dhandle, nouveau_dsm_muid, 0x00000102,
|
|
|
|
1 << NOUVEAU_DSM_POWER))
|
2011-03-21 22:10:27 -06:00
|
|
|
retval |= NOUVEAU_DSM_HAS_MUX;
|
|
|
|
|
2014-02-20 02:23:16 -07:00
|
|
|
if (nouveau_check_optimus_dsm(dhandle))
|
2011-03-21 22:10:27 -06:00
|
|
|
retval |= NOUVEAU_DSM_HAS_OPT;
|
|
|
|
|
2012-09-09 22:20:51 -06:00
|
|
|
if (retval & NOUVEAU_DSM_HAS_OPT) {
|
|
|
|
uint32_t result;
|
|
|
|
nouveau_optimus_dsm(dhandle, NOUVEAU_DSM_OPTIMUS_CAPS, 0,
|
|
|
|
&result);
|
|
|
|
dev_info(&pdev->dev, "optimus capabilities: %s, status %s%s\n",
|
|
|
|
(result & OPTIMUS_ENABLED) ? "enabled" : "disabled",
|
|
|
|
(result & OPTIMUS_DYNAMIC_PWR_CAP) ? "dynamic power, " : "",
|
|
|
|
(result & OPTIMUS_HDA_CODEC_MASK) ? "hda bios codec supported" : "");
|
|
|
|
}
|
2011-03-21 22:10:27 -06:00
|
|
|
if (retval)
|
|
|
|
nouveau_dsm_priv.dhandle = dhandle;
|
2009-12-11 02:24:15 -07:00
|
|
|
|
2011-03-21 22:10:27 -06:00
|
|
|
return retval;
|
2009-12-11 02:24:15 -07:00
|
|
|
}
|
2010-01-31 22:38:10 -07:00
|
|
|
|
|
|
|
static bool nouveau_dsm_detect(void)
|
|
|
|
{
|
|
|
|
char acpi_method_name[255] = { 0 };
|
|
|
|
struct acpi_buffer buffer = {sizeof(acpi_method_name), acpi_method_name};
|
|
|
|
struct pci_dev *pdev = NULL;
|
|
|
|
int has_dsm = 0;
|
2012-05-02 13:26:24 -06:00
|
|
|
int has_optimus = 0;
|
2010-01-31 22:38:10 -07:00
|
|
|
int vga_count = 0;
|
2010-12-05 19:57:45 -07:00
|
|
|
bool guid_valid;
|
2011-03-21 22:10:27 -06:00
|
|
|
int retval;
|
|
|
|
bool ret = false;
|
2010-12-05 19:57:45 -07:00
|
|
|
|
2011-03-21 22:10:27 -06:00
|
|
|
/* lookup the MXM GUID */
|
2010-12-05 19:57:45 -07:00
|
|
|
guid_valid = mxm_wmi_supported();
|
|
|
|
|
2011-03-21 22:10:27 -06:00
|
|
|
if (guid_valid)
|
|
|
|
printk("MXM: GUID detected in BIOS\n");
|
2010-04-06 21:55:09 -06:00
|
|
|
|
2011-03-21 22:10:27 -06:00
|
|
|
/* now do DSM detection */
|
2010-01-31 22:38:10 -07:00
|
|
|
while ((pdev = pci_get_class(PCI_CLASS_DISPLAY_VGA << 8, pdev)) != NULL) {
|
|
|
|
vga_count++;
|
|
|
|
|
2011-03-21 22:10:27 -06:00
|
|
|
retval = nouveau_dsm_pci_probe(pdev);
|
|
|
|
if (retval & NOUVEAU_DSM_HAS_MUX)
|
|
|
|
has_dsm |= 1;
|
|
|
|
if (retval & NOUVEAU_DSM_HAS_OPT)
|
|
|
|
has_optimus = 1;
|
2010-01-31 22:38:10 -07:00
|
|
|
}
|
|
|
|
|
2013-10-09 01:25:16 -06:00
|
|
|
while ((pdev = pci_get_class(PCI_CLASS_DISPLAY_3D << 8, pdev)) != NULL) {
|
|
|
|
vga_count++;
|
|
|
|
|
|
|
|
retval = nouveau_dsm_pci_probe(pdev);
|
|
|
|
if (retval & NOUVEAU_DSM_HAS_MUX)
|
|
|
|
has_dsm |= 1;
|
|
|
|
if (retval & NOUVEAU_DSM_HAS_OPT)
|
|
|
|
has_optimus = 1;
|
|
|
|
}
|
|
|
|
|
2012-11-01 19:04:27 -06:00
|
|
|
/* find the optimus DSM or the old v1 DSM */
|
|
|
|
if (has_optimus == 1) {
|
2011-12-17 04:54:04 -07:00
|
|
|
acpi_get_name(nouveau_dsm_priv.dhandle, ACPI_FULL_PATHNAME,
|
|
|
|
&buffer);
|
2012-11-01 19:04:27 -06:00
|
|
|
printk(KERN_INFO "VGA switcheroo: detected Optimus DSM method %s handle\n",
|
2011-12-17 04:54:04 -07:00
|
|
|
acpi_method_name);
|
2012-11-01 19:04:27 -06:00
|
|
|
nouveau_dsm_priv.optimus_detected = true;
|
2011-03-21 22:10:27 -06:00
|
|
|
ret = true;
|
2012-11-01 19:04:27 -06:00
|
|
|
} else if (vga_count == 2 && has_dsm && guid_valid) {
|
2011-12-17 04:54:04 -07:00
|
|
|
acpi_get_name(nouveau_dsm_priv.dhandle, ACPI_FULL_PATHNAME,
|
|
|
|
&buffer);
|
2012-11-01 19:04:27 -06:00
|
|
|
printk(KERN_INFO "VGA switcheroo: detected DSM switching method %s handle\n",
|
2011-12-17 04:54:04 -07:00
|
|
|
acpi_method_name);
|
2012-11-01 19:04:27 -06:00
|
|
|
nouveau_dsm_priv.dsm_detected = true;
|
ACPIPHP / radeon / nouveau: Fix VGA switcheroo problem related to hotplug
The changes in the ACPI-based PCI hotplug (ACPIPHP) subsystem made
during the 3.12 development cycle uncovered a problem with VGA
switcheroo that on some systems, when the device-specific method
(ATPX in the radeon case, _DSM in the nouveau case) is used to turn
off the discrete graphics, the BIOS generates ACPI hotplug events for
that device and those events cause ACPIPHP to attempt to remove the
device from the system (they are events for a device that was present
previously and is not present any more, so that's what should be done
according to the spec). Then, the system stops functioning correctly.
Since the hotplug events in question were simply silently ignored
previously, the least intrusive way to address that problem is to
make ACPIPHP ignore them again. For this purpose, introduce a new
ACPI device flag, no_hotplug, and modify ACPIPHP to ignore hotplug
events for PCI devices whose ACPI companions have that flag set.
Next, make the radeon and nouveau switcheroo detection code set the
no_hotplug flag for the discrete graphics' ACPI companion.
Fixes: bbd34fcdd1b2 (ACPI / hotplug / PCI: Register all devices under the given bridge)
References: https://bugzilla.kernel.org/show_bug.cgi?id=61891
References: https://bugzilla.kernel.org/show_bug.cgi?id=64891
Reported-and-tested-by: Mike Lothian <mike@fireburn.co.uk>
Reported-and-tested-by: <madcatx@atlas.cz>
Reported-and-tested-by: Joaquín Aramendía <samsagax@gmail.com>
Cc: Alex Deucher <alexdeucher@gmail.com>
Cc: Dave Airlie <airlied@linux.ie>
Cc: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: 3.12+ <stable@vger.kernel.org> # 3.12+
2013-12-31 05:39:42 -07:00
|
|
|
/*
|
|
|
|
* On some systems hotplug events are generated for the device
|
|
|
|
* being switched off when _DSM is executed. They cause ACPI
|
|
|
|
* hotplug to trigger and attempt to remove the device from
|
|
|
|
* the system, which causes it to break down. Prevent that from
|
|
|
|
* happening by setting the no_hotplug flag for the involved
|
|
|
|
* ACPI device objects.
|
|
|
|
*/
|
|
|
|
acpi_bus_no_hotplug(nouveau_dsm_priv.dhandle);
|
|
|
|
acpi_bus_no_hotplug(nouveau_dsm_priv.other_handle);
|
2011-12-17 04:54:04 -07:00
|
|
|
ret = true;
|
|
|
|
}
|
2011-03-21 22:10:27 -06:00
|
|
|
|
2012-11-01 19:04:27 -06:00
|
|
|
|
2011-03-21 22:10:27 -06:00
|
|
|
return ret;
|
2010-01-31 22:38:10 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
void nouveau_register_dsm_handler(void)
|
|
|
|
{
|
|
|
|
bool r;
|
|
|
|
|
|
|
|
r = nouveau_dsm_detect();
|
|
|
|
if (!r)
|
|
|
|
return;
|
|
|
|
|
|
|
|
vga_switcheroo_register_handler(&nouveau_dsm_handler);
|
|
|
|
}
|
|
|
|
|
2011-12-17 04:54:04 -07:00
|
|
|
/* Must be called for Optimus models before the card can be turned off */
|
|
|
|
void nouveau_switcheroo_optimus_dsm(void)
|
|
|
|
{
|
|
|
|
u32 result = 0;
|
|
|
|
if (!nouveau_dsm_priv.optimus_detected)
|
|
|
|
return;
|
|
|
|
|
2012-09-09 22:20:51 -06:00
|
|
|
nouveau_optimus_dsm(nouveau_dsm_priv.dhandle, NOUVEAU_DSM_OPTIMUS_FLAGS,
|
|
|
|
0x3, &result);
|
|
|
|
|
|
|
|
nouveau_optimus_dsm(nouveau_dsm_priv.dhandle, NOUVEAU_DSM_OPTIMUS_CAPS,
|
|
|
|
NOUVEAU_DSM_OPTIMUS_SET_POWERDOWN, &result);
|
|
|
|
|
2011-12-17 04:54:04 -07:00
|
|
|
}
|
|
|
|
|
2010-01-31 22:38:10 -07:00
|
|
|
void nouveau_unregister_dsm_handler(void)
|
|
|
|
{
|
2012-05-20 17:14:50 -06:00
|
|
|
if (nouveau_dsm_priv.optimus_detected || nouveau_dsm_priv.dsm_detected)
|
|
|
|
vga_switcheroo_unregister_handler();
|
2010-01-31 22:38:10 -07:00
|
|
|
}
|
2014-01-21 15:34:52 -07:00
|
|
|
#else
|
|
|
|
void nouveau_register_dsm_handler(void) {}
|
|
|
|
void nouveau_unregister_dsm_handler(void) {}
|
|
|
|
void nouveau_switcheroo_optimus_dsm(void) {}
|
|
|
|
#endif
|
2010-04-06 21:55:09 -06:00
|
|
|
|
|
|
|
/* retrieve the ROM in 4k blocks */
|
|
|
|
static int nouveau_rom_call(acpi_handle rom_handle, uint8_t *bios,
|
|
|
|
int offset, int len)
|
|
|
|
{
|
|
|
|
acpi_status status;
|
|
|
|
union acpi_object rom_arg_elements[2], *obj;
|
|
|
|
struct acpi_object_list rom_arg;
|
|
|
|
struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL};
|
|
|
|
|
|
|
|
rom_arg.count = 2;
|
|
|
|
rom_arg.pointer = &rom_arg_elements[0];
|
|
|
|
|
|
|
|
rom_arg_elements[0].type = ACPI_TYPE_INTEGER;
|
|
|
|
rom_arg_elements[0].integer.value = offset;
|
|
|
|
|
|
|
|
rom_arg_elements[1].type = ACPI_TYPE_INTEGER;
|
|
|
|
rom_arg_elements[1].integer.value = len;
|
|
|
|
|
|
|
|
status = acpi_evaluate_object(rom_handle, NULL, &rom_arg, &buffer);
|
|
|
|
if (ACPI_FAILURE(status)) {
|
|
|
|
printk(KERN_INFO "failed to evaluate ROM got %s\n", acpi_format_exception(status));
|
|
|
|
return -ENODEV;
|
|
|
|
}
|
|
|
|
obj = (union acpi_object *)buffer.pointer;
|
|
|
|
memcpy(bios+offset, obj->buffer.pointer, len);
|
|
|
|
kfree(buffer.pointer);
|
|
|
|
return len;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool nouveau_acpi_rom_supported(struct pci_dev *pdev)
|
|
|
|
{
|
|
|
|
acpi_status status;
|
|
|
|
acpi_handle dhandle, rom_handle;
|
|
|
|
|
2013-11-14 15:17:21 -07:00
|
|
|
dhandle = ACPI_HANDLE(&pdev->dev);
|
2010-04-06 21:55:09 -06:00
|
|
|
if (!dhandle)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
status = acpi_get_handle(dhandle, "_ROM", &rom_handle);
|
|
|
|
if (ACPI_FAILURE(status))
|
|
|
|
return false;
|
|
|
|
|
|
|
|
nouveau_dsm_priv.rom_handle = rom_handle;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
int nouveau_acpi_get_bios_chunk(uint8_t *bios, int offset, int len)
|
|
|
|
{
|
|
|
|
return nouveau_rom_call(nouveau_dsm_priv.rom_handle, bios, offset, len);
|
|
|
|
}
|
2010-07-11 23:33:07 -06:00
|
|
|
|
2012-07-25 16:51:21 -06:00
|
|
|
void *
|
2010-07-11 23:33:07 -06:00
|
|
|
nouveau_acpi_edid(struct drm_device *dev, struct drm_connector *connector)
|
|
|
|
{
|
|
|
|
struct acpi_device *acpidev;
|
|
|
|
acpi_handle handle;
|
|
|
|
int type, ret;
|
|
|
|
void *edid;
|
|
|
|
|
|
|
|
switch (connector->connector_type) {
|
|
|
|
case DRM_MODE_CONNECTOR_LVDS:
|
|
|
|
case DRM_MODE_CONNECTOR_eDP:
|
|
|
|
type = ACPI_VIDEO_DISPLAY_LCD;
|
|
|
|
break;
|
|
|
|
default:
|
2012-07-25 16:51:21 -06:00
|
|
|
return NULL;
|
2010-07-11 23:33:07 -06:00
|
|
|
}
|
|
|
|
|
2013-11-14 15:17:21 -07:00
|
|
|
handle = ACPI_HANDLE(&dev->pdev->dev);
|
2010-07-11 23:33:07 -06:00
|
|
|
if (!handle)
|
2012-07-25 16:51:21 -06:00
|
|
|
return NULL;
|
2010-07-11 23:33:07 -06:00
|
|
|
|
|
|
|
ret = acpi_bus_get_device(handle, &acpidev);
|
|
|
|
if (ret)
|
2012-07-25 16:51:21 -06:00
|
|
|
return NULL;
|
2010-07-11 23:33:07 -06:00
|
|
|
|
|
|
|
ret = acpi_video_get_edid(acpidev, type, -1, &edid);
|
|
|
|
if (ret < 0)
|
2012-07-25 16:51:21 -06:00
|
|
|
return NULL;
|
2010-07-11 23:33:07 -06:00
|
|
|
|
2012-07-25 16:51:21 -06:00
|
|
|
return kmemdup(edid, EDID_LENGTH, GFP_KERNEL);
|
2010-07-11 23:33:07 -06:00
|
|
|
}
|