|
@@ -822,16 +822,15 @@ void intel_crt_init(struct drm_device *dev)
|
|
|
crt->base.mode_set = intel_crt_mode_set;
|
|
|
crt->base.disable = intel_disable_crt;
|
|
|
crt->base.enable = intel_enable_crt;
|
|
|
- if (IS_HASWELL(dev))
|
|
|
- crt->base.get_config = hsw_crt_get_config;
|
|
|
- else
|
|
|
- crt->base.get_config = intel_crt_get_config;
|
|
|
if (I915_HAS_HOTPLUG(dev))
|
|
|
crt->base.hpd_pin = HPD_CRT;
|
|
|
- if (HAS_DDI(dev))
|
|
|
+ if (HAS_DDI(dev)) {
|
|
|
+ crt->base.get_config = hsw_crt_get_config;
|
|
|
crt->base.get_hw_state = intel_ddi_get_hw_state;
|
|
|
- else
|
|
|
+ } else {
|
|
|
+ crt->base.get_config = intel_crt_get_config;
|
|
|
crt->base.get_hw_state = intel_crt_get_hw_state;
|
|
|
+ }
|
|
|
intel_connector->get_hw_state = intel_connector_get_hw_state;
|
|
|
|
|
|
drm_connector_helper_add(connector, &intel_crt_connector_helper_funcs);
|