Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
[cascardo/linux.git] / drivers / gpu / drm / gma500 / psb_intel_sdvo.c
1 /*
2  * Copyright 2006 Dave Airlie <airlied@linux.ie>
3  * Copyright © 2006-2007 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  */
28 #include <linux/module.h>
29 #include <linux/i2c.h>
30 #include <linux/slab.h>
31 #include <linux/delay.h>
32 #include <drm/drmP.h>
33 #include <drm/drm_crtc.h>
34 #include <drm/drm_edid.h>
35 #include "psb_intel_drv.h"
36 #include <drm/gma_drm.h>
37 #include "psb_drv.h"
38 #include "psb_intel_sdvo_regs.h"
39 #include "psb_intel_reg.h"
40
41 #define SDVO_TMDS_MASK (SDVO_OUTPUT_TMDS0 | SDVO_OUTPUT_TMDS1)
42 #define SDVO_RGB_MASK  (SDVO_OUTPUT_RGB0 | SDVO_OUTPUT_RGB1)
43 #define SDVO_LVDS_MASK (SDVO_OUTPUT_LVDS0 | SDVO_OUTPUT_LVDS1)
44 #define SDVO_TV_MASK   (SDVO_OUTPUT_CVBS0 | SDVO_OUTPUT_SVID0)
45
46 #define SDVO_OUTPUT_MASK (SDVO_TMDS_MASK | SDVO_RGB_MASK | SDVO_LVDS_MASK |\
47                          SDVO_TV_MASK)
48
49 #define IS_TV(c)        (c->output_flag & SDVO_TV_MASK)
50 #define IS_TMDS(c)      (c->output_flag & SDVO_TMDS_MASK)
51 #define IS_LVDS(c)      (c->output_flag & SDVO_LVDS_MASK)
52 #define IS_TV_OR_LVDS(c) (c->output_flag & (SDVO_TV_MASK | SDVO_LVDS_MASK))
53
54
55 static const char *tv_format_names[] = {
56         "NTSC_M"   , "NTSC_J"  , "NTSC_443",
57         "PAL_B"    , "PAL_D"   , "PAL_G"   ,
58         "PAL_H"    , "PAL_I"   , "PAL_M"   ,
59         "PAL_N"    , "PAL_NC"  , "PAL_60"  ,
60         "SECAM_B"  , "SECAM_D" , "SECAM_G" ,
61         "SECAM_K"  , "SECAM_K1", "SECAM_L" ,
62         "SECAM_60"
63 };
64
65 #define TV_FORMAT_NUM  (sizeof(tv_format_names) / sizeof(*tv_format_names))
66
67 struct psb_intel_sdvo {
68         struct psb_intel_encoder base;
69
70         struct i2c_adapter *i2c;
71         u8 slave_addr;
72
73         struct i2c_adapter ddc;
74
75         /* Register for the SDVO device: SDVOB or SDVOC */
76         int sdvo_reg;
77
78         /* Active outputs controlled by this SDVO output */
79         uint16_t controlled_output;
80
81         /*
82          * Capabilities of the SDVO device returned by
83          * i830_sdvo_get_capabilities()
84          */
85         struct psb_intel_sdvo_caps caps;
86
87         /* Pixel clock limitations reported by the SDVO device, in kHz */
88         int pixel_clock_min, pixel_clock_max;
89
90         /*
91         * For multiple function SDVO device,
92         * this is for current attached outputs.
93         */
94         uint16_t attached_output;
95
96         /**
97          * This is used to select the color range of RBG outputs in HDMI mode.
98          * It is only valid when using TMDS encoding and 8 bit per color mode.
99          */
100         uint32_t color_range;
101
102         /**
103          * This is set if we're going to treat the device as TV-out.
104          *
105          * While we have these nice friendly flags for output types that ought
106          * to decide this for us, the S-Video output on our HDMI+S-Video card
107          * shows up as RGB1 (VGA).
108          */
109         bool is_tv;
110
111         /* This is for current tv format name */
112         int tv_format_index;
113
114         /**
115          * This is set if we treat the device as HDMI, instead of DVI.
116          */
117         bool is_hdmi;
118         bool has_hdmi_monitor;
119         bool has_hdmi_audio;
120
121         /**
122          * This is set if we detect output of sdvo device as LVDS and
123          * have a valid fixed mode to use with the panel.
124          */
125         bool is_lvds;
126
127         /**
128          * This is sdvo fixed pannel mode pointer
129          */
130         struct drm_display_mode *sdvo_lvds_fixed_mode;
131
132         /* DDC bus used by this SDVO encoder */
133         uint8_t ddc_bus;
134
135         /* Input timings for adjusted_mode */
136         struct psb_intel_sdvo_dtd input_dtd;
137 };
138
139 struct psb_intel_sdvo_connector {
140         struct psb_intel_connector base;
141
142         /* Mark the type of connector */
143         uint16_t output_flag;
144
145         int force_audio;
146
147         /* This contains all current supported TV format */
148         u8 tv_format_supported[TV_FORMAT_NUM];
149         int   format_supported_num;
150         struct drm_property *tv_format;
151
152         /* add the property for the SDVO-TV */
153         struct drm_property *left;
154         struct drm_property *right;
155         struct drm_property *top;
156         struct drm_property *bottom;
157         struct drm_property *hpos;
158         struct drm_property *vpos;
159         struct drm_property *contrast;
160         struct drm_property *saturation;
161         struct drm_property *hue;
162         struct drm_property *sharpness;
163         struct drm_property *flicker_filter;
164         struct drm_property *flicker_filter_adaptive;
165         struct drm_property *flicker_filter_2d;
166         struct drm_property *tv_chroma_filter;
167         struct drm_property *tv_luma_filter;
168         struct drm_property *dot_crawl;
169
170         /* add the property for the SDVO-TV/LVDS */
171         struct drm_property *brightness;
172
173         /* Add variable to record current setting for the above property */
174         u32     left_margin, right_margin, top_margin, bottom_margin;
175
176         /* this is to get the range of margin.*/
177         u32     max_hscan,  max_vscan;
178         u32     max_hpos, cur_hpos;
179         u32     max_vpos, cur_vpos;
180         u32     cur_brightness, max_brightness;
181         u32     cur_contrast,   max_contrast;
182         u32     cur_saturation, max_saturation;
183         u32     cur_hue,        max_hue;
184         u32     cur_sharpness,  max_sharpness;
185         u32     cur_flicker_filter,             max_flicker_filter;
186         u32     cur_flicker_filter_adaptive,    max_flicker_filter_adaptive;
187         u32     cur_flicker_filter_2d,          max_flicker_filter_2d;
188         u32     cur_tv_chroma_filter,   max_tv_chroma_filter;
189         u32     cur_tv_luma_filter,     max_tv_luma_filter;
190         u32     cur_dot_crawl,  max_dot_crawl;
191 };
192
193 static struct psb_intel_sdvo *to_psb_intel_sdvo(struct drm_encoder *encoder)
194 {
195         return container_of(encoder, struct psb_intel_sdvo, base.base);
196 }
197
198 static struct psb_intel_sdvo *intel_attached_sdvo(struct drm_connector *connector)
199 {
200         return container_of(psb_intel_attached_encoder(connector),
201                             struct psb_intel_sdvo, base);
202 }
203
204 static struct psb_intel_sdvo_connector *to_psb_intel_sdvo_connector(struct drm_connector *connector)
205 {
206         return container_of(to_psb_intel_connector(connector), struct psb_intel_sdvo_connector, base);
207 }
208
209 static bool
210 psb_intel_sdvo_output_setup(struct psb_intel_sdvo *psb_intel_sdvo, uint16_t flags);
211 static bool
212 psb_intel_sdvo_tv_create_property(struct psb_intel_sdvo *psb_intel_sdvo,
213                               struct psb_intel_sdvo_connector *psb_intel_sdvo_connector,
214                               int type);
215 static bool
216 psb_intel_sdvo_create_enhance_property(struct psb_intel_sdvo *psb_intel_sdvo,
217                                    struct psb_intel_sdvo_connector *psb_intel_sdvo_connector);
218
219 /**
220  * Writes the SDVOB or SDVOC with the given value, but always writes both
221  * SDVOB and SDVOC to work around apparent hardware issues (according to
222  * comments in the BIOS).
223  */
224 static void psb_intel_sdvo_write_sdvox(struct psb_intel_sdvo *psb_intel_sdvo, u32 val)
225 {
226         struct drm_device *dev = psb_intel_sdvo->base.base.dev;
227         u32 bval = val, cval = val;
228         int i;
229
230         if (psb_intel_sdvo->sdvo_reg == SDVOB) {
231                 cval = REG_READ(SDVOC);
232         } else {
233                 bval = REG_READ(SDVOB);
234         }
235         /*
236          * Write the registers twice for luck. Sometimes,
237          * writing them only once doesn't appear to 'stick'.
238          * The BIOS does this too. Yay, magic
239          */
240         for (i = 0; i < 2; i++)
241         {
242                 REG_WRITE(SDVOB, bval);
243                 REG_READ(SDVOB);
244                 REG_WRITE(SDVOC, cval);
245                 REG_READ(SDVOC);
246         }
247 }
248
249 static bool psb_intel_sdvo_read_byte(struct psb_intel_sdvo *psb_intel_sdvo, u8 addr, u8 *ch)
250 {
251         struct i2c_msg msgs[] = {
252                 {
253                         .addr = psb_intel_sdvo->slave_addr,
254                         .flags = 0,
255                         .len = 1,
256                         .buf = &addr,
257                 },
258                 {
259                         .addr = psb_intel_sdvo->slave_addr,
260                         .flags = I2C_M_RD,
261                         .len = 1,
262                         .buf = ch,
263                 }
264         };
265         int ret;
266
267         if ((ret = i2c_transfer(psb_intel_sdvo->i2c, msgs, 2)) == 2)
268                 return true;
269
270         DRM_DEBUG_KMS("i2c transfer returned %d\n", ret);
271         return false;
272 }
273
274 #define SDVO_CMD_NAME_ENTRY(cmd) {cmd, #cmd}
275 /** Mapping of command numbers to names, for debug output */
276 static const struct _sdvo_cmd_name {
277         u8 cmd;
278         const char *name;
279 } sdvo_cmd_names[] = {
280     SDVO_CMD_NAME_ENTRY(SDVO_CMD_RESET),
281     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_DEVICE_CAPS),
282     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_FIRMWARE_REV),
283     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_TRAINED_INPUTS),
284     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_ACTIVE_OUTPUTS),
285     SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_ACTIVE_OUTPUTS),
286     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_IN_OUT_MAP),
287     SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_IN_OUT_MAP),
288     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_ATTACHED_DISPLAYS),
289     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_HOT_PLUG_SUPPORT),
290     SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_ACTIVE_HOT_PLUG),
291     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_ACTIVE_HOT_PLUG),
292     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_INTERRUPT_EVENT_SOURCE),
293     SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_TARGET_INPUT),
294     SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_TARGET_OUTPUT),
295     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_INPUT_TIMINGS_PART1),
296     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_INPUT_TIMINGS_PART2),
297     SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_INPUT_TIMINGS_PART1),
298     SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_INPUT_TIMINGS_PART2),
299     SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_INPUT_TIMINGS_PART1),
300     SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_OUTPUT_TIMINGS_PART1),
301     SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_OUTPUT_TIMINGS_PART2),
302     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_OUTPUT_TIMINGS_PART1),
303     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_OUTPUT_TIMINGS_PART2),
304     SDVO_CMD_NAME_ENTRY(SDVO_CMD_CREATE_PREFERRED_INPUT_TIMING),
305     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_PREFERRED_INPUT_TIMING_PART1),
306     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_PREFERRED_INPUT_TIMING_PART2),
307     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_INPUT_PIXEL_CLOCK_RANGE),
308     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_OUTPUT_PIXEL_CLOCK_RANGE),
309     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_SUPPORTED_CLOCK_RATE_MULTS),
310     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_CLOCK_RATE_MULT),
311     SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_CLOCK_RATE_MULT),
312     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_SUPPORTED_TV_FORMATS),
313     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_TV_FORMAT),
314     SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_TV_FORMAT),
315     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_SUPPORTED_POWER_STATES),
316     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_POWER_STATE),
317     SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_ENCODER_POWER_STATE),
318     SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_DISPLAY_POWER_STATE),
319     SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_CONTROL_BUS_SWITCH),
320     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_SDTV_RESOLUTION_SUPPORT),
321     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_SCALED_HDTV_RESOLUTION_SUPPORT),
322     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_SUPPORTED_ENHANCEMENTS),
323
324     /* Add the op code for SDVO enhancements */
325     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_MAX_HPOS),
326     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_HPOS),
327     SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_HPOS),
328     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_MAX_VPOS),
329     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_VPOS),
330     SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_VPOS),
331     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_MAX_SATURATION),
332     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_SATURATION),
333     SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_SATURATION),
334     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_MAX_HUE),
335     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_HUE),
336     SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_HUE),
337     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_MAX_CONTRAST),
338     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_CONTRAST),
339     SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_CONTRAST),
340     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_MAX_BRIGHTNESS),
341     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_BRIGHTNESS),
342     SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_BRIGHTNESS),
343     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_MAX_OVERSCAN_H),
344     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_OVERSCAN_H),
345     SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_OVERSCAN_H),
346     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_MAX_OVERSCAN_V),
347     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_OVERSCAN_V),
348     SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_OVERSCAN_V),
349     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_MAX_FLICKER_FILTER),
350     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_FLICKER_FILTER),
351     SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_FLICKER_FILTER),
352     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_MAX_FLICKER_FILTER_ADAPTIVE),
353     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_FLICKER_FILTER_ADAPTIVE),
354     SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_FLICKER_FILTER_ADAPTIVE),
355     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_MAX_FLICKER_FILTER_2D),
356     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_FLICKER_FILTER_2D),
357     SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_FLICKER_FILTER_2D),
358     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_MAX_SHARPNESS),
359     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_SHARPNESS),
360     SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_SHARPNESS),
361     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_DOT_CRAWL),
362     SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_DOT_CRAWL),
363     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_MAX_TV_CHROMA_FILTER),
364     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_TV_CHROMA_FILTER),
365     SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_TV_CHROMA_FILTER),
366     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_MAX_TV_LUMA_FILTER),
367     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_TV_LUMA_FILTER),
368     SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_TV_LUMA_FILTER),
369
370     /* HDMI op code */
371     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_SUPP_ENCODE),
372     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_ENCODE),
373     SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_ENCODE),
374     SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_PIXEL_REPLI),
375     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_PIXEL_REPLI),
376     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_COLORIMETRY_CAP),
377     SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_COLORIMETRY),
378     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_COLORIMETRY),
379     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_AUDIO_ENCRYPT_PREFER),
380     SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_AUDIO_STAT),
381     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_AUDIO_STAT),
382     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_HBUF_INDEX),
383     SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_HBUF_INDEX),
384     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_HBUF_INFO),
385     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_HBUF_AV_SPLIT),
386     SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_HBUF_AV_SPLIT),
387     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_HBUF_TXRATE),
388     SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_HBUF_TXRATE),
389     SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_HBUF_DATA),
390     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_HBUF_DATA),
391 };
392
393 #define IS_SDVOB(reg)   (reg == SDVOB)
394 #define SDVO_NAME(svdo) (IS_SDVOB((svdo)->sdvo_reg) ? "SDVOB" : "SDVOC")
395
396 static void psb_intel_sdvo_debug_write(struct psb_intel_sdvo *psb_intel_sdvo, u8 cmd,
397                                    const void *args, int args_len)
398 {
399         int i;
400
401         DRM_DEBUG_KMS("%s: W: %02X ",
402                                 SDVO_NAME(psb_intel_sdvo), cmd);
403         for (i = 0; i < args_len; i++)
404                 DRM_LOG_KMS("%02X ", ((u8 *)args)[i]);
405         for (; i < 8; i++)
406                 DRM_LOG_KMS("   ");
407         for (i = 0; i < ARRAY_SIZE(sdvo_cmd_names); i++) {
408                 if (cmd == sdvo_cmd_names[i].cmd) {
409                         DRM_LOG_KMS("(%s)", sdvo_cmd_names[i].name);
410                         break;
411                 }
412         }
413         if (i == ARRAY_SIZE(sdvo_cmd_names))
414                 DRM_LOG_KMS("(%02X)", cmd);
415         DRM_LOG_KMS("\n");
416 }
417
418 static const char *cmd_status_names[] = {
419         "Power on",
420         "Success",
421         "Not supported",
422         "Invalid arg",
423         "Pending",
424         "Target not specified",
425         "Scaling not supported"
426 };
427
428 static bool psb_intel_sdvo_write_cmd(struct psb_intel_sdvo *psb_intel_sdvo, u8 cmd,
429                                  const void *args, int args_len)
430 {
431         u8 buf[args_len*2 + 2], status;
432         struct i2c_msg msgs[args_len + 3];
433         int i, ret;
434
435         psb_intel_sdvo_debug_write(psb_intel_sdvo, cmd, args, args_len);
436
437         for (i = 0; i < args_len; i++) {
438                 msgs[i].addr = psb_intel_sdvo->slave_addr;
439                 msgs[i].flags = 0;
440                 msgs[i].len = 2;
441                 msgs[i].buf = buf + 2 *i;
442                 buf[2*i + 0] = SDVO_I2C_ARG_0 - i;
443                 buf[2*i + 1] = ((u8*)args)[i];
444         }
445         msgs[i].addr = psb_intel_sdvo->slave_addr;
446         msgs[i].flags = 0;
447         msgs[i].len = 2;
448         msgs[i].buf = buf + 2*i;
449         buf[2*i + 0] = SDVO_I2C_OPCODE;
450         buf[2*i + 1] = cmd;
451
452         /* the following two are to read the response */
453         status = SDVO_I2C_CMD_STATUS;
454         msgs[i+1].addr = psb_intel_sdvo->slave_addr;
455         msgs[i+1].flags = 0;
456         msgs[i+1].len = 1;
457         msgs[i+1].buf = &status;
458
459         msgs[i+2].addr = psb_intel_sdvo->slave_addr;
460         msgs[i+2].flags = I2C_M_RD;
461         msgs[i+2].len = 1;
462         msgs[i+2].buf = &status;
463
464         ret = i2c_transfer(psb_intel_sdvo->i2c, msgs, i+3);
465         if (ret < 0) {
466                 DRM_DEBUG_KMS("I2c transfer returned %d\n", ret);
467                 return false;
468         }
469         if (ret != i+3) {
470                 /* failure in I2C transfer */
471                 DRM_DEBUG_KMS("I2c transfer returned %d/%d\n", ret, i+3);
472                 return false;
473         }
474
475         return true;
476 }
477
478 static bool psb_intel_sdvo_read_response(struct psb_intel_sdvo *psb_intel_sdvo,
479                                      void *response, int response_len)
480 {
481         u8 retry = 5;
482         u8 status;
483         int i;
484
485         DRM_DEBUG_KMS("%s: R: ", SDVO_NAME(psb_intel_sdvo));
486
487         /*
488          * The documentation states that all commands will be
489          * processed within 15µs, and that we need only poll
490          * the status byte a maximum of 3 times in order for the
491          * command to be complete.
492          *
493          * Check 5 times in case the hardware failed to read the docs.
494          */
495         if (!psb_intel_sdvo_read_byte(psb_intel_sdvo,
496                                   SDVO_I2C_CMD_STATUS,
497                                   &status))
498                 goto log_fail;
499
500         while (status == SDVO_CMD_STATUS_PENDING && retry--) {
501                 udelay(15);
502                 if (!psb_intel_sdvo_read_byte(psb_intel_sdvo,
503                                           SDVO_I2C_CMD_STATUS,
504                                           &status))
505                         goto log_fail;
506         }
507
508         if (status <= SDVO_CMD_STATUS_SCALING_NOT_SUPP)
509                 DRM_LOG_KMS("(%s)", cmd_status_names[status]);
510         else
511                 DRM_LOG_KMS("(??? %d)", status);
512
513         if (status != SDVO_CMD_STATUS_SUCCESS)
514                 goto log_fail;
515
516         /* Read the command response */
517         for (i = 0; i < response_len; i++) {
518                 if (!psb_intel_sdvo_read_byte(psb_intel_sdvo,
519                                           SDVO_I2C_RETURN_0 + i,
520                                           &((u8 *)response)[i]))
521                         goto log_fail;
522                 DRM_LOG_KMS(" %02X", ((u8 *)response)[i]);
523         }
524         DRM_LOG_KMS("\n");
525         return true;
526
527 log_fail:
528         DRM_LOG_KMS("... failed\n");
529         return false;
530 }
531
532 static int psb_intel_sdvo_get_pixel_multiplier(struct drm_display_mode *mode)
533 {
534         if (mode->clock >= 100000)
535                 return 1;
536         else if (mode->clock >= 50000)
537                 return 2;
538         else
539                 return 4;
540 }
541
542 static bool psb_intel_sdvo_set_control_bus_switch(struct psb_intel_sdvo *psb_intel_sdvo,
543                                               u8 ddc_bus)
544 {
545         /* This must be the immediately preceding write before the i2c xfer */
546         return psb_intel_sdvo_write_cmd(psb_intel_sdvo,
547                                     SDVO_CMD_SET_CONTROL_BUS_SWITCH,
548                                     &ddc_bus, 1);
549 }
550
551 static bool psb_intel_sdvo_set_value(struct psb_intel_sdvo *psb_intel_sdvo, u8 cmd, const void *data, int len)
552 {
553         if (!psb_intel_sdvo_write_cmd(psb_intel_sdvo, cmd, data, len))
554                 return false;
555
556         return psb_intel_sdvo_read_response(psb_intel_sdvo, NULL, 0);
557 }
558
559 static bool
560 psb_intel_sdvo_get_value(struct psb_intel_sdvo *psb_intel_sdvo, u8 cmd, void *value, int len)
561 {
562         if (!psb_intel_sdvo_write_cmd(psb_intel_sdvo, cmd, NULL, 0))
563                 return false;
564
565         return psb_intel_sdvo_read_response(psb_intel_sdvo, value, len);
566 }
567
568 static bool psb_intel_sdvo_set_target_input(struct psb_intel_sdvo *psb_intel_sdvo)
569 {
570         struct psb_intel_sdvo_set_target_input_args targets = {0};
571         return psb_intel_sdvo_set_value(psb_intel_sdvo,
572                                     SDVO_CMD_SET_TARGET_INPUT,
573                                     &targets, sizeof(targets));
574 }
575
576 /**
577  * Return whether each input is trained.
578  *
579  * This function is making an assumption about the layout of the response,
580  * which should be checked against the docs.
581  */
582 static bool psb_intel_sdvo_get_trained_inputs(struct psb_intel_sdvo *psb_intel_sdvo, bool *input_1, bool *input_2)
583 {
584         struct psb_intel_sdvo_get_trained_inputs_response response;
585
586         BUILD_BUG_ON(sizeof(response) != 1);
587         if (!psb_intel_sdvo_get_value(psb_intel_sdvo, SDVO_CMD_GET_TRAINED_INPUTS,
588                                   &response, sizeof(response)))
589                 return false;
590
591         *input_1 = response.input0_trained;
592         *input_2 = response.input1_trained;
593         return true;
594 }
595
596 static bool psb_intel_sdvo_set_active_outputs(struct psb_intel_sdvo *psb_intel_sdvo,
597                                           u16 outputs)
598 {
599         return psb_intel_sdvo_set_value(psb_intel_sdvo,
600                                     SDVO_CMD_SET_ACTIVE_OUTPUTS,
601                                     &outputs, sizeof(outputs));
602 }
603
604 static bool psb_intel_sdvo_set_encoder_power_state(struct psb_intel_sdvo *psb_intel_sdvo,
605                                                int mode)
606 {
607         u8 state = SDVO_ENCODER_STATE_ON;
608
609         switch (mode) {
610         case DRM_MODE_DPMS_ON:
611                 state = SDVO_ENCODER_STATE_ON;
612                 break;
613         case DRM_MODE_DPMS_STANDBY:
614                 state = SDVO_ENCODER_STATE_STANDBY;
615                 break;
616         case DRM_MODE_DPMS_SUSPEND:
617                 state = SDVO_ENCODER_STATE_SUSPEND;
618                 break;
619         case DRM_MODE_DPMS_OFF:
620                 state = SDVO_ENCODER_STATE_OFF;
621                 break;
622         }
623
624         return psb_intel_sdvo_set_value(psb_intel_sdvo,
625                                     SDVO_CMD_SET_ENCODER_POWER_STATE, &state, sizeof(state));
626 }
627
628 static bool psb_intel_sdvo_get_input_pixel_clock_range(struct psb_intel_sdvo *psb_intel_sdvo,
629                                                    int *clock_min,
630                                                    int *clock_max)
631 {
632         struct psb_intel_sdvo_pixel_clock_range clocks;
633
634         BUILD_BUG_ON(sizeof(clocks) != 4);
635         if (!psb_intel_sdvo_get_value(psb_intel_sdvo,
636                                   SDVO_CMD_GET_INPUT_PIXEL_CLOCK_RANGE,
637                                   &clocks, sizeof(clocks)))
638                 return false;
639
640         /* Convert the values from units of 10 kHz to kHz. */
641         *clock_min = clocks.min * 10;
642         *clock_max = clocks.max * 10;
643         return true;
644 }
645
646 static bool psb_intel_sdvo_set_target_output(struct psb_intel_sdvo *psb_intel_sdvo,
647                                          u16 outputs)
648 {
649         return psb_intel_sdvo_set_value(psb_intel_sdvo,
650                                     SDVO_CMD_SET_TARGET_OUTPUT,
651                                     &outputs, sizeof(outputs));
652 }
653
654 static bool psb_intel_sdvo_set_timing(struct psb_intel_sdvo *psb_intel_sdvo, u8 cmd,
655                                   struct psb_intel_sdvo_dtd *dtd)
656 {
657         return psb_intel_sdvo_set_value(psb_intel_sdvo, cmd, &dtd->part1, sizeof(dtd->part1)) &&
658                 psb_intel_sdvo_set_value(psb_intel_sdvo, cmd + 1, &dtd->part2, sizeof(dtd->part2));
659 }
660
661 static bool psb_intel_sdvo_set_input_timing(struct psb_intel_sdvo *psb_intel_sdvo,
662                                          struct psb_intel_sdvo_dtd *dtd)
663 {
664         return psb_intel_sdvo_set_timing(psb_intel_sdvo,
665                                      SDVO_CMD_SET_INPUT_TIMINGS_PART1, dtd);
666 }
667
668 static bool psb_intel_sdvo_set_output_timing(struct psb_intel_sdvo *psb_intel_sdvo,
669                                          struct psb_intel_sdvo_dtd *dtd)
670 {
671         return psb_intel_sdvo_set_timing(psb_intel_sdvo,
672                                      SDVO_CMD_SET_OUTPUT_TIMINGS_PART1, dtd);
673 }
674
675 static bool
676 psb_intel_sdvo_create_preferred_input_timing(struct psb_intel_sdvo *psb_intel_sdvo,
677                                          uint16_t clock,
678                                          uint16_t width,
679                                          uint16_t height)
680 {
681         struct psb_intel_sdvo_preferred_input_timing_args args;
682
683         memset(&args, 0, sizeof(args));
684         args.clock = clock;
685         args.width = width;
686         args.height = height;
687         args.interlace = 0;
688
689         if (psb_intel_sdvo->is_lvds &&
690            (psb_intel_sdvo->sdvo_lvds_fixed_mode->hdisplay != width ||
691             psb_intel_sdvo->sdvo_lvds_fixed_mode->vdisplay != height))
692                 args.scaled = 1;
693
694         return psb_intel_sdvo_set_value(psb_intel_sdvo,
695                                     SDVO_CMD_CREATE_PREFERRED_INPUT_TIMING,
696                                     &args, sizeof(args));
697 }
698
699 static bool psb_intel_sdvo_get_preferred_input_timing(struct psb_intel_sdvo *psb_intel_sdvo,
700                                                   struct psb_intel_sdvo_dtd *dtd)
701 {
702         BUILD_BUG_ON(sizeof(dtd->part1) != 8);
703         BUILD_BUG_ON(sizeof(dtd->part2) != 8);
704         return psb_intel_sdvo_get_value(psb_intel_sdvo, SDVO_CMD_GET_PREFERRED_INPUT_TIMING_PART1,
705                                     &dtd->part1, sizeof(dtd->part1)) &&
706                 psb_intel_sdvo_get_value(psb_intel_sdvo, SDVO_CMD_GET_PREFERRED_INPUT_TIMING_PART2,
707                                      &dtd->part2, sizeof(dtd->part2));
708 }
709
710 static bool psb_intel_sdvo_set_clock_rate_mult(struct psb_intel_sdvo *psb_intel_sdvo, u8 val)
711 {
712         return psb_intel_sdvo_set_value(psb_intel_sdvo, SDVO_CMD_SET_CLOCK_RATE_MULT, &val, 1);
713 }
714
715 static void psb_intel_sdvo_get_dtd_from_mode(struct psb_intel_sdvo_dtd *dtd,
716                                          const struct drm_display_mode *mode)
717 {
718         uint16_t width, height;
719         uint16_t h_blank_len, h_sync_len, v_blank_len, v_sync_len;
720         uint16_t h_sync_offset, v_sync_offset;
721
722         width = mode->crtc_hdisplay;
723         height = mode->crtc_vdisplay;
724
725         /* do some mode translations */
726         h_blank_len = mode->crtc_hblank_end - mode->crtc_hblank_start;
727         h_sync_len = mode->crtc_hsync_end - mode->crtc_hsync_start;
728
729         v_blank_len = mode->crtc_vblank_end - mode->crtc_vblank_start;
730         v_sync_len = mode->crtc_vsync_end - mode->crtc_vsync_start;
731
732         h_sync_offset = mode->crtc_hsync_start - mode->crtc_hblank_start;
733         v_sync_offset = mode->crtc_vsync_start - mode->crtc_vblank_start;
734
735         dtd->part1.clock = mode->clock / 10;
736         dtd->part1.h_active = width & 0xff;
737         dtd->part1.h_blank = h_blank_len & 0xff;
738         dtd->part1.h_high = (((width >> 8) & 0xf) << 4) |
739                 ((h_blank_len >> 8) & 0xf);
740         dtd->part1.v_active = height & 0xff;
741         dtd->part1.v_blank = v_blank_len & 0xff;
742         dtd->part1.v_high = (((height >> 8) & 0xf) << 4) |
743                 ((v_blank_len >> 8) & 0xf);
744
745         dtd->part2.h_sync_off = h_sync_offset & 0xff;
746         dtd->part2.h_sync_width = h_sync_len & 0xff;
747         dtd->part2.v_sync_off_width = (v_sync_offset & 0xf) << 4 |
748                 (v_sync_len & 0xf);
749         dtd->part2.sync_off_width_high = ((h_sync_offset & 0x300) >> 2) |
750                 ((h_sync_len & 0x300) >> 4) | ((v_sync_offset & 0x30) >> 2) |
751                 ((v_sync_len & 0x30) >> 4);
752
753         dtd->part2.dtd_flags = 0x18;
754         if (mode->flags & DRM_MODE_FLAG_PHSYNC)
755                 dtd->part2.dtd_flags |= 0x2;
756         if (mode->flags & DRM_MODE_FLAG_PVSYNC)
757                 dtd->part2.dtd_flags |= 0x4;
758
759         dtd->part2.sdvo_flags = 0;
760         dtd->part2.v_sync_off_high = v_sync_offset & 0xc0;
761         dtd->part2.reserved = 0;
762 }
763
764 static void psb_intel_sdvo_get_mode_from_dtd(struct drm_display_mode * mode,
765                                          const struct psb_intel_sdvo_dtd *dtd)
766 {
767         mode->hdisplay = dtd->part1.h_active;
768         mode->hdisplay += ((dtd->part1.h_high >> 4) & 0x0f) << 8;
769         mode->hsync_start = mode->hdisplay + dtd->part2.h_sync_off;
770         mode->hsync_start += (dtd->part2.sync_off_width_high & 0xc0) << 2;
771         mode->hsync_end = mode->hsync_start + dtd->part2.h_sync_width;
772         mode->hsync_end += (dtd->part2.sync_off_width_high & 0x30) << 4;
773         mode->htotal = mode->hdisplay + dtd->part1.h_blank;
774         mode->htotal += (dtd->part1.h_high & 0xf) << 8;
775
776         mode->vdisplay = dtd->part1.v_active;
777         mode->vdisplay += ((dtd->part1.v_high >> 4) & 0x0f) << 8;
778         mode->vsync_start = mode->vdisplay;
779         mode->vsync_start += (dtd->part2.v_sync_off_width >> 4) & 0xf;
780         mode->vsync_start += (dtd->part2.sync_off_width_high & 0x0c) << 2;
781         mode->vsync_start += dtd->part2.v_sync_off_high & 0xc0;
782         mode->vsync_end = mode->vsync_start +
783                 (dtd->part2.v_sync_off_width & 0xf);
784         mode->vsync_end += (dtd->part2.sync_off_width_high & 0x3) << 4;
785         mode->vtotal = mode->vdisplay + dtd->part1.v_blank;
786         mode->vtotal += (dtd->part1.v_high & 0xf) << 8;
787
788         mode->clock = dtd->part1.clock * 10;
789
790         mode->flags &= ~(DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC);
791         if (dtd->part2.dtd_flags & 0x2)
792                 mode->flags |= DRM_MODE_FLAG_PHSYNC;
793         if (dtd->part2.dtd_flags & 0x4)
794                 mode->flags |= DRM_MODE_FLAG_PVSYNC;
795 }
796
797 static bool psb_intel_sdvo_check_supp_encode(struct psb_intel_sdvo *psb_intel_sdvo)
798 {
799         struct psb_intel_sdvo_encode encode;
800
801         BUILD_BUG_ON(sizeof(encode) != 2);
802         return psb_intel_sdvo_get_value(psb_intel_sdvo,
803                                   SDVO_CMD_GET_SUPP_ENCODE,
804                                   &encode, sizeof(encode));
805 }
806
807 static bool psb_intel_sdvo_set_encode(struct psb_intel_sdvo *psb_intel_sdvo,
808                                   uint8_t mode)
809 {
810         return psb_intel_sdvo_set_value(psb_intel_sdvo, SDVO_CMD_SET_ENCODE, &mode, 1);
811 }
812
813 static bool psb_intel_sdvo_set_colorimetry(struct psb_intel_sdvo *psb_intel_sdvo,
814                                        uint8_t mode)
815 {
816         return psb_intel_sdvo_set_value(psb_intel_sdvo, SDVO_CMD_SET_COLORIMETRY, &mode, 1);
817 }
818
819 #if 0
820 static void psb_intel_sdvo_dump_hdmi_buf(struct psb_intel_sdvo *psb_intel_sdvo)
821 {
822         int i, j;
823         uint8_t set_buf_index[2];
824         uint8_t av_split;
825         uint8_t buf_size;
826         uint8_t buf[48];
827         uint8_t *pos;
828
829         psb_intel_sdvo_get_value(encoder, SDVO_CMD_GET_HBUF_AV_SPLIT, &av_split, 1);
830
831         for (i = 0; i <= av_split; i++) {
832                 set_buf_index[0] = i; set_buf_index[1] = 0;
833                 psb_intel_sdvo_write_cmd(encoder, SDVO_CMD_SET_HBUF_INDEX,
834                                      set_buf_index, 2);
835                 psb_intel_sdvo_write_cmd(encoder, SDVO_CMD_GET_HBUF_INFO, NULL, 0);
836                 psb_intel_sdvo_read_response(encoder, &buf_size, 1);
837
838                 pos = buf;
839                 for (j = 0; j <= buf_size; j += 8) {
840                         psb_intel_sdvo_write_cmd(encoder, SDVO_CMD_GET_HBUF_DATA,
841                                              NULL, 0);
842                         psb_intel_sdvo_read_response(encoder, pos, 8);
843                         pos += 8;
844                 }
845         }
846 }
847 #endif
848
849 static bool psb_intel_sdvo_set_avi_infoframe(struct psb_intel_sdvo *psb_intel_sdvo)
850 {
851         DRM_INFO("HDMI is not supported yet");
852
853         return false;
854 #if 0
855         struct dip_infoframe avi_if = {
856                 .type = DIP_TYPE_AVI,
857                 .ver = DIP_VERSION_AVI,
858                 .len = DIP_LEN_AVI,
859         };
860         uint8_t tx_rate = SDVO_HBUF_TX_VSYNC;
861         uint8_t set_buf_index[2] = { 1, 0 };
862         uint64_t *data = (uint64_t *)&avi_if;
863         unsigned i;
864
865         intel_dip_infoframe_csum(&avi_if);
866
867         if (!psb_intel_sdvo_set_value(psb_intel_sdvo,
868                                   SDVO_CMD_SET_HBUF_INDEX,
869                                   set_buf_index, 2))
870                 return false;
871
872         for (i = 0; i < sizeof(avi_if); i += 8) {
873                 if (!psb_intel_sdvo_set_value(psb_intel_sdvo,
874                                           SDVO_CMD_SET_HBUF_DATA,
875                                           data, 8))
876                         return false;
877                 data++;
878         }
879
880         return psb_intel_sdvo_set_value(psb_intel_sdvo,
881                                     SDVO_CMD_SET_HBUF_TXRATE,
882                                     &tx_rate, 1);
883 #endif
884 }
885
886 static bool psb_intel_sdvo_set_tv_format(struct psb_intel_sdvo *psb_intel_sdvo)
887 {
888         struct psb_intel_sdvo_tv_format format;
889         uint32_t format_map;
890
891         format_map = 1 << psb_intel_sdvo->tv_format_index;
892         memset(&format, 0, sizeof(format));
893         memcpy(&format, &format_map, min(sizeof(format), sizeof(format_map)));
894
895         BUILD_BUG_ON(sizeof(format) != 6);
896         return psb_intel_sdvo_set_value(psb_intel_sdvo,
897                                     SDVO_CMD_SET_TV_FORMAT,
898                                     &format, sizeof(format));
899 }
900
901 static bool
902 psb_intel_sdvo_set_output_timings_from_mode(struct psb_intel_sdvo *psb_intel_sdvo,
903                                         const struct drm_display_mode *mode)
904 {
905         struct psb_intel_sdvo_dtd output_dtd;
906
907         if (!psb_intel_sdvo_set_target_output(psb_intel_sdvo,
908                                           psb_intel_sdvo->attached_output))
909                 return false;
910
911         psb_intel_sdvo_get_dtd_from_mode(&output_dtd, mode);
912         if (!psb_intel_sdvo_set_output_timing(psb_intel_sdvo, &output_dtd))
913                 return false;
914
915         return true;
916 }
917
918 static bool
919 psb_intel_sdvo_set_input_timings_for_mode(struct psb_intel_sdvo *psb_intel_sdvo,
920                                         const struct drm_display_mode *mode,
921                                         struct drm_display_mode *adjusted_mode)
922 {
923         /* Reset the input timing to the screen. Assume always input 0. */
924         if (!psb_intel_sdvo_set_target_input(psb_intel_sdvo))
925                 return false;
926
927         if (!psb_intel_sdvo_create_preferred_input_timing(psb_intel_sdvo,
928                                                       mode->clock / 10,
929                                                       mode->hdisplay,
930                                                       mode->vdisplay))
931                 return false;
932
933         if (!psb_intel_sdvo_get_preferred_input_timing(psb_intel_sdvo,
934                                                    &psb_intel_sdvo->input_dtd))
935                 return false;
936
937         psb_intel_sdvo_get_mode_from_dtd(adjusted_mode, &psb_intel_sdvo->input_dtd);
938
939         drm_mode_set_crtcinfo(adjusted_mode, 0);
940         return true;
941 }
942
943 static bool psb_intel_sdvo_mode_fixup(struct drm_encoder *encoder,
944                                   const struct drm_display_mode *mode,
945                                   struct drm_display_mode *adjusted_mode)
946 {
947         struct psb_intel_sdvo *psb_intel_sdvo = to_psb_intel_sdvo(encoder);
948         int multiplier;
949
950         /* We need to construct preferred input timings based on our
951          * output timings.  To do that, we have to set the output
952          * timings, even though this isn't really the right place in
953          * the sequence to do it. Oh well.
954          */
955         if (psb_intel_sdvo->is_tv) {
956                 if (!psb_intel_sdvo_set_output_timings_from_mode(psb_intel_sdvo, mode))
957                         return false;
958
959                 (void) psb_intel_sdvo_set_input_timings_for_mode(psb_intel_sdvo,
960                                                              mode,
961                                                              adjusted_mode);
962         } else if (psb_intel_sdvo->is_lvds) {
963                 if (!psb_intel_sdvo_set_output_timings_from_mode(psb_intel_sdvo,
964                                                              psb_intel_sdvo->sdvo_lvds_fixed_mode))
965                         return false;
966
967                 (void) psb_intel_sdvo_set_input_timings_for_mode(psb_intel_sdvo,
968                                                              mode,
969                                                              adjusted_mode);
970         }
971
972         /* Make the CRTC code factor in the SDVO pixel multiplier.  The
973          * SDVO device will factor out the multiplier during mode_set.
974          */
975         multiplier = psb_intel_sdvo_get_pixel_multiplier(adjusted_mode);
976         psb_intel_mode_set_pixel_multiplier(adjusted_mode, multiplier);
977
978         return true;
979 }
980
981 static void psb_intel_sdvo_mode_set(struct drm_encoder *encoder,
982                                 struct drm_display_mode *mode,
983                                 struct drm_display_mode *adjusted_mode)
984 {
985         struct drm_device *dev = encoder->dev;
986         struct drm_crtc *crtc = encoder->crtc;
987         struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
988         struct psb_intel_sdvo *psb_intel_sdvo = to_psb_intel_sdvo(encoder);
989         u32 sdvox;
990         struct psb_intel_sdvo_in_out_map in_out;
991         struct psb_intel_sdvo_dtd input_dtd;
992         int pixel_multiplier = psb_intel_mode_get_pixel_multiplier(adjusted_mode);
993         int rate;
994
995         if (!mode)
996                 return;
997
998         /* First, set the input mapping for the first input to our controlled
999          * output. This is only correct if we're a single-input device, in
1000          * which case the first input is the output from the appropriate SDVO
1001          * channel on the motherboard.  In a two-input device, the first input
1002          * will be SDVOB and the second SDVOC.
1003          */
1004         in_out.in0 = psb_intel_sdvo->attached_output;
1005         in_out.in1 = 0;
1006
1007         psb_intel_sdvo_set_value(psb_intel_sdvo,
1008                              SDVO_CMD_SET_IN_OUT_MAP,
1009                              &in_out, sizeof(in_out));
1010
1011         /* Set the output timings to the screen */
1012         if (!psb_intel_sdvo_set_target_output(psb_intel_sdvo,
1013                                           psb_intel_sdvo->attached_output))
1014                 return;
1015
1016         /* We have tried to get input timing in mode_fixup, and filled into
1017          * adjusted_mode.
1018          */
1019         if (psb_intel_sdvo->is_tv || psb_intel_sdvo->is_lvds) {
1020                 input_dtd = psb_intel_sdvo->input_dtd;
1021         } else {
1022                 /* Set the output timing to the screen */
1023                 if (!psb_intel_sdvo_set_target_output(psb_intel_sdvo,
1024                                                   psb_intel_sdvo->attached_output))
1025                         return;
1026
1027                 psb_intel_sdvo_get_dtd_from_mode(&input_dtd, adjusted_mode);
1028                 (void) psb_intel_sdvo_set_output_timing(psb_intel_sdvo, &input_dtd);
1029         }
1030
1031         /* Set the input timing to the screen. Assume always input 0. */
1032         if (!psb_intel_sdvo_set_target_input(psb_intel_sdvo))
1033                 return;
1034
1035         if (psb_intel_sdvo->has_hdmi_monitor) {
1036                 psb_intel_sdvo_set_encode(psb_intel_sdvo, SDVO_ENCODE_HDMI);
1037                 psb_intel_sdvo_set_colorimetry(psb_intel_sdvo,
1038                                            SDVO_COLORIMETRY_RGB256);
1039                 psb_intel_sdvo_set_avi_infoframe(psb_intel_sdvo);
1040         } else
1041                 psb_intel_sdvo_set_encode(psb_intel_sdvo, SDVO_ENCODE_DVI);
1042
1043         if (psb_intel_sdvo->is_tv &&
1044             !psb_intel_sdvo_set_tv_format(psb_intel_sdvo))
1045                 return;
1046
1047         (void) psb_intel_sdvo_set_input_timing(psb_intel_sdvo, &input_dtd);
1048
1049         switch (pixel_multiplier) {
1050         default:
1051         case 1: rate = SDVO_CLOCK_RATE_MULT_1X; break;
1052         case 2: rate = SDVO_CLOCK_RATE_MULT_2X; break;
1053         case 4: rate = SDVO_CLOCK_RATE_MULT_4X; break;
1054         }
1055         if (!psb_intel_sdvo_set_clock_rate_mult(psb_intel_sdvo, rate))
1056                 return;
1057
1058         /* Set the SDVO control regs. */
1059         sdvox = REG_READ(psb_intel_sdvo->sdvo_reg);
1060         switch (psb_intel_sdvo->sdvo_reg) {
1061         case SDVOB:
1062                 sdvox &= SDVOB_PRESERVE_MASK;
1063                 break;
1064         case SDVOC:
1065                 sdvox &= SDVOC_PRESERVE_MASK;
1066                 break;
1067         }
1068         sdvox |= (9 << 19) | SDVO_BORDER_ENABLE;
1069
1070         if (psb_intel_crtc->pipe == 1)
1071                 sdvox |= SDVO_PIPE_B_SELECT;
1072         if (psb_intel_sdvo->has_hdmi_audio)
1073                 sdvox |= SDVO_AUDIO_ENABLE;
1074
1075         /* FIXME: Check if this is needed for PSB
1076         sdvox |= (pixel_multiplier - 1) << SDVO_PORT_MULTIPLY_SHIFT;
1077         */
1078
1079         if (input_dtd.part2.sdvo_flags & SDVO_NEED_TO_STALL)
1080                 sdvox |= SDVO_STALL_SELECT;
1081         psb_intel_sdvo_write_sdvox(psb_intel_sdvo, sdvox);
1082 }
1083
1084 static void psb_intel_sdvo_dpms(struct drm_encoder *encoder, int mode)
1085 {
1086         struct drm_device *dev = encoder->dev;
1087         struct psb_intel_sdvo *psb_intel_sdvo = to_psb_intel_sdvo(encoder);
1088         u32 temp;
1089
1090         switch (mode) {
1091         case DRM_MODE_DPMS_ON:
1092                 DRM_DEBUG("DPMS_ON");
1093                 break;
1094         case DRM_MODE_DPMS_OFF:
1095                 DRM_DEBUG("DPMS_OFF");
1096                 break;
1097         default:
1098                 DRM_DEBUG("DPMS: %d", mode);
1099         }
1100
1101         if (mode != DRM_MODE_DPMS_ON) {
1102                 psb_intel_sdvo_set_active_outputs(psb_intel_sdvo, 0);
1103                 if (0)
1104                         psb_intel_sdvo_set_encoder_power_state(psb_intel_sdvo, mode);
1105
1106                 if (mode == DRM_MODE_DPMS_OFF) {
1107                         temp = REG_READ(psb_intel_sdvo->sdvo_reg);
1108                         if ((temp & SDVO_ENABLE) != 0) {
1109                                 psb_intel_sdvo_write_sdvox(psb_intel_sdvo, temp & ~SDVO_ENABLE);
1110                         }
1111                 }
1112         } else {
1113                 bool input1, input2;
1114                 int i;
1115                 u8 status;
1116
1117                 temp = REG_READ(psb_intel_sdvo->sdvo_reg);
1118                 if ((temp & SDVO_ENABLE) == 0)
1119                         psb_intel_sdvo_write_sdvox(psb_intel_sdvo, temp | SDVO_ENABLE);
1120                 for (i = 0; i < 2; i++)
1121                         psb_intel_wait_for_vblank(dev);
1122
1123                 status = psb_intel_sdvo_get_trained_inputs(psb_intel_sdvo, &input1, &input2);
1124                 /* Warn if the device reported failure to sync.
1125                  * A lot of SDVO devices fail to notify of sync, but it's
1126                  * a given it the status is a success, we succeeded.
1127                  */
1128                 if (status == SDVO_CMD_STATUS_SUCCESS && !input1) {
1129                         DRM_DEBUG_KMS("First %s output reported failure to "
1130                                         "sync\n", SDVO_NAME(psb_intel_sdvo));
1131                 }
1132
1133                 if (0)
1134                         psb_intel_sdvo_set_encoder_power_state(psb_intel_sdvo, mode);
1135                 psb_intel_sdvo_set_active_outputs(psb_intel_sdvo, psb_intel_sdvo->attached_output);
1136         }
1137         return;
1138 }
1139
1140 static int psb_intel_sdvo_mode_valid(struct drm_connector *connector,
1141                                  struct drm_display_mode *mode)
1142 {
1143         struct psb_intel_sdvo *psb_intel_sdvo = intel_attached_sdvo(connector);
1144
1145         if (mode->flags & DRM_MODE_FLAG_DBLSCAN)
1146                 return MODE_NO_DBLESCAN;
1147
1148         if (psb_intel_sdvo->pixel_clock_min > mode->clock)
1149                 return MODE_CLOCK_LOW;
1150
1151         if (psb_intel_sdvo->pixel_clock_max < mode->clock)
1152                 return MODE_CLOCK_HIGH;
1153
1154         if (psb_intel_sdvo->is_lvds) {
1155                 if (mode->hdisplay > psb_intel_sdvo->sdvo_lvds_fixed_mode->hdisplay)
1156                         return MODE_PANEL;
1157
1158                 if (mode->vdisplay > psb_intel_sdvo->sdvo_lvds_fixed_mode->vdisplay)
1159                         return MODE_PANEL;
1160         }
1161
1162         return MODE_OK;
1163 }
1164
1165 static bool psb_intel_sdvo_get_capabilities(struct psb_intel_sdvo *psb_intel_sdvo, struct psb_intel_sdvo_caps *caps)
1166 {
1167         BUILD_BUG_ON(sizeof(*caps) != 8);
1168         if (!psb_intel_sdvo_get_value(psb_intel_sdvo,
1169                                   SDVO_CMD_GET_DEVICE_CAPS,
1170                                   caps, sizeof(*caps)))
1171                 return false;
1172
1173         DRM_DEBUG_KMS("SDVO capabilities:\n"
1174                       "  vendor_id: %d\n"
1175                       "  device_id: %d\n"
1176                       "  device_rev_id: %d\n"
1177                       "  sdvo_version_major: %d\n"
1178                       "  sdvo_version_minor: %d\n"
1179                       "  sdvo_inputs_mask: %d\n"
1180                       "  smooth_scaling: %d\n"
1181                       "  sharp_scaling: %d\n"
1182                       "  up_scaling: %d\n"
1183                       "  down_scaling: %d\n"
1184                       "  stall_support: %d\n"
1185                       "  output_flags: %d\n",
1186                       caps->vendor_id,
1187                       caps->device_id,
1188                       caps->device_rev_id,
1189                       caps->sdvo_version_major,
1190                       caps->sdvo_version_minor,
1191                       caps->sdvo_inputs_mask,
1192                       caps->smooth_scaling,
1193                       caps->sharp_scaling,
1194                       caps->up_scaling,
1195                       caps->down_scaling,
1196                       caps->stall_support,
1197                       caps->output_flags);
1198
1199         return true;
1200 }
1201
1202 /* No use! */
1203 #if 0
1204 struct drm_connector* psb_intel_sdvo_find(struct drm_device *dev, int sdvoB)
1205 {
1206         struct drm_connector *connector = NULL;
1207         struct psb_intel_sdvo *iout = NULL;
1208         struct psb_intel_sdvo *sdvo;
1209
1210         /* find the sdvo connector */
1211         list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
1212                 iout = to_psb_intel_sdvo(connector);
1213
1214                 if (iout->type != INTEL_OUTPUT_SDVO)
1215                         continue;
1216
1217                 sdvo = iout->dev_priv;
1218
1219                 if (sdvo->sdvo_reg == SDVOB && sdvoB)
1220                         return connector;
1221
1222                 if (sdvo->sdvo_reg == SDVOC && !sdvoB)
1223                         return connector;
1224
1225         }
1226
1227         return NULL;
1228 }
1229
1230 int psb_intel_sdvo_supports_hotplug(struct drm_connector *connector)
1231 {
1232         u8 response[2];
1233         u8 status;
1234         struct psb_intel_sdvo *psb_intel_sdvo;
1235         DRM_DEBUG_KMS("\n");
1236
1237         if (!connector)
1238                 return 0;
1239
1240         psb_intel_sdvo = to_psb_intel_sdvo(connector);
1241
1242         return psb_intel_sdvo_get_value(psb_intel_sdvo, SDVO_CMD_GET_HOT_PLUG_SUPPORT,
1243                                     &response, 2) && response[0];
1244 }
1245
1246 void psb_intel_sdvo_set_hotplug(struct drm_connector *connector, int on)
1247 {
1248         u8 response[2];
1249         u8 status;
1250         struct psb_intel_sdvo *psb_intel_sdvo = to_psb_intel_sdvo(connector);
1251
1252         psb_intel_sdvo_write_cmd(psb_intel_sdvo, SDVO_CMD_GET_ACTIVE_HOT_PLUG, NULL, 0);
1253         psb_intel_sdvo_read_response(psb_intel_sdvo, &response, 2);
1254
1255         if (on) {
1256                 psb_intel_sdvo_write_cmd(psb_intel_sdvo, SDVO_CMD_GET_HOT_PLUG_SUPPORT, NULL, 0);
1257                 status = psb_intel_sdvo_read_response(psb_intel_sdvo, &response, 2);
1258
1259                 psb_intel_sdvo_write_cmd(psb_intel_sdvo, SDVO_CMD_SET_ACTIVE_HOT_PLUG, &response, 2);
1260         } else {
1261                 response[0] = 0;
1262                 response[1] = 0;
1263                 psb_intel_sdvo_write_cmd(psb_intel_sdvo, SDVO_CMD_SET_ACTIVE_HOT_PLUG, &response, 2);
1264         }
1265
1266         psb_intel_sdvo_write_cmd(psb_intel_sdvo, SDVO_CMD_GET_ACTIVE_HOT_PLUG, NULL, 0);
1267         psb_intel_sdvo_read_response(psb_intel_sdvo, &response, 2);
1268 }
1269 #endif
1270
1271 static bool
1272 psb_intel_sdvo_multifunc_encoder(struct psb_intel_sdvo *psb_intel_sdvo)
1273 {
1274         /* Is there more than one type of output? */
1275         int caps = psb_intel_sdvo->caps.output_flags & 0xf;
1276         return caps & -caps;
1277 }
1278
1279 static struct edid *
1280 psb_intel_sdvo_get_edid(struct drm_connector *connector)
1281 {
1282         struct psb_intel_sdvo *sdvo = intel_attached_sdvo(connector);
1283         return drm_get_edid(connector, &sdvo->ddc);
1284 }
1285
1286 /* Mac mini hack -- use the same DDC as the analog connector */
1287 static struct edid *
1288 psb_intel_sdvo_get_analog_edid(struct drm_connector *connector)
1289 {
1290         struct drm_psb_private *dev_priv = connector->dev->dev_private;
1291
1292         return drm_get_edid(connector,
1293                             &dev_priv->gmbus[dev_priv->crt_ddc_pin].adapter);
1294 }
1295
1296 static enum drm_connector_status
1297 psb_intel_sdvo_hdmi_sink_detect(struct drm_connector *connector)
1298 {
1299         struct psb_intel_sdvo *psb_intel_sdvo = intel_attached_sdvo(connector);
1300         enum drm_connector_status status;
1301         struct edid *edid;
1302
1303         edid = psb_intel_sdvo_get_edid(connector);
1304
1305         if (edid == NULL && psb_intel_sdvo_multifunc_encoder(psb_intel_sdvo)) {
1306                 u8 ddc, saved_ddc = psb_intel_sdvo->ddc_bus;
1307
1308                 /*
1309                  * Don't use the 1 as the argument of DDC bus switch to get
1310                  * the EDID. It is used for SDVO SPD ROM.
1311                  */
1312                 for (ddc = psb_intel_sdvo->ddc_bus >> 1; ddc > 1; ddc >>= 1) {
1313                         psb_intel_sdvo->ddc_bus = ddc;
1314                         edid = psb_intel_sdvo_get_edid(connector);
1315                         if (edid)
1316                                 break;
1317                 }
1318                 /*
1319                  * If we found the EDID on the other bus,
1320                  * assume that is the correct DDC bus.
1321                  */
1322                 if (edid == NULL)
1323                         psb_intel_sdvo->ddc_bus = saved_ddc;
1324         }
1325
1326         /*
1327          * When there is no edid and no monitor is connected with VGA
1328          * port, try to use the CRT ddc to read the EDID for DVI-connector.
1329          */
1330         if (edid == NULL)
1331                 edid = psb_intel_sdvo_get_analog_edid(connector);
1332
1333         status = connector_status_unknown;
1334         if (edid != NULL) {
1335                 /* DDC bus is shared, match EDID to connector type */
1336                 if (edid->input & DRM_EDID_INPUT_DIGITAL) {
1337                         status = connector_status_connected;
1338                         if (psb_intel_sdvo->is_hdmi) {
1339                                 psb_intel_sdvo->has_hdmi_monitor = drm_detect_hdmi_monitor(edid);
1340                                 psb_intel_sdvo->has_hdmi_audio = drm_detect_monitor_audio(edid);
1341                         }
1342                 } else
1343                         status = connector_status_disconnected;
1344                 kfree(edid);
1345         }
1346
1347         if (status == connector_status_connected) {
1348                 struct psb_intel_sdvo_connector *psb_intel_sdvo_connector = to_psb_intel_sdvo_connector(connector);
1349                 if (psb_intel_sdvo_connector->force_audio)
1350                         psb_intel_sdvo->has_hdmi_audio = psb_intel_sdvo_connector->force_audio > 0;
1351         }
1352
1353         return status;
1354 }
1355
1356 static enum drm_connector_status
1357 psb_intel_sdvo_detect(struct drm_connector *connector, bool force)
1358 {
1359         uint16_t response;
1360         struct psb_intel_sdvo *psb_intel_sdvo = intel_attached_sdvo(connector);
1361         struct psb_intel_sdvo_connector *psb_intel_sdvo_connector = to_psb_intel_sdvo_connector(connector);
1362         enum drm_connector_status ret;
1363
1364         if (!psb_intel_sdvo_write_cmd(psb_intel_sdvo,
1365                                   SDVO_CMD_GET_ATTACHED_DISPLAYS, NULL, 0))
1366                 return connector_status_unknown;
1367
1368         /* add 30ms delay when the output type might be TV */
1369         if (psb_intel_sdvo->caps.output_flags &
1370             (SDVO_OUTPUT_SVID0 | SDVO_OUTPUT_CVBS0))
1371                 mdelay(30);
1372
1373         if (!psb_intel_sdvo_read_response(psb_intel_sdvo, &response, 2))
1374                 return connector_status_unknown;
1375
1376         DRM_DEBUG_KMS("SDVO response %d %d [%x]\n",
1377                       response & 0xff, response >> 8,
1378                       psb_intel_sdvo_connector->output_flag);
1379
1380         if (response == 0)
1381                 return connector_status_disconnected;
1382
1383         psb_intel_sdvo->attached_output = response;
1384
1385         psb_intel_sdvo->has_hdmi_monitor = false;
1386         psb_intel_sdvo->has_hdmi_audio = false;
1387
1388         if ((psb_intel_sdvo_connector->output_flag & response) == 0)
1389                 ret = connector_status_disconnected;
1390         else if (IS_TMDS(psb_intel_sdvo_connector))
1391                 ret = psb_intel_sdvo_hdmi_sink_detect(connector);
1392         else {
1393                 struct edid *edid;
1394
1395                 /* if we have an edid check it matches the connection */
1396                 edid = psb_intel_sdvo_get_edid(connector);
1397                 if (edid == NULL)
1398                         edid = psb_intel_sdvo_get_analog_edid(connector);
1399                 if (edid != NULL) {
1400                         if (edid->input & DRM_EDID_INPUT_DIGITAL)
1401                                 ret = connector_status_disconnected;
1402                         else
1403                                 ret = connector_status_connected;
1404                         kfree(edid);
1405                 } else
1406                         ret = connector_status_connected;
1407         }
1408
1409         /* May update encoder flag for like clock for SDVO TV, etc.*/
1410         if (ret == connector_status_connected) {
1411                 psb_intel_sdvo->is_tv = false;
1412                 psb_intel_sdvo->is_lvds = false;
1413                 psb_intel_sdvo->base.needs_tv_clock = false;
1414
1415                 if (response & SDVO_TV_MASK) {
1416                         psb_intel_sdvo->is_tv = true;
1417                         psb_intel_sdvo->base.needs_tv_clock = true;
1418                 }
1419                 if (response & SDVO_LVDS_MASK)
1420                         psb_intel_sdvo->is_lvds = psb_intel_sdvo->sdvo_lvds_fixed_mode != NULL;
1421         }
1422
1423         return ret;
1424 }
1425
1426 static void psb_intel_sdvo_get_ddc_modes(struct drm_connector *connector)
1427 {
1428         struct edid *edid;
1429
1430         /* set the bus switch and get the modes */
1431         edid = psb_intel_sdvo_get_edid(connector);
1432
1433         /*
1434          * Mac mini hack.  On this device, the DVI-I connector shares one DDC
1435          * link between analog and digital outputs. So, if the regular SDVO
1436          * DDC fails, check to see if the analog output is disconnected, in
1437          * which case we'll look there for the digital DDC data.
1438          */
1439         if (edid == NULL)
1440                 edid = psb_intel_sdvo_get_analog_edid(connector);
1441
1442         if (edid != NULL) {
1443                 struct psb_intel_sdvo_connector *psb_intel_sdvo_connector = to_psb_intel_sdvo_connector(connector);
1444                 bool monitor_is_digital = !!(edid->input & DRM_EDID_INPUT_DIGITAL);
1445                 bool connector_is_digital = !!IS_TMDS(psb_intel_sdvo_connector);
1446
1447                 if (connector_is_digital == monitor_is_digital) {
1448                         drm_mode_connector_update_edid_property(connector, edid);
1449                         drm_add_edid_modes(connector, edid);
1450                 }
1451
1452                 kfree(edid);
1453         }
1454 }
1455
1456 /*
1457  * Set of SDVO TV modes.
1458  * Note!  This is in reply order (see loop in get_tv_modes).
1459  * XXX: all 60Hz refresh?
1460  */
1461 static const struct drm_display_mode sdvo_tv_modes[] = {
1462         { DRM_MODE("320x200", DRM_MODE_TYPE_DRIVER, 5815, 320, 321, 384,
1463                    416, 0, 200, 201, 232, 233, 0,
1464                    DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
1465         { DRM_MODE("320x240", DRM_MODE_TYPE_DRIVER, 6814, 320, 321, 384,
1466                    416, 0, 240, 241, 272, 273, 0,
1467                    DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
1468         { DRM_MODE("400x300", DRM_MODE_TYPE_DRIVER, 9910, 400, 401, 464,
1469                    496, 0, 300, 301, 332, 333, 0,
1470                    DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
1471         { DRM_MODE("640x350", DRM_MODE_TYPE_DRIVER, 16913, 640, 641, 704,
1472                    736, 0, 350, 351, 382, 383, 0,
1473                    DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
1474         { DRM_MODE("640x400", DRM_MODE_TYPE_DRIVER, 19121, 640, 641, 704,
1475                    736, 0, 400, 401, 432, 433, 0,
1476                    DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
1477         { DRM_MODE("640x480", DRM_MODE_TYPE_DRIVER, 22654, 640, 641, 704,
1478                    736, 0, 480, 481, 512, 513, 0,
1479                    DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
1480         { DRM_MODE("704x480", DRM_MODE_TYPE_DRIVER, 24624, 704, 705, 768,
1481                    800, 0, 480, 481, 512, 513, 0,
1482                    DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
1483         { DRM_MODE("704x576", DRM_MODE_TYPE_DRIVER, 29232, 704, 705, 768,
1484                    800, 0, 576, 577, 608, 609, 0,
1485                    DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
1486         { DRM_MODE("720x350", DRM_MODE_TYPE_DRIVER, 18751, 720, 721, 784,
1487                    816, 0, 350, 351, 382, 383, 0,
1488                    DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
1489         { DRM_MODE("720x400", DRM_MODE_TYPE_DRIVER, 21199, 720, 721, 784,
1490                    816, 0, 400, 401, 432, 433, 0,
1491                    DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
1492         { DRM_MODE("720x480", DRM_MODE_TYPE_DRIVER, 25116, 720, 721, 784,
1493                    816, 0, 480, 481, 512, 513, 0,
1494                    DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
1495         { DRM_MODE("720x540", DRM_MODE_TYPE_DRIVER, 28054, 720, 721, 784,
1496                    816, 0, 540, 541, 572, 573, 0,
1497                    DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
1498         { DRM_MODE("720x576", DRM_MODE_TYPE_DRIVER, 29816, 720, 721, 784,
1499                    816, 0, 576, 577, 608, 609, 0,
1500                    DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
1501         { DRM_MODE("768x576", DRM_MODE_TYPE_DRIVER, 31570, 768, 769, 832,
1502                    864, 0, 576, 577, 608, 609, 0,
1503                    DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
1504         { DRM_MODE("800x600", DRM_MODE_TYPE_DRIVER, 34030, 800, 801, 864,
1505                    896, 0, 600, 601, 632, 633, 0,
1506                    DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
1507         { DRM_MODE("832x624", DRM_MODE_TYPE_DRIVER, 36581, 832, 833, 896,
1508                    928, 0, 624, 625, 656, 657, 0,
1509                    DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
1510         { DRM_MODE("920x766", DRM_MODE_TYPE_DRIVER, 48707, 920, 921, 984,
1511                    1016, 0, 766, 767, 798, 799, 0,
1512                    DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
1513         { DRM_MODE("1024x768", DRM_MODE_TYPE_DRIVER, 53827, 1024, 1025, 1088,
1514                    1120, 0, 768, 769, 800, 801, 0,
1515                    DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
1516         { DRM_MODE("1280x1024", DRM_MODE_TYPE_DRIVER, 87265, 1280, 1281, 1344,
1517                    1376, 0, 1024, 1025, 1056, 1057, 0,
1518                    DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
1519 };
1520
1521 static void psb_intel_sdvo_get_tv_modes(struct drm_connector *connector)
1522 {
1523         struct psb_intel_sdvo *psb_intel_sdvo = intel_attached_sdvo(connector);
1524         struct psb_intel_sdvo_sdtv_resolution_request tv_res;
1525         uint32_t reply = 0, format_map = 0;
1526         int i;
1527
1528         /* Read the list of supported input resolutions for the selected TV
1529          * format.
1530          */
1531         format_map = 1 << psb_intel_sdvo->tv_format_index;
1532         memcpy(&tv_res, &format_map,
1533                min(sizeof(format_map), sizeof(struct psb_intel_sdvo_sdtv_resolution_request)));
1534
1535         if (!psb_intel_sdvo_set_target_output(psb_intel_sdvo, psb_intel_sdvo->attached_output))
1536                 return;
1537
1538         BUILD_BUG_ON(sizeof(tv_res) != 3);
1539         if (!psb_intel_sdvo_write_cmd(psb_intel_sdvo,
1540                                   SDVO_CMD_GET_SDTV_RESOLUTION_SUPPORT,
1541                                   &tv_res, sizeof(tv_res)))
1542                 return;
1543         if (!psb_intel_sdvo_read_response(psb_intel_sdvo, &reply, 3))
1544                 return;
1545
1546         for (i = 0; i < ARRAY_SIZE(sdvo_tv_modes); i++)
1547                 if (reply & (1 << i)) {
1548                         struct drm_display_mode *nmode;
1549                         nmode = drm_mode_duplicate(connector->dev,
1550                                                    &sdvo_tv_modes[i]);
1551                         if (nmode)
1552                                 drm_mode_probed_add(connector, nmode);
1553                 }
1554 }
1555
1556 static void psb_intel_sdvo_get_lvds_modes(struct drm_connector *connector)
1557 {
1558         struct psb_intel_sdvo *psb_intel_sdvo = intel_attached_sdvo(connector);
1559         struct drm_psb_private *dev_priv = connector->dev->dev_private;
1560         struct drm_display_mode *newmode;
1561
1562         /*
1563          * Attempt to get the mode list from DDC.
1564          * Assume that the preferred modes are
1565          * arranged in priority order.
1566          */
1567         psb_intel_ddc_get_modes(connector, psb_intel_sdvo->i2c);
1568         if (list_empty(&connector->probed_modes) == false)
1569                 goto end;
1570
1571         /* Fetch modes from VBT */
1572         if (dev_priv->sdvo_lvds_vbt_mode != NULL) {
1573                 newmode = drm_mode_duplicate(connector->dev,
1574                                              dev_priv->sdvo_lvds_vbt_mode);
1575                 if (newmode != NULL) {
1576                         /* Guarantee the mode is preferred */
1577                         newmode->type = (DRM_MODE_TYPE_PREFERRED |
1578                                          DRM_MODE_TYPE_DRIVER);
1579                         drm_mode_probed_add(connector, newmode);
1580                 }
1581         }
1582
1583 end:
1584         list_for_each_entry(newmode, &connector->probed_modes, head) {
1585                 if (newmode->type & DRM_MODE_TYPE_PREFERRED) {
1586                         psb_intel_sdvo->sdvo_lvds_fixed_mode =
1587                                 drm_mode_duplicate(connector->dev, newmode);
1588
1589                         drm_mode_set_crtcinfo(psb_intel_sdvo->sdvo_lvds_fixed_mode,
1590                                               0);
1591
1592                         psb_intel_sdvo->is_lvds = true;
1593                         break;
1594                 }
1595         }
1596
1597 }
1598
1599 static int psb_intel_sdvo_get_modes(struct drm_connector *connector)
1600 {
1601         struct psb_intel_sdvo_connector *psb_intel_sdvo_connector = to_psb_intel_sdvo_connector(connector);
1602
1603         if (IS_TV(psb_intel_sdvo_connector))
1604                 psb_intel_sdvo_get_tv_modes(connector);
1605         else if (IS_LVDS(psb_intel_sdvo_connector))
1606                 psb_intel_sdvo_get_lvds_modes(connector);
1607         else
1608                 psb_intel_sdvo_get_ddc_modes(connector);
1609
1610         return !list_empty(&connector->probed_modes);
1611 }
1612
1613 static void
1614 psb_intel_sdvo_destroy_enhance_property(struct drm_connector *connector)
1615 {
1616         struct psb_intel_sdvo_connector *psb_intel_sdvo_connector = to_psb_intel_sdvo_connector(connector);
1617         struct drm_device *dev = connector->dev;
1618
1619         if (psb_intel_sdvo_connector->left)
1620                 drm_property_destroy(dev, psb_intel_sdvo_connector->left);
1621         if (psb_intel_sdvo_connector->right)
1622                 drm_property_destroy(dev, psb_intel_sdvo_connector->right);
1623         if (psb_intel_sdvo_connector->top)
1624                 drm_property_destroy(dev, psb_intel_sdvo_connector->top);
1625         if (psb_intel_sdvo_connector->bottom)
1626                 drm_property_destroy(dev, psb_intel_sdvo_connector->bottom);
1627         if (psb_intel_sdvo_connector->hpos)
1628                 drm_property_destroy(dev, psb_intel_sdvo_connector->hpos);
1629         if (psb_intel_sdvo_connector->vpos)
1630                 drm_property_destroy(dev, psb_intel_sdvo_connector->vpos);
1631         if (psb_intel_sdvo_connector->saturation)
1632                 drm_property_destroy(dev, psb_intel_sdvo_connector->saturation);
1633         if (psb_intel_sdvo_connector->contrast)
1634                 drm_property_destroy(dev, psb_intel_sdvo_connector->contrast);
1635         if (psb_intel_sdvo_connector->hue)
1636                 drm_property_destroy(dev, psb_intel_sdvo_connector->hue);
1637         if (psb_intel_sdvo_connector->sharpness)
1638                 drm_property_destroy(dev, psb_intel_sdvo_connector->sharpness);
1639         if (psb_intel_sdvo_connector->flicker_filter)
1640                 drm_property_destroy(dev, psb_intel_sdvo_connector->flicker_filter);
1641         if (psb_intel_sdvo_connector->flicker_filter_2d)
1642                 drm_property_destroy(dev, psb_intel_sdvo_connector->flicker_filter_2d);
1643         if (psb_intel_sdvo_connector->flicker_filter_adaptive)
1644                 drm_property_destroy(dev, psb_intel_sdvo_connector->flicker_filter_adaptive);
1645         if (psb_intel_sdvo_connector->tv_luma_filter)
1646                 drm_property_destroy(dev, psb_intel_sdvo_connector->tv_luma_filter);
1647         if (psb_intel_sdvo_connector->tv_chroma_filter)
1648                 drm_property_destroy(dev, psb_intel_sdvo_connector->tv_chroma_filter);
1649         if (psb_intel_sdvo_connector->dot_crawl)
1650                 drm_property_destroy(dev, psb_intel_sdvo_connector->dot_crawl);
1651         if (psb_intel_sdvo_connector->brightness)
1652                 drm_property_destroy(dev, psb_intel_sdvo_connector->brightness);
1653 }
1654
1655 static void psb_intel_sdvo_destroy(struct drm_connector *connector)
1656 {
1657         struct psb_intel_sdvo_connector *psb_intel_sdvo_connector = to_psb_intel_sdvo_connector(connector);
1658
1659         if (psb_intel_sdvo_connector->tv_format)
1660                 drm_property_destroy(connector->dev,
1661                                      psb_intel_sdvo_connector->tv_format);
1662
1663         psb_intel_sdvo_destroy_enhance_property(connector);
1664         drm_sysfs_connector_remove(connector);
1665         drm_connector_cleanup(connector);
1666         kfree(connector);
1667 }
1668
1669 static bool psb_intel_sdvo_detect_hdmi_audio(struct drm_connector *connector)
1670 {
1671         struct psb_intel_sdvo *psb_intel_sdvo = intel_attached_sdvo(connector);
1672         struct edid *edid;
1673         bool has_audio = false;
1674
1675         if (!psb_intel_sdvo->is_hdmi)
1676                 return false;
1677
1678         edid = psb_intel_sdvo_get_edid(connector);
1679         if (edid != NULL && edid->input & DRM_EDID_INPUT_DIGITAL)
1680                 has_audio = drm_detect_monitor_audio(edid);
1681
1682         return has_audio;
1683 }
1684
1685 static int
1686 psb_intel_sdvo_set_property(struct drm_connector *connector,
1687                         struct drm_property *property,
1688                         uint64_t val)
1689 {
1690         struct psb_intel_sdvo *psb_intel_sdvo = intel_attached_sdvo(connector);
1691         struct psb_intel_sdvo_connector *psb_intel_sdvo_connector = to_psb_intel_sdvo_connector(connector);
1692         struct drm_psb_private *dev_priv = connector->dev->dev_private;
1693         uint16_t temp_value;
1694         uint8_t cmd;
1695         int ret;
1696
1697         ret = drm_connector_property_set_value(connector, property, val);
1698         if (ret)
1699                 return ret;
1700
1701         if (property == dev_priv->force_audio_property) {
1702                 int i = val;
1703                 bool has_audio;
1704
1705                 if (i == psb_intel_sdvo_connector->force_audio)
1706                         return 0;
1707
1708                 psb_intel_sdvo_connector->force_audio = i;
1709
1710                 if (i == 0)
1711                         has_audio = psb_intel_sdvo_detect_hdmi_audio(connector);
1712                 else
1713                         has_audio = i > 0;
1714
1715                 if (has_audio == psb_intel_sdvo->has_hdmi_audio)
1716                         return 0;
1717
1718                 psb_intel_sdvo->has_hdmi_audio = has_audio;
1719                 goto done;
1720         }
1721
1722         if (property == dev_priv->broadcast_rgb_property) {
1723                 if (val == !!psb_intel_sdvo->color_range)
1724                         return 0;
1725
1726                 psb_intel_sdvo->color_range = val ? SDVO_COLOR_RANGE_16_235 : 0;
1727                 goto done;
1728         }
1729
1730 #define CHECK_PROPERTY(name, NAME) \
1731         if (psb_intel_sdvo_connector->name == property) { \
1732                 if (psb_intel_sdvo_connector->cur_##name == temp_value) return 0; \
1733                 if (psb_intel_sdvo_connector->max_##name < temp_value) return -EINVAL; \
1734                 cmd = SDVO_CMD_SET_##NAME; \
1735                 psb_intel_sdvo_connector->cur_##name = temp_value; \
1736                 goto set_value; \
1737         }
1738
1739         if (property == psb_intel_sdvo_connector->tv_format) {
1740                 if (val >= TV_FORMAT_NUM)
1741                         return -EINVAL;
1742
1743                 if (psb_intel_sdvo->tv_format_index ==
1744                     psb_intel_sdvo_connector->tv_format_supported[val])
1745                         return 0;
1746
1747                 psb_intel_sdvo->tv_format_index = psb_intel_sdvo_connector->tv_format_supported[val];
1748                 goto done;
1749         } else if (IS_TV_OR_LVDS(psb_intel_sdvo_connector)) {
1750                 temp_value = val;
1751                 if (psb_intel_sdvo_connector->left == property) {
1752                         drm_connector_property_set_value(connector,
1753                                                          psb_intel_sdvo_connector->right, val);
1754                         if (psb_intel_sdvo_connector->left_margin == temp_value)
1755                                 return 0;
1756
1757                         psb_intel_sdvo_connector->left_margin = temp_value;
1758                         psb_intel_sdvo_connector->right_margin = temp_value;
1759                         temp_value = psb_intel_sdvo_connector->max_hscan -
1760                                 psb_intel_sdvo_connector->left_margin;
1761                         cmd = SDVO_CMD_SET_OVERSCAN_H;
1762                         goto set_value;
1763                 } else if (psb_intel_sdvo_connector->right == property) {
1764                         drm_connector_property_set_value(connector,
1765                                                          psb_intel_sdvo_connector->left, val);
1766                         if (psb_intel_sdvo_connector->right_margin == temp_value)
1767                                 return 0;
1768
1769                         psb_intel_sdvo_connector->left_margin = temp_value;
1770                         psb_intel_sdvo_connector->right_margin = temp_value;
1771                         temp_value = psb_intel_sdvo_connector->max_hscan -
1772                                 psb_intel_sdvo_connector->left_margin;
1773                         cmd = SDVO_CMD_SET_OVERSCAN_H;
1774                         goto set_value;
1775                 } else if (psb_intel_sdvo_connector->top == property) {
1776                         drm_connector_property_set_value(connector,
1777                                                          psb_intel_sdvo_connector->bottom, val);
1778                         if (psb_intel_sdvo_connector->top_margin == temp_value)
1779                                 return 0;
1780
1781                         psb_intel_sdvo_connector->top_margin = temp_value;
1782                         psb_intel_sdvo_connector->bottom_margin = temp_value;
1783                         temp_value = psb_intel_sdvo_connector->max_vscan -
1784                                 psb_intel_sdvo_connector->top_margin;
1785                         cmd = SDVO_CMD_SET_OVERSCAN_V;
1786                         goto set_value;
1787                 } else if (psb_intel_sdvo_connector->bottom == property) {
1788                         drm_connector_property_set_value(connector,
1789                                                          psb_intel_sdvo_connector->top, val);
1790                         if (psb_intel_sdvo_connector->bottom_margin == temp_value)
1791                                 return 0;
1792
1793                         psb_intel_sdvo_connector->top_margin = temp_value;
1794                         psb_intel_sdvo_connector->bottom_margin = temp_value;
1795                         temp_value = psb_intel_sdvo_connector->max_vscan -
1796                                 psb_intel_sdvo_connector->top_margin;
1797                         cmd = SDVO_CMD_SET_OVERSCAN_V;
1798                         goto set_value;
1799                 }
1800                 CHECK_PROPERTY(hpos, HPOS)
1801                 CHECK_PROPERTY(vpos, VPOS)
1802                 CHECK_PROPERTY(saturation, SATURATION)
1803                 CHECK_PROPERTY(contrast, CONTRAST)
1804                 CHECK_PROPERTY(hue, HUE)
1805                 CHECK_PROPERTY(brightness, BRIGHTNESS)
1806                 CHECK_PROPERTY(sharpness, SHARPNESS)
1807                 CHECK_PROPERTY(flicker_filter, FLICKER_FILTER)
1808                 CHECK_PROPERTY(flicker_filter_2d, FLICKER_FILTER_2D)
1809                 CHECK_PROPERTY(flicker_filter_adaptive, FLICKER_FILTER_ADAPTIVE)
1810                 CHECK_PROPERTY(tv_chroma_filter, TV_CHROMA_FILTER)
1811                 CHECK_PROPERTY(tv_luma_filter, TV_LUMA_FILTER)
1812                 CHECK_PROPERTY(dot_crawl, DOT_CRAWL)
1813         }
1814
1815         return -EINVAL; /* unknown property */
1816
1817 set_value:
1818         if (!psb_intel_sdvo_set_value(psb_intel_sdvo, cmd, &temp_value, 2))
1819                 return -EIO;
1820
1821
1822 done:
1823         if (psb_intel_sdvo->base.base.crtc) {
1824                 struct drm_crtc *crtc = psb_intel_sdvo->base.base.crtc;
1825                 drm_crtc_helper_set_mode(crtc, &crtc->mode, crtc->x,
1826                                          crtc->y, crtc->fb);
1827         }
1828
1829         return 0;
1830 #undef CHECK_PROPERTY
1831 }
1832
1833 static const struct drm_encoder_helper_funcs psb_intel_sdvo_helper_funcs = {
1834         .dpms = psb_intel_sdvo_dpms,
1835         .mode_fixup = psb_intel_sdvo_mode_fixup,
1836         .prepare = psb_intel_encoder_prepare,
1837         .mode_set = psb_intel_sdvo_mode_set,
1838         .commit = psb_intel_encoder_commit,
1839 };
1840
1841 static const struct drm_connector_funcs psb_intel_sdvo_connector_funcs = {
1842         .dpms = drm_helper_connector_dpms,
1843         .detect = psb_intel_sdvo_detect,
1844         .fill_modes = drm_helper_probe_single_connector_modes,
1845         .set_property = psb_intel_sdvo_set_property,
1846         .destroy = psb_intel_sdvo_destroy,
1847 };
1848
1849 static const struct drm_connector_helper_funcs psb_intel_sdvo_connector_helper_funcs = {
1850         .get_modes = psb_intel_sdvo_get_modes,
1851         .mode_valid = psb_intel_sdvo_mode_valid,
1852         .best_encoder = psb_intel_best_encoder,
1853 };
1854
1855 static void psb_intel_sdvo_enc_destroy(struct drm_encoder *encoder)
1856 {
1857         struct psb_intel_sdvo *psb_intel_sdvo = to_psb_intel_sdvo(encoder);
1858
1859         if (psb_intel_sdvo->sdvo_lvds_fixed_mode != NULL)
1860                 drm_mode_destroy(encoder->dev,
1861                                  psb_intel_sdvo->sdvo_lvds_fixed_mode);
1862
1863         i2c_del_adapter(&psb_intel_sdvo->ddc);
1864         psb_intel_encoder_destroy(encoder);
1865 }
1866
1867 static const struct drm_encoder_funcs psb_intel_sdvo_enc_funcs = {
1868         .destroy = psb_intel_sdvo_enc_destroy,
1869 };
1870
1871 static void
1872 psb_intel_sdvo_guess_ddc_bus(struct psb_intel_sdvo *sdvo)
1873 {
1874         /* FIXME: At the moment, ddc_bus = 2 is the only thing that works.
1875          * We need to figure out if this is true for all available poulsbo
1876          * hardware, or if we need to fiddle with the guessing code above.
1877          * The problem might go away if we can parse sdvo mappings from bios */
1878         sdvo->ddc_bus = 2;
1879
1880 #if 0
1881         uint16_t mask = 0;
1882         unsigned int num_bits;
1883
1884         /* Make a mask of outputs less than or equal to our own priority in the
1885          * list.
1886          */
1887         switch (sdvo->controlled_output) {
1888         case SDVO_OUTPUT_LVDS1:
1889                 mask |= SDVO_OUTPUT_LVDS1;
1890         case SDVO_OUTPUT_LVDS0:
1891                 mask |= SDVO_OUTPUT_LVDS0;
1892         case SDVO_OUTPUT_TMDS1:
1893                 mask |= SDVO_OUTPUT_TMDS1;
1894         case SDVO_OUTPUT_TMDS0:
1895                 mask |= SDVO_OUTPUT_TMDS0;
1896         case SDVO_OUTPUT_RGB1:
1897                 mask |= SDVO_OUTPUT_RGB1;
1898         case SDVO_OUTPUT_RGB0:
1899                 mask |= SDVO_OUTPUT_RGB0;
1900                 break;
1901         }
1902
1903         /* Count bits to find what number we are in the priority list. */
1904         mask &= sdvo->caps.output_flags;
1905         num_bits = hweight16(mask);
1906         /* If more than 3 outputs, default to DDC bus 3 for now. */
1907         if (num_bits > 3)
1908                 num_bits = 3;
1909
1910         /* Corresponds to SDVO_CONTROL_BUS_DDCx */
1911         sdvo->ddc_bus = 1 << num_bits;
1912 #endif
1913 }
1914
1915 /**
1916  * Choose the appropriate DDC bus for control bus switch command for this
1917  * SDVO output based on the controlled output.
1918  *
1919  * DDC bus number assignment is in a priority order of RGB outputs, then TMDS
1920  * outputs, then LVDS outputs.
1921  */
1922 static void
1923 psb_intel_sdvo_select_ddc_bus(struct drm_psb_private *dev_priv,
1924                           struct psb_intel_sdvo *sdvo, u32 reg)
1925 {
1926         struct sdvo_device_mapping *mapping;
1927
1928         if (IS_SDVOB(reg))
1929                 mapping = &(dev_priv->sdvo_mappings[0]);
1930         else
1931                 mapping = &(dev_priv->sdvo_mappings[1]);
1932
1933         if (mapping->initialized)
1934                 sdvo->ddc_bus = 1 << ((mapping->ddc_pin & 0xf0) >> 4);
1935         else
1936                 psb_intel_sdvo_guess_ddc_bus(sdvo);
1937 }
1938
1939 static void
1940 psb_intel_sdvo_select_i2c_bus(struct drm_psb_private *dev_priv,
1941                           struct psb_intel_sdvo *sdvo, u32 reg)
1942 {
1943         struct sdvo_device_mapping *mapping;
1944         u8 pin, speed;
1945
1946         if (IS_SDVOB(reg))
1947                 mapping = &dev_priv->sdvo_mappings[0];
1948         else
1949                 mapping = &dev_priv->sdvo_mappings[1];
1950
1951         pin = GMBUS_PORT_DPB;
1952         speed = GMBUS_RATE_1MHZ >> 8;
1953         if (mapping->initialized) {
1954                 pin = mapping->i2c_pin;
1955                 speed = mapping->i2c_speed;
1956         }
1957
1958         if (pin < GMBUS_NUM_PORTS) {
1959                 sdvo->i2c = &dev_priv->gmbus[pin].adapter;
1960                 gma_intel_gmbus_set_speed(sdvo->i2c, speed);
1961                 gma_intel_gmbus_force_bit(sdvo->i2c, true);
1962         } else
1963                 sdvo->i2c = &dev_priv->gmbus[GMBUS_PORT_DPB].adapter;
1964 }
1965
1966 static bool
1967 psb_intel_sdvo_is_hdmi_connector(struct psb_intel_sdvo *psb_intel_sdvo, int device)
1968 {
1969         return psb_intel_sdvo_check_supp_encode(psb_intel_sdvo);
1970 }
1971
1972 static u8
1973 psb_intel_sdvo_get_slave_addr(struct drm_device *dev, int sdvo_reg)
1974 {
1975         struct drm_psb_private *dev_priv = dev->dev_private;
1976         struct sdvo_device_mapping *my_mapping, *other_mapping;
1977
1978         if (IS_SDVOB(sdvo_reg)) {
1979                 my_mapping = &dev_priv->sdvo_mappings[0];
1980                 other_mapping = &dev_priv->sdvo_mappings[1];
1981         } else {
1982                 my_mapping = &dev_priv->sdvo_mappings[1];
1983                 other_mapping = &dev_priv->sdvo_mappings[0];
1984         }
1985
1986         /* If the BIOS described our SDVO device, take advantage of it. */
1987         if (my_mapping->slave_addr)
1988                 return my_mapping->slave_addr;
1989
1990         /* If the BIOS only described a different SDVO device, use the
1991          * address that it isn't using.
1992          */
1993         if (other_mapping->slave_addr) {
1994                 if (other_mapping->slave_addr == 0x70)
1995                         return 0x72;
1996                 else
1997                         return 0x70;
1998         }
1999
2000         /* No SDVO device info is found for another DVO port,
2001          * so use mapping assumption we had before BIOS parsing.
2002          */
2003         if (IS_SDVOB(sdvo_reg))
2004                 return 0x70;
2005         else
2006                 return 0x72;
2007 }
2008
2009 static void
2010 psb_intel_sdvo_connector_init(struct psb_intel_sdvo_connector *connector,
2011                           struct psb_intel_sdvo *encoder)
2012 {
2013         drm_connector_init(encoder->base.base.dev,
2014                            &connector->base.base,
2015                            &psb_intel_sdvo_connector_funcs,
2016                            connector->base.base.connector_type);
2017
2018         drm_connector_helper_add(&connector->base.base,
2019                                  &psb_intel_sdvo_connector_helper_funcs);
2020
2021         connector->base.base.interlace_allowed = 0;
2022         connector->base.base.doublescan_allowed = 0;
2023         connector->base.base.display_info.subpixel_order = SubPixelHorizontalRGB;
2024
2025         psb_intel_connector_attach_encoder(&connector->base, &encoder->base);
2026         drm_sysfs_connector_add(&connector->base.base);
2027 }
2028
2029 static void
2030 psb_intel_sdvo_add_hdmi_properties(struct psb_intel_sdvo_connector *connector)
2031 {
2032         /* FIXME: We don't support HDMI at the moment
2033         struct drm_device *dev = connector->base.base.dev;
2034
2035         intel_attach_force_audio_property(&connector->base.base);
2036         intel_attach_broadcast_rgb_property(&connector->base.base);
2037         */
2038 }
2039
2040 static bool
2041 psb_intel_sdvo_dvi_init(struct psb_intel_sdvo *psb_intel_sdvo, int device)
2042 {
2043         struct drm_encoder *encoder = &psb_intel_sdvo->base.base;
2044         struct drm_connector *connector;
2045         struct psb_intel_connector *intel_connector;
2046         struct psb_intel_sdvo_connector *psb_intel_sdvo_connector;
2047
2048         psb_intel_sdvo_connector = kzalloc(sizeof(struct psb_intel_sdvo_connector), GFP_KERNEL);
2049         if (!psb_intel_sdvo_connector)
2050                 return false;
2051
2052         if (device == 0) {
2053                 psb_intel_sdvo->controlled_output |= SDVO_OUTPUT_TMDS0;
2054                 psb_intel_sdvo_connector->output_flag = SDVO_OUTPUT_TMDS0;
2055         } else if (device == 1) {
2056                 psb_intel_sdvo->controlled_output |= SDVO_OUTPUT_TMDS1;
2057                 psb_intel_sdvo_connector->output_flag = SDVO_OUTPUT_TMDS1;
2058         }
2059
2060         intel_connector = &psb_intel_sdvo_connector->base;
2061         connector = &intel_connector->base;
2062         // connector->polled = DRM_CONNECTOR_POLL_CONNECT | DRM_CONNECTOR_POLL_DISCONNECT;
2063         encoder->encoder_type = DRM_MODE_ENCODER_TMDS;
2064         connector->connector_type = DRM_MODE_CONNECTOR_DVID;
2065
2066         if (psb_intel_sdvo_is_hdmi_connector(psb_intel_sdvo, device)) {
2067                 connector->connector_type = DRM_MODE_CONNECTOR_HDMIA;
2068                 psb_intel_sdvo->is_hdmi = true;
2069         }
2070         psb_intel_sdvo->base.clone_mask = ((1 << INTEL_SDVO_NON_TV_CLONE_BIT) |
2071                                        (1 << INTEL_ANALOG_CLONE_BIT));
2072
2073         psb_intel_sdvo_connector_init(psb_intel_sdvo_connector, psb_intel_sdvo);
2074         if (psb_intel_sdvo->is_hdmi)
2075                 psb_intel_sdvo_add_hdmi_properties(psb_intel_sdvo_connector);
2076
2077         return true;
2078 }
2079
2080 static bool
2081 psb_intel_sdvo_tv_init(struct psb_intel_sdvo *psb_intel_sdvo, int type)
2082 {
2083         struct drm_encoder *encoder = &psb_intel_sdvo->base.base;
2084         struct drm_connector *connector;
2085         struct psb_intel_connector *intel_connector;
2086         struct psb_intel_sdvo_connector *psb_intel_sdvo_connector;
2087
2088         psb_intel_sdvo_connector = kzalloc(sizeof(struct psb_intel_sdvo_connector), GFP_KERNEL);
2089         if (!psb_intel_sdvo_connector)
2090                 return false;
2091
2092         intel_connector = &psb_intel_sdvo_connector->base;
2093         connector = &intel_connector->base;
2094         encoder->encoder_type = DRM_MODE_ENCODER_TVDAC;
2095         connector->connector_type = DRM_MODE_CONNECTOR_SVIDEO;
2096
2097         psb_intel_sdvo->controlled_output |= type;
2098         psb_intel_sdvo_connector->output_flag = type;
2099
2100         psb_intel_sdvo->is_tv = true;
2101         psb_intel_sdvo->base.needs_tv_clock = true;
2102         psb_intel_sdvo->base.clone_mask = 1 << INTEL_SDVO_TV_CLONE_BIT;
2103
2104         psb_intel_sdvo_connector_init(psb_intel_sdvo_connector, psb_intel_sdvo);
2105
2106         if (!psb_intel_sdvo_tv_create_property(psb_intel_sdvo, psb_intel_sdvo_connector, type))
2107                 goto err;
2108
2109         if (!psb_intel_sdvo_create_enhance_property(psb_intel_sdvo, psb_intel_sdvo_connector))
2110                 goto err;
2111
2112         return true;
2113
2114 err:
2115         psb_intel_sdvo_destroy(connector);
2116         return false;
2117 }
2118
2119 static bool
2120 psb_intel_sdvo_analog_init(struct psb_intel_sdvo *psb_intel_sdvo, int device)
2121 {
2122         struct drm_encoder *encoder = &psb_intel_sdvo->base.base;
2123         struct drm_connector *connector;
2124         struct psb_intel_connector *intel_connector;
2125         struct psb_intel_sdvo_connector *psb_intel_sdvo_connector;
2126
2127         psb_intel_sdvo_connector = kzalloc(sizeof(struct psb_intel_sdvo_connector), GFP_KERNEL);
2128         if (!psb_intel_sdvo_connector)
2129                 return false;
2130
2131         intel_connector = &psb_intel_sdvo_connector->base;
2132         connector = &intel_connector->base;
2133         connector->polled = DRM_CONNECTOR_POLL_CONNECT;
2134         encoder->encoder_type = DRM_MODE_ENCODER_DAC;
2135         connector->connector_type = DRM_MODE_CONNECTOR_VGA;
2136
2137         if (device == 0) {
2138                 psb_intel_sdvo->controlled_output |= SDVO_OUTPUT_RGB0;
2139                 psb_intel_sdvo_connector->output_flag = SDVO_OUTPUT_RGB0;
2140         } else if (device == 1) {
2141                 psb_intel_sdvo->controlled_output |= SDVO_OUTPUT_RGB1;
2142                 psb_intel_sdvo_connector->output_flag = SDVO_OUTPUT_RGB1;
2143         }
2144
2145         psb_intel_sdvo->base.clone_mask = ((1 << INTEL_SDVO_NON_TV_CLONE_BIT) |
2146                                        (1 << INTEL_ANALOG_CLONE_BIT));
2147
2148         psb_intel_sdvo_connector_init(psb_intel_sdvo_connector,
2149                                   psb_intel_sdvo);
2150         return true;
2151 }
2152
2153 static bool
2154 psb_intel_sdvo_lvds_init(struct psb_intel_sdvo *psb_intel_sdvo, int device)
2155 {
2156         struct drm_encoder *encoder = &psb_intel_sdvo->base.base;
2157         struct drm_connector *connector;
2158         struct psb_intel_connector *intel_connector;
2159         struct psb_intel_sdvo_connector *psb_intel_sdvo_connector;
2160
2161         psb_intel_sdvo_connector = kzalloc(sizeof(struct psb_intel_sdvo_connector), GFP_KERNEL);
2162         if (!psb_intel_sdvo_connector)
2163                 return false;
2164
2165         intel_connector = &psb_intel_sdvo_connector->base;
2166         connector = &intel_connector->base;
2167         encoder->encoder_type = DRM_MODE_ENCODER_LVDS;
2168         connector->connector_type = DRM_MODE_CONNECTOR_LVDS;
2169
2170         if (device == 0) {
2171                 psb_intel_sdvo->controlled_output |= SDVO_OUTPUT_LVDS0;
2172                 psb_intel_sdvo_connector->output_flag = SDVO_OUTPUT_LVDS0;
2173         } else if (device == 1) {
2174                 psb_intel_sdvo->controlled_output |= SDVO_OUTPUT_LVDS1;
2175                 psb_intel_sdvo_connector->output_flag = SDVO_OUTPUT_LVDS1;
2176         }
2177
2178         psb_intel_sdvo->base.clone_mask = ((1 << INTEL_ANALOG_CLONE_BIT) |
2179                                        (1 << INTEL_SDVO_LVDS_CLONE_BIT));
2180
2181         psb_intel_sdvo_connector_init(psb_intel_sdvo_connector, psb_intel_sdvo);
2182         if (!psb_intel_sdvo_create_enhance_property(psb_intel_sdvo, psb_intel_sdvo_connector))
2183                 goto err;
2184
2185         return true;
2186
2187 err:
2188         psb_intel_sdvo_destroy(connector);
2189         return false;
2190 }
2191
2192 static bool
2193 psb_intel_sdvo_output_setup(struct psb_intel_sdvo *psb_intel_sdvo, uint16_t flags)
2194 {
2195         psb_intel_sdvo->is_tv = false;
2196         psb_intel_sdvo->base.needs_tv_clock = false;
2197         psb_intel_sdvo->is_lvds = false;
2198
2199         /* SDVO requires XXX1 function may not exist unless it has XXX0 function.*/
2200
2201         if (flags & SDVO_OUTPUT_TMDS0)
2202                 if (!psb_intel_sdvo_dvi_init(psb_intel_sdvo, 0))
2203                         return false;
2204
2205         if ((flags & SDVO_TMDS_MASK) == SDVO_TMDS_MASK)
2206                 if (!psb_intel_sdvo_dvi_init(psb_intel_sdvo, 1))
2207                         return false;
2208
2209         /* TV has no XXX1 function block */
2210         if (flags & SDVO_OUTPUT_SVID0)
2211                 if (!psb_intel_sdvo_tv_init(psb_intel_sdvo, SDVO_OUTPUT_SVID0))
2212                         return false;
2213
2214         if (flags & SDVO_OUTPUT_CVBS0)
2215                 if (!psb_intel_sdvo_tv_init(psb_intel_sdvo, SDVO_OUTPUT_CVBS0))
2216                         return false;
2217
2218         if (flags & SDVO_OUTPUT_RGB0)
2219                 if (!psb_intel_sdvo_analog_init(psb_intel_sdvo, 0))
2220                         return false;
2221
2222         if ((flags & SDVO_RGB_MASK) == SDVO_RGB_MASK)
2223                 if (!psb_intel_sdvo_analog_init(psb_intel_sdvo, 1))
2224                         return false;
2225
2226         if (flags & SDVO_OUTPUT_LVDS0)
2227                 if (!psb_intel_sdvo_lvds_init(psb_intel_sdvo, 0))
2228                         return false;
2229
2230         if ((flags & SDVO_LVDS_MASK) == SDVO_LVDS_MASK)
2231                 if (!psb_intel_sdvo_lvds_init(psb_intel_sdvo, 1))
2232                         return false;
2233
2234         if ((flags & SDVO_OUTPUT_MASK) == 0) {
2235                 unsigned char bytes[2];
2236
2237                 psb_intel_sdvo->controlled_output = 0;
2238                 memcpy(bytes, &psb_intel_sdvo->caps.output_flags, 2);
2239                 DRM_DEBUG_KMS("%s: Unknown SDVO output type (0x%02x%02x)\n",
2240                               SDVO_NAME(psb_intel_sdvo),
2241                               bytes[0], bytes[1]);
2242                 return false;
2243         }
2244         psb_intel_sdvo->base.crtc_mask = (1 << 0) | (1 << 1);
2245
2246         return true;
2247 }
2248
2249 static bool psb_intel_sdvo_tv_create_property(struct psb_intel_sdvo *psb_intel_sdvo,
2250                                           struct psb_intel_sdvo_connector *psb_intel_sdvo_connector,
2251                                           int type)
2252 {
2253         struct drm_device *dev = psb_intel_sdvo->base.base.dev;
2254         struct psb_intel_sdvo_tv_format format;
2255         uint32_t format_map, i;
2256
2257         if (!psb_intel_sdvo_set_target_output(psb_intel_sdvo, type))
2258                 return false;
2259
2260         BUILD_BUG_ON(sizeof(format) != 6);
2261         if (!psb_intel_sdvo_get_value(psb_intel_sdvo,
2262                                   SDVO_CMD_GET_SUPPORTED_TV_FORMATS,
2263                                   &format, sizeof(format)))
2264                 return false;
2265
2266         memcpy(&format_map, &format, min(sizeof(format_map), sizeof(format)));
2267
2268         if (format_map == 0)
2269                 return false;
2270
2271         psb_intel_sdvo_connector->format_supported_num = 0;
2272         for (i = 0 ; i < TV_FORMAT_NUM; i++)
2273                 if (format_map & (1 << i))
2274                         psb_intel_sdvo_connector->tv_format_supported[psb_intel_sdvo_connector->format_supported_num++] = i;
2275
2276
2277         psb_intel_sdvo_connector->tv_format =
2278                         drm_property_create(dev, DRM_MODE_PROP_ENUM,
2279                                             "mode", psb_intel_sdvo_connector->format_supported_num);
2280         if (!psb_intel_sdvo_connector->tv_format)
2281                 return false;
2282
2283         for (i = 0; i < psb_intel_sdvo_connector->format_supported_num; i++)
2284                 drm_property_add_enum(
2285                                 psb_intel_sdvo_connector->tv_format, i,
2286                                 i, tv_format_names[psb_intel_sdvo_connector->tv_format_supported[i]]);
2287
2288         psb_intel_sdvo->tv_format_index = psb_intel_sdvo_connector->tv_format_supported[0];
2289         drm_connector_attach_property(&psb_intel_sdvo_connector->base.base,
2290                                       psb_intel_sdvo_connector->tv_format, 0);
2291         return true;
2292
2293 }
2294
2295 #define ENHANCEMENT(name, NAME) do { \
2296         if (enhancements.name) { \
2297                 if (!psb_intel_sdvo_get_value(psb_intel_sdvo, SDVO_CMD_GET_MAX_##NAME, &data_value, 4) || \
2298                     !psb_intel_sdvo_get_value(psb_intel_sdvo, SDVO_CMD_GET_##NAME, &response, 2)) \
2299                         return false; \
2300                 psb_intel_sdvo_connector->max_##name = data_value[0]; \
2301                 psb_intel_sdvo_connector->cur_##name = response; \
2302                 psb_intel_sdvo_connector->name = \
2303                         drm_property_create_range(dev, 0, #name, 0, data_value[0]); \
2304                 if (!psb_intel_sdvo_connector->name) return false; \
2305                 drm_connector_attach_property(connector, \
2306                                               psb_intel_sdvo_connector->name, \
2307                                               psb_intel_sdvo_connector->cur_##name); \
2308                 DRM_DEBUG_KMS(#name ": max %d, default %d, current %d\n", \
2309                               data_value[0], data_value[1], response); \
2310         } \
2311 } while(0)
2312
2313 static bool
2314 psb_intel_sdvo_create_enhance_property_tv(struct psb_intel_sdvo *psb_intel_sdvo,
2315                                       struct psb_intel_sdvo_connector *psb_intel_sdvo_connector,
2316                                       struct psb_intel_sdvo_enhancements_reply enhancements)
2317 {
2318         struct drm_device *dev = psb_intel_sdvo->base.base.dev;
2319         struct drm_connector *connector = &psb_intel_sdvo_connector->base.base;
2320         uint16_t response, data_value[2];
2321
2322         /* when horizontal overscan is supported, Add the left/right  property */
2323         if (enhancements.overscan_h) {
2324                 if (!psb_intel_sdvo_get_value(psb_intel_sdvo,
2325                                           SDVO_CMD_GET_MAX_OVERSCAN_H,
2326                                           &data_value, 4))
2327                         return false;
2328
2329                 if (!psb_intel_sdvo_get_value(psb_intel_sdvo,
2330                                           SDVO_CMD_GET_OVERSCAN_H,
2331                                           &response, 2))
2332                         return false;
2333
2334                 psb_intel_sdvo_connector->max_hscan = data_value[0];
2335                 psb_intel_sdvo_connector->left_margin = data_value[0] - response;
2336                 psb_intel_sdvo_connector->right_margin = psb_intel_sdvo_connector->left_margin;
2337                 psb_intel_sdvo_connector->left =
2338                         drm_property_create_range(dev, 0, "left_margin", 0, data_value[0]);
2339                 if (!psb_intel_sdvo_connector->left)
2340                         return false;
2341
2342                 drm_connector_attach_property(connector,
2343                                               psb_intel_sdvo_connector->left,
2344                                               psb_intel_sdvo_connector->left_margin);
2345
2346                 psb_intel_sdvo_connector->right =
2347                         drm_property_create_range(dev, 0, "right_margin", 0, data_value[0]);
2348                 if (!psb_intel_sdvo_connector->right)
2349                         return false;
2350
2351                 drm_connector_attach_property(connector,
2352                                               psb_intel_sdvo_connector->right,
2353                                               psb_intel_sdvo_connector->right_margin);
2354                 DRM_DEBUG_KMS("h_overscan: max %d, "
2355                               "default %d, current %d\n",
2356                               data_value[0], data_value[1], response);
2357         }
2358
2359         if (enhancements.overscan_v) {
2360                 if (!psb_intel_sdvo_get_value(psb_intel_sdvo,
2361                                           SDVO_CMD_GET_MAX_OVERSCAN_V,
2362                                           &data_value, 4))
2363                         return false;
2364
2365                 if (!psb_intel_sdvo_get_value(psb_intel_sdvo,
2366                                           SDVO_CMD_GET_OVERSCAN_V,
2367                                           &response, 2))
2368                         return false;
2369
2370                 psb_intel_sdvo_connector->max_vscan = data_value[0];
2371                 psb_intel_sdvo_connector->top_margin = data_value[0] - response;
2372                 psb_intel_sdvo_connector->bottom_margin = psb_intel_sdvo_connector->top_margin;
2373                 psb_intel_sdvo_connector->top =
2374                         drm_property_create_range(dev, 0, "top_margin", 0, data_value[0]);
2375                 if (!psb_intel_sdvo_connector->top)
2376                         return false;
2377
2378                 drm_connector_attach_property(connector,
2379                                               psb_intel_sdvo_connector->top,
2380                                               psb_intel_sdvo_connector->top_margin);
2381
2382                 psb_intel_sdvo_connector->bottom =
2383                         drm_property_create_range(dev, 0, "bottom_margin", 0, data_value[0]);
2384                 if (!psb_intel_sdvo_connector->bottom)
2385                         return false;
2386
2387                 drm_connector_attach_property(connector,
2388                                               psb_intel_sdvo_connector->bottom,
2389                                               psb_intel_sdvo_connector->bottom_margin);
2390                 DRM_DEBUG_KMS("v_overscan: max %d, "
2391                               "default %d, current %d\n",
2392                               data_value[0], data_value[1], response);
2393         }
2394
2395         ENHANCEMENT(hpos, HPOS);
2396         ENHANCEMENT(vpos, VPOS);
2397         ENHANCEMENT(saturation, SATURATION);
2398         ENHANCEMENT(contrast, CONTRAST);
2399         ENHANCEMENT(hue, HUE);
2400         ENHANCEMENT(sharpness, SHARPNESS);
2401         ENHANCEMENT(brightness, BRIGHTNESS);
2402         ENHANCEMENT(flicker_filter, FLICKER_FILTER);
2403         ENHANCEMENT(flicker_filter_adaptive, FLICKER_FILTER_ADAPTIVE);
2404         ENHANCEMENT(flicker_filter_2d, FLICKER_FILTER_2D);
2405         ENHANCEMENT(tv_chroma_filter, TV_CHROMA_FILTER);
2406         ENHANCEMENT(tv_luma_filter, TV_LUMA_FILTER);
2407
2408         if (enhancements.dot_crawl) {
2409                 if (!psb_intel_sdvo_get_value(psb_intel_sdvo, SDVO_CMD_GET_DOT_CRAWL, &response, 2))
2410                         return false;
2411
2412                 psb_intel_sdvo_connector->max_dot_crawl = 1;
2413                 psb_intel_sdvo_connector->cur_dot_crawl = response & 0x1;
2414                 psb_intel_sdvo_connector->dot_crawl =
2415                         drm_property_create_range(dev, 0, "dot_crawl", 0, 1);
2416                 if (!psb_intel_sdvo_connector->dot_crawl)
2417                         return false;
2418
2419                 drm_connector_attach_property(connector,
2420                                               psb_intel_sdvo_connector->dot_crawl,
2421                                               psb_intel_sdvo_connector->cur_dot_crawl);
2422                 DRM_DEBUG_KMS("dot crawl: current %d\n", response);
2423         }
2424
2425         return true;
2426 }
2427
2428 static bool
2429 psb_intel_sdvo_create_enhance_property_lvds(struct psb_intel_sdvo *psb_intel_sdvo,
2430                                         struct psb_intel_sdvo_connector *psb_intel_sdvo_connector,
2431                                         struct psb_intel_sdvo_enhancements_reply enhancements)
2432 {
2433         struct drm_device *dev = psb_intel_sdvo->base.base.dev;
2434         struct drm_connector *connector = &psb_intel_sdvo_connector->base.base;
2435         uint16_t response, data_value[2];
2436
2437         ENHANCEMENT(brightness, BRIGHTNESS);
2438
2439         return true;
2440 }
2441 #undef ENHANCEMENT
2442
2443 static bool psb_intel_sdvo_create_enhance_property(struct psb_intel_sdvo *psb_intel_sdvo,
2444                                                struct psb_intel_sdvo_connector *psb_intel_sdvo_connector)
2445 {
2446         union {
2447                 struct psb_intel_sdvo_enhancements_reply reply;
2448                 uint16_t response;
2449         } enhancements;
2450
2451         BUILD_BUG_ON(sizeof(enhancements) != 2);
2452
2453         enhancements.response = 0;
2454         psb_intel_sdvo_get_value(psb_intel_sdvo,
2455                              SDVO_CMD_GET_SUPPORTED_ENHANCEMENTS,
2456                              &enhancements, sizeof(enhancements));
2457         if (enhancements.response == 0) {
2458                 DRM_DEBUG_KMS("No enhancement is supported\n");
2459                 return true;
2460         }
2461
2462         if (IS_TV(psb_intel_sdvo_connector))
2463                 return psb_intel_sdvo_create_enhance_property_tv(psb_intel_sdvo, psb_intel_sdvo_connector, enhancements.reply);
2464         else if(IS_LVDS(psb_intel_sdvo_connector))
2465                 return psb_intel_sdvo_create_enhance_property_lvds(psb_intel_sdvo, psb_intel_sdvo_connector, enhancements.reply);
2466         else
2467                 return true;
2468 }
2469
2470 static int psb_intel_sdvo_ddc_proxy_xfer(struct i2c_adapter *adapter,
2471                                      struct i2c_msg *msgs,
2472                                      int num)
2473 {
2474         struct psb_intel_sdvo *sdvo = adapter->algo_data;
2475
2476         if (!psb_intel_sdvo_set_control_bus_switch(sdvo, sdvo->ddc_bus))
2477                 return -EIO;
2478
2479         return sdvo->i2c->algo->master_xfer(sdvo->i2c, msgs, num);
2480 }
2481
2482 static u32 psb_intel_sdvo_ddc_proxy_func(struct i2c_adapter *adapter)
2483 {
2484         struct psb_intel_sdvo *sdvo = adapter->algo_data;
2485         return sdvo->i2c->algo->functionality(sdvo->i2c);
2486 }
2487
2488 static const struct i2c_algorithm psb_intel_sdvo_ddc_proxy = {
2489         .master_xfer    = psb_intel_sdvo_ddc_proxy_xfer,
2490         .functionality  = psb_intel_sdvo_ddc_proxy_func
2491 };
2492
2493 static bool
2494 psb_intel_sdvo_init_ddc_proxy(struct psb_intel_sdvo *sdvo,
2495                           struct drm_device *dev)
2496 {
2497         sdvo->ddc.owner = THIS_MODULE;
2498         sdvo->ddc.class = I2C_CLASS_DDC;
2499         snprintf(sdvo->ddc.name, I2C_NAME_SIZE, "SDVO DDC proxy");
2500         sdvo->ddc.dev.parent = &dev->pdev->dev;
2501         sdvo->ddc.algo_data = sdvo;
2502         sdvo->ddc.algo = &psb_intel_sdvo_ddc_proxy;
2503
2504         return i2c_add_adapter(&sdvo->ddc) == 0;
2505 }
2506
2507 bool psb_intel_sdvo_init(struct drm_device *dev, int sdvo_reg)
2508 {
2509         struct drm_psb_private *dev_priv = dev->dev_private;
2510         struct psb_intel_encoder *psb_intel_encoder;
2511         struct psb_intel_sdvo *psb_intel_sdvo;
2512         int i;
2513
2514         psb_intel_sdvo = kzalloc(sizeof(struct psb_intel_sdvo), GFP_KERNEL);
2515         if (!psb_intel_sdvo)
2516                 return false;
2517
2518         psb_intel_sdvo->sdvo_reg = sdvo_reg;
2519         psb_intel_sdvo->slave_addr = psb_intel_sdvo_get_slave_addr(dev, sdvo_reg) >> 1;
2520         psb_intel_sdvo_select_i2c_bus(dev_priv, psb_intel_sdvo, sdvo_reg);
2521         if (!psb_intel_sdvo_init_ddc_proxy(psb_intel_sdvo, dev)) {
2522                 kfree(psb_intel_sdvo);
2523                 return false;
2524         }
2525
2526         /* encoder type will be decided later */
2527         psb_intel_encoder = &psb_intel_sdvo->base;
2528         psb_intel_encoder->type = INTEL_OUTPUT_SDVO;
2529         drm_encoder_init(dev, &psb_intel_encoder->base, &psb_intel_sdvo_enc_funcs, 0);
2530
2531         /* Read the regs to test if we can talk to the device */
2532         for (i = 0; i < 0x40; i++) {
2533                 u8 byte;
2534
2535                 if (!psb_intel_sdvo_read_byte(psb_intel_sdvo, i, &byte)) {
2536                         DRM_DEBUG_KMS("No SDVO device found on SDVO%c\n",
2537                                       IS_SDVOB(sdvo_reg) ? 'B' : 'C');
2538                         goto err;
2539                 }
2540         }
2541
2542         if (IS_SDVOB(sdvo_reg))
2543                 dev_priv->hotplug_supported_mask |= SDVOB_HOTPLUG_INT_STATUS;
2544         else
2545                 dev_priv->hotplug_supported_mask |= SDVOC_HOTPLUG_INT_STATUS;
2546
2547         drm_encoder_helper_add(&psb_intel_encoder->base, &psb_intel_sdvo_helper_funcs);
2548
2549         /* In default case sdvo lvds is false */
2550         if (!psb_intel_sdvo_get_capabilities(psb_intel_sdvo, &psb_intel_sdvo->caps))
2551                 goto err;
2552
2553         if (psb_intel_sdvo_output_setup(psb_intel_sdvo,
2554                                     psb_intel_sdvo->caps.output_flags) != true) {
2555                 DRM_DEBUG_KMS("SDVO output failed to setup on SDVO%c\n",
2556                               IS_SDVOB(sdvo_reg) ? 'B' : 'C');
2557                 goto err;
2558         }
2559
2560         psb_intel_sdvo_select_ddc_bus(dev_priv, psb_intel_sdvo, sdvo_reg);
2561
2562         /* Set the input timing to the screen. Assume always input 0. */
2563         if (!psb_intel_sdvo_set_target_input(psb_intel_sdvo))
2564                 goto err;
2565
2566         if (!psb_intel_sdvo_get_input_pixel_clock_range(psb_intel_sdvo,
2567                                                     &psb_intel_sdvo->pixel_clock_min,
2568                                                     &psb_intel_sdvo->pixel_clock_max))
2569                 goto err;
2570
2571         DRM_DEBUG_KMS("%s device VID/DID: %02X:%02X.%02X, "
2572                         "clock range %dMHz - %dMHz, "
2573                         "input 1: %c, input 2: %c, "
2574                         "output 1: %c, output 2: %c\n",
2575                         SDVO_NAME(psb_intel_sdvo),
2576                         psb_intel_sdvo->caps.vendor_id, psb_intel_sdvo->caps.device_id,
2577                         psb_intel_sdvo->caps.device_rev_id,
2578                         psb_intel_sdvo->pixel_clock_min / 1000,
2579                         psb_intel_sdvo->pixel_clock_max / 1000,
2580                         (psb_intel_sdvo->caps.sdvo_inputs_mask & 0x1) ? 'Y' : 'N',
2581                         (psb_intel_sdvo->caps.sdvo_inputs_mask & 0x2) ? 'Y' : 'N',
2582                         /* check currently supported outputs */
2583                         psb_intel_sdvo->caps.output_flags &
2584                         (SDVO_OUTPUT_TMDS0 | SDVO_OUTPUT_RGB0) ? 'Y' : 'N',
2585                         psb_intel_sdvo->caps.output_flags &
2586                         (SDVO_OUTPUT_TMDS1 | SDVO_OUTPUT_RGB1) ? 'Y' : 'N');
2587         return true;
2588
2589 err:
2590         drm_encoder_cleanup(&psb_intel_encoder->base);
2591         i2c_del_adapter(&psb_intel_sdvo->ddc);
2592         kfree(psb_intel_sdvo);
2593
2594         return false;
2595 }