2009-12-11 09:24:15 +00: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 08:04:11 +00:00
|
|
|
#include <linux/slab.h>
|
2009-12-11 09:24:15 +00:00
|
|
|
#include <acpi/acpi_drivers.h>
|
|
|
|
#include <acpi/acpi_bus.h>
|
2010-07-12 05:33:07 +00:00
|
|
|
#include <acpi/video.h>
|
2009-12-11 09:24:15 +00:00
|
|
|
|
|
|
|
#include "drmP.h"
|
|
|
|
#include "drm.h"
|
|
|
|
#include "drm_sarea.h"
|
|
|
|
#include "drm_crtc_helper.h"
|
|
|
|
#include "nouveau_drv.h"
|
|
|
|
#include "nouveau_drm.h"
|
|
|
|
#include "nv50_display.h"
|
2010-07-12 05:33:07 +00:00
|
|
|
#include "nouveau_connector.h"
|
2009-12-11 09:24:15 +00:00
|
|
|
|
2010-02-01 05:38:10 +00:00
|
|
|
#include <linux/vga_switcheroo.h>
|
|
|
|
|
2009-12-11 09:24:15 +00:00
|
|
|
#define NOUVEAU_DSM_SUPPORTED 0x00
|
|
|
|
#define NOUVEAU_DSM_SUPPORTED_FUNCTIONS 0x00
|
|
|
|
|
|
|
|
#define NOUVEAU_DSM_ACTIVE 0x01
|
|
|
|
#define NOUVEAU_DSM_ACTIVE_QUERY 0x00
|
|
|
|
|
|
|
|
#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
|
|
|
|
|
2010-02-01 05:38:10 +00:00
|
|
|
static struct nouveau_dsm_priv {
|
|
|
|
bool dsm_detected;
|
|
|
|
acpi_handle dhandle;
|
2010-04-07 03:55:09 +00:00
|
|
|
acpi_handle rom_handle;
|
2010-02-01 05:38:10 +00:00
|
|
|
} nouveau_dsm_priv;
|
|
|
|
|
|
|
|
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 09:24:15 +00:00
|
|
|
|
2010-07-03 16:36:39 +00:00
|
|
|
static int nouveau_dsm(acpi_handle handle, int func, int arg, uint32_t *result)
|
2010-02-01 05:38:10 +00:00
|
|
|
{
|
2009-12-11 09:24:15 +00:00
|
|
|
struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL };
|
|
|
|
struct acpi_object_list input;
|
|
|
|
union acpi_object params[4];
|
|
|
|
union acpi_object *obj;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
input.count = 4;
|
|
|
|
input.pointer = params;
|
|
|
|
params[0].type = ACPI_TYPE_BUFFER;
|
2010-02-01 05:38:10 +00:00
|
|
|
params[0].buffer.length = sizeof(nouveau_dsm_muid);
|
|
|
|
params[0].buffer.pointer = (char *)nouveau_dsm_muid;
|
2009-12-11 09:24:15 +00:00
|
|
|
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) {
|
2010-02-01 05:38:10 +00:00
|
|
|
printk(KERN_INFO "failed to evaluate _DSM: %d\n", err);
|
2009-12-11 09:24:15 +00:00
|
|
|
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 |= obj->buffer.pointer[0];
|
|
|
|
*result |= (obj->buffer.pointer[1] << 8);
|
|
|
|
*result |= (obj->buffer.pointer[2] << 16);
|
|
|
|
*result |= (obj->buffer.pointer[3] << 24);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
kfree(output.pointer);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2010-02-01 05:38:10 +00:00
|
|
|
static int nouveau_dsm_switch_mux(acpi_handle handle, int mux_id)
|
2009-12-11 09:24:15 +00:00
|
|
|
{
|
2010-02-01 05:38:10 +00:00
|
|
|
return nouveau_dsm(handle, NOUVEAU_DSM_LED, mux_id, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
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;
|
|
|
|
nouveau_dsm(handle, NOUVEAU_DSM_POWER, arg, NULL);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int nouveau_dsm_switchto(enum vga_switcheroo_client_id id)
|
|
|
|
{
|
|
|
|
if (id == VGA_SWITCHEROO_IGD)
|
2010-05-31 07:10:52 +00:00
|
|
|
return nouveau_dsm_switch_mux(nouveau_dsm_priv.dhandle, NOUVEAU_DSM_LED_STAMINA);
|
2010-02-01 05:38:10 +00:00
|
|
|
else
|
2010-05-31 07:10:52 +00:00
|
|
|
return nouveau_dsm_switch_mux(nouveau_dsm_priv.dhandle, NOUVEAU_DSM_LED_SPEED);
|
2010-02-01 05:38:10 +00:00
|
|
|
}
|
2009-12-11 09:24:15 +00:00
|
|
|
|
2010-02-01 05:38:10 +00: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;
|
|
|
|
|
2010-05-31 07:10:52 +00:00
|
|
|
return nouveau_dsm_set_discrete_state(nouveau_dsm_priv.dhandle, state);
|
2010-02-01 05:38:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int nouveau_dsm_init(void)
|
|
|
|
{
|
2009-12-11 09:24:15 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2010-02-01 05:38:10 +00:00
|
|
|
static int nouveau_dsm_get_client_id(struct pci_dev *pdev)
|
2009-12-11 09:24:15 +00:00
|
|
|
{
|
2010-12-06 02:56:44 +00:00
|
|
|
/* easy option one - intel vendor ID means Integrated */
|
|
|
|
if (pdev->vendor == PCI_VENDOR_ID_INTEL)
|
2010-02-01 05:38:10 +00:00
|
|
|
return VGA_SWITCHEROO_IGD;
|
2010-12-06 02:56:44 +00: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-02-01 05:38:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static struct vga_switcheroo_handler nouveau_dsm_handler = {
|
|
|
|
.switchto = nouveau_dsm_switchto,
|
|
|
|
.power_state = nouveau_dsm_power_state,
|
|
|
|
.init = nouveau_dsm_init,
|
|
|
|
.get_client_id = nouveau_dsm_get_client_id,
|
|
|
|
};
|
2009-12-11 09:24:15 +00:00
|
|
|
|
2010-02-01 05:38:10 +00:00
|
|
|
static bool nouveau_dsm_pci_probe(struct pci_dev *pdev)
|
|
|
|
{
|
|
|
|
acpi_handle dhandle, nvidia_handle;
|
|
|
|
acpi_status status;
|
|
|
|
int ret;
|
|
|
|
uint32_t result;
|
|
|
|
|
|
|
|
dhandle = DEVICE_ACPI_HANDLE(&pdev->dev);
|
|
|
|
if (!dhandle)
|
|
|
|
return false;
|
2010-04-07 03:55:09 +00:00
|
|
|
|
2010-02-01 05:38:10 +00:00
|
|
|
status = acpi_get_handle(dhandle, "_DSM", &nvidia_handle);
|
|
|
|
if (ACPI_FAILURE(status)) {
|
2009-12-11 09:24:15 +00:00
|
|
|
return false;
|
2010-02-01 05:38:10 +00:00
|
|
|
}
|
2009-12-11 09:24:15 +00:00
|
|
|
|
2010-05-31 07:10:52 +00:00
|
|
|
ret = nouveau_dsm(dhandle, NOUVEAU_DSM_SUPPORTED,
|
|
|
|
NOUVEAU_DSM_SUPPORTED_FUNCTIONS, &result);
|
2010-02-01 05:38:10 +00:00
|
|
|
if (ret < 0)
|
2009-12-11 09:24:15 +00:00
|
|
|
return false;
|
|
|
|
|
2010-02-01 05:38:10 +00:00
|
|
|
nouveau_dsm_priv.dhandle = dhandle;
|
2009-12-11 09:24:15 +00:00
|
|
|
return true;
|
|
|
|
}
|
2010-02-01 05:38:10 +00: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;
|
|
|
|
int vga_count = 0;
|
2010-04-07 03:55:09 +00:00
|
|
|
|
2010-02-01 05:38:10 +00:00
|
|
|
while ((pdev = pci_get_class(PCI_CLASS_DISPLAY_VGA << 8, pdev)) != NULL) {
|
|
|
|
vga_count++;
|
|
|
|
|
|
|
|
has_dsm |= (nouveau_dsm_pci_probe(pdev) == true);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (vga_count == 2 && has_dsm) {
|
2010-05-31 07:10:52 +00:00
|
|
|
acpi_get_name(nouveau_dsm_priv.dhandle, ACPI_FULL_PATHNAME, &buffer);
|
2010-02-01 05:38:10 +00:00
|
|
|
printk(KERN_INFO "VGA switcheroo: detected DSM switching method %s handle\n",
|
|
|
|
acpi_method_name);
|
|
|
|
nouveau_dsm_priv.dsm_detected = true;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
void nouveau_register_dsm_handler(void)
|
|
|
|
{
|
|
|
|
bool r;
|
|
|
|
|
|
|
|
r = nouveau_dsm_detect();
|
|
|
|
if (!r)
|
|
|
|
return;
|
|
|
|
|
|
|
|
vga_switcheroo_register_handler(&nouveau_dsm_handler);
|
|
|
|
}
|
|
|
|
|
|
|
|
void nouveau_unregister_dsm_handler(void)
|
|
|
|
{
|
|
|
|
vga_switcheroo_unregister_handler();
|
|
|
|
}
|
2010-04-07 03:55:09 +00: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;
|
|
|
|
|
|
|
|
if (!nouveau_dsm_priv.dsm_detected)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
dhandle = DEVICE_ACPI_HANDLE(&pdev->dev);
|
|
|
|
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-12 05:33:07 +00:00
|
|
|
|
|
|
|
int
|
|
|
|
nouveau_acpi_edid(struct drm_device *dev, struct drm_connector *connector)
|
|
|
|
{
|
|
|
|
struct nouveau_connector *nv_connector = nouveau_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:
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
handle = DEVICE_ACPI_HANDLE(&dev->pdev->dev);
|
|
|
|
if (!handle)
|
|
|
|
return -ENODEV;
|
|
|
|
|
|
|
|
ret = acpi_bus_get_device(handle, &acpidev);
|
|
|
|
if (ret)
|
|
|
|
return -ENODEV;
|
|
|
|
|
|
|
|
ret = acpi_video_get_edid(acpidev, type, -1, &edid);
|
|
|
|
if (ret < 0)
|
|
|
|
return ret;
|
|
|
|
|
2010-09-10 05:33:11 +00:00
|
|
|
nv_connector->edid = kmemdup(edid, EDID_LENGTH, GFP_KERNEL);
|
2010-07-12 05:33:07 +00:00
|
|
|
return 0;
|
|
|
|
}
|