Commit 291106cb authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Manasi Navare
Browse files

drm/i915: Move hw.active assignment into intel_crtc_get_pipe_config() 



No reason to make the callers of intel_crtc_get_pipe_config()
populate hw.active. Let's do it in intel_crtc_get_pipe_config()
itself. hw.enable we leave up to the callers since it's slightly
different for readout vs. state check.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarManasi Navare <manasi.d.navare@intel.com>
Signed-off-by: default avatarManasi Navare <manasi.d.navare@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201112191718.16683-4-ville.syrjala@linux.intel.com
parent 11f9af16

drivers/gpu/drm/i915/display/intel_display.c

+10 −4
Original line number Diff line number Diff line
@@ -11412,7 +11412,12 @@ static bool intel_crtc_get_pipe_config(struct intel_crtc_state *crtc_state) 
	struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);

	struct drm_i915_private *i915 = to_i915(crtc->base.dev);









	return i915->display.get_pipe_config(crtc, crtc_state);









	if (!i915->display.get_pipe_config(crtc, crtc_state))









		return false;

















	crtc_state->hw.active = true;

















	return true;









}

















static u32 intel_cursor_base(const struct intel_plane_state *plane_state)








@@ -14430,7 +14435,7 @@ verify_crtc_state(struct intel_crtc *crtc,















	pipe_config->hw.enable = new_crtc_state->hw.enable;

















	pipe_config->hw.active = intel_crtc_get_pipe_config(pipe_config);









	intel_crtc_get_pipe_config(pipe_config);

















	/* we keep both pipes enabled on 830 */









	if (IS_I830(dev_priv) && pipe_config->hw.active)








@@ -18742,9 +18747,10 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)







		intel_crtc_free_hw_state(crtc_state);









		intel_crtc_state_reset(crtc_state, crtc);

















		crtc_state->hw.active = crtc_state->hw.enable =









		intel_crtc_get_pipe_config(crtc_state);

















		crtc_state->hw.enable = crtc_state->hw.active;

















		crtc->base.enabled = crtc_state->hw.enable;









		crtc->active = crtc_state->hw.active;



































































CRA Git | Maintained and supported by SUSTech CRA and CCSE