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

Commit e79dfb51 authored by Imre Deak's avatar Imre Deak Committed by Daniel Vetter
Browse files

drm/i915: Simplify scaler init during CRTC HW readout 



The crtc state starts out being bzero'd, so no need to clear
scaler_users. Also intel_crtc_init_scalers() knows already which
platforms have scalers, so no need for the platform check here.
Similarly intel_crtc_init_scalers() will init scaler_id as required,
so no need to do it here separately.

Cc: Chandra Konduru <chandra.konduru@intel.com>
Cc: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
Reviewed-by: default avatarMahesh Kumar <mahesh1.kumar@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20170719225057.20131-2-imre.deak@intel.com


Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 5fb9dadf

drivers/gpu/drm/i915/intel_display.c

+1 −6
Original line number Diff line number Diff line
@@ -8989,13 +8989,8 @@ static bool haswell_get_pipe_config(struct intel_crtc *crtc, 
	u64 power_domain_mask;

	bool active;



	if (INTEL_GEN(dev_priv) >= 9) {

	intel_crtc_init_scalers(crtc, pipe_config);



		pipe_config->scaler_state.scaler_id = -1;

		pipe_config->scaler_state.scaler_users &= ~(1 << SKL_CRTC_INDEX);

	}



	power_domain = POWER_DOMAIN_PIPE(crtc->pipe);

	if (!intel_display_power_get_if_enabled(dev_priv, power_domain))

		return false;