aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm
diff options
context:
space:
mode:
authorPatrik Jakobsson <patrik.r.jakobsson@gmail.com>2011-12-19 16:40:58 -0500
committerDave Airlie <airlied@redhat.com>2011-12-20 05:23:13 -0500
commit5c0c1d50d7ba7a678b7d6e2c4f2ff31edafb1067 (patch)
tree8136abb90b7a87dfe78271576387e810c396d78e /drivers/gpu/drm
parent9c8cee471392258271bdf36361903d306a0c2dd6 (diff)
gma500: Add support for Intel GMBUS
Before we integrate the new SDVO code we need GMBUS support Signed-off-by: Patrik Jakobsson <patrik.r.jakobsson@gmail.com> Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r--drivers/gpu/drm/gma500/Makefile1
-rw-r--r--drivers/gpu/drm/gma500/intel_gmbus.c493
-rw-r--r--drivers/gpu/drm/gma500/psb_device.c7
-rw-r--r--drivers/gpu/drm/gma500/psb_drv.h9
-rw-r--r--drivers/gpu/drm/gma500/psb_intel_drv.h6
-rw-r--r--drivers/gpu/drm/gma500/psb_intel_reg.h72
6 files changed, 588 insertions, 0 deletions
diff --git a/drivers/gpu/drm/gma500/Makefile b/drivers/gpu/drm/gma500/Makefile
index 613c74f33a1e..96658ec057e2 100644
--- a/drivers/gpu/drm/gma500/Makefile
+++ b/drivers/gpu/drm/gma500/Makefile
@@ -11,6 +11,7 @@ gma500_gfx-y += gem_glue.o \
11 gtt.o \ 11 gtt.o \
12 intel_bios.o \ 12 intel_bios.o \
13 intel_i2c.o \ 13 intel_i2c.o \
14 intel_gmbus.o \
14 intel_opregion.o \ 15 intel_opregion.o \
15 mmu.o \ 16 mmu.o \
16 power.o \ 17 power.o \
diff --git a/drivers/gpu/drm/gma500/intel_gmbus.c b/drivers/gpu/drm/gma500/intel_gmbus.c
new file mode 100644
index 000000000000..147584ac8d02
--- /dev/null
+++ b/drivers/gpu/drm/gma500/intel_gmbus.c
@@ -0,0 +1,493 @@
1/*
2 * Copyright (c) 2006 Dave Airlie <airlied@linux.ie>
3 * Copyright © 2006-2008,2010 Intel Corporation
4 * Jesse Barnes <jesse.barnes@intel.com>
5 *
6 * Permission is hereby granted, free of charge, to any person obtaining a
7 * copy of this software and associated documentation files (the "Software"),
8 * to deal in the Software without restriction, including without limitation
9 * the rights to use, copy, modify, merge, publish, distribute, sublicense,
10 * and/or sell copies of the Software, and to permit persons to whom the
11 * Software is furnished to do so, subject to the following conditions:
12 *
13 * The above copyright notice and this permission notice (including the next
14 * paragraph) shall be included in all copies or substantial portions of the
15 * Software.
16 *
17 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
18 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
19 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
20 * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
21 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
22 * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23 * DEALINGS IN THE SOFTWARE.
24 *
25 * Authors:
26 * Eric Anholt <eric@anholt.net>
27 * Chris Wilson <chris@chris-wilson.co.uk>
28 */
29#include <linux/module.h>
30#include <linux/i2c.h>
31#include <linux/i2c-algo-bit.h>
32#include "drmP.h"
33#include "drm.h"
34#include "psb_intel_drv.h"
35#include "gma_drm.h"
36#include "psb_drv.h"
37#include "psb_intel_reg.h"
38
39#define _wait_for(COND, MS, W) ({ \
40 unsigned long timeout__ = jiffies + msecs_to_jiffies(MS); \
41 int ret__ = 0; \
42 while (! (COND)) { \
43 if (time_after(jiffies, timeout__)) { \
44 ret__ = -ETIMEDOUT; \
45 break; \
46 } \
47 if (W && !(in_atomic() || in_dbg_master())) msleep(W); \
48 } \
49 ret__; \
50})
51
52#define wait_for(COND, MS) _wait_for(COND, MS, 1)
53#define wait_for_atomic(COND, MS) _wait_for(COND, MS, 0)
54
55/* Intel GPIO access functions */
56
57#define I2C_RISEFALL_TIME 20
58
59static inline struct intel_gmbus *
60to_intel_gmbus(struct i2c_adapter *i2c)
61{
62 return container_of(i2c, struct intel_gmbus, adapter);
63}
64
65struct intel_gpio {
66 struct i2c_adapter adapter;
67 struct i2c_algo_bit_data algo;
68 struct drm_psb_private *dev_priv;
69 u32 reg;
70};
71
72void
73gma_intel_i2c_reset(struct drm_device *dev)
74{
75 REG_WRITE(GMBUS0, 0);
76}
77
78static void intel_i2c_quirk_set(struct drm_psb_private *dev_priv, bool enable)
79{
80 /* When using bit bashing for I2C, this bit needs to be set to 1 */
81 /* FIXME: We are never Pineview, right?
82
83 u32 val;
84
85 if (!IS_PINEVIEW(dev_priv->dev))
86 return;
87
88 val = REG_READ(DSPCLK_GATE_D);
89 if (enable)
90 val |= DPCUNIT_CLOCK_GATE_DISABLE;
91 else
92 val &= ~DPCUNIT_CLOCK_GATE_DISABLE;
93 REG_WRITE(DSPCLK_GATE_D, val);
94
95 return;
96 */
97}
98
99static u32 get_reserved(struct intel_gpio *gpio)
100{
101 struct drm_psb_private *dev_priv = gpio->dev_priv;
102 struct drm_device *dev = dev_priv->dev;
103 u32 reserved = 0;
104
105 /* On most chips, these bits must be preserved in software. */
106 reserved = REG_READ(gpio->reg) &
107 (GPIO_DATA_PULLUP_DISABLE |
108 GPIO_CLOCK_PULLUP_DISABLE);
109
110 return reserved;
111}
112
113static int get_clock(void *data)
114{
115 struct intel_gpio *gpio = data;
116 struct drm_psb_private *dev_priv = gpio->dev_priv;
117 struct drm_device *dev = dev_priv->dev;
118 u32 reserved = get_reserved(gpio);
119 REG_WRITE(gpio->reg, reserved | GPIO_CLOCK_DIR_MASK);
120 REG_WRITE(gpio->reg, reserved);
121 return (REG_READ(gpio->reg) & GPIO_CLOCK_VAL_IN) != 0;
122}
123
124static int get_data(void *data)
125{
126 struct intel_gpio *gpio = data;
127 struct drm_psb_private *dev_priv = gpio->dev_priv;
128 struct drm_device *dev = dev_priv->dev;
129 u32 reserved = get_reserved(gpio);
130 REG_WRITE(gpio->reg, reserved | GPIO_DATA_DIR_MASK);
131 REG_WRITE(gpio->reg, reserved);
132 return (REG_READ(gpio->reg) & GPIO_DATA_VAL_IN) != 0;
133}
134
135static void set_clock(void *data, int state_high)
136{
137 struct intel_gpio *gpio = data;
138 struct drm_psb_private *dev_priv = gpio->dev_priv;
139 struct drm_device *dev = dev_priv->dev;
140 u32 reserved = get_reserved(gpio);
141 u32 clock_bits;
142
143 if (state_high)
144 clock_bits = GPIO_CLOCK_DIR_IN | GPIO_CLOCK_DIR_MASK;
145 else
146 clock_bits = GPIO_CLOCK_DIR_OUT | GPIO_CLOCK_DIR_MASK |
147 GPIO_CLOCK_VAL_MASK;
148
149 REG_WRITE(gpio->reg, reserved | clock_bits);
150 REG_READ(gpio->reg); /* Posting */
151}
152
153static void set_data(void *data, int state_high)
154{
155 struct intel_gpio *gpio = data;
156 struct drm_psb_private *dev_priv = gpio->dev_priv;
157 struct drm_device *dev = dev_priv->dev;
158 u32 reserved = get_reserved(gpio);
159 u32 data_bits;
160
161 if (state_high)
162 data_bits = GPIO_DATA_DIR_IN | GPIO_DATA_DIR_MASK;
163 else
164 data_bits = GPIO_DATA_DIR_OUT | GPIO_DATA_DIR_MASK |
165 GPIO_DATA_VAL_MASK;
166
167 REG_WRITE(gpio->reg, reserved | data_bits);
168 REG_READ(gpio->reg);
169}
170
171static struct i2c_adapter *
172intel_gpio_create(struct drm_psb_private *dev_priv, u32 pin)
173{
174 static const int map_pin_to_reg[] = {
175 0,
176 GPIOB,
177 GPIOA,
178 GPIOC,
179 GPIOD,
180 GPIOE,
181 0,
182 GPIOF,
183 };
184 struct intel_gpio *gpio;
185
186 if (pin >= ARRAY_SIZE(map_pin_to_reg) || !map_pin_to_reg[pin])
187 return NULL;
188
189 gpio = kzalloc(sizeof(struct intel_gpio), GFP_KERNEL);
190 if (gpio == NULL)
191 return NULL;
192
193 gpio->reg = map_pin_to_reg[pin];
194 gpio->dev_priv = dev_priv;
195
196 snprintf(gpio->adapter.name, sizeof(gpio->adapter.name),
197 "gma500 GPIO%c", "?BACDE?F"[pin]);
198 gpio->adapter.owner = THIS_MODULE;
199 gpio->adapter.algo_data = &gpio->algo;
200 gpio->adapter.dev.parent = &dev_priv->dev->pdev->dev;
201 gpio->algo.setsda = set_data;
202 gpio->algo.setscl = set_clock;
203 gpio->algo.getsda = get_data;
204 gpio->algo.getscl = get_clock;
205 gpio->algo.udelay = I2C_RISEFALL_TIME;
206 gpio->algo.timeout = usecs_to_jiffies(2200);
207 gpio->algo.data = gpio;
208
209 if (i2c_bit_add_bus(&gpio->adapter))
210 goto out_free;
211
212 return &gpio->adapter;
213
214out_free:
215 kfree(gpio);
216 return NULL;
217}
218
219static int
220intel_i2c_quirk_xfer(struct drm_psb_private *dev_priv,
221 struct i2c_adapter *adapter,
222 struct i2c_msg *msgs,
223 int num)
224{
225 struct intel_gpio *gpio = container_of(adapter,
226 struct intel_gpio,
227 adapter);
228 int ret;
229
230 gma_intel_i2c_reset(dev_priv->dev);
231
232 intel_i2c_quirk_set(dev_priv, true);
233 set_data(gpio, 1);
234 set_clock(gpio, 1);
235 udelay(I2C_RISEFALL_TIME);
236
237 ret = adapter->algo->master_xfer(adapter, msgs, num);
238
239 set_data(gpio, 1);
240 set_clock(gpio, 1);
241 intel_i2c_quirk_set(dev_priv, false);
242
243 return ret;
244}
245
246static int
247gmbus_xfer(struct i2c_adapter *adapter,
248 struct i2c_msg *msgs,
249 int num)
250{
251 struct intel_gmbus *bus = container_of(adapter,
252 struct intel_gmbus,
253 adapter);
254 struct drm_psb_private *dev_priv = adapter->algo_data;
255 struct drm_device *dev = dev_priv->dev;
256 int i, reg_offset;
257
258 if (bus->force_bit)
259 return intel_i2c_quirk_xfer(dev_priv,
260 bus->force_bit, msgs, num);
261
262 reg_offset = 0;
263
264 REG_WRITE(GMBUS0 + reg_offset, bus->reg0);
265
266 for (i = 0; i < num; i++) {
267 u16 len = msgs[i].len;
268 u8 *buf = msgs[i].buf;
269
270 if (msgs[i].flags & I2C_M_RD) {
271 REG_WRITE(GMBUS1 + reg_offset,
272 GMBUS_CYCLE_WAIT | (i + 1 == num ? GMBUS_CYCLE_STOP : 0) |
273 (len << GMBUS_BYTE_COUNT_SHIFT) |
274 (msgs[i].addr << GMBUS_SLAVE_ADDR_SHIFT) |
275 GMBUS_SLAVE_READ | GMBUS_SW_RDY);
276 REG_READ(GMBUS2+reg_offset);
277 do {
278 u32 val, loop = 0;
279
280 if (wait_for(REG_READ(GMBUS2 + reg_offset) & (GMBUS_SATOER | GMBUS_HW_RDY), 50))
281 goto timeout;
282 if (REG_READ(GMBUS2 + reg_offset) & GMBUS_SATOER)
283 goto clear_err;
284
285 val = REG_READ(GMBUS3 + reg_offset);
286 do {
287 *buf++ = val & 0xff;
288 val >>= 8;
289 } while (--len && ++loop < 4);
290 } while (len);
291 } else {
292 u32 val, loop;
293
294 val = loop = 0;
295 do {
296 val |= *buf++ << (8 * loop);
297 } while (--len && ++loop < 4);
298
299 REG_WRITE(GMBUS3 + reg_offset, val);
300 REG_WRITE(GMBUS1 + reg_offset,
301 (i + 1 == num ? GMBUS_CYCLE_STOP : GMBUS_CYCLE_WAIT) |
302 (msgs[i].len << GMBUS_BYTE_COUNT_SHIFT) |
303 (msgs[i].addr << GMBUS_SLAVE_ADDR_SHIFT) |
304 GMBUS_SLAVE_WRITE | GMBUS_SW_RDY);
305 REG_READ(GMBUS2+reg_offset);
306
307 while (len) {
308 if (wait_for(REG_READ(GMBUS2 + reg_offset) & (GMBUS_SATOER | GMBUS_HW_RDY), 50))
309 goto timeout;
310 if (REG_READ(GMBUS2 + reg_offset) & GMBUS_SATOER)
311 goto clear_err;
312
313 val = loop = 0;
314 do {
315 val |= *buf++ << (8 * loop);
316 } while (--len && ++loop < 4);
317
318 REG_WRITE(GMBUS3 + reg_offset, val);
319 REG_READ(GMBUS2+reg_offset);
320 }
321 }
322
323 if (i + 1 < num && wait_for(REG_READ(GMBUS2 + reg_offset) & (GMBUS_SATOER | GMBUS_HW_WAIT_PHASE), 50))
324 goto timeout;
325 if (REG_READ(GMBUS2 + reg_offset) & GMBUS_SATOER)
326 goto clear_err;
327 }
328
329 goto done;
330
331clear_err:
332 /* Toggle the Software Clear Interrupt bit. This has the effect
333 * of resetting the GMBUS controller and so clearing the
334 * BUS_ERROR raised by the slave's NAK.
335 */
336 REG_WRITE(GMBUS1 + reg_offset, GMBUS_SW_CLR_INT);
337 REG_WRITE(GMBUS1 + reg_offset, 0);
338
339done:
340 /* Mark the GMBUS interface as disabled. We will re-enable it at the
341 * start of the next xfer, till then let it sleep.
342 */
343 REG_WRITE(GMBUS0 + reg_offset, 0);
344 return i;
345
346timeout:
347 DRM_INFO("GMBUS timed out, falling back to bit banging on pin %d [%s]\n",
348 bus->reg0 & 0xff, bus->adapter.name);
349 REG_WRITE(GMBUS0 + reg_offset, 0);
350
351 /* Hardware may not support GMBUS over these pins? Try GPIO bitbanging instead. */
352 bus->force_bit = intel_gpio_create(dev_priv, bus->reg0 & 0xff);
353 if (!bus->force_bit)
354 return -ENOMEM;
355
356 return intel_i2c_quirk_xfer(dev_priv, bus->force_bit, msgs, num);
357}
358
359static u32 gmbus_func(struct i2c_adapter *adapter)
360{
361 struct intel_gmbus *bus = container_of(adapter,
362 struct intel_gmbus,
363 adapter);
364
365 if (bus->force_bit)
366 bus->force_bit->algo->functionality(bus->force_bit);
367
368 return (I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL |
369 /* I2C_FUNC_10BIT_ADDR | */
370 I2C_FUNC_SMBUS_READ_BLOCK_DATA |
371 I2C_FUNC_SMBUS_BLOCK_PROC_CALL);
372}
373
374static const struct i2c_algorithm gmbus_algorithm = {
375 .master_xfer = gmbus_xfer,
376 .functionality = gmbus_func
377};
378
379/**
380 * intel_gmbus_setup - instantiate all Intel i2c GMBuses
381 * @dev: DRM device
382 */
383int gma_intel_setup_gmbus(struct drm_device *dev)
384{
385 static const char *names[GMBUS_NUM_PORTS] = {
386 "disabled",
387 "ssc",
388 "vga",
389 "panel",
390 "dpc",
391 "dpb",
392 "reserved",
393 "dpd",
394 };
395 struct drm_psb_private *dev_priv = dev->dev_private;
396 int ret, i;
397
398 dev_priv->gmbus = kcalloc(sizeof(struct intel_gmbus), GMBUS_NUM_PORTS,
399 GFP_KERNEL);
400 if (dev_priv->gmbus == NULL)
401 return -ENOMEM;
402
403 for (i = 0; i < GMBUS_NUM_PORTS; i++) {
404 struct intel_gmbus *bus = &dev_priv->gmbus[i];
405
406 bus->adapter.owner = THIS_MODULE;
407 bus->adapter.class = I2C_CLASS_DDC;
408 snprintf(bus->adapter.name,
409 sizeof(bus->adapter.name),
410 "gma500 gmbus %s",
411 names[i]);
412
413 bus->adapter.dev.parent = &dev->pdev->dev;
414 bus->adapter.algo_data = dev_priv;
415
416 bus->adapter.algo = &gmbus_algorithm;
417 ret = i2c_add_adapter(&bus->adapter);
418 if (ret)
419 goto err;
420
421 /* By default use a conservative clock rate */
422 bus->reg0 = i | GMBUS_RATE_100KHZ;
423
424 /* XXX force bit banging until GMBUS is fully debugged */
425 bus->force_bit = intel_gpio_create(dev_priv, i);
426 }
427
428 gma_intel_i2c_reset(dev_priv->dev);
429
430 return 0;
431
432err:
433 while (--i) {
434 struct intel_gmbus *bus = &dev_priv->gmbus[i];
435 i2c_del_adapter(&bus->adapter);
436 }
437 kfree(dev_priv->gmbus);
438 dev_priv->gmbus = NULL;
439 return ret;
440}
441
442void gma_intel_gmbus_set_speed(struct i2c_adapter *adapter, int speed)
443{
444 struct intel_gmbus *bus = to_intel_gmbus(adapter);
445
446 /* speed:
447 * 0x0 = 100 KHz
448 * 0x1 = 50 KHz
449 * 0x2 = 400 KHz
450 * 0x3 = 1000 Khz
451 */
452 bus->reg0 = (bus->reg0 & ~(0x3 << 8)) | (speed << 8);
453}
454
455void gma_intel_gmbus_force_bit(struct i2c_adapter *adapter, bool force_bit)
456{
457 struct intel_gmbus *bus = to_intel_gmbus(adapter);
458
459 if (force_bit) {
460 if (bus->force_bit == NULL) {
461 struct drm_psb_private *dev_priv = adapter->algo_data;
462 bus->force_bit = intel_gpio_create(dev_priv,
463 bus->reg0 & 0xff);
464 }
465 } else {
466 if (bus->force_bit) {
467 i2c_del_adapter(bus->force_bit);
468 kfree(bus->force_bit);
469 bus->force_bit = NULL;
470 }
471 }
472}
473
474void gma_intel_teardown_gmbus(struct drm_device *dev)
475{
476 struct drm_psb_private *dev_priv = dev->dev_private;
477 int i;
478
479 if (dev_priv->gmbus == NULL)
480 return;
481
482 for (i = 0; i < GMBUS_NUM_PORTS; i++) {
483 struct intel_gmbus *bus = &dev_priv->gmbus[i];
484 if (bus->force_bit) {
485 i2c_del_adapter(bus->force_bit);
486 kfree(bus->force_bit);
487 }
488 i2c_del_adapter(&bus->adapter);
489 }
490
491 kfree(dev_priv->gmbus);
492 dev_priv->gmbus = NULL;
493}
diff --git a/drivers/gpu/drm/gma500/psb_device.c b/drivers/gpu/drm/gma500/psb_device.c
index 35eddef45bed..e5f5906172b0 100644
--- a/drivers/gpu/drm/gma500/psb_device.c
+++ b/drivers/gpu/drm/gma500/psb_device.c
@@ -290,11 +290,17 @@ static void psb_get_core_freq(struct drm_device *dev)
290static int psb_chip_setup(struct drm_device *dev) 290static int psb_chip_setup(struct drm_device *dev)
291{ 291{
292 psb_get_core_freq(dev); 292 psb_get_core_freq(dev);
293 gma_intel_setup_gmbus(dev);
293 gma_intel_opregion_init(dev); 294 gma_intel_opregion_init(dev);
294 psb_intel_init_bios(dev); 295 psb_intel_init_bios(dev);
295 return 0; 296 return 0;
296} 297}
297 298
299static void psb_chip_teardown(struct drm_device *dev)
300{
301 gma_intel_teardown_gmbus(dev);
302}
303
298const struct psb_ops psb_chip_ops = { 304const struct psb_ops psb_chip_ops = {
299 .name = "Poulsbo", 305 .name = "Poulsbo",
300 .accel_2d = 1, 306 .accel_2d = 1,
@@ -302,6 +308,7 @@ const struct psb_ops psb_chip_ops = {
302 .crtcs = 2, 308 .crtcs = 2,
303 .sgx_offset = PSB_SGX_OFFSET, 309 .sgx_offset = PSB_SGX_OFFSET,
304 .chip_setup = psb_chip_setup, 310 .chip_setup = psb_chip_setup,
311 .chip_teardown = psb_chip_teardown,
305 312
306 .crtc_helper = &psb_intel_helper_funcs, 313 .crtc_helper = &psb_intel_helper_funcs,
307 .crtc_funcs = &psb_intel_crtc_funcs, 314 .crtc_funcs = &psb_intel_crtc_funcs,
diff --git a/drivers/gpu/drm/gma500/psb_drv.h b/drivers/gpu/drm/gma500/psb_drv.h
index 5ec8edf65163..962c1b605c32 100644
--- a/drivers/gpu/drm/gma500/psb_drv.h
+++ b/drivers/gpu/drm/gma500/psb_drv.h
@@ -260,6 +260,12 @@ struct psb_intel_opregion {
260 int enabled; 260 int enabled;
261}; 261};
262 262
263struct intel_gmbus {
264 struct i2c_adapter adapter;
265 struct i2c_adapter *force_bit;
266 u32 reg0;
267};
268
263struct psb_ops; 269struct psb_ops;
264 270
265#define PSB_NUM_PIPE 3 271#define PSB_NUM_PIPE 3
@@ -336,6 +342,9 @@ struct drm_psb_private {
336 /* PCI revision ID for B0:D2:F0 */ 342 /* PCI revision ID for B0:D2:F0 */
337 uint8_t platform_rev_id; 343 uint8_t platform_rev_id;
338 344
345 /* gmbus */
346 struct intel_gmbus *gmbus;
347
339 /* 348 /*
340 * LVDS info 349 * LVDS info
341 */ 350 */
diff --git a/drivers/gpu/drm/gma500/psb_intel_drv.h b/drivers/gpu/drm/gma500/psb_intel_drv.h
index af34b244606e..3d7a2275238b 100644
--- a/drivers/gpu/drm/gma500/psb_intel_drv.h
+++ b/drivers/gpu/drm/gma500/psb_intel_drv.h
@@ -235,5 +235,11 @@ extern int psb_intel_lvds_set_property(struct drm_connector *connector,
235extern void psb_intel_lvds_destroy(struct drm_connector *connector); 235extern void psb_intel_lvds_destroy(struct drm_connector *connector);
236extern const struct drm_encoder_funcs psb_intel_lvds_enc_funcs; 236extern const struct drm_encoder_funcs psb_intel_lvds_enc_funcs;
237 237
238/* intel_gmbus.c */
239extern void gma_intel_i2c_reset(struct drm_device *dev);
240extern int gma_intel_setup_gmbus(struct drm_device *dev);
241extern void gma_intel_gmbus_set_speed(struct i2c_adapter *adapter, int speed);
242extern void gma_intel_gmbus_force_bit(struct i2c_adapter *adapter, bool force_bit);
243extern void gma_intel_teardown_gmbus(struct drm_device *dev);
238 244
239#endif /* __INTEL_DRV_H__ */ 245#endif /* __INTEL_DRV_H__ */
diff --git a/drivers/gpu/drm/gma500/psb_intel_reg.h b/drivers/gpu/drm/gma500/psb_intel_reg.h
index 1ac16aa791c9..f5c19f55bf6e 100644
--- a/drivers/gpu/drm/gma500/psb_intel_reg.h
+++ b/drivers/gpu/drm/gma500/psb_intel_reg.h
@@ -17,6 +17,78 @@
17#ifndef __PSB_INTEL_REG_H__ 17#ifndef __PSB_INTEL_REG_H__
18#define __PSB_INTEL_REG_H__ 18#define __PSB_INTEL_REG_H__
19 19
20/*
21 * GPIO regs
22 */
23#define GPIOA 0x5010
24#define GPIOB 0x5014
25#define GPIOC 0x5018
26#define GPIOD 0x501c
27#define GPIOE 0x5020
28#define GPIOF 0x5024
29#define GPIOG 0x5028
30#define GPIOH 0x502c
31# define GPIO_CLOCK_DIR_MASK (1 << 0)
32# define GPIO_CLOCK_DIR_IN (0 << 1)
33# define GPIO_CLOCK_DIR_OUT (1 << 1)
34# define GPIO_CLOCK_VAL_MASK (1 << 2)
35# define GPIO_CLOCK_VAL_OUT (1 << 3)
36# define GPIO_CLOCK_VAL_IN (1 << 4)
37# define GPIO_CLOCK_PULLUP_DISABLE (1 << 5)
38# define GPIO_DATA_DIR_MASK (1 << 8)
39# define GPIO_DATA_DIR_IN (0 << 9)
40# define GPIO_DATA_DIR_OUT (1 << 9)
41# define GPIO_DATA_VAL_MASK (1 << 10)
42# define GPIO_DATA_VAL_OUT (1 << 11)
43# define GPIO_DATA_VAL_IN (1 << 12)
44# define GPIO_DATA_PULLUP_DISABLE (1 << 13)
45
46#define GMBUS0 0x5100 /* clock/port select */
47#define GMBUS_RATE_100KHZ (0<<8)
48#define GMBUS_RATE_50KHZ (1<<8)
49#define GMBUS_RATE_400KHZ (2<<8) /* reserved on Pineview */
50#define GMBUS_RATE_1MHZ (3<<8) /* reserved on Pineview */
51#define GMBUS_HOLD_EXT (1<<7) /* 300ns hold time, rsvd on Pineview */
52#define GMBUS_PORT_DISABLED 0
53#define GMBUS_PORT_SSC 1
54#define GMBUS_PORT_VGADDC 2
55#define GMBUS_PORT_PANEL 3
56#define GMBUS_PORT_DPC 4 /* HDMIC */
57#define GMBUS_PORT_DPB 5 /* SDVO, HDMIB */
58 /* 6 reserved */
59#define GMBUS_PORT_DPD 7 /* HDMID */
60#define GMBUS_NUM_PORTS 8
61#define GMBUS1 0x5104 /* command/status */
62#define GMBUS_SW_CLR_INT (1<<31)
63#define GMBUS_SW_RDY (1<<30)
64#define GMBUS_ENT (1<<29) /* enable timeout */
65#define GMBUS_CYCLE_NONE (0<<25)
66#define GMBUS_CYCLE_WAIT (1<<25)
67#define GMBUS_CYCLE_INDEX (2<<25)
68#define GMBUS_CYCLE_STOP (4<<25)
69#define GMBUS_BYTE_COUNT_SHIFT 16
70#define GMBUS_SLAVE_INDEX_SHIFT 8
71#define GMBUS_SLAVE_ADDR_SHIFT 1
72#define GMBUS_SLAVE_READ (1<<0)
73#define GMBUS_SLAVE_WRITE (0<<0)
74#define GMBUS2 0x5108 /* status */
75#define GMBUS_INUSE (1<<15)
76#define GMBUS_HW_WAIT_PHASE (1<<14)
77#define GMBUS_STALL_TIMEOUT (1<<13)
78#define GMBUS_INT (1<<12)
79#define GMBUS_HW_RDY (1<<11)
80#define GMBUS_SATOER (1<<10)
81#define GMBUS_ACTIVE (1<<9)
82#define GMBUS3 0x510c /* data buffer bytes 3-0 */
83#define GMBUS4 0x5110 /* interrupt mask (Pineview+) */
84#define GMBUS_SLAVE_TIMEOUT_EN (1<<4)
85#define GMBUS_NAK_EN (1<<3)
86#define GMBUS_IDLE_EN (1<<2)
87#define GMBUS_HW_WAIT_EN (1<<1)
88#define GMBUS_HW_RDY_EN (1<<0)
89#define GMBUS5 0x5120 /* byte index */
90#define GMBUS_2BYTE_INDEX_EN (1<<31)
91
20#define BLC_PWM_CTL 0x61254 92#define BLC_PWM_CTL 0x61254
21#define BLC_PWM_CTL2 0x61250 93#define BLC_PWM_CTL2 0x61250
22#define BLC_PWM_CTL_C 0x62254 94#define BLC_PWM_CTL_C 0x62254