Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2985791 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

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: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent a81a507d

drivers/gpu/drm/i915/intel_crt.c

+5 −6
Original line number Diff line number Diff line
@@ -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);