Commit 13d0add3 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/edid: Pass connector to AVI infoframe functions 



Make life easier for drivers by simply passing the connector
to drm_hdmi_avi_infoframe_from_display_mode() and
drm_hdmi_avi_infoframe_quant_range(). That way drivers don't
need to worry about is_hdmi2_sink mess.

v2: Make is_hdmi2_sink() return true for sil-sii8620
    Adapt to omap/vc4 changes

Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: "David (ChunMing) Zhou" <David1.Zhou@amd.com>
Cc: Archit Taneja <architt@codeaurora.org>
Cc: Andrzej Hajda <a.hajda@samsung.com>
Cc: Laurent Pinchart <Laurent.pinchart@ideasonboard.com>
Cc: Inki Dae <inki.dae@samsung.com>
Cc: Joonyoung Shim <jy0922.shim@samsung.com>
Cc: Seung-Woo Kim <sw0312.kim@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Russell King <linux@armlinux.org.uk>
Cc: CK Hu <ck.hu@mediatek.com>
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Cc: Rob Clark <robdclark@gmail.com>
Cc: Ben Skeggs <bskeggs@redhat.com>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: Sandy Huang <hjc@rock-chips.com>
Cc: "Heiko Stübner" <heiko@sntech.de>
Cc: Benjamin Gaignard <benjamin.gaignard@linaro.org>
Cc: Vincent Abriou <vincent.abriou@st.com>
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: Eric Anholt <eric@anholt.net>
Cc: Shawn Guo <shawnguo@kernel.org>
Cc: Ilia Mirkin <imirkin@alum.mit.edu>
Cc: amd-gfx@lists.freedesktop.org
Cc: linux-arm-msm@vger.kernel.org
Cc: freedreno@lists.freedesktop.org
Cc: nouveau@lists.freedesktop.org
Cc: linux-tegra@vger.kernel.org
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Acked-by: default avatarThierry Reding <treding@nvidia.com>
Acked-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190108172828.15184-1-ville.syrjala@linux.intel.com
parent 2b5ab0ee

drivers/gpu/drm/amd/amdgpu/dce_v10_0.c

+1 −1
Original line number Diff line number Diff line
@@ -1682,7 +1682,7 @@ static void dce_v10_0_afmt_setmode(struct drm_encoder *encoder, 
	dce_v10_0_audio_write_sad_regs(encoder);

	dce_v10_0_audio_write_latency_fields(encoder, mode);



	err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode, false);

	err = drm_hdmi_avi_infoframe_from_display_mode(&frame, connector, mode);

	if (err < 0) {

		DRM_ERROR("failed to setup AVI infoframe: %zd\n", err);

		return;

drivers/gpu/drm/amd/amdgpu/dce_v11_0.c

+1 −1
Original line number Diff line number Diff line
@@ -1724,7 +1724,7 @@ static void dce_v11_0_afmt_setmode(struct drm_encoder *encoder, 
	dce_v11_0_audio_write_sad_regs(encoder);

	dce_v11_0_audio_write_latency_fields(encoder, mode);



	err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode, false);

	err = drm_hdmi_avi_infoframe_from_display_mode(&frame, connector, mode);

	if (err < 0) {

		DRM_ERROR("failed to setup AVI infoframe: %zd\n", err);

		return;

drivers/gpu/drm/amd/amdgpu/dce_v6_0.c

+2 −1
Original line number Diff line number Diff line
@@ -1423,6 +1423,7 @@ static void dce_v6_0_audio_set_avi_infoframe(struct drm_encoder *encoder, 
	struct amdgpu_device *adev = dev->dev_private;

	struct amdgpu_encoder *amdgpu_encoder = to_amdgpu_encoder(encoder);

	struct amdgpu_encoder_atom_dig *dig = amdgpu_encoder->enc_priv;

	struct drm_connector *connector = amdgpu_get_connector_for_encoder(encoder);

	struct hdmi_avi_infoframe frame;

	u8 buffer[HDMI_INFOFRAME_HEADER_SIZE + HDMI_AVI_INFOFRAME_SIZE];

	uint8_t *payload = buffer + 3;
@@ -1430,7 +1431,7 @@ static void dce_v6_0_audio_set_avi_infoframe(struct drm_encoder *encoder, 
	ssize_t err;

	u32 tmp;



	err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode, false);

	err = drm_hdmi_avi_infoframe_from_display_mode(&frame, connector, mode);

	if (err < 0) {

		DRM_ERROR("failed to setup AVI infoframe: %zd\n", err);

		return;

drivers/gpu/drm/amd/amdgpu/dce_v8_0.c

+1 −1
Original line number Diff line number Diff line
@@ -1616,7 +1616,7 @@ static void dce_v8_0_afmt_setmode(struct drm_encoder *encoder, 
	dce_v8_0_audio_write_sad_regs(encoder);

	dce_v8_0_audio_write_latency_fields(encoder, mode);



	err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode, false);

	err = drm_hdmi_avi_infoframe_from_display_mode(&frame, connector, mode);

	if (err < 0) {

		DRM_ERROR("failed to setup AVI infoframe: %zd\n", err);

		return;

drivers/gpu/drm/bridge/analogix-anx78xx.c

+3 −2
Original line number Diff line number Diff line
@@ -1094,8 +1094,9 @@ static void anx78xx_bridge_mode_set(struct drm_bridge *bridge, 


	mutex_lock(&anx78xx->lock);



	err = drm_hdmi_avi_infoframe_from_display_mode(&frame, adjusted_mode,

						       false);

	err = drm_hdmi_avi_infoframe_from_display_mode(&frame,

						       &anx78xx->connector,

						       adjusted_mode);

	if (err) {

		DRM_ERROR("Failed to setup AVI infoframe: %d\n", err);

		goto unlock;

CRA Git | Maintained and supported by SUSTech CRA and CCSE