diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-12-05 21:42:46 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-12-08 00:40:44 -0500 |
| commit | 599bbb9de0fe9c494a223a34d790b353ad4d69f8 (patch) | |
| tree | d535cd1eacfe9217da0c43c5e6bfdc76994b6b2a /drivers/gpu | |
| parent | 8961d52d4cc52edf5672f8f2712c57162b736793 (diff) | |
drm/i915: i915 cannot provide switcher services.
it has a DSM but the switcher is done via WMI.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_acpi.c | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/drivers/gpu/drm/i915/intel_acpi.c b/drivers/gpu/drm/i915/intel_acpi.c index 65c88f9ba12c..2cb8e0b9f1ee 100644 --- a/drivers/gpu/drm/i915/intel_acpi.c +++ b/drivers/gpu/drm/i915/intel_acpi.c | |||
| @@ -190,37 +190,6 @@ out: | |||
| 190 | kfree(output.pointer); | 190 | kfree(output.pointer); |
| 191 | } | 191 | } |
| 192 | 192 | ||
| 193 | static int intel_dsm_switchto(enum vga_switcheroo_client_id id) | ||
| 194 | { | ||
| 195 | return 0; | ||
| 196 | } | ||
| 197 | |||
| 198 | static int intel_dsm_power_state(enum vga_switcheroo_client_id id, | ||
| 199 | enum vga_switcheroo_state state) | ||
| 200 | { | ||
| 201 | return 0; | ||
| 202 | } | ||
| 203 | |||
| 204 | static int intel_dsm_init(void) | ||
| 205 | { | ||
| 206 | return 0; | ||
| 207 | } | ||
| 208 | |||
| 209 | static int intel_dsm_get_client_id(struct pci_dev *pdev) | ||
| 210 | { | ||
| 211 | if (intel_dsm_priv.dhandle == DEVICE_ACPI_HANDLE(&pdev->dev)) | ||
| 212 | return VGA_SWITCHEROO_IGD; | ||
| 213 | else | ||
| 214 | return VGA_SWITCHEROO_DIS; | ||
| 215 | } | ||
| 216 | |||
| 217 | static struct vga_switcheroo_handler intel_dsm_handler = { | ||
| 218 | .switchto = intel_dsm_switchto, | ||
| 219 | .power_state = intel_dsm_power_state, | ||
| 220 | .init = intel_dsm_init, | ||
| 221 | .get_client_id = intel_dsm_get_client_id, | ||
| 222 | }; | ||
| 223 | |||
| 224 | static bool intel_dsm_pci_probe(struct pci_dev *pdev) | 193 | static bool intel_dsm_pci_probe(struct pci_dev *pdev) |
| 225 | { | 194 | { |
| 226 | acpi_handle dhandle, intel_handle; | 195 | acpi_handle dhandle, intel_handle; |
| @@ -276,11 +245,8 @@ void intel_register_dsm_handler(void) | |||
| 276 | { | 245 | { |
| 277 | if (!intel_dsm_detect()) | 246 | if (!intel_dsm_detect()) |
| 278 | return; | 247 | return; |
| 279 | |||
| 280 | vga_switcheroo_register_handler(&intel_dsm_handler); | ||
| 281 | } | 248 | } |
| 282 | 249 | ||
| 283 | void intel_unregister_dsm_handler(void) | 250 | void intel_unregister_dsm_handler(void) |
| 284 | { | 251 | { |
| 285 | vga_switcheroo_unregister_handler(); | ||
| 286 | } | 252 | } |
