Commit 5cb3c1a1 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Add the missing HDMI gamut metadata packet stuff 



We have definitions and low level code for everything except the gamut
metadata HDMI packet. Add the missing bits.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20190225174106.2163-2-ville.syrjala@linux.intel.com
parent 5a80e4a2

drivers/gpu/drm/i915/i915_reg.h

+5 −3
Original line number Diff line number Diff line
@@ -4649,13 +4649,14 @@ enum { 
#define   VIDEO_DIP_ENABLE		(1 << 31)

#define   VIDEO_DIP_PORT(port)		((port) << 29)

#define   VIDEO_DIP_PORT_MASK		(3 << 29)

#define   VIDEO_DIP_ENABLE_GCP		(1 << 25)

#define   VIDEO_DIP_ENABLE_GCP		(1 << 25) /* ilk+ */

#define   VIDEO_DIP_ENABLE_AVI		(1 << 21)

#define   VIDEO_DIP_ENABLE_VENDOR	(2 << 21)

#define   VIDEO_DIP_ENABLE_GAMUT	(4 << 21)

#define   VIDEO_DIP_ENABLE_GAMUT	(4 << 21) /* ilk+ */

#define   VIDEO_DIP_ENABLE_SPD		(8 << 21)

#define   VIDEO_DIP_SELECT_AVI		(0 << 19)

#define   VIDEO_DIP_SELECT_VENDOR	(1 << 19)

#define   VIDEO_DIP_SELECT_GAMUT	(2 << 19)

#define   VIDEO_DIP_SELECT_SPD		(3 << 19)

#define   VIDEO_DIP_SELECT_MASK		(3 << 19)

#define   VIDEO_DIP_FREQ_ONCE		(0 << 16)
@@ -8133,10 +8134,11 @@ enum { 
#define _ICL_VIDEO_DIP_PPS_ECC_B	0x613D4



#define HSW_TVIDEO_DIP_CTL(trans)		_MMIO_TRANS2(trans, _HSW_VIDEO_DIP_CTL_A)

#define HSW_TVIDEO_DIP_GCP(trans)		_MMIO_TRANS2(trans, _HSW_VIDEO_DIP_GCP_A)

#define HSW_TVIDEO_DIP_AVI_DATA(trans, i)	_MMIO_TRANS2(trans, _HSW_VIDEO_DIP_AVI_DATA_A + (i) * 4)

#define HSW_TVIDEO_DIP_VS_DATA(trans, i)	_MMIO_TRANS2(trans, _HSW_VIDEO_DIP_VS_DATA_A + (i) * 4)

#define HSW_TVIDEO_DIP_SPD_DATA(trans, i)	_MMIO_TRANS2(trans, _HSW_VIDEO_DIP_SPD_DATA_A + (i) * 4)

#define HSW_TVIDEO_DIP_GCP(trans)		_MMIO_TRANS2(trans, _HSW_VIDEO_DIP_GCP_A)

#define HSW_TVIDEO_DIP_GMP_DATA(trans, i)	_MMIO_TRANS2(trans, _HSW_VIDEO_DIP_GMP_DATA_A + (i) * 4)

#define HSW_TVIDEO_DIP_VSC_DATA(trans, i)	_MMIO_TRANS2(trans, _HSW_VIDEO_DIP_VSC_DATA_A + (i) * 4)

#define ICL_VIDEO_DIP_PPS_DATA(trans, i)	_MMIO_TRANS2(trans, _ICL_VIDEO_DIP_PPS_DATA_A + (i) * 4)

#define ICL_VIDEO_DIP_PPS_ECC(trans, i)		_MMIO_TRANS2(trans, _ICL_VIDEO_DIP_PPS_ECC_A + (i) * 4)

drivers/gpu/drm/i915/intel_hdmi.c

+12 −0
Original line number Diff line number Diff line
@@ -82,6 +82,8 @@ static struct intel_hdmi *intel_attached_hdmi(struct drm_connector *connector) 
static u32 g4x_infoframe_index(unsigned int type)

{

	switch (type) {

	case HDMI_PACKET_TYPE_GAMUT_METADATA:

		return VIDEO_DIP_SELECT_GAMUT;

	case HDMI_INFOFRAME_TYPE_AVI:

		return VIDEO_DIP_SELECT_AVI;

	case HDMI_INFOFRAME_TYPE_SPD:
@@ -97,6 +99,10 @@ static u32 g4x_infoframe_index(unsigned int type) 
static u32 g4x_infoframe_enable(unsigned int type)

{

	switch (type) {

	case HDMI_PACKET_TYPE_GENERAL_CONTROL:

		return VIDEO_DIP_ENABLE_GCP;

	case HDMI_PACKET_TYPE_GAMUT_METADATA:

		return VIDEO_DIP_ENABLE_GAMUT;

	case HDMI_INFOFRAME_TYPE_AVI:

		return VIDEO_DIP_ENABLE_AVI;

	case HDMI_INFOFRAME_TYPE_SPD:
@@ -112,6 +118,10 @@ static u32 g4x_infoframe_enable(unsigned int type) 
static u32 hsw_infoframe_enable(unsigned int type)

{

	switch (type) {

	case HDMI_PACKET_TYPE_GENERAL_CONTROL:

		return VIDEO_DIP_ENABLE_GCP_HSW;

	case HDMI_PACKET_TYPE_GAMUT_METADATA:

		return VIDEO_DIP_ENABLE_GMP_HSW;

	case DP_SDP_VSC:

		return VIDEO_DIP_ENABLE_VSC_HSW;

	case DP_SDP_PPS:
@@ -135,6 +145,8 @@ hsw_dip_data_reg(struct drm_i915_private *dev_priv, 
		 int i)

{

	switch (type) {

	case HDMI_PACKET_TYPE_GAMUT_METADATA:

		return HSW_TVIDEO_DIP_GMP_DATA(cpu_transcoder, i);

	case DP_SDP_VSC:

		return HSW_TVIDEO_DIP_VSC_DATA(cpu_transcoder, i);

	case DP_SDP_PPS:

CRA Git | Maintained and supported by SUSTech CRA and CCSE