Commit 818a1968 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Nuke PIPE_CONFIG_QUIRK_BIGJOINER_SLAVE 



Now that the bigjoiner state readout/computation has been
made to do the right thing nuke the related state checker
quirk.

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

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

+52 −63
Original line number Diff line number Diff line
@@ -6498,8 +6498,6 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config, 


	PIPE_CONF_CHECK_X(output_types);



	/* FIXME do the readout properly and get rid of this quirk */

	if (!PIPE_CONF_QUIRK(PIPE_CONFIG_QUIRK_BIGJOINER_SLAVE)) {

	PIPE_CONF_CHECK_I(hw.pipe_mode.crtc_hdisplay);

	PIPE_CONF_CHECK_I(hw.pipe_mode.crtc_htotal);

	PIPE_CONF_CHECK_I(hw.pipe_mode.crtc_hblank_start);
@@ -6543,7 +6541,6 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config, 
		PIPE_CONF_CHECK_FLAGS(hw.adjusted_mode.flags,

				      DRM_MODE_FLAG_NVSYNC);

	}

	}



	PIPE_CONF_CHECK_I(output_format);

	PIPE_CONF_CHECK_BOOL(has_hdmi_sink);
@@ -6554,8 +6551,6 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config, 
	PIPE_CONF_CHECK_BOOL(hdmi_scrambling);

	PIPE_CONF_CHECK_BOOL(hdmi_high_tmds_clock_ratio);

	PIPE_CONF_CHECK_BOOL(has_infoframe);

	/* FIXME do the readout properly and get rid of this quirk */

	if (!PIPE_CONF_QUIRK(PIPE_CONFIG_QUIRK_BIGJOINER_SLAVE))

	PIPE_CONF_CHECK_BOOL(fec_enable);



	PIPE_CONF_CHECK_BOOL_INCOMPLETE(has_audio);
@@ -6585,8 +6580,6 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config, 
		}



		PIPE_CONF_CHECK_I(scaler_state.scaler_id);

		/* FIXME do the readout properly and get rid of this quirk */

		if (!PIPE_CONF_QUIRK(PIPE_CONFIG_QUIRK_BIGJOINER_SLAVE))

		PIPE_CONF_CHECK_CLOCK_FUZZY(pixel_rate);



		PIPE_CONF_CHECK_X(gamma_mode);
@@ -6614,11 +6607,9 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config, 


	PIPE_CONF_CHECK_BOOL(double_wide);



	if (dev_priv->dpll.mgr)

	if (dev_priv->dpll.mgr) {

		PIPE_CONF_CHECK_P(shared_dpll);



	/* FIXME do the readout properly and get rid of this quirk */

	if (dev_priv->dpll.mgr && !PIPE_CONF_QUIRK(PIPE_CONFIG_QUIRK_BIGJOINER_SLAVE)) {

		PIPE_CONF_CHECK_X(dpll_hw_state.dpll);

		PIPE_CONF_CHECK_X(dpll_hw_state.dpll_md);

		PIPE_CONF_CHECK_X(dpll_hw_state.fp0);
@@ -6652,7 +6643,6 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config, 
		PIPE_CONF_CHECK_X(dpll_hw_state.mg_pll_tdc_coldst_bias);

	}



	if (!PIPE_CONF_QUIRK(PIPE_CONFIG_QUIRK_BIGJOINER_SLAVE)) {

	PIPE_CONF_CHECK_X(dsi_pll.ctrl);

	PIPE_CONF_CHECK_X(dsi_pll.div);
@@ -6664,7 +6654,6 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config, 
	PIPE_CONF_CHECK_CLOCK_FUZZY(port_clock);



	PIPE_CONF_CHECK_I(min_voltage_level);

	}



	if (current_config->has_psr || pipe_config->has_psr)

		PIPE_CONF_CHECK_X_WITH_MASK(infoframes.enable,

drivers/gpu/drm/i915/display/intel_display_types.h

+0 −1
Original line number Diff line number Diff line
@@ -945,7 +945,6 @@ struct intel_crtc_state { 
	 * accordingly.

	 */

#define PIPE_CONFIG_QUIRK_MODE_SYNC_FLAGS	(1<<0) /* unreliable sync mode.flags */

#define PIPE_CONFIG_QUIRK_BIGJOINER_SLAVE      (1<<1) /* bigjoiner slave, partial readout */

	unsigned long quirks;



	unsigned fb_bits; /* framebuffers to flip */