Rev 4398 | Rev 5060 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 4398 | Rev 4560 | ||
|---|---|---|---|
| Line 151... | Line 151... | ||
| 151 | flags |= DRM_MODE_FLAG_PVSYNC; |
151 | flags |= DRM_MODE_FLAG_PVSYNC; |
| 152 | else |
152 | else |
| 153 | flags |= DRM_MODE_FLAG_NVSYNC; |
153 | flags |= DRM_MODE_FLAG_NVSYNC; |
| Line 154... | Line 154... | ||
| 154 | 154 | ||
| - | 155 | pipe_config->adjusted_mode.flags |= flags; |
|
| - | 156 | ||
| 155 | pipe_config->adjusted_mode.flags |= flags; |
157 | pipe_config->adjusted_mode.crtc_clock = pipe_config->port_clock; |
| Line 156... | Line 158... | ||
| 156 | } |
158 | } |
| 157 | 159 | ||
| 158 | static void intel_disable_dvo(struct intel_encoder *encoder) |
160 | static void intel_disable_dvo(struct intel_encoder *encoder) |
| Line 230... | Line 232... | ||
| 230 | } |
232 | } |
| Line 231... | Line 233... | ||
| 231 | 233 | ||
| 232 | intel_modeset_check_state(connector->dev); |
234 | intel_modeset_check_state(connector->dev); |
| Line -... | Line 235... | ||
| - | 235 | } |
|
| 233 | } |
236 | |
| 234 | 237 | static enum drm_mode_status |
|
| 235 | static int intel_dvo_mode_valid(struct drm_connector *connector, |
238 | intel_dvo_mode_valid(struct drm_connector *connector, |
| 236 | struct drm_display_mode *mode) |
239 | struct drm_display_mode *mode) |
| Line 237... | Line 240... | ||
| 237 | { |
240 | { |
| Line 277... | Line 280... | ||
| 277 | #undef C |
280 | #undef C |
| Line 278... | Line 281... | ||
| 278 | 281 | ||
| 279 | drm_mode_set_crtcinfo(adjusted_mode, 0); |
282 | drm_mode_set_crtcinfo(adjusted_mode, 0); |
| Line 280... | Line -... | ||
| 280 | } |
- | |
| 281 | - | ||
| 282 | if (intel_dvo->dev.dev_ops->mode_fixup) |
- | |
| 283 | return intel_dvo->dev.dev_ops->mode_fixup(&intel_dvo->dev, |
- | |
| 284 | &pipe_config->requested_mode, |
- | |
| 285 | adjusted_mode); |
283 | } |
| 286 | 284 | ||
| Line 287... | Line 285... | ||
| 287 | return true; |
285 | return true; |
| 288 | } |
286 | } |
| Line 376... | Line 374... | ||
| 376 | return 0; |
374 | return 0; |
| 377 | } |
375 | } |
| Line 378... | Line 376... | ||
| 378 | 376 | ||
| 379 | static void intel_dvo_destroy(struct drm_connector *connector) |
377 | static void intel_dvo_destroy(struct drm_connector *connector) |
| 380 | { |
- | |
| 381 | drm_sysfs_connector_remove(connector); |
378 | { |
| 382 | drm_connector_cleanup(connector); |
379 | drm_connector_cleanup(connector); |
| 383 | kfree(connector); |
380 | kfree(connector); |
| Line 384... | Line 381... | ||
| 384 | } |
381 | } |
| Line 457... | Line 454... | ||
| 457 | struct intel_dvo *intel_dvo; |
454 | struct intel_dvo *intel_dvo; |
| 458 | struct intel_connector *intel_connector; |
455 | struct intel_connector *intel_connector; |
| 459 | int i; |
456 | int i; |
| 460 | int encoder_type = DRM_MODE_ENCODER_NONE; |
457 | int encoder_type = DRM_MODE_ENCODER_NONE; |
| Line 461... | Line 458... | ||
| 461 | 458 | ||
| 462 | intel_dvo = kzalloc(sizeof(struct intel_dvo), GFP_KERNEL); |
459 | intel_dvo = kzalloc(sizeof(*intel_dvo), GFP_KERNEL); |
| 463 | if (!intel_dvo) |
460 | if (!intel_dvo) |
| Line 464... | Line 461... | ||
| 464 | return; |
461 | return; |
| 465 | 462 | ||
| 466 | intel_connector = kzalloc(sizeof(struct intel_connector), GFP_KERNEL); |
463 | intel_connector = kzalloc(sizeof(*intel_connector), GFP_KERNEL); |
| 467 | if (!intel_connector) { |
464 | if (!intel_connector) { |
| 468 | kfree(intel_dvo); |
465 | kfree(intel_dvo); |