| 198,10 → 198,14 |
|---|
| return MODE_OK; |
| } |
| |
| static bool intel_crt_mode_fixup(struct drm_encoder *encoder, |
| const struct drm_display_mode *mode, |
| struct drm_display_mode *adjusted_mode) |
| static bool intel_crt_compute_config(struct intel_encoder *encoder, |
| struct intel_crtc_config *pipe_config) |
| { |
| struct drm_device *dev = encoder->base.dev; |
| |
| if (HAS_PCH_SPLIT(dev)) |
| pipe_config->has_pch_encoder = true; |
| |
| return true; |
| } |
| |
| 675,7 → 679,6 |
|---|
| */ |
| |
| static const struct drm_encoder_helper_funcs crt_encoder_funcs = { |
| .mode_fixup = intel_crt_mode_fixup, |
| .mode_set = intel_crt_mode_set, |
| }; |
| |
| 745,8 → 748,11 |
|---|
| else |
| crt->adpa_reg = ADPA; |
| |
| crt->base.compute_config = intel_crt_compute_config; |
| crt->base.disable = intel_disable_crt; |
| crt->base.enable = intel_enable_crt; |
| if (I915_HAS_HOTPLUG(dev)) |
| crt->base.hpd_pin = HPD_CRT; |
| if (HAS_DDI(dev)) |
| crt->base.get_hw_state = intel_ddi_get_hw_state; |
| else |
| 758,10 → 764,8 |
|---|
| |
| drm_sysfs_connector_add(connector); |
| |
| if (I915_HAS_HOTPLUG(dev)) |
| connector->polled = DRM_CONNECTOR_POLL_HPD; |
| else |
| connector->polled = DRM_CONNECTOR_POLL_CONNECT; |
| if (!I915_HAS_HOTPLUG(dev)) |
| intel_connector->polled = DRM_CONNECTOR_POLL_CONNECT; |
| |
| /* |
| * Configure the automatic hotplug detection stuff |
| 768,8 → 772,6 |
|---|
| */ |
| crt->force_hotplug_required = 0; |
| |
| dev_priv->hotplug_supported_mask |= CRT_HOTPLUG_INT_STATUS; |
| |
| /* |
| * TODO: find a proper way to discover whether we need to set the the |
| * polarity and link reversal bits or not, instead of relying on the |