| 112,8 → 112,16 |
|---|
| |
| static bool intel_dvo_connector_get_hw_state(struct intel_connector *connector) |
| { |
| struct drm_device *dev = connector->base.dev; |
| struct drm_i915_private *dev_priv = dev->dev_private; |
| struct intel_dvo *intel_dvo = intel_attached_dvo(&connector->base); |
| u32 tmp; |
| |
| tmp = I915_READ(intel_dvo->dev.dvo_reg); |
| |
| if (!(tmp & DVO_ENABLE)) |
| return false; |
| |
| return intel_dvo->dev.dev_ops->get_hw_state(&intel_dvo->dev); |
| } |
| |
| 285,7 → 293,7 |
|---|
| return true; |
| } |
| |
| static void intel_dvo_mode_set(struct intel_encoder *encoder) |
| static void intel_dvo_pre_enable(struct intel_encoder *encoder) |
| { |
| struct drm_device *dev = encoder->base.dev; |
| struct drm_i915_private *dev_priv = dev->dev_private; |
| 343,7 → 351,7 |
|---|
| { |
| struct intel_dvo *intel_dvo = intel_attached_dvo(connector); |
| DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n", |
| connector->base.id, drm_get_connector_name(connector)); |
| connector->base.id, connector->name); |
| return intel_dvo->dev.dev_ops->detect(&intel_dvo->dev); |
| } |
| |
| 475,8 → 483,9 |
|---|
| intel_encoder->get_hw_state = intel_dvo_get_hw_state; |
| intel_encoder->get_config = intel_dvo_get_config; |
| intel_encoder->compute_config = intel_dvo_compute_config; |
| intel_encoder->mode_set = intel_dvo_mode_set; |
| intel_encoder->pre_enable = intel_dvo_pre_enable; |
| intel_connector->get_hw_state = intel_dvo_connector_get_hw_state; |
| intel_connector->unregister = intel_connector_unregister; |
| |
| /* Now, try to find a controller */ |
| for (i = 0; i < ARRAY_SIZE(intel_dvo_devices); i++) { |
| 521,7 → 530,8 |
|---|
| intel_encoder->crtc_mask = (1 << 0) | (1 << 1); |
| switch (dvo->type) { |
| case INTEL_DVO_CHIP_TMDS: |
| intel_encoder->cloneable = true; |
| intel_encoder->cloneable = (1 << INTEL_OUTPUT_ANALOG) | |
| (1 << INTEL_OUTPUT_DVO); |
| drm_connector_init(dev, connector, |
| &intel_dvo_connector_funcs, |
| DRM_MODE_CONNECTOR_DVII); |
| 528,7 → 538,7 |
|---|
| encoder_type = DRM_MODE_ENCODER_TMDS; |
| break; |
| case INTEL_DVO_CHIP_LVDS: |
| intel_encoder->cloneable = false; |
| intel_encoder->cloneable = 0; |
| drm_connector_init(dev, connector, |
| &intel_dvo_connector_funcs, |
| DRM_MODE_CONNECTOR_LVDS); |
| 556,7 → 566,7 |
|---|
| intel_dvo->panel_wants_dither = true; |
| } |
| |
| drm_sysfs_connector_add(connector); |
| drm_connector_register(connector); |
| return; |
| } |
| |