Rev 5060 | Rev 6084 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 5060 | Rev 5354 | ||
---|---|---|---|
Line 83... | Line 83... | ||
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 = DVOB, |
89 | .slave_addr = NS2501_ADDR, |
89 | .slave_addr = NS2501_ADDR, |
90 | .dev_ops = &ns2501_ops, |
90 | .dev_ops = &ns2501_ops, |
91 | } |
91 | } |
92 | }; |
92 | }; |
Line 183... | Line 183... | ||
183 | struct intel_dvo *intel_dvo = enc_to_dvo(encoder); |
183 | struct intel_dvo *intel_dvo = enc_to_dvo(encoder); |
184 | struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc); |
184 | struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc); |
185 | u32 dvo_reg = intel_dvo->dev.dvo_reg; |
185 | u32 dvo_reg = intel_dvo->dev.dvo_reg; |
186 | u32 temp = I915_READ(dvo_reg); |
186 | u32 temp = I915_READ(dvo_reg); |
Line 187... | Line -... | ||
187 | - | ||
188 | I915_WRITE(dvo_reg, temp | DVO_ENABLE); |
- | |
189 | I915_READ(dvo_reg); |
187 | |
190 | intel_dvo->dev.dev_ops->mode_set(&intel_dvo->dev, |
188 | intel_dvo->dev.dev_ops->mode_set(&intel_dvo->dev, |
191 | &crtc->config.requested_mode, |
189 | &crtc->config.requested_mode, |
Line -... | Line 190... | ||
- | 190 | &crtc->config.adjusted_mode); |
|
- | 191 | ||
- | 192 | I915_WRITE(dvo_reg, temp | DVO_ENABLE); |
|
192 | &crtc->config.adjusted_mode); |
193 | I915_READ(dvo_reg); |
193 | 194 | ||
Line 194... | Line 195... | ||
194 | intel_dvo->dev.dev_ops->dpms(&intel_dvo->dev, true); |
195 | intel_dvo->dev.dev_ops->dpms(&intel_dvo->dev, true); |
195 | } |
196 | } |
Line 224... | Line 225... | ||
224 | 225 | ||
Line 225... | Line 226... | ||
225 | intel_dvo->base.connectors_active = true; |
226 | intel_dvo->base.connectors_active = true; |
Line 226... | Line -... | ||
226 | - | ||
227 | intel_crtc_update_dpms(crtc); |
- | |
228 | - | ||
229 | intel_dvo->dev.dev_ops->mode_set(&intel_dvo->dev, |
- | |
230 | &config->requested_mode, |
227 | |
231 | &config->adjusted_mode); |
228 | intel_crtc_update_dpms(crtc); |
232 | 229 | ||
Line 233... | Line 230... | ||
233 | intel_dvo->dev.dev_ops->dpms(&intel_dvo->dev, true); |
230 | intel_dvo->dev.dev_ops->dpms(&intel_dvo->dev, true); |