diff options
author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2013-11-07 12:25:59 -0500 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-11-08 12:10:09 -0500 |
commit | a29857914d456e316420d3795b86aaedcad31516 (patch) | |
tree | b9f5834fb0da67cd172b2d0f49b281ce90b19aa1 | |
parent | a81a507d487c1696c67d4cd9dc6f11bdd0548e22 (diff) |
drm/i915: Use hsw_crt_get_config on BDW
Broadwell should also use hsw_crt_get_config(). Just move the
function pointer assignment to the if HAS_DDI block we already
have there.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r-- | drivers/gpu/drm/i915/intel_crt.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c index 2e01bd3a5d8c..b5b1b9b23adf 100644 --- a/drivers/gpu/drm/i915/intel_crt.c +++ b/drivers/gpu/drm/i915/intel_crt.c | |||
@@ -822,16 +822,15 @@ void intel_crt_init(struct drm_device *dev) | |||
822 | crt->base.mode_set = intel_crt_mode_set; | 822 | crt->base.mode_set = intel_crt_mode_set; |
823 | crt->base.disable = intel_disable_crt; | 823 | crt->base.disable = intel_disable_crt; |
824 | crt->base.enable = intel_enable_crt; | 824 | crt->base.enable = intel_enable_crt; |
825 | if (IS_HASWELL(dev)) | ||
826 | crt->base.get_config = hsw_crt_get_config; | ||
827 | else | ||
828 | crt->base.get_config = intel_crt_get_config; | ||
829 | if (I915_HAS_HOTPLUG(dev)) | 825 | if (I915_HAS_HOTPLUG(dev)) |
830 | crt->base.hpd_pin = HPD_CRT; | 826 | crt->base.hpd_pin = HPD_CRT; |
831 | if (HAS_DDI(dev)) | 827 | if (HAS_DDI(dev)) { |
828 | crt->base.get_config = hsw_crt_get_config; | ||
832 | crt->base.get_hw_state = intel_ddi_get_hw_state; | 829 | crt->base.get_hw_state = intel_ddi_get_hw_state; |
833 | else | 830 | } else { |
831 | crt->base.get_config = intel_crt_get_config; | ||
834 | crt->base.get_hw_state = intel_crt_get_hw_state; | 832 | crt->base.get_hw_state = intel_crt_get_hw_state; |
833 | } | ||
835 | intel_connector->get_hw_state = intel_connector_get_hw_state; | 834 | intel_connector->get_hw_state = intel_connector_get_hw_state; |
836 | 835 | ||
837 | drm_connector_helper_add(connector, &intel_crt_connector_helper_funcs); | 836 | drm_connector_helper_add(connector, &intel_crt_connector_helper_funcs); |