Rev 4560 | Rev 5354 | Go to most recent revision | Only display areas with differences | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 4560 | Rev 5060 | ||
---|---|---|---|
1 | /* |
1 | /* |
2 | * Copyright 2006 Dave Airlie |
2 | * Copyright 2006 Dave Airlie |
3 | * Copyright © 2006-2007 Intel Corporation |
3 | * Copyright © 2006-2007 Intel Corporation |
4 | * |
4 | * |
5 | * Permission is hereby granted, free of charge, to any person obtaining a |
5 | * Permission is hereby granted, free of charge, to any person obtaining a |
6 | * copy of this software and associated documentation files (the "Software"), |
6 | * copy of this software and associated documentation files (the "Software"), |
7 | * to deal in the Software without restriction, including without limitation |
7 | * to deal in the Software without restriction, including without limitation |
8 | * the rights to use, copy, modify, merge, publish, distribute, sublicense, |
8 | * the rights to use, copy, modify, merge, publish, distribute, sublicense, |
9 | * and/or sell copies of the Software, and to permit persons to whom the |
9 | * and/or sell copies of the Software, and to permit persons to whom the |
10 | * Software is furnished to do so, subject to the following conditions: |
10 | * Software is furnished to do so, subject to the following conditions: |
11 | * |
11 | * |
12 | * The above copyright notice and this permission notice (including the next |
12 | * The above copyright notice and this permission notice (including the next |
13 | * paragraph) shall be included in all copies or substantial portions of the |
13 | * paragraph) shall be included in all copies or substantial portions of the |
14 | * Software. |
14 | * Software. |
15 | * |
15 | * |
16 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
16 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
17 | * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
17 | * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
18 | * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL |
18 | * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL |
19 | * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
19 | * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
20 | * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
20 | * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
21 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
21 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
22 | * DEALINGS IN THE SOFTWARE. |
22 | * DEALINGS IN THE SOFTWARE. |
23 | * |
23 | * |
24 | * Authors: |
24 | * Authors: |
25 | * Eric Anholt |
25 | * Eric Anholt |
26 | */ |
26 | */ |
27 | #include |
27 | #include |
28 | #include |
28 | #include |
29 | #include |
29 | #include |
30 | #include |
30 | #include |
31 | #include "intel_drv.h" |
31 | #include "intel_drv.h" |
32 | #include |
32 | #include |
33 | #include "i915_drv.h" |
33 | #include "i915_drv.h" |
34 | #include "dvo.h" |
34 | #include "dvo.h" |
35 | 35 | ||
36 | #define SIL164_ADDR 0x38 |
36 | #define SIL164_ADDR 0x38 |
37 | #define CH7xxx_ADDR 0x76 |
37 | #define CH7xxx_ADDR 0x76 |
38 | #define TFP410_ADDR 0x38 |
38 | #define TFP410_ADDR 0x38 |
39 | #define NS2501_ADDR 0x38 |
39 | #define NS2501_ADDR 0x38 |
40 | 40 | ||
41 | static const struct intel_dvo_device intel_dvo_devices[] = { |
41 | static const struct intel_dvo_device intel_dvo_devices[] = { |
42 | { |
42 | { |
43 | .type = INTEL_DVO_CHIP_TMDS, |
43 | .type = INTEL_DVO_CHIP_TMDS, |
44 | .name = "sil164", |
44 | .name = "sil164", |
45 | .dvo_reg = DVOC, |
45 | .dvo_reg = DVOC, |
46 | .slave_addr = SIL164_ADDR, |
46 | .slave_addr = SIL164_ADDR, |
47 | .dev_ops = &sil164_ops, |
47 | .dev_ops = &sil164_ops, |
48 | }, |
48 | }, |
49 | { |
49 | { |
50 | .type = INTEL_DVO_CHIP_TMDS, |
50 | .type = INTEL_DVO_CHIP_TMDS, |
51 | .name = "ch7xxx", |
51 | .name = "ch7xxx", |
52 | .dvo_reg = DVOC, |
52 | .dvo_reg = DVOC, |
53 | .slave_addr = CH7xxx_ADDR, |
53 | .slave_addr = CH7xxx_ADDR, |
54 | .dev_ops = &ch7xxx_ops, |
54 | .dev_ops = &ch7xxx_ops, |
55 | }, |
55 | }, |
56 | { |
56 | { |
57 | .type = INTEL_DVO_CHIP_TMDS, |
57 | .type = INTEL_DVO_CHIP_TMDS, |
58 | .name = "ch7xxx", |
58 | .name = "ch7xxx", |
59 | .dvo_reg = DVOC, |
59 | .dvo_reg = DVOC, |
60 | .slave_addr = 0x75, /* For some ch7010 */ |
60 | .slave_addr = 0x75, /* For some ch7010 */ |
61 | .dev_ops = &ch7xxx_ops, |
61 | .dev_ops = &ch7xxx_ops, |
62 | }, |
62 | }, |
63 | { |
63 | { |
64 | .type = INTEL_DVO_CHIP_LVDS, |
64 | .type = INTEL_DVO_CHIP_LVDS, |
65 | .name = "ivch", |
65 | .name = "ivch", |
66 | .dvo_reg = DVOA, |
66 | .dvo_reg = DVOA, |
67 | .slave_addr = 0x02, /* Might also be 0x44, 0x84, 0xc4 */ |
67 | .slave_addr = 0x02, /* Might also be 0x44, 0x84, 0xc4 */ |
68 | .dev_ops = &ivch_ops, |
68 | .dev_ops = &ivch_ops, |
69 | }, |
69 | }, |
70 | { |
70 | { |
71 | .type = INTEL_DVO_CHIP_TMDS, |
71 | .type = INTEL_DVO_CHIP_TMDS, |
72 | .name = "tfp410", |
72 | .name = "tfp410", |
73 | .dvo_reg = DVOC, |
73 | .dvo_reg = DVOC, |
74 | .slave_addr = TFP410_ADDR, |
74 | .slave_addr = TFP410_ADDR, |
75 | .dev_ops = &tfp410_ops, |
75 | .dev_ops = &tfp410_ops, |
76 | }, |
76 | }, |
77 | { |
77 | { |
78 | .type = INTEL_DVO_CHIP_LVDS, |
78 | .type = INTEL_DVO_CHIP_LVDS, |
79 | .name = "ch7017", |
79 | .name = "ch7017", |
80 | .dvo_reg = DVOC, |
80 | .dvo_reg = DVOC, |
81 | .slave_addr = 0x75, |
81 | .slave_addr = 0x75, |
82 | .gpio = GMBUS_PORT_DPB, |
82 | .gpio = GMBUS_PORT_DPB, |
83 | .dev_ops = &ch7017_ops, |
83 | .dev_ops = &ch7017_ops, |
84 | }, |
84 | }, |
85 | { |
85 | { |
86 | .type = INTEL_DVO_CHIP_TMDS, |
86 | .type = INTEL_DVO_CHIP_TMDS, |
87 | .name = "ns2501", |
87 | .name = "ns2501", |
88 | .dvo_reg = DVOC, |
88 | .dvo_reg = DVOC, |
89 | .slave_addr = NS2501_ADDR, |
89 | .slave_addr = NS2501_ADDR, |
90 | .dev_ops = &ns2501_ops, |
90 | .dev_ops = &ns2501_ops, |
91 | } |
91 | } |
92 | }; |
92 | }; |
93 | 93 | ||
94 | struct intel_dvo { |
94 | struct intel_dvo { |
95 | struct intel_encoder base; |
95 | struct intel_encoder base; |
96 | 96 | ||
97 | struct intel_dvo_device dev; |
97 | struct intel_dvo_device dev; |
98 | 98 | ||
99 | struct drm_display_mode *panel_fixed_mode; |
99 | struct drm_display_mode *panel_fixed_mode; |
100 | bool panel_wants_dither; |
100 | bool panel_wants_dither; |
101 | }; |
101 | }; |
102 | 102 | ||
103 | static struct intel_dvo *enc_to_dvo(struct intel_encoder *encoder) |
103 | static struct intel_dvo *enc_to_dvo(struct intel_encoder *encoder) |
104 | { |
104 | { |
105 | return container_of(encoder, struct intel_dvo, base); |
105 | return container_of(encoder, struct intel_dvo, base); |
106 | } |
106 | } |
107 | 107 | ||
108 | static struct intel_dvo *intel_attached_dvo(struct drm_connector *connector) |
108 | static struct intel_dvo *intel_attached_dvo(struct drm_connector *connector) |
109 | { |
109 | { |
110 | return enc_to_dvo(intel_attached_encoder(connector)); |
110 | return enc_to_dvo(intel_attached_encoder(connector)); |
111 | } |
111 | } |
112 | 112 | ||
113 | static bool intel_dvo_connector_get_hw_state(struct intel_connector *connector) |
113 | static bool intel_dvo_connector_get_hw_state(struct intel_connector *connector) |
114 | { |
114 | { |
- | 115 | struct drm_device *dev = connector->base.dev; |
|
- | 116 | struct drm_i915_private *dev_priv = dev->dev_private; |
|
115 | struct intel_dvo *intel_dvo = intel_attached_dvo(&connector->base); |
117 | struct intel_dvo *intel_dvo = intel_attached_dvo(&connector->base); |
- | 118 | u32 tmp; |
|
- | 119 | ||
- | 120 | tmp = I915_READ(intel_dvo->dev.dvo_reg); |
|
- | 121 | ||
- | 122 | if (!(tmp & DVO_ENABLE)) |
|
- | 123 | return false; |
|
116 | 124 | ||
117 | return intel_dvo->dev.dev_ops->get_hw_state(&intel_dvo->dev); |
125 | return intel_dvo->dev.dev_ops->get_hw_state(&intel_dvo->dev); |
118 | } |
126 | } |
119 | 127 | ||
120 | static bool intel_dvo_get_hw_state(struct intel_encoder *encoder, |
128 | static bool intel_dvo_get_hw_state(struct intel_encoder *encoder, |
121 | enum pipe *pipe) |
129 | enum pipe *pipe) |
122 | { |
130 | { |
123 | struct drm_device *dev = encoder->base.dev; |
131 | struct drm_device *dev = encoder->base.dev; |
124 | struct drm_i915_private *dev_priv = dev->dev_private; |
132 | struct drm_i915_private *dev_priv = dev->dev_private; |
125 | struct intel_dvo *intel_dvo = enc_to_dvo(encoder); |
133 | struct intel_dvo *intel_dvo = enc_to_dvo(encoder); |
126 | u32 tmp; |
134 | u32 tmp; |
127 | 135 | ||
128 | tmp = I915_READ(intel_dvo->dev.dvo_reg); |
136 | tmp = I915_READ(intel_dvo->dev.dvo_reg); |
129 | 137 | ||
130 | if (!(tmp & DVO_ENABLE)) |
138 | if (!(tmp & DVO_ENABLE)) |
131 | return false; |
139 | return false; |
132 | 140 | ||
133 | *pipe = PORT_TO_PIPE(tmp); |
141 | *pipe = PORT_TO_PIPE(tmp); |
134 | 142 | ||
135 | return true; |
143 | return true; |
136 | } |
144 | } |
137 | 145 | ||
138 | static void intel_dvo_get_config(struct intel_encoder *encoder, |
146 | static void intel_dvo_get_config(struct intel_encoder *encoder, |
139 | struct intel_crtc_config *pipe_config) |
147 | struct intel_crtc_config *pipe_config) |
140 | { |
148 | { |
141 | struct drm_i915_private *dev_priv = encoder->base.dev->dev_private; |
149 | struct drm_i915_private *dev_priv = encoder->base.dev->dev_private; |
142 | struct intel_dvo *intel_dvo = enc_to_dvo(encoder); |
150 | struct intel_dvo *intel_dvo = enc_to_dvo(encoder); |
143 | u32 tmp, flags = 0; |
151 | u32 tmp, flags = 0; |
144 | 152 | ||
145 | tmp = I915_READ(intel_dvo->dev.dvo_reg); |
153 | tmp = I915_READ(intel_dvo->dev.dvo_reg); |
146 | if (tmp & DVO_HSYNC_ACTIVE_HIGH) |
154 | if (tmp & DVO_HSYNC_ACTIVE_HIGH) |
147 | flags |= DRM_MODE_FLAG_PHSYNC; |
155 | flags |= DRM_MODE_FLAG_PHSYNC; |
148 | else |
156 | else |
149 | flags |= DRM_MODE_FLAG_NHSYNC; |
157 | flags |= DRM_MODE_FLAG_NHSYNC; |
150 | if (tmp & DVO_VSYNC_ACTIVE_HIGH) |
158 | if (tmp & DVO_VSYNC_ACTIVE_HIGH) |
151 | flags |= DRM_MODE_FLAG_PVSYNC; |
159 | flags |= DRM_MODE_FLAG_PVSYNC; |
152 | else |
160 | else |
153 | flags |= DRM_MODE_FLAG_NVSYNC; |
161 | flags |= DRM_MODE_FLAG_NVSYNC; |
154 | 162 | ||
155 | pipe_config->adjusted_mode.flags |= flags; |
163 | pipe_config->adjusted_mode.flags |= flags; |
156 | 164 | ||
157 | pipe_config->adjusted_mode.crtc_clock = pipe_config->port_clock; |
165 | pipe_config->adjusted_mode.crtc_clock = pipe_config->port_clock; |
158 | } |
166 | } |
159 | 167 | ||
160 | static void intel_disable_dvo(struct intel_encoder *encoder) |
168 | static void intel_disable_dvo(struct intel_encoder *encoder) |
161 | { |
169 | { |
162 | struct drm_i915_private *dev_priv = encoder->base.dev->dev_private; |
170 | struct drm_i915_private *dev_priv = encoder->base.dev->dev_private; |
163 | struct intel_dvo *intel_dvo = enc_to_dvo(encoder); |
171 | struct intel_dvo *intel_dvo = enc_to_dvo(encoder); |
164 | u32 dvo_reg = intel_dvo->dev.dvo_reg; |
172 | u32 dvo_reg = intel_dvo->dev.dvo_reg; |
165 | u32 temp = I915_READ(dvo_reg); |
173 | u32 temp = I915_READ(dvo_reg); |
166 | 174 | ||
167 | intel_dvo->dev.dev_ops->dpms(&intel_dvo->dev, false); |
175 | intel_dvo->dev.dev_ops->dpms(&intel_dvo->dev, false); |
168 | I915_WRITE(dvo_reg, temp & ~DVO_ENABLE); |
176 | I915_WRITE(dvo_reg, temp & ~DVO_ENABLE); |
169 | I915_READ(dvo_reg); |
177 | I915_READ(dvo_reg); |
170 | } |
178 | } |
171 | 179 | ||
172 | static void intel_enable_dvo(struct intel_encoder *encoder) |
180 | static void intel_enable_dvo(struct intel_encoder *encoder) |
173 | { |
181 | { |
174 | struct drm_i915_private *dev_priv = encoder->base.dev->dev_private; |
182 | struct drm_i915_private *dev_priv = encoder->base.dev->dev_private; |
175 | struct intel_dvo *intel_dvo = enc_to_dvo(encoder); |
183 | struct intel_dvo *intel_dvo = enc_to_dvo(encoder); |
176 | struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc); |
184 | struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc); |
177 | u32 dvo_reg = intel_dvo->dev.dvo_reg; |
185 | u32 dvo_reg = intel_dvo->dev.dvo_reg; |
178 | u32 temp = I915_READ(dvo_reg); |
186 | u32 temp = I915_READ(dvo_reg); |
179 | 187 | ||
180 | I915_WRITE(dvo_reg, temp | DVO_ENABLE); |
188 | I915_WRITE(dvo_reg, temp | DVO_ENABLE); |
181 | I915_READ(dvo_reg); |
189 | I915_READ(dvo_reg); |
182 | intel_dvo->dev.dev_ops->mode_set(&intel_dvo->dev, |
190 | intel_dvo->dev.dev_ops->mode_set(&intel_dvo->dev, |
183 | &crtc->config.requested_mode, |
191 | &crtc->config.requested_mode, |
184 | &crtc->config.adjusted_mode); |
192 | &crtc->config.adjusted_mode); |
185 | 193 | ||
186 | intel_dvo->dev.dev_ops->dpms(&intel_dvo->dev, true); |
194 | intel_dvo->dev.dev_ops->dpms(&intel_dvo->dev, true); |
187 | } |
195 | } |
188 | 196 | ||
189 | /* Special dpms function to support cloning between dvo/sdvo/crt. */ |
197 | /* Special dpms function to support cloning between dvo/sdvo/crt. */ |
190 | static void intel_dvo_dpms(struct drm_connector *connector, int mode) |
198 | static void intel_dvo_dpms(struct drm_connector *connector, int mode) |
191 | { |
199 | { |
192 | struct intel_dvo *intel_dvo = intel_attached_dvo(connector); |
200 | struct intel_dvo *intel_dvo = intel_attached_dvo(connector); |
193 | struct drm_crtc *crtc; |
201 | struct drm_crtc *crtc; |
194 | struct intel_crtc_config *config; |
202 | struct intel_crtc_config *config; |
195 | 203 | ||
196 | /* dvo supports only 2 dpms states. */ |
204 | /* dvo supports only 2 dpms states. */ |
197 | if (mode != DRM_MODE_DPMS_ON) |
205 | if (mode != DRM_MODE_DPMS_ON) |
198 | mode = DRM_MODE_DPMS_OFF; |
206 | mode = DRM_MODE_DPMS_OFF; |
199 | 207 | ||
200 | if (mode == connector->dpms) |
208 | if (mode == connector->dpms) |
201 | return; |
209 | return; |
202 | 210 | ||
203 | connector->dpms = mode; |
211 | connector->dpms = mode; |
204 | 212 | ||
205 | /* Only need to change hw state when actually enabled */ |
213 | /* Only need to change hw state when actually enabled */ |
206 | crtc = intel_dvo->base.base.crtc; |
214 | crtc = intel_dvo->base.base.crtc; |
207 | if (!crtc) { |
215 | if (!crtc) { |
208 | intel_dvo->base.connectors_active = false; |
216 | intel_dvo->base.connectors_active = false; |
209 | return; |
217 | return; |
210 | } |
218 | } |
211 | 219 | ||
212 | /* We call connector dpms manually below in case pipe dpms doesn't |
220 | /* We call connector dpms manually below in case pipe dpms doesn't |
213 | * change due to cloning. */ |
221 | * change due to cloning. */ |
214 | if (mode == DRM_MODE_DPMS_ON) { |
222 | if (mode == DRM_MODE_DPMS_ON) { |
215 | config = &to_intel_crtc(crtc)->config; |
223 | config = &to_intel_crtc(crtc)->config; |
216 | 224 | ||
217 | intel_dvo->base.connectors_active = true; |
225 | intel_dvo->base.connectors_active = true; |
218 | 226 | ||
219 | intel_crtc_update_dpms(crtc); |
227 | intel_crtc_update_dpms(crtc); |
220 | 228 | ||
221 | intel_dvo->dev.dev_ops->mode_set(&intel_dvo->dev, |
229 | intel_dvo->dev.dev_ops->mode_set(&intel_dvo->dev, |
222 | &config->requested_mode, |
230 | &config->requested_mode, |
223 | &config->adjusted_mode); |
231 | &config->adjusted_mode); |
224 | 232 | ||
225 | intel_dvo->dev.dev_ops->dpms(&intel_dvo->dev, true); |
233 | intel_dvo->dev.dev_ops->dpms(&intel_dvo->dev, true); |
226 | } else { |
234 | } else { |
227 | intel_dvo->dev.dev_ops->dpms(&intel_dvo->dev, false); |
235 | intel_dvo->dev.dev_ops->dpms(&intel_dvo->dev, false); |
228 | 236 | ||
229 | intel_dvo->base.connectors_active = false; |
237 | intel_dvo->base.connectors_active = false; |
230 | 238 | ||
231 | intel_crtc_update_dpms(crtc); |
239 | intel_crtc_update_dpms(crtc); |
232 | } |
240 | } |
233 | 241 | ||
234 | intel_modeset_check_state(connector->dev); |
242 | intel_modeset_check_state(connector->dev); |
235 | } |
243 | } |
236 | 244 | ||
237 | static enum drm_mode_status |
245 | static enum drm_mode_status |
238 | intel_dvo_mode_valid(struct drm_connector *connector, |
246 | intel_dvo_mode_valid(struct drm_connector *connector, |
239 | struct drm_display_mode *mode) |
247 | struct drm_display_mode *mode) |
240 | { |
248 | { |
241 | struct intel_dvo *intel_dvo = intel_attached_dvo(connector); |
249 | struct intel_dvo *intel_dvo = intel_attached_dvo(connector); |
242 | 250 | ||
243 | if (mode->flags & DRM_MODE_FLAG_DBLSCAN) |
251 | if (mode->flags & DRM_MODE_FLAG_DBLSCAN) |
244 | return MODE_NO_DBLESCAN; |
252 | return MODE_NO_DBLESCAN; |
245 | 253 | ||
246 | /* XXX: Validate clock range */ |
254 | /* XXX: Validate clock range */ |
247 | 255 | ||
248 | if (intel_dvo->panel_fixed_mode) { |
256 | if (intel_dvo->panel_fixed_mode) { |
249 | if (mode->hdisplay > intel_dvo->panel_fixed_mode->hdisplay) |
257 | if (mode->hdisplay > intel_dvo->panel_fixed_mode->hdisplay) |
250 | return MODE_PANEL; |
258 | return MODE_PANEL; |
251 | if (mode->vdisplay > intel_dvo->panel_fixed_mode->vdisplay) |
259 | if (mode->vdisplay > intel_dvo->panel_fixed_mode->vdisplay) |
252 | return MODE_PANEL; |
260 | return MODE_PANEL; |
253 | } |
261 | } |
254 | 262 | ||
255 | return intel_dvo->dev.dev_ops->mode_valid(&intel_dvo->dev, mode); |
263 | return intel_dvo->dev.dev_ops->mode_valid(&intel_dvo->dev, mode); |
256 | } |
264 | } |
257 | 265 | ||
258 | static bool intel_dvo_compute_config(struct intel_encoder *encoder, |
266 | static bool intel_dvo_compute_config(struct intel_encoder *encoder, |
259 | struct intel_crtc_config *pipe_config) |
267 | struct intel_crtc_config *pipe_config) |
260 | { |
268 | { |
261 | struct intel_dvo *intel_dvo = enc_to_dvo(encoder); |
269 | struct intel_dvo *intel_dvo = enc_to_dvo(encoder); |
262 | struct drm_display_mode *adjusted_mode = &pipe_config->adjusted_mode; |
270 | struct drm_display_mode *adjusted_mode = &pipe_config->adjusted_mode; |
263 | 271 | ||
264 | /* If we have timings from the BIOS for the panel, put them in |
272 | /* If we have timings from the BIOS for the panel, put them in |
265 | * to the adjusted mode. The CRTC will be set up for this mode, |
273 | * to the adjusted mode. The CRTC will be set up for this mode, |
266 | * with the panel scaling set up to source from the H/VDisplay |
274 | * with the panel scaling set up to source from the H/VDisplay |
267 | * of the original mode. |
275 | * of the original mode. |
268 | */ |
276 | */ |
269 | if (intel_dvo->panel_fixed_mode != NULL) { |
277 | if (intel_dvo->panel_fixed_mode != NULL) { |
270 | #define C(x) adjusted_mode->x = intel_dvo->panel_fixed_mode->x |
278 | #define C(x) adjusted_mode->x = intel_dvo->panel_fixed_mode->x |
271 | C(hdisplay); |
279 | C(hdisplay); |
272 | C(hsync_start); |
280 | C(hsync_start); |
273 | C(hsync_end); |
281 | C(hsync_end); |
274 | C(htotal); |
282 | C(htotal); |
275 | C(vdisplay); |
283 | C(vdisplay); |
276 | C(vsync_start); |
284 | C(vsync_start); |
277 | C(vsync_end); |
285 | C(vsync_end); |
278 | C(vtotal); |
286 | C(vtotal); |
279 | C(clock); |
287 | C(clock); |
280 | #undef C |
288 | #undef C |
281 | 289 | ||
282 | drm_mode_set_crtcinfo(adjusted_mode, 0); |
290 | drm_mode_set_crtcinfo(adjusted_mode, 0); |
283 | } |
291 | } |
284 | 292 | ||
285 | return true; |
293 | return true; |
286 | } |
294 | } |
287 | 295 | ||
288 | static void intel_dvo_mode_set(struct intel_encoder *encoder) |
296 | static void intel_dvo_pre_enable(struct intel_encoder *encoder) |
289 | { |
297 | { |
290 | struct drm_device *dev = encoder->base.dev; |
298 | struct drm_device *dev = encoder->base.dev; |
291 | struct drm_i915_private *dev_priv = dev->dev_private; |
299 | struct drm_i915_private *dev_priv = dev->dev_private; |
292 | struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc); |
300 | struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc); |
293 | struct drm_display_mode *adjusted_mode = &crtc->config.adjusted_mode; |
301 | struct drm_display_mode *adjusted_mode = &crtc->config.adjusted_mode; |
294 | struct intel_dvo *intel_dvo = enc_to_dvo(encoder); |
302 | struct intel_dvo *intel_dvo = enc_to_dvo(encoder); |
295 | int pipe = crtc->pipe; |
303 | int pipe = crtc->pipe; |
296 | u32 dvo_val; |
304 | u32 dvo_val; |
297 | u32 dvo_reg = intel_dvo->dev.dvo_reg, dvo_srcdim_reg; |
305 | u32 dvo_reg = intel_dvo->dev.dvo_reg, dvo_srcdim_reg; |
298 | 306 | ||
299 | switch (dvo_reg) { |
307 | switch (dvo_reg) { |
300 | case DVOA: |
308 | case DVOA: |
301 | default: |
309 | default: |
302 | dvo_srcdim_reg = DVOA_SRCDIM; |
310 | dvo_srcdim_reg = DVOA_SRCDIM; |
303 | break; |
311 | break; |
304 | case DVOB: |
312 | case DVOB: |
305 | dvo_srcdim_reg = DVOB_SRCDIM; |
313 | dvo_srcdim_reg = DVOB_SRCDIM; |
306 | break; |
314 | break; |
307 | case DVOC: |
315 | case DVOC: |
308 | dvo_srcdim_reg = DVOC_SRCDIM; |
316 | dvo_srcdim_reg = DVOC_SRCDIM; |
309 | break; |
317 | break; |
310 | } |
318 | } |
311 | 319 | ||
312 | /* Save the data order, since I don't know what it should be set to. */ |
320 | /* Save the data order, since I don't know what it should be set to. */ |
313 | dvo_val = I915_READ(dvo_reg) & |
321 | dvo_val = I915_READ(dvo_reg) & |
314 | (DVO_PRESERVE_MASK | DVO_DATA_ORDER_GBRG); |
322 | (DVO_PRESERVE_MASK | DVO_DATA_ORDER_GBRG); |
315 | dvo_val |= DVO_DATA_ORDER_FP | DVO_BORDER_ENABLE | |
323 | dvo_val |= DVO_DATA_ORDER_FP | DVO_BORDER_ENABLE | |
316 | DVO_BLANK_ACTIVE_HIGH; |
324 | DVO_BLANK_ACTIVE_HIGH; |
317 | 325 | ||
318 | if (pipe == 1) |
326 | if (pipe == 1) |
319 | dvo_val |= DVO_PIPE_B_SELECT; |
327 | dvo_val |= DVO_PIPE_B_SELECT; |
320 | dvo_val |= DVO_PIPE_STALL; |
328 | dvo_val |= DVO_PIPE_STALL; |
321 | if (adjusted_mode->flags & DRM_MODE_FLAG_PHSYNC) |
329 | if (adjusted_mode->flags & DRM_MODE_FLAG_PHSYNC) |
322 | dvo_val |= DVO_HSYNC_ACTIVE_HIGH; |
330 | dvo_val |= DVO_HSYNC_ACTIVE_HIGH; |
323 | if (adjusted_mode->flags & DRM_MODE_FLAG_PVSYNC) |
331 | if (adjusted_mode->flags & DRM_MODE_FLAG_PVSYNC) |
324 | dvo_val |= DVO_VSYNC_ACTIVE_HIGH; |
332 | dvo_val |= DVO_VSYNC_ACTIVE_HIGH; |
325 | 333 | ||
326 | /*I915_WRITE(DVOB_SRCDIM, |
334 | /*I915_WRITE(DVOB_SRCDIM, |
327 | (adjusted_mode->hdisplay << DVO_SRCDIM_HORIZONTAL_SHIFT) | |
335 | (adjusted_mode->hdisplay << DVO_SRCDIM_HORIZONTAL_SHIFT) | |
328 | (adjusted_mode->VDisplay << DVO_SRCDIM_VERTICAL_SHIFT));*/ |
336 | (adjusted_mode->VDisplay << DVO_SRCDIM_VERTICAL_SHIFT));*/ |
329 | I915_WRITE(dvo_srcdim_reg, |
337 | I915_WRITE(dvo_srcdim_reg, |
330 | (adjusted_mode->hdisplay << DVO_SRCDIM_HORIZONTAL_SHIFT) | |
338 | (adjusted_mode->hdisplay << DVO_SRCDIM_HORIZONTAL_SHIFT) | |
331 | (adjusted_mode->vdisplay << DVO_SRCDIM_VERTICAL_SHIFT)); |
339 | (adjusted_mode->vdisplay << DVO_SRCDIM_VERTICAL_SHIFT)); |
332 | /*I915_WRITE(DVOB, dvo_val);*/ |
340 | /*I915_WRITE(DVOB, dvo_val);*/ |
333 | I915_WRITE(dvo_reg, dvo_val); |
341 | I915_WRITE(dvo_reg, dvo_val); |
334 | } |
342 | } |
335 | 343 | ||
336 | /** |
344 | /** |
337 | * Detect the output connection on our DVO device. |
345 | * Detect the output connection on our DVO device. |
338 | * |
346 | * |
339 | * Unimplemented. |
347 | * Unimplemented. |
340 | */ |
348 | */ |
341 | static enum drm_connector_status |
349 | static enum drm_connector_status |
342 | intel_dvo_detect(struct drm_connector *connector, bool force) |
350 | intel_dvo_detect(struct drm_connector *connector, bool force) |
343 | { |
351 | { |
344 | struct intel_dvo *intel_dvo = intel_attached_dvo(connector); |
352 | struct intel_dvo *intel_dvo = intel_attached_dvo(connector); |
345 | DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n", |
353 | DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n", |
346 | connector->base.id, drm_get_connector_name(connector)); |
354 | connector->base.id, connector->name); |
347 | return intel_dvo->dev.dev_ops->detect(&intel_dvo->dev); |
355 | return intel_dvo->dev.dev_ops->detect(&intel_dvo->dev); |
348 | } |
356 | } |
349 | 357 | ||
350 | static int intel_dvo_get_modes(struct drm_connector *connector) |
358 | static int intel_dvo_get_modes(struct drm_connector *connector) |
351 | { |
359 | { |
352 | struct intel_dvo *intel_dvo = intel_attached_dvo(connector); |
360 | struct intel_dvo *intel_dvo = intel_attached_dvo(connector); |
353 | struct drm_i915_private *dev_priv = connector->dev->dev_private; |
361 | struct drm_i915_private *dev_priv = connector->dev->dev_private; |
354 | 362 | ||
355 | /* We should probably have an i2c driver get_modes function for those |
363 | /* We should probably have an i2c driver get_modes function for those |
356 | * devices which will have a fixed set of modes determined by the chip |
364 | * devices which will have a fixed set of modes determined by the chip |
357 | * (TV-out, for example), but for now with just TMDS and LVDS, |
365 | * (TV-out, for example), but for now with just TMDS and LVDS, |
358 | * that's not the case. |
366 | * that's not the case. |
359 | */ |
367 | */ |
360 | intel_ddc_get_modes(connector, |
368 | intel_ddc_get_modes(connector, |
361 | intel_gmbus_get_adapter(dev_priv, GMBUS_PORT_DPC)); |
369 | intel_gmbus_get_adapter(dev_priv, GMBUS_PORT_DPC)); |
362 | if (!list_empty(&connector->probed_modes)) |
370 | if (!list_empty(&connector->probed_modes)) |
363 | return 1; |
371 | return 1; |
364 | 372 | ||
365 | if (intel_dvo->panel_fixed_mode != NULL) { |
373 | if (intel_dvo->panel_fixed_mode != NULL) { |
366 | struct drm_display_mode *mode; |
374 | struct drm_display_mode *mode; |
367 | mode = drm_mode_duplicate(connector->dev, intel_dvo->panel_fixed_mode); |
375 | mode = drm_mode_duplicate(connector->dev, intel_dvo->panel_fixed_mode); |
368 | if (mode) { |
376 | if (mode) { |
369 | drm_mode_probed_add(connector, mode); |
377 | drm_mode_probed_add(connector, mode); |
370 | return 1; |
378 | return 1; |
371 | } |
379 | } |
372 | } |
380 | } |
373 | 381 | ||
374 | return 0; |
382 | return 0; |
375 | } |
383 | } |
376 | 384 | ||
377 | static void intel_dvo_destroy(struct drm_connector *connector) |
385 | static void intel_dvo_destroy(struct drm_connector *connector) |
378 | { |
386 | { |
379 | drm_connector_cleanup(connector); |
387 | drm_connector_cleanup(connector); |
380 | kfree(connector); |
388 | kfree(connector); |
381 | } |
389 | } |
382 | 390 | ||
383 | static const struct drm_connector_funcs intel_dvo_connector_funcs = { |
391 | static const struct drm_connector_funcs intel_dvo_connector_funcs = { |
384 | .dpms = intel_dvo_dpms, |
392 | .dpms = intel_dvo_dpms, |
385 | .detect = intel_dvo_detect, |
393 | .detect = intel_dvo_detect, |
386 | .destroy = intel_dvo_destroy, |
394 | .destroy = intel_dvo_destroy, |
387 | .fill_modes = drm_helper_probe_single_connector_modes, |
395 | .fill_modes = drm_helper_probe_single_connector_modes, |
388 | }; |
396 | }; |
389 | 397 | ||
390 | static const struct drm_connector_helper_funcs intel_dvo_connector_helper_funcs = { |
398 | static const struct drm_connector_helper_funcs intel_dvo_connector_helper_funcs = { |
391 | .mode_valid = intel_dvo_mode_valid, |
399 | .mode_valid = intel_dvo_mode_valid, |
392 | .get_modes = intel_dvo_get_modes, |
400 | .get_modes = intel_dvo_get_modes, |
393 | .best_encoder = intel_best_encoder, |
401 | .best_encoder = intel_best_encoder, |
394 | }; |
402 | }; |
395 | 403 | ||
396 | static void intel_dvo_enc_destroy(struct drm_encoder *encoder) |
404 | static void intel_dvo_enc_destroy(struct drm_encoder *encoder) |
397 | { |
405 | { |
398 | struct intel_dvo *intel_dvo = enc_to_dvo(to_intel_encoder(encoder)); |
406 | struct intel_dvo *intel_dvo = enc_to_dvo(to_intel_encoder(encoder)); |
399 | 407 | ||
400 | if (intel_dvo->dev.dev_ops->destroy) |
408 | if (intel_dvo->dev.dev_ops->destroy) |
401 | intel_dvo->dev.dev_ops->destroy(&intel_dvo->dev); |
409 | intel_dvo->dev.dev_ops->destroy(&intel_dvo->dev); |
402 | 410 | ||
403 | kfree(intel_dvo->panel_fixed_mode); |
411 | kfree(intel_dvo->panel_fixed_mode); |
404 | 412 | ||
405 | intel_encoder_destroy(encoder); |
413 | intel_encoder_destroy(encoder); |
406 | } |
414 | } |
407 | 415 | ||
408 | static const struct drm_encoder_funcs intel_dvo_enc_funcs = { |
416 | static const struct drm_encoder_funcs intel_dvo_enc_funcs = { |
409 | .destroy = intel_dvo_enc_destroy, |
417 | .destroy = intel_dvo_enc_destroy, |
410 | }; |
418 | }; |
411 | 419 | ||
412 | /** |
420 | /** |
413 | * Attempts to get a fixed panel timing for LVDS (currently only the i830). |
421 | * Attempts to get a fixed panel timing for LVDS (currently only the i830). |
414 | * |
422 | * |
415 | * Other chips with DVO LVDS will need to extend this to deal with the LVDS |
423 | * Other chips with DVO LVDS will need to extend this to deal with the LVDS |
416 | * chip being on DVOB/C and having multiple pipes. |
424 | * chip being on DVOB/C and having multiple pipes. |
417 | */ |
425 | */ |
418 | static struct drm_display_mode * |
426 | static struct drm_display_mode * |
419 | intel_dvo_get_current_mode(struct drm_connector *connector) |
427 | intel_dvo_get_current_mode(struct drm_connector *connector) |
420 | { |
428 | { |
421 | struct drm_device *dev = connector->dev; |
429 | struct drm_device *dev = connector->dev; |
422 | struct drm_i915_private *dev_priv = dev->dev_private; |
430 | struct drm_i915_private *dev_priv = dev->dev_private; |
423 | struct intel_dvo *intel_dvo = intel_attached_dvo(connector); |
431 | struct intel_dvo *intel_dvo = intel_attached_dvo(connector); |
424 | uint32_t dvo_val = I915_READ(intel_dvo->dev.dvo_reg); |
432 | uint32_t dvo_val = I915_READ(intel_dvo->dev.dvo_reg); |
425 | struct drm_display_mode *mode = NULL; |
433 | struct drm_display_mode *mode = NULL; |
426 | 434 | ||
427 | /* If the DVO port is active, that'll be the LVDS, so we can pull out |
435 | /* If the DVO port is active, that'll be the LVDS, so we can pull out |
428 | * its timings to get how the BIOS set up the panel. |
436 | * its timings to get how the BIOS set up the panel. |
429 | */ |
437 | */ |
430 | if (dvo_val & DVO_ENABLE) { |
438 | if (dvo_val & DVO_ENABLE) { |
431 | struct drm_crtc *crtc; |
439 | struct drm_crtc *crtc; |
432 | int pipe = (dvo_val & DVO_PIPE_B_SELECT) ? 1 : 0; |
440 | int pipe = (dvo_val & DVO_PIPE_B_SELECT) ? 1 : 0; |
433 | 441 | ||
434 | crtc = intel_get_crtc_for_pipe(dev, pipe); |
442 | crtc = intel_get_crtc_for_pipe(dev, pipe); |
435 | if (crtc) { |
443 | if (crtc) { |
436 | mode = intel_crtc_mode_get(dev, crtc); |
444 | mode = intel_crtc_mode_get(dev, crtc); |
437 | if (mode) { |
445 | if (mode) { |
438 | mode->type |= DRM_MODE_TYPE_PREFERRED; |
446 | mode->type |= DRM_MODE_TYPE_PREFERRED; |
439 | if (dvo_val & DVO_HSYNC_ACTIVE_HIGH) |
447 | if (dvo_val & DVO_HSYNC_ACTIVE_HIGH) |
440 | mode->flags |= DRM_MODE_FLAG_PHSYNC; |
448 | mode->flags |= DRM_MODE_FLAG_PHSYNC; |
441 | if (dvo_val & DVO_VSYNC_ACTIVE_HIGH) |
449 | if (dvo_val & DVO_VSYNC_ACTIVE_HIGH) |
442 | mode->flags |= DRM_MODE_FLAG_PVSYNC; |
450 | mode->flags |= DRM_MODE_FLAG_PVSYNC; |
443 | } |
451 | } |
444 | } |
452 | } |
445 | } |
453 | } |
446 | 454 | ||
447 | return mode; |
455 | return mode; |
448 | } |
456 | } |
449 | 457 | ||
450 | void intel_dvo_init(struct drm_device *dev) |
458 | void intel_dvo_init(struct drm_device *dev) |
451 | { |
459 | { |
452 | struct drm_i915_private *dev_priv = dev->dev_private; |
460 | struct drm_i915_private *dev_priv = dev->dev_private; |
453 | struct intel_encoder *intel_encoder; |
461 | struct intel_encoder *intel_encoder; |
454 | struct intel_dvo *intel_dvo; |
462 | struct intel_dvo *intel_dvo; |
455 | struct intel_connector *intel_connector; |
463 | struct intel_connector *intel_connector; |
456 | int i; |
464 | int i; |
457 | int encoder_type = DRM_MODE_ENCODER_NONE; |
465 | int encoder_type = DRM_MODE_ENCODER_NONE; |
458 | 466 | ||
459 | intel_dvo = kzalloc(sizeof(*intel_dvo), GFP_KERNEL); |
467 | intel_dvo = kzalloc(sizeof(*intel_dvo), GFP_KERNEL); |
460 | if (!intel_dvo) |
468 | if (!intel_dvo) |
461 | return; |
469 | return; |
462 | 470 | ||
463 | intel_connector = kzalloc(sizeof(*intel_connector), GFP_KERNEL); |
471 | intel_connector = kzalloc(sizeof(*intel_connector), GFP_KERNEL); |
464 | if (!intel_connector) { |
472 | if (!intel_connector) { |
465 | kfree(intel_dvo); |
473 | kfree(intel_dvo); |
466 | return; |
474 | return; |
467 | } |
475 | } |
468 | 476 | ||
469 | intel_encoder = &intel_dvo->base; |
477 | intel_encoder = &intel_dvo->base; |
470 | drm_encoder_init(dev, &intel_encoder->base, |
478 | drm_encoder_init(dev, &intel_encoder->base, |
471 | &intel_dvo_enc_funcs, encoder_type); |
479 | &intel_dvo_enc_funcs, encoder_type); |
472 | 480 | ||
473 | intel_encoder->disable = intel_disable_dvo; |
481 | intel_encoder->disable = intel_disable_dvo; |
474 | intel_encoder->enable = intel_enable_dvo; |
482 | intel_encoder->enable = intel_enable_dvo; |
475 | intel_encoder->get_hw_state = intel_dvo_get_hw_state; |
483 | intel_encoder->get_hw_state = intel_dvo_get_hw_state; |
476 | intel_encoder->get_config = intel_dvo_get_config; |
484 | intel_encoder->get_config = intel_dvo_get_config; |
477 | intel_encoder->compute_config = intel_dvo_compute_config; |
485 | intel_encoder->compute_config = intel_dvo_compute_config; |
478 | intel_encoder->mode_set = intel_dvo_mode_set; |
486 | intel_encoder->pre_enable = intel_dvo_pre_enable; |
479 | intel_connector->get_hw_state = intel_dvo_connector_get_hw_state; |
487 | intel_connector->get_hw_state = intel_dvo_connector_get_hw_state; |
- | 488 | intel_connector->unregister = intel_connector_unregister; |
|
480 | 489 | ||
481 | /* Now, try to find a controller */ |
490 | /* Now, try to find a controller */ |
482 | for (i = 0; i < ARRAY_SIZE(intel_dvo_devices); i++) { |
491 | for (i = 0; i < ARRAY_SIZE(intel_dvo_devices); i++) { |
483 | struct drm_connector *connector = &intel_connector->base; |
492 | struct drm_connector *connector = &intel_connector->base; |
484 | const struct intel_dvo_device *dvo = &intel_dvo_devices[i]; |
493 | const struct intel_dvo_device *dvo = &intel_dvo_devices[i]; |
485 | struct i2c_adapter *i2c; |
494 | struct i2c_adapter *i2c; |
486 | int gpio; |
495 | int gpio; |
487 | bool dvoinit; |
496 | bool dvoinit; |
488 | 497 | ||
489 | /* Allow the I2C driver info to specify the GPIO to be used in |
498 | /* Allow the I2C driver info to specify the GPIO to be used in |
490 | * special cases, but otherwise default to what's defined |
499 | * special cases, but otherwise default to what's defined |
491 | * in the spec. |
500 | * in the spec. |
492 | */ |
501 | */ |
493 | if (intel_gmbus_is_port_valid(dvo->gpio)) |
502 | if (intel_gmbus_is_port_valid(dvo->gpio)) |
494 | gpio = dvo->gpio; |
503 | gpio = dvo->gpio; |
495 | else if (dvo->type == INTEL_DVO_CHIP_LVDS) |
504 | else if (dvo->type == INTEL_DVO_CHIP_LVDS) |
496 | gpio = GMBUS_PORT_SSC; |
505 | gpio = GMBUS_PORT_SSC; |
497 | else |
506 | else |
498 | gpio = GMBUS_PORT_DPB; |
507 | gpio = GMBUS_PORT_DPB; |
499 | 508 | ||
500 | /* Set up the I2C bus necessary for the chip we're probing. |
509 | /* Set up the I2C bus necessary for the chip we're probing. |
501 | * It appears that everything is on GPIOE except for panels |
510 | * It appears that everything is on GPIOE except for panels |
502 | * on i830 laptops, which are on GPIOB (DVOA). |
511 | * on i830 laptops, which are on GPIOB (DVOA). |
503 | */ |
512 | */ |
504 | i2c = intel_gmbus_get_adapter(dev_priv, gpio); |
513 | i2c = intel_gmbus_get_adapter(dev_priv, gpio); |
505 | 514 | ||
506 | intel_dvo->dev = *dvo; |
515 | intel_dvo->dev = *dvo; |
507 | 516 | ||
508 | /* GMBUS NAK handling seems to be unstable, hence let the |
517 | /* GMBUS NAK handling seems to be unstable, hence let the |
509 | * transmitter detection run in bit banging mode for now. |
518 | * transmitter detection run in bit banging mode for now. |
510 | */ |
519 | */ |
511 | intel_gmbus_force_bit(i2c, true); |
520 | intel_gmbus_force_bit(i2c, true); |
512 | 521 | ||
513 | dvoinit = dvo->dev_ops->init(&intel_dvo->dev, i2c); |
522 | dvoinit = dvo->dev_ops->init(&intel_dvo->dev, i2c); |
514 | 523 | ||
515 | intel_gmbus_force_bit(i2c, false); |
524 | intel_gmbus_force_bit(i2c, false); |
516 | 525 | ||
517 | if (!dvoinit) |
526 | if (!dvoinit) |
518 | continue; |
527 | continue; |
519 | 528 | ||
520 | intel_encoder->type = INTEL_OUTPUT_DVO; |
529 | intel_encoder->type = INTEL_OUTPUT_DVO; |
521 | intel_encoder->crtc_mask = (1 << 0) | (1 << 1); |
530 | intel_encoder->crtc_mask = (1 << 0) | (1 << 1); |
522 | switch (dvo->type) { |
531 | switch (dvo->type) { |
523 | case INTEL_DVO_CHIP_TMDS: |
532 | case INTEL_DVO_CHIP_TMDS: |
524 | intel_encoder->cloneable = true; |
533 | intel_encoder->cloneable = (1 << INTEL_OUTPUT_ANALOG) | |
- | 534 | (1 << INTEL_OUTPUT_DVO); |
|
525 | drm_connector_init(dev, connector, |
535 | drm_connector_init(dev, connector, |
526 | &intel_dvo_connector_funcs, |
536 | &intel_dvo_connector_funcs, |
527 | DRM_MODE_CONNECTOR_DVII); |
537 | DRM_MODE_CONNECTOR_DVII); |
528 | encoder_type = DRM_MODE_ENCODER_TMDS; |
538 | encoder_type = DRM_MODE_ENCODER_TMDS; |
529 | break; |
539 | break; |
530 | case INTEL_DVO_CHIP_LVDS: |
540 | case INTEL_DVO_CHIP_LVDS: |
531 | intel_encoder->cloneable = false; |
541 | intel_encoder->cloneable = 0; |
532 | drm_connector_init(dev, connector, |
542 | drm_connector_init(dev, connector, |
533 | &intel_dvo_connector_funcs, |
543 | &intel_dvo_connector_funcs, |
534 | DRM_MODE_CONNECTOR_LVDS); |
544 | DRM_MODE_CONNECTOR_LVDS); |
535 | encoder_type = DRM_MODE_ENCODER_LVDS; |
545 | encoder_type = DRM_MODE_ENCODER_LVDS; |
536 | break; |
546 | break; |
537 | } |
547 | } |
538 | 548 | ||
539 | drm_connector_helper_add(connector, |
549 | drm_connector_helper_add(connector, |
540 | &intel_dvo_connector_helper_funcs); |
550 | &intel_dvo_connector_helper_funcs); |
541 | connector->display_info.subpixel_order = SubPixelHorizontalRGB; |
551 | connector->display_info.subpixel_order = SubPixelHorizontalRGB; |
542 | connector->interlace_allowed = false; |
552 | connector->interlace_allowed = false; |
543 | connector->doublescan_allowed = false; |
553 | connector->doublescan_allowed = false; |
544 | 554 | ||
545 | intel_connector_attach_encoder(intel_connector, intel_encoder); |
555 | intel_connector_attach_encoder(intel_connector, intel_encoder); |
546 | if (dvo->type == INTEL_DVO_CHIP_LVDS) { |
556 | if (dvo->type == INTEL_DVO_CHIP_LVDS) { |
547 | /* For our LVDS chipsets, we should hopefully be able |
557 | /* For our LVDS chipsets, we should hopefully be able |
548 | * to dig the fixed panel mode out of the BIOS data. |
558 | * to dig the fixed panel mode out of the BIOS data. |
549 | * However, it's in a different format from the BIOS |
559 | * However, it's in a different format from the BIOS |
550 | * data on chipsets with integrated LVDS (stored in AIM |
560 | * data on chipsets with integrated LVDS (stored in AIM |
551 | * headers, likely), so for now, just get the current |
561 | * headers, likely), so for now, just get the current |
552 | * mode being output through DVO. |
562 | * mode being output through DVO. |
553 | */ |
563 | */ |
554 | intel_dvo->panel_fixed_mode = |
564 | intel_dvo->panel_fixed_mode = |
555 | intel_dvo_get_current_mode(connector); |
565 | intel_dvo_get_current_mode(connector); |
556 | intel_dvo->panel_wants_dither = true; |
566 | intel_dvo->panel_wants_dither = true; |
557 | } |
567 | } |
558 | 568 | ||
559 | drm_sysfs_connector_add(connector); |
569 | drm_connector_register(connector); |
560 | return; |
570 | return; |
561 | } |
571 | } |
562 | 572 | ||
563 | drm_encoder_cleanup(&intel_encoder->base); |
573 | drm_encoder_cleanup(&intel_encoder->base); |
564 | kfree(intel_dvo); |
574 | kfree(intel_dvo); |
565 | kfree(intel_connector); |
575 | kfree(intel_connector); |
566 | }><>><>>><>><>><>><> |
576 | }><>><>><>><>>><>><>><>><> |