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

Commit 37aa52bf authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Add broadcast RGB property for DP MST 



Add the "Broadcast RGB" property to MST connectors, and implement
the same logic for it as we have in the SST code.

v2: Extract and reuse intel_dp_limited_color_range()

Cc: Ivan Vlk <ari@adyline.sk>
Tested-by: default avatarIvan Vlk <ari@adyline.sk>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=108821


Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com> #v1
Link: https://patchwork.freedesktop.org/patch/msgid/20190326142556.21176-1-ville.syrjala@linux.intel.com
parent 547fcf9b

drivers/gpu/drm/i915/intel_dp.c

+25 −14
Original line number Diff line number Diff line
@@ -2107,6 +2107,29 @@ intel_dp_compute_link_config(struct intel_encoder *encoder, 
	return 0;

}



bool intel_dp_limited_color_range(const struct intel_crtc_state *crtc_state,

				  const struct drm_connector_state *conn_state)

{

	const struct intel_digital_connector_state *intel_conn_state =

		to_intel_digital_connector_state(conn_state);

	const struct drm_display_mode *adjusted_mode =

		&crtc_state->base.adjusted_mode;



	if (intel_conn_state->broadcast_rgb == INTEL_BROADCAST_RGB_AUTO) {

		/*

		 * See:

		 * CEA-861-E - 5.1 Default Encoding Parameters

		 * VESA DisplayPort Ver.1.2a - 5.1.1.1 Video Colorimetry

		 */

		return crtc_state->pipe_bpp != 18 &&

			drm_default_rgb_quant_range(adjusted_mode) ==

			HDMI_QUANTIZATION_RANGE_LIMITED;

	} else {

		return intel_conn_state->broadcast_rgb ==

			INTEL_BROADCAST_RGB_LIMITED;

	}

}



int

intel_dp_compute_config(struct intel_encoder *encoder,

			struct intel_crtc_state *pipe_config,
@@ -2175,20 +2198,8 @@ intel_dp_compute_config(struct intel_encoder *encoder, 
	if (ret < 0)

		return ret;



	if (intel_conn_state->broadcast_rgb == INTEL_BROADCAST_RGB_AUTO) {

		/*

		 * See:

		 * CEA-861-E - 5.1 Default Encoding Parameters

		 * VESA DisplayPort Ver.1.2a - 5.1.1.1 Video Colorimetry

		 */

		pipe_config->limited_color_range =

			pipe_config->pipe_bpp != 18 &&

			drm_default_rgb_quant_range(adjusted_mode) ==

			HDMI_QUANTIZATION_RANGE_LIMITED;

	} else {

	pipe_config->limited_color_range =

			intel_conn_state->broadcast_rgb == INTEL_BROADCAST_RGB_LIMITED;

	}

		intel_dp_limited_color_range(pipe_config, conn_state);



	if (!pipe_config->dsc_params.compression_enable)

		intel_link_compute_m_n(pipe_config->pipe_bpp,

drivers/gpu/drm/i915/intel_dp_mst.c

+13 −2
Original line number Diff line number Diff line
@@ -77,6 +77,9 @@ static int intel_dp_mst_compute_config(struct intel_encoder *encoder, 
	if (drm_dp_mst_port_has_audio(&intel_dp->mst_mgr, port))

		pipe_config->has_audio = true;



	pipe_config->limited_color_range =

		intel_dp_limited_color_range(pipe_config, conn_state);



	mst_pbn = drm_dp_calc_pbn_mode(adjusted_mode->crtc_clock, bpp);

	pipe_config->pbn = mst_pbn;
@@ -117,7 +120,11 @@ intel_dp_mst_atomic_check(struct drm_connector *connector, 
	struct drm_crtc *new_crtc = new_conn_state->crtc;

	struct drm_crtc_state *crtc_state;

	struct drm_dp_mst_topology_mgr *mgr;

	int ret = 0;

	int ret;



	ret = intel_digital_connector_atomic_check(connector, new_conn_state);

	if (ret)

		return ret;



	if (!old_conn_state->crtc)

		return 0;
@@ -354,11 +361,13 @@ intel_dp_mst_detect(struct drm_connector *connector, bool force) 
static const struct drm_connector_funcs intel_dp_mst_connector_funcs = {

	.detect = intel_dp_mst_detect,

	.fill_modes = drm_helper_probe_single_connector_modes,

	.atomic_get_property = intel_digital_connector_atomic_get_property,

	.atomic_set_property = intel_digital_connector_atomic_set_property,

	.late_register = intel_connector_register,

	.early_unregister = intel_connector_unregister,

	.destroy = intel_connector_destroy,

	.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,

	.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,

	.atomic_duplicate_state = intel_digital_connector_duplicate_state,

};



static int intel_dp_mst_get_modes(struct drm_connector *connector)
@@ -487,6 +496,8 @@ static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topolo 
	if (ret)

		goto err;



	intel_attach_broadcast_rgb_property(connector);



	return connector;



err:

drivers/gpu/drm/i915/intel_drv.h

+2 −0
Original line number Diff line number Diff line
@@ -1908,6 +1908,8 @@ void intel_csr_ucode_suspend(struct drm_i915_private *); 
void intel_csr_ucode_resume(struct drm_i915_private *);



/* intel_dp.c */

bool intel_dp_limited_color_range(const struct intel_crtc_state *crtc_state,

				  const struct drm_connector_state *conn_state);

bool intel_dp_port_enabled(struct drm_i915_private *dev_priv,

			   i915_reg_t dp_reg, enum port port,

			   enum pipe *pipe);