diff options
Diffstat (limited to 'drivers/platform/x86/apple-gmux.c')
-rw-r--r-- | drivers/platform/x86/apple-gmux.c | 426 |
1 files changed, 402 insertions, 24 deletions
diff --git a/drivers/platform/x86/apple-gmux.c b/drivers/platform/x86/apple-gmux.c index 905fa01ac8df..dfb1a92ce949 100644 --- a/drivers/platform/x86/apple-gmux.c +++ b/drivers/platform/x86/apple-gmux.c | |||
@@ -2,6 +2,7 @@ | |||
2 | * Gmux driver for Apple laptops | 2 | * Gmux driver for Apple laptops |
3 | * | 3 | * |
4 | * Copyright (C) Canonical Ltd. <seth.forshee@canonical.com> | 4 | * Copyright (C) Canonical Ltd. <seth.forshee@canonical.com> |
5 | * Copyright (C) 2010-2012 Andreas Heider <andreas@meetr.de> | ||
5 | * | 6 | * |
6 | * This program is free software; you can redistribute it and/or modify | 7 | * This program is free software; you can redistribute it and/or modify |
7 | * it under the terms of the GNU General Public License version 2 as | 8 | * it under the terms of the GNU General Public License version 2 as |
@@ -18,16 +19,30 @@ | |||
18 | #include <linux/pnp.h> | 19 | #include <linux/pnp.h> |
19 | #include <linux/apple_bl.h> | 20 | #include <linux/apple_bl.h> |
20 | #include <linux/slab.h> | 21 | #include <linux/slab.h> |
22 | #include <linux/delay.h> | ||
23 | #include <linux/pci.h> | ||
24 | #include <linux/vga_switcheroo.h> | ||
21 | #include <acpi/video.h> | 25 | #include <acpi/video.h> |
22 | #include <asm/io.h> | 26 | #include <asm/io.h> |
23 | 27 | ||
24 | struct apple_gmux_data { | 28 | struct apple_gmux_data { |
25 | unsigned long iostart; | 29 | unsigned long iostart; |
26 | unsigned long iolen; | 30 | unsigned long iolen; |
31 | bool indexed; | ||
32 | struct mutex index_lock; | ||
27 | 33 | ||
28 | struct backlight_device *bdev; | 34 | struct backlight_device *bdev; |
35 | |||
36 | /* switcheroo data */ | ||
37 | acpi_handle dhandle; | ||
38 | int gpe; | ||
39 | enum vga_switcheroo_client_id resume_client_id; | ||
40 | enum vga_switcheroo_state power_state; | ||
41 | struct completion powerchange_done; | ||
29 | }; | 42 | }; |
30 | 43 | ||
44 | static struct apple_gmux_data *apple_gmux_data; | ||
45 | |||
31 | /* | 46 | /* |
32 | * gmux port offsets. Many of these are not yet used, but may be in the | 47 | * gmux port offsets. Many of these are not yet used, but may be in the |
33 | * future, and it's useful to have them documented here anyhow. | 48 | * future, and it's useful to have them documented here anyhow. |
@@ -45,6 +60,9 @@ struct apple_gmux_data { | |||
45 | #define GMUX_PORT_DISCRETE_POWER 0x50 | 60 | #define GMUX_PORT_DISCRETE_POWER 0x50 |
46 | #define GMUX_PORT_MAX_BRIGHTNESS 0x70 | 61 | #define GMUX_PORT_MAX_BRIGHTNESS 0x70 |
47 | #define GMUX_PORT_BRIGHTNESS 0x74 | 62 | #define GMUX_PORT_BRIGHTNESS 0x74 |
63 | #define GMUX_PORT_VALUE 0xc2 | ||
64 | #define GMUX_PORT_READ 0xd0 | ||
65 | #define GMUX_PORT_WRITE 0xd4 | ||
48 | 66 | ||
49 | #define GMUX_MIN_IO_LEN (GMUX_PORT_BRIGHTNESS + 4) | 67 | #define GMUX_MIN_IO_LEN (GMUX_PORT_BRIGHTNESS + 4) |
50 | 68 | ||
@@ -59,22 +77,172 @@ struct apple_gmux_data { | |||
59 | #define GMUX_BRIGHTNESS_MASK 0x00ffffff | 77 | #define GMUX_BRIGHTNESS_MASK 0x00ffffff |
60 | #define GMUX_MAX_BRIGHTNESS GMUX_BRIGHTNESS_MASK | 78 | #define GMUX_MAX_BRIGHTNESS GMUX_BRIGHTNESS_MASK |
61 | 79 | ||
62 | static inline u8 gmux_read8(struct apple_gmux_data *gmux_data, int port) | 80 | static u8 gmux_pio_read8(struct apple_gmux_data *gmux_data, int port) |
63 | { | 81 | { |
64 | return inb(gmux_data->iostart + port); | 82 | return inb(gmux_data->iostart + port); |
65 | } | 83 | } |
66 | 84 | ||
67 | static inline void gmux_write8(struct apple_gmux_data *gmux_data, int port, | 85 | static void gmux_pio_write8(struct apple_gmux_data *gmux_data, int port, |
68 | u8 val) | 86 | u8 val) |
69 | { | 87 | { |
70 | outb(val, gmux_data->iostart + port); | 88 | outb(val, gmux_data->iostart + port); |
71 | } | 89 | } |
72 | 90 | ||
73 | static inline u32 gmux_read32(struct apple_gmux_data *gmux_data, int port) | 91 | static u32 gmux_pio_read32(struct apple_gmux_data *gmux_data, int port) |
74 | { | 92 | { |
75 | return inl(gmux_data->iostart + port); | 93 | return inl(gmux_data->iostart + port); |
76 | } | 94 | } |
77 | 95 | ||
96 | static void gmux_pio_write32(struct apple_gmux_data *gmux_data, int port, | ||
97 | u32 val) | ||
98 | { | ||
99 | int i; | ||
100 | u8 tmpval; | ||
101 | |||
102 | for (i = 0; i < 4; i++) { | ||
103 | tmpval = (val >> (i * 8)) & 0xff; | ||
104 | outb(tmpval, port + i); | ||
105 | } | ||
106 | } | ||
107 | |||
108 | static int gmux_index_wait_ready(struct apple_gmux_data *gmux_data) | ||
109 | { | ||
110 | int i = 200; | ||
111 | u8 gwr = inb(gmux_data->iostart + GMUX_PORT_WRITE); | ||
112 | |||
113 | while (i && (gwr & 0x01)) { | ||
114 | inb(gmux_data->iostart + GMUX_PORT_READ); | ||
115 | gwr = inb(gmux_data->iostart + GMUX_PORT_WRITE); | ||
116 | udelay(100); | ||
117 | i--; | ||
118 | } | ||
119 | |||
120 | return !!i; | ||
121 | } | ||
122 | |||
123 | static int gmux_index_wait_complete(struct apple_gmux_data *gmux_data) | ||
124 | { | ||
125 | int i = 200; | ||
126 | u8 gwr = inb(gmux_data->iostart + GMUX_PORT_WRITE); | ||
127 | |||
128 | while (i && !(gwr & 0x01)) { | ||
129 | gwr = inb(gmux_data->iostart + GMUX_PORT_WRITE); | ||
130 | udelay(100); | ||
131 | i--; | ||
132 | } | ||
133 | |||
134 | if (gwr & 0x01) | ||
135 | inb(gmux_data->iostart + GMUX_PORT_READ); | ||
136 | |||
137 | return !!i; | ||
138 | } | ||
139 | |||
140 | static u8 gmux_index_read8(struct apple_gmux_data *gmux_data, int port) | ||
141 | { | ||
142 | u8 val; | ||
143 | |||
144 | mutex_lock(&gmux_data->index_lock); | ||
145 | outb((port & 0xff), gmux_data->iostart + GMUX_PORT_READ); | ||
146 | gmux_index_wait_ready(gmux_data); | ||
147 | val = inb(gmux_data->iostart + GMUX_PORT_VALUE); | ||
148 | mutex_unlock(&gmux_data->index_lock); | ||
149 | |||
150 | return val; | ||
151 | } | ||
152 | |||
153 | static void gmux_index_write8(struct apple_gmux_data *gmux_data, int port, | ||
154 | u8 val) | ||
155 | { | ||
156 | mutex_lock(&gmux_data->index_lock); | ||
157 | outb(val, gmux_data->iostart + GMUX_PORT_VALUE); | ||
158 | gmux_index_wait_ready(gmux_data); | ||
159 | outb(port & 0xff, gmux_data->iostart + GMUX_PORT_WRITE); | ||
160 | gmux_index_wait_complete(gmux_data); | ||
161 | mutex_unlock(&gmux_data->index_lock); | ||
162 | } | ||
163 | |||
164 | static u32 gmux_index_read32(struct apple_gmux_data *gmux_data, int port) | ||
165 | { | ||
166 | u32 val; | ||
167 | |||
168 | mutex_lock(&gmux_data->index_lock); | ||
169 | outb((port & 0xff), gmux_data->iostart + GMUX_PORT_READ); | ||
170 | gmux_index_wait_ready(gmux_data); | ||
171 | val = inl(gmux_data->iostart + GMUX_PORT_VALUE); | ||
172 | mutex_unlock(&gmux_data->index_lock); | ||
173 | |||
174 | return val; | ||
175 | } | ||
176 | |||
177 | static void gmux_index_write32(struct apple_gmux_data *gmux_data, int port, | ||
178 | u32 val) | ||
179 | { | ||
180 | int i; | ||
181 | u8 tmpval; | ||
182 | |||
183 | mutex_lock(&gmux_data->index_lock); | ||
184 | |||
185 | for (i = 0; i < 4; i++) { | ||
186 | tmpval = (val >> (i * 8)) & 0xff; | ||
187 | outb(tmpval, gmux_data->iostart + GMUX_PORT_VALUE + i); | ||
188 | } | ||
189 | |||
190 | gmux_index_wait_ready(gmux_data); | ||
191 | outb(port & 0xff, gmux_data->iostart + GMUX_PORT_WRITE); | ||
192 | gmux_index_wait_complete(gmux_data); | ||
193 | mutex_unlock(&gmux_data->index_lock); | ||
194 | } | ||
195 | |||
196 | static u8 gmux_read8(struct apple_gmux_data *gmux_data, int port) | ||
197 | { | ||
198 | if (gmux_data->indexed) | ||
199 | return gmux_index_read8(gmux_data, port); | ||
200 | else | ||
201 | return gmux_pio_read8(gmux_data, port); | ||
202 | } | ||
203 | |||
204 | static void gmux_write8(struct apple_gmux_data *gmux_data, int port, u8 val) | ||
205 | { | ||
206 | if (gmux_data->indexed) | ||
207 | gmux_index_write8(gmux_data, port, val); | ||
208 | else | ||
209 | gmux_pio_write8(gmux_data, port, val); | ||
210 | } | ||
211 | |||
212 | static u32 gmux_read32(struct apple_gmux_data *gmux_data, int port) | ||
213 | { | ||
214 | if (gmux_data->indexed) | ||
215 | return gmux_index_read32(gmux_data, port); | ||
216 | else | ||
217 | return gmux_pio_read32(gmux_data, port); | ||
218 | } | ||
219 | |||
220 | static void gmux_write32(struct apple_gmux_data *gmux_data, int port, | ||
221 | u32 val) | ||
222 | { | ||
223 | if (gmux_data->indexed) | ||
224 | gmux_index_write32(gmux_data, port, val); | ||
225 | else | ||
226 | gmux_pio_write32(gmux_data, port, val); | ||
227 | } | ||
228 | |||
229 | static bool gmux_is_indexed(struct apple_gmux_data *gmux_data) | ||
230 | { | ||
231 | u16 val; | ||
232 | |||
233 | outb(0xaa, gmux_data->iostart + 0xcc); | ||
234 | outb(0x55, gmux_data->iostart + 0xcd); | ||
235 | outb(0x00, gmux_data->iostart + 0xce); | ||
236 | |||
237 | val = inb(gmux_data->iostart + 0xcc) | | ||
238 | (inb(gmux_data->iostart + 0xcd) << 8); | ||
239 | |||
240 | if (val == 0x55aa) | ||
241 | return true; | ||
242 | |||
243 | return false; | ||
244 | } | ||
245 | |||
78 | static int gmux_get_brightness(struct backlight_device *bd) | 246 | static int gmux_get_brightness(struct backlight_device *bd) |
79 | { | 247 | { |
80 | struct apple_gmux_data *gmux_data = bl_get_data(bd); | 248 | struct apple_gmux_data *gmux_data = bl_get_data(bd); |
@@ -90,16 +258,7 @@ static int gmux_update_status(struct backlight_device *bd) | |||
90 | if (bd->props.state & BL_CORE_SUSPENDED) | 258 | if (bd->props.state & BL_CORE_SUSPENDED) |
91 | return 0; | 259 | return 0; |
92 | 260 | ||
93 | /* | 261 | gmux_write32(gmux_data, GMUX_PORT_BRIGHTNESS, brightness); |
94 | * Older gmux versions require writing out lower bytes first then | ||
95 | * setting the upper byte to 0 to flush the values. Newer versions | ||
96 | * accept a single u32 write, but the old method also works, so we | ||
97 | * just use the old method for all gmux versions. | ||
98 | */ | ||
99 | gmux_write8(gmux_data, GMUX_PORT_BRIGHTNESS, brightness); | ||
100 | gmux_write8(gmux_data, GMUX_PORT_BRIGHTNESS + 1, brightness >> 8); | ||
101 | gmux_write8(gmux_data, GMUX_PORT_BRIGHTNESS + 2, brightness >> 16); | ||
102 | gmux_write8(gmux_data, GMUX_PORT_BRIGHTNESS + 3, 0); | ||
103 | 262 | ||
104 | return 0; | 263 | return 0; |
105 | } | 264 | } |
@@ -110,6 +269,146 @@ static const struct backlight_ops gmux_bl_ops = { | |||
110 | .update_status = gmux_update_status, | 269 | .update_status = gmux_update_status, |
111 | }; | 270 | }; |
112 | 271 | ||
272 | static int gmux_switchto(enum vga_switcheroo_client_id id) | ||
273 | { | ||
274 | if (id == VGA_SWITCHEROO_IGD) { | ||
275 | gmux_write8(apple_gmux_data, GMUX_PORT_SWITCH_DDC, 1); | ||
276 | gmux_write8(apple_gmux_data, GMUX_PORT_SWITCH_DISPLAY, 2); | ||
277 | gmux_write8(apple_gmux_data, GMUX_PORT_SWITCH_EXTERNAL, 2); | ||
278 | } else { | ||
279 | gmux_write8(apple_gmux_data, GMUX_PORT_SWITCH_DDC, 2); | ||
280 | gmux_write8(apple_gmux_data, GMUX_PORT_SWITCH_DISPLAY, 3); | ||
281 | gmux_write8(apple_gmux_data, GMUX_PORT_SWITCH_EXTERNAL, 3); | ||
282 | } | ||
283 | |||
284 | return 0; | ||
285 | } | ||
286 | |||
287 | static int gmux_set_discrete_state(struct apple_gmux_data *gmux_data, | ||
288 | enum vga_switcheroo_state state) | ||
289 | { | ||
290 | INIT_COMPLETION(gmux_data->powerchange_done); | ||
291 | |||
292 | if (state == VGA_SWITCHEROO_ON) { | ||
293 | gmux_write8(gmux_data, GMUX_PORT_DISCRETE_POWER, 1); | ||
294 | gmux_write8(gmux_data, GMUX_PORT_DISCRETE_POWER, 3); | ||
295 | pr_debug("Discrete card powered up\n"); | ||
296 | } else { | ||
297 | gmux_write8(gmux_data, GMUX_PORT_DISCRETE_POWER, 1); | ||
298 | gmux_write8(gmux_data, GMUX_PORT_DISCRETE_POWER, 0); | ||
299 | pr_debug("Discrete card powered down\n"); | ||
300 | } | ||
301 | |||
302 | gmux_data->power_state = state; | ||
303 | |||
304 | if (gmux_data->gpe >= 0 && | ||
305 | !wait_for_completion_interruptible_timeout(&gmux_data->powerchange_done, | ||
306 | msecs_to_jiffies(200))) | ||
307 | pr_warn("Timeout waiting for gmux switch to complete\n"); | ||
308 | |||
309 | return 0; | ||
310 | } | ||
311 | |||
312 | static int gmux_set_power_state(enum vga_switcheroo_client_id id, | ||
313 | enum vga_switcheroo_state state) | ||
314 | { | ||
315 | if (id == VGA_SWITCHEROO_IGD) | ||
316 | return 0; | ||
317 | |||
318 | return gmux_set_discrete_state(apple_gmux_data, state); | ||
319 | } | ||
320 | |||
321 | static int gmux_get_client_id(struct pci_dev *pdev) | ||
322 | { | ||
323 | /* | ||
324 | * Early Macbook Pros with switchable graphics use nvidia | ||
325 | * integrated graphics. Hardcode that the 9400M is integrated. | ||
326 | */ | ||
327 | if (pdev->vendor == PCI_VENDOR_ID_INTEL) | ||
328 | return VGA_SWITCHEROO_IGD; | ||
329 | else if (pdev->vendor == PCI_VENDOR_ID_NVIDIA && | ||
330 | pdev->device == 0x0863) | ||
331 | return VGA_SWITCHEROO_IGD; | ||
332 | else | ||
333 | return VGA_SWITCHEROO_DIS; | ||
334 | } | ||
335 | |||
336 | static enum vga_switcheroo_client_id | ||
337 | gmux_active_client(struct apple_gmux_data *gmux_data) | ||
338 | { | ||
339 | if (gmux_read8(gmux_data, GMUX_PORT_SWITCH_DISPLAY) == 2) | ||
340 | return VGA_SWITCHEROO_IGD; | ||
341 | |||
342 | return VGA_SWITCHEROO_DIS; | ||
343 | } | ||
344 | |||
345 | static struct vga_switcheroo_handler gmux_handler = { | ||
346 | .switchto = gmux_switchto, | ||
347 | .power_state = gmux_set_power_state, | ||
348 | .get_client_id = gmux_get_client_id, | ||
349 | }; | ||
350 | |||
351 | static inline void gmux_disable_interrupts(struct apple_gmux_data *gmux_data) | ||
352 | { | ||
353 | gmux_write8(gmux_data, GMUX_PORT_INTERRUPT_ENABLE, | ||
354 | GMUX_INTERRUPT_DISABLE); | ||
355 | } | ||
356 | |||
357 | static inline void gmux_enable_interrupts(struct apple_gmux_data *gmux_data) | ||
358 | { | ||
359 | gmux_write8(gmux_data, GMUX_PORT_INTERRUPT_ENABLE, | ||
360 | GMUX_INTERRUPT_ENABLE); | ||
361 | } | ||
362 | |||
363 | static inline u8 gmux_interrupt_get_status(struct apple_gmux_data *gmux_data) | ||
364 | { | ||
365 | return gmux_read8(gmux_data, GMUX_PORT_INTERRUPT_STATUS); | ||
366 | } | ||
367 | |||
368 | static void gmux_clear_interrupts(struct apple_gmux_data *gmux_data) | ||
369 | { | ||
370 | u8 status; | ||
371 | |||
372 | /* to clear interrupts write back current status */ | ||
373 | status = gmux_interrupt_get_status(gmux_data); | ||
374 | gmux_write8(gmux_data, GMUX_PORT_INTERRUPT_STATUS, status); | ||
375 | } | ||
376 | |||
377 | static void gmux_notify_handler(acpi_handle device, u32 value, void *context) | ||
378 | { | ||
379 | u8 status; | ||
380 | struct pnp_dev *pnp = (struct pnp_dev *)context; | ||
381 | struct apple_gmux_data *gmux_data = pnp_get_drvdata(pnp); | ||
382 | |||
383 | status = gmux_interrupt_get_status(gmux_data); | ||
384 | gmux_disable_interrupts(gmux_data); | ||
385 | pr_debug("Notify handler called: status %d\n", status); | ||
386 | |||
387 | gmux_clear_interrupts(gmux_data); | ||
388 | gmux_enable_interrupts(gmux_data); | ||
389 | |||
390 | if (status & GMUX_INTERRUPT_STATUS_POWER) | ||
391 | complete(&gmux_data->powerchange_done); | ||
392 | } | ||
393 | |||
394 | static int gmux_suspend(struct pnp_dev *pnp, pm_message_t state) | ||
395 | { | ||
396 | struct apple_gmux_data *gmux_data = pnp_get_drvdata(pnp); | ||
397 | gmux_data->resume_client_id = gmux_active_client(gmux_data); | ||
398 | gmux_disable_interrupts(gmux_data); | ||
399 | return 0; | ||
400 | } | ||
401 | |||
402 | static int gmux_resume(struct pnp_dev *pnp) | ||
403 | { | ||
404 | struct apple_gmux_data *gmux_data = pnp_get_drvdata(pnp); | ||
405 | gmux_enable_interrupts(gmux_data); | ||
406 | gmux_switchto(gmux_data->resume_client_id); | ||
407 | if (gmux_data->power_state == VGA_SWITCHEROO_OFF) | ||
408 | gmux_set_discrete_state(gmux_data, gmux_data->power_state); | ||
409 | return 0; | ||
410 | } | ||
411 | |||
113 | static int __devinit gmux_probe(struct pnp_dev *pnp, | 412 | static int __devinit gmux_probe(struct pnp_dev *pnp, |
114 | const struct pnp_device_id *id) | 413 | const struct pnp_device_id *id) |
115 | { | 414 | { |
@@ -119,6 +418,11 @@ static int __devinit gmux_probe(struct pnp_dev *pnp, | |||
119 | struct backlight_device *bdev; | 418 | struct backlight_device *bdev; |
120 | u8 ver_major, ver_minor, ver_release; | 419 | u8 ver_major, ver_minor, ver_release; |
121 | int ret = -ENXIO; | 420 | int ret = -ENXIO; |
421 | acpi_status status; | ||
422 | unsigned long long gpe; | ||
423 | |||
424 | if (apple_gmux_data) | ||
425 | return -EBUSY; | ||
122 | 426 | ||
123 | gmux_data = kzalloc(sizeof(*gmux_data), GFP_KERNEL); | 427 | gmux_data = kzalloc(sizeof(*gmux_data), GFP_KERNEL); |
124 | if (!gmux_data) | 428 | if (!gmux_data) |
@@ -147,22 +451,29 @@ static int __devinit gmux_probe(struct pnp_dev *pnp, | |||
147 | } | 451 | } |
148 | 452 | ||
149 | /* | 453 | /* |
150 | * On some machines the gmux is in ACPI even thought the machine | 454 | * Invalid version information may indicate either that the gmux |
151 | * doesn't really have a gmux. Check for invalid version information | 455 | * device isn't present or that it's a new one that uses indexed |
152 | * to detect this. | 456 | * io |
153 | */ | 457 | */ |
458 | |||
154 | ver_major = gmux_read8(gmux_data, GMUX_PORT_VERSION_MAJOR); | 459 | ver_major = gmux_read8(gmux_data, GMUX_PORT_VERSION_MAJOR); |
155 | ver_minor = gmux_read8(gmux_data, GMUX_PORT_VERSION_MINOR); | 460 | ver_minor = gmux_read8(gmux_data, GMUX_PORT_VERSION_MINOR); |
156 | ver_release = gmux_read8(gmux_data, GMUX_PORT_VERSION_RELEASE); | 461 | ver_release = gmux_read8(gmux_data, GMUX_PORT_VERSION_RELEASE); |
157 | if (ver_major == 0xff && ver_minor == 0xff && ver_release == 0xff) { | 462 | if (ver_major == 0xff && ver_minor == 0xff && ver_release == 0xff) { |
158 | pr_info("gmux device not present\n"); | 463 | if (gmux_is_indexed(gmux_data)) { |
159 | ret = -ENODEV; | 464 | mutex_init(&gmux_data->index_lock); |
160 | goto err_release; | 465 | gmux_data->indexed = true; |
466 | } else { | ||
467 | pr_info("gmux device not present\n"); | ||
468 | ret = -ENODEV; | ||
469 | goto err_release; | ||
470 | } | ||
471 | pr_info("Found indexed gmux\n"); | ||
472 | } else { | ||
473 | pr_info("Found gmux version %d.%d.%d\n", ver_major, ver_minor, | ||
474 | ver_release); | ||
161 | } | 475 | } |
162 | 476 | ||
163 | pr_info("Found gmux version %d.%d.%d\n", ver_major, ver_minor, | ||
164 | ver_release); | ||
165 | |||
166 | memset(&props, 0, sizeof(props)); | 477 | memset(&props, 0, sizeof(props)); |
167 | props.type = BACKLIGHT_PLATFORM; | 478 | props.type = BACKLIGHT_PLATFORM; |
168 | props.max_brightness = gmux_read32(gmux_data, GMUX_PORT_MAX_BRIGHTNESS); | 479 | props.max_brightness = gmux_read32(gmux_data, GMUX_PORT_MAX_BRIGHTNESS); |
@@ -194,13 +505,67 @@ static int __devinit gmux_probe(struct pnp_dev *pnp, | |||
194 | * Disable the other backlight choices. | 505 | * Disable the other backlight choices. |
195 | */ | 506 | */ |
196 | acpi_video_dmi_promote_vendor(); | 507 | acpi_video_dmi_promote_vendor(); |
197 | #ifdef CONFIG_ACPI_VIDEO | 508 | #if defined (CONFIG_ACPI_VIDEO) || defined (CONFIG_ACPI_VIDEO_MODULE) |
198 | acpi_video_unregister(); | 509 | acpi_video_unregister(); |
199 | #endif | 510 | #endif |
200 | apple_bl_unregister(); | 511 | apple_bl_unregister(); |
201 | 512 | ||
513 | gmux_data->power_state = VGA_SWITCHEROO_ON; | ||
514 | |||
515 | gmux_data->dhandle = DEVICE_ACPI_HANDLE(&pnp->dev); | ||
516 | if (!gmux_data->dhandle) { | ||
517 | pr_err("Cannot find acpi handle for pnp device %s\n", | ||
518 | dev_name(&pnp->dev)); | ||
519 | ret = -ENODEV; | ||
520 | goto err_notify; | ||
521 | } | ||
522 | |||
523 | status = acpi_evaluate_integer(gmux_data->dhandle, "GMGP", NULL, &gpe); | ||
524 | if (ACPI_SUCCESS(status)) { | ||
525 | gmux_data->gpe = (int)gpe; | ||
526 | |||
527 | status = acpi_install_notify_handler(gmux_data->dhandle, | ||
528 | ACPI_DEVICE_NOTIFY, | ||
529 | &gmux_notify_handler, pnp); | ||
530 | if (ACPI_FAILURE(status)) { | ||
531 | pr_err("Install notify handler failed: %s\n", | ||
532 | acpi_format_exception(status)); | ||
533 | ret = -ENODEV; | ||
534 | goto err_notify; | ||
535 | } | ||
536 | |||
537 | status = acpi_enable_gpe(NULL, gmux_data->gpe); | ||
538 | if (ACPI_FAILURE(status)) { | ||
539 | pr_err("Cannot enable gpe: %s\n", | ||
540 | acpi_format_exception(status)); | ||
541 | goto err_enable_gpe; | ||
542 | } | ||
543 | } else { | ||
544 | pr_warn("No GPE found for gmux\n"); | ||
545 | gmux_data->gpe = -1; | ||
546 | } | ||
547 | |||
548 | if (vga_switcheroo_register_handler(&gmux_handler)) { | ||
549 | ret = -ENODEV; | ||
550 | goto err_register_handler; | ||
551 | } | ||
552 | |||
553 | init_completion(&gmux_data->powerchange_done); | ||
554 | apple_gmux_data = gmux_data; | ||
555 | gmux_enable_interrupts(gmux_data); | ||
556 | |||
202 | return 0; | 557 | return 0; |
203 | 558 | ||
559 | err_register_handler: | ||
560 | if (gmux_data->gpe >= 0) | ||
561 | acpi_disable_gpe(NULL, gmux_data->gpe); | ||
562 | err_enable_gpe: | ||
563 | if (gmux_data->gpe >= 0) | ||
564 | acpi_remove_notify_handler(gmux_data->dhandle, | ||
565 | ACPI_DEVICE_NOTIFY, | ||
566 | &gmux_notify_handler); | ||
567 | err_notify: | ||
568 | backlight_device_unregister(bdev); | ||
204 | err_release: | 569 | err_release: |
205 | release_region(gmux_data->iostart, gmux_data->iolen); | 570 | release_region(gmux_data->iostart, gmux_data->iolen); |
206 | err_free: | 571 | err_free: |
@@ -212,12 +577,23 @@ static void __devexit gmux_remove(struct pnp_dev *pnp) | |||
212 | { | 577 | { |
213 | struct apple_gmux_data *gmux_data = pnp_get_drvdata(pnp); | 578 | struct apple_gmux_data *gmux_data = pnp_get_drvdata(pnp); |
214 | 579 | ||
580 | vga_switcheroo_unregister_handler(); | ||
581 | gmux_disable_interrupts(gmux_data); | ||
582 | if (gmux_data->gpe >= 0) { | ||
583 | acpi_disable_gpe(NULL, gmux_data->gpe); | ||
584 | acpi_remove_notify_handler(gmux_data->dhandle, | ||
585 | ACPI_DEVICE_NOTIFY, | ||
586 | &gmux_notify_handler); | ||
587 | } | ||
588 | |||
215 | backlight_device_unregister(gmux_data->bdev); | 589 | backlight_device_unregister(gmux_data->bdev); |
590 | |||
216 | release_region(gmux_data->iostart, gmux_data->iolen); | 591 | release_region(gmux_data->iostart, gmux_data->iolen); |
592 | apple_gmux_data = NULL; | ||
217 | kfree(gmux_data); | 593 | kfree(gmux_data); |
218 | 594 | ||
219 | acpi_video_dmi_demote_vendor(); | 595 | acpi_video_dmi_demote_vendor(); |
220 | #ifdef CONFIG_ACPI_VIDEO | 596 | #if defined (CONFIG_ACPI_VIDEO) || defined (CONFIG_ACPI_VIDEO_MODULE) |
221 | acpi_video_register(); | 597 | acpi_video_register(); |
222 | #endif | 598 | #endif |
223 | apple_bl_register(); | 599 | apple_bl_register(); |
@@ -233,6 +609,8 @@ static struct pnp_driver gmux_pnp_driver = { | |||
233 | .probe = gmux_probe, | 609 | .probe = gmux_probe, |
234 | .remove = __devexit_p(gmux_remove), | 610 | .remove = __devexit_p(gmux_remove), |
235 | .id_table = gmux_device_ids, | 611 | .id_table = gmux_device_ids, |
612 | .suspend = gmux_suspend, | ||
613 | .resume = gmux_resume | ||
236 | }; | 614 | }; |
237 | 615 | ||
238 | static int __init apple_gmux_init(void) | 616 | static int __init apple_gmux_init(void) |