Skip to contentSkip to conversation

drm: add drm_edid_to_eld helper extracting SADs from EDID

RFC PATCH In review Rafał Miłecki 2 participants 4 messages Apr 7, 2013 – Apr 8, 2013

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

RFC PATCH v2 1/2 drm: add drm_edid_to_eld helper extracting SADs from EDID

Some devices (ATI/AMD cards) don't support passing ELD struct to the hardware but just require filling specific registers and then the hardware/firmware does the rest. In such cases we need to read the info from SAD blocks and put them in the correct registers.
---
V2: fix commit message
return number of SADs
take pointer as an argument
break after finding AUDIO_BLOCK

---
 drivers/gpu/drm/drm_edid.c |   58 ++++++++++++++++++++++++++++++++++++++++++++
 include/drm/drm_edid.h     |   24 ++++++++++++++++++
 2 files changed, 82 insertions(+)
drivers/gpu/drm/drm_edid.c +58 -0
index e2acfdb..079d97f 100644
@@ -2511,6 +2511,64 @@ void drm_edid_to_eld(struct drm_connector *connector, struct edid *edid)
 EXPORT_SYMBOL(drm_edid_to_eld);
 
 /**
+ * drm_edid_to_sad - extracts SADs from EDID
+ * @edid: EDID to parse
+ * @sads: pointer that will be set to the extracted SADs
+ *
+ * Looks for CEA EDID block and extracts SADs (Short Audio Descriptors) from it.
+ *
+ * Return number of found SADs or negative number on error.
+ */
+int drm_edid_to_sad(struct edid *edid, struct cea_sad **sads)
+{
+	int count = 0;
+	int i, start, end, dbl;
+	u8 *db, *cea;
+
+	cea = drm_find_cea_extension(edid);
+	if (!cea) {
+		DRM_DEBUG_KMS("SAD: no CEA Extension found\n");
+		return -ENOENT;
+	}
+
+	if (cea_revision(cea) < 3) {
+		DRM_DEBUG_KMS("SAD: wrong CEA revision\n");
+		return -ENOTSUPP;
+	}
+
+	if (cea_db_offsets(cea, &start, &end)) {
+		DRM_DEBUG_KMS("SAD: invalid data block offsets\n");
+		return -EPROTO;
+	}
+
+	for_each_cea_db(cea, i, start, end) {
+		db = &cea[i];
+		dbl = cea_db_payload_len(db);
+
+		if (cea_db_tag(db) == AUDIO_BLOCK) {
+			int j;
+
+			count = dbl / 3; /* SAD is 3B */
+			*sads = kzalloc(count * sizeof(*sads), GFP_KERNEL);
+			if (!*sads)
+				return -ENOMEM;
+			for (j = 0; j < count; j++) {
+				u8 *sad = &db[1 + j * 3];
+
+				(*sads)[j].format = (sad[0] & 0x78) >> 3;
+				(*sads)[j].channels = sad[0] & 0x7;
+				(*sads)[j].freq = sad[1] & 0x7F;
+				(*sads)[j].byte2 = sad[2];
+			}
+			break;
+		}
+	}
+
+	return count;
+}
+EXPORT_SYMBOL(drm_edid_to_sad);
+
+/**
  * drm_av_sync_delay - HDMI/DP sink audio-video sync delay in millisecond
  * @connector: connector associated with the HDMI/DP sink
  * @mode: the display mode
include/drm/drm_edid.h +24 -0
index 5da1b4a..7082c82 100644
@@ -244,12 +244,36 @@ struct edid {
 
 #define EDID_PRODUCT_ID(e) ((e)->prod_code[0] | ((e)->prod_code[1] << 8))
 
+#define SAD_FORMAT_LPCM			0x01
+#define SAD_FORMAT_AC3			0x02
+#define SAD_FORMAT_MPEG1		0x03
+#define SAD_FORMAT_MP3			0x04
+#define SAD_FORMAT_MPEG2		0x05
+#define SAD_FORMAT_AAC			0x06
+#define SAD_FORMAT_DTS			0x07
+#define SAD_FORMAT_ATRAC		0x08
+#define SAD_FORMAT_ONE_BIT_AUDIO	0x09
+#define SAD_FORMAT_DOLBY_DIGITAL	0x0a
+#define SAD_FORMAT_DTS_HD		0x0b
+#define SAD_FORMAT_MAT_MLP		0x0c
+#define SAD_FORMAT_DST			0x0d
+#define SAD_FORMAT_WMA_PRO		0x0e
+
+/* Short Audio Descriptor */
+struct cea_sad {
+	u8 format;
+	u8 channels; /* max number of channels - 1 */
+	u8 freq;
+	u8 byte2; /* meaning depends on format */
+};
+
 struct drm_encoder;
 struct drm_connector;
 struct drm_display_mode;
 struct hdmi_avi_infoframe;
 
 void drm_edid_to_eld(struct drm_connector *connector, struct edid *edid);
+int drm_edid_to_sad(struct edid *edid, struct cea_sad **sads);
 int drm_av_sync_delay(struct drm_connector *connector,
 		      struct drm_display_mode *mode);
 struct drm_connector *drm_select_eld(struct drm_encoder *encoder,
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH 2/2 drm/radeon/evergreen: set ELD registers

---
 drivers/gpu/drm/radeon/evergreen_hdmi.c |   63 +++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)
drivers/gpu/drm/radeon/evergreen_hdmi.c +63 -0
index ed46dad..81db8b9 100644
@@ -85,6 +85,67 @@ static void evergreen_hdmi_update_avi_infoframe(struct drm_encoder *encoder,
 		frame[0xC] | (frame[0xD] << 8));
 }
 
+static void evergreen_hdmi_write_eld(struct drm_encoder *encoder)
+{
+	struct radeon_device *rdev = encoder->dev->dev_private;
+	struct drm_connector *connector;
+	struct radeon_connector *radeon_connector = NULL;
+	struct cea_sad *sads;
+	int i, j, sad_count;
+
+	static const u16 eld_reg_to_type[][2] = {
+		{ AZ_F0_CODEC_PIN0_CONTROL_AUDIO_DESCRIPTOR0, SAD_FORMAT_LPCM },
+		{ AZ_F0_CODEC_PIN0_CONTROL_AUDIO_DESCRIPTOR1, SAD_FORMAT_AC3 },
+		{ AZ_F0_CODEC_PIN0_CONTROL_AUDIO_DESCRIPTOR2, SAD_FORMAT_MPEG1 },
+		{ AZ_F0_CODEC_PIN0_CONTROL_AUDIO_DESCRIPTOR3, SAD_FORMAT_MP3 },
+		{ AZ_F0_CODEC_PIN0_CONTROL_AUDIO_DESCRIPTOR4, SAD_FORMAT_MPEG2 },
+		{ AZ_F0_CODEC_PIN0_CONTROL_AUDIO_DESCRIPTOR5, SAD_FORMAT_AAC },
+		{ AZ_F0_CODEC_PIN0_CONTROL_AUDIO_DESCRIPTOR6, SAD_FORMAT_DTS },
+		{ AZ_F0_CODEC_PIN0_CONTROL_AUDIO_DESCRIPTOR7, SAD_FORMAT_ATRAC },
+		{ AZ_F0_CODEC_PIN0_CONTROL_AUDIO_DESCRIPTOR9, SAD_FORMAT_DOLBY_DIGITAL },
+		{ AZ_F0_CODEC_PIN0_CONTROL_AUDIO_DESCRIPTOR10, SAD_FORMAT_DTS_HD },
+		{ AZ_F0_CODEC_PIN0_CONTROL_AUDIO_DESCRIPTOR11, SAD_FORMAT_MAT_MLP },
+		{ AZ_F0_CODEC_PIN0_CONTROL_AUDIO_DESCRIPTOR13, SAD_FORMAT_WMA_PRO },
+	};
+
+	list_for_each_entry(connector, &encoder->dev->mode_config.connector_list, head) {
+		if (connector->encoder == encoder)
+			radeon_connector = to_radeon_connector(connector);
+	}
+
+	if (!radeon_connector) {
+		DRM_ERROR("Couldn't find encoder's connector\n");
+		return;
+	}
+
+	sad_count = drm_edid_to_sad(radeon_connector->edid, &sads);
+	if (sad_count < 0) {
+		DRM_ERROR("Couldn't read SADs: %d\n", sad_count);
+		return;
+	}
+	BUG_ON(!sads);
+
+	for (i = 0; i < ARRAY_SIZE(eld_reg_to_type); i++) {
+		u32 value = 0;
+		for (j = 0; j < sad_count; j++) {
+			struct cea_sad *sad = &sads[j];
+
+			if (sad->format == eld_reg_to_type[i][1]) {
+				value = MAX_CHANNELS(sad->channels) |
+					DESCRIPTOR_BYTE_2(sad->byte2) |
+					SUPPORTED_FREQUENCIES(sad->freq);
+				if (sad->format == SAD_FORMAT_LPCM)
+					value |= SUPPORTED_FREQUENCIES_STEREO(sad->freq);
+				break;
+			}
+		}
+		WREG32(eld_reg_to_type[i][0], value);
+		pr_info("write32(0x%x,\t0x%08x);\n", eld_reg_to_type[i][0], value);
+	}
+
+	kfree(sads);
+}
+
 /*
  * update the info frames with the data from the current display mode
  */
@@ -171,6 +232,8 @@ void evergreen_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_mode
 
 	/* fglrx sets 0x40 in 0x5f80 here */
 
+	evergreen_hdmi_write_eld(encoder);
+
 	err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode);
 	if (err < 0) {
 		DRM_ERROR("failed to setup AVI infoframe: %zd\n", err);
Signature · 1 line
1.7.10.4
#2 lore raw
In reply to Rafał Miłecki
Quoted 51 lines · Rafał Miłecki

Some devices (ATI/AMD cards) don't support passing ELD struct to the hardware but just require filling specific registers and then the hardware/firmware does the rest. In such cases we need to read the info from SAD blocks and put them in the correct registers.
---
V2: fix commit message
return number of SADs
take pointer as an argument
break after finding AUDIO_BLOCK

---
 drivers/gpu/drm/drm_edid.c |   58 ++++++++++++++++++++++++++++++++++++++++++++
 include/drm/drm_edid.h     |   24 ++++++++++++++++++
 2 files changed, 82 insertions(+)
drivers/gpu/drm/drm_edid.c +29 -0
index e2acfdb..079d97f 100644
@@ -2511,6 +2511,64 @@ void drm_edid_to_eld(struct drm_connector *connector, struct edid *edid)
 EXPORT_SYMBOL(drm_edid_to_eld);
 
 /**
+ * drm_edid_to_sad - extracts SADs from EDID
+ * @edid: EDID to parse
+ * @sads: pointer that will be set to the extracted SADs
+ *
+ * Looks for CEA EDID block and extracts SADs (Short Audio Descriptors) from it.
+ *
+ * Return number of found SADs or negative number on error.
+ */
+int drm_edid_to_sad(struct edid *edid, struct cea_sad **sads)
+{
+	int count = 0;
+	int i, start, end, dbl;
+	u8 *db, *cea;
+
+	cea = drm_find_cea_extension(edid);
+	if (!cea) {
+		DRM_DEBUG_KMS("SAD: no CEA Extension found\n");
+		return -ENOENT;
+	}
+
+	if (cea_revision(cea) < 3) {
+		DRM_DEBUG_KMS("SAD: wrong CEA revision\n");
+		return -ENOTSUPP;
+	}
+
+	if (cea_db_offsets(cea, &start, &end)) {
+		DRM_DEBUG_KMS("SAD: invalid data block offsets\n");
+		return -EPROTO;
+	}

drivers/gpu/drm/drm_edid.c void drm_edid_to_eld(struct drm_connector *connector, struct edid *edid) · line 2552

Quoted 10 lines
drivers/gpu/drm/drm_edid.c +10 -0
+
+	for_each_cea_db(cea, i, start, end) {
+		db = &cea[i];
+		dbl = cea_db_payload_len(db);
+
+		if (cea_db_tag(db) == AUDIO_BLOCK) {
+			int j;
+
+			count = dbl / 3; /* SAD is 3B */
+			*sads = kzalloc(count * sizeof(*sads), GFP_KERNEL);

Still looks a bit wrong.

kcalloc(count, sizeof(**sads), GFP_KERNEL);

Also a minor nit, but the scope of some variables is needlessly large. db and dbl are only needed inside the outer loop, and count is only needed inside the 'if (... == AUDIO_BLOCK)' block. But this is not a big deal, so feel free to ignore me on this point if you're feeling lazy :)

Quoted 34 lines
drivers/gpu/drm/drm_edid.c +19 -0
+			if (!*sads)
+				return -ENOMEM;
+			for (j = 0; j < count; j++) {
+				u8 *sad = &db[1 + j * 3];
+
+				(*sads)[j].format = (sad[0] & 0x78) >> 3;
+				(*sads)[j].channels = sad[0] & 0x7;
+				(*sads)[j].freq = sad[1] & 0x7F;
+				(*sads)[j].byte2 = sad[2];
+			}
+			break;
+		}
+	}
+
+	return count;
+}
+EXPORT_SYMBOL(drm_edid_to_sad);
+
+/**
  * drm_av_sync_delay - HDMI/DP sink audio-video sync delay in millisecond
  * @connector: connector associated with the HDMI/DP sink
  * @mode: the display mode
include/drm/drm_edid.h +4 -0
index 5da1b4a..7082c82 100644
@@ -244,12 +244,36 @@ struct edid {
 
 #define EDID_PRODUCT_ID(e) ((e)->prod_code[0] | ((e)->prod_code[1] << 8))
 
+#define SAD_FORMAT_LPCM			0x01
+#define SAD_FORMAT_AC3			0x02
+#define SAD_FORMAT_MPEG1		0x03
+#define SAD_FORMAT_MP3			0x04

include/drm/drm_edid.h struct edid { · line 260

Quoted 10 lines
include/drm/drm_edid.h +10 -0
+#define SAD_FORMAT_MPEG2		0x05
+#define SAD_FORMAT_AAC			0x06
+#define SAD_FORMAT_DTS			0x07
+#define SAD_FORMAT_ATRAC		0x08
+#define SAD_FORMAT_ONE_BIT_AUDIO	0x09
+#define SAD_FORMAT_DOLBY_DIGITAL	0x0a
+#define SAD_FORMAT_DTS_HD		0x0b
+#define SAD_FORMAT_MAT_MLP		0x0c
+#define SAD_FORMAT_DST			0x0d
+#define SAD_FORMAT_WMA_PRO		0x0e

We already have names for these in include/linux/hdmi.h. No need to duplicate them here.

Quoted 26 lines
include/drm/drm_edid.h +10 -0
+
+/* Short Audio Descriptor */
+struct cea_sad {
+	u8 format;
+	u8 channels; /* max number of channels - 1 */
+	u8 freq;
+	u8 byte2; /* meaning depends on format */
+};
+
 struct drm_encoder;
 struct drm_connector;
 struct drm_display_mode;
 struct hdmi_avi_infoframe;
 
 void drm_edid_to_eld(struct drm_connector *connector, struct edid *edid);
+int drm_edid_to_sad(struct edid *edid, struct cea_sad **sads);
 int drm_av_sync_delay(struct drm_connector *connector,
 		      struct drm_display_mode *mode);
 struct drm_connector *drm_select_eld(struct drm_encoder *encoder,
Signature · 6 lines
1.7.10.4

_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 6 lines
Ville Syrjälä
Intel OTC
_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel
#3 lore raw

2013/4/8 Ville Syrjälä <[email protected]>:

Quoted 11 lines
Quoted 1 line

+ *sads = kzalloc(count * sizeof(*sads), GFP_KERNEL);

Still looks a bit wrong.

kcalloc(count, sizeof(**sads), GFP_KERNEL);

Also a minor nit, but the scope of some variables is needlessly large. db and dbl are only needed inside the outer loop, and count is only needed inside the 'if (... == AUDIO_BLOCK)' block. But this is not a big deal, so feel free to ignore me on this point if you're feeling lazy :)

Quoted 4 lines
Quoted 1 line

+#define SAD_FORMAT_WMA_PRO 0x0e

We already have names for these in include/linux/hdmi.h. No need to duplicate them here.

Thanks for your comments Ville! I appreciate that :)

Signature · 5 lines
Rafał
_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel