diff mbox series

[17/25] drm/edid: add drm_edid helper for drm_edid_to_sad()

Message ID b3a5a99b1ec07d9b3b2bb9ccfadbf89768213fc6.1651830939.git.jani.nikula@intel.com (mailing list archive)
State New, archived
Headers show
Series drm/edid: introduce struct drm_edid | expand

Commit Message

Jani Nikula May 6, 2022, 10:10 a.m. UTC 
We'll need to propagate drm_edid everywhere.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/drm_edid.c | 37 ++++++++++++++++++++++++-------------
 1 file changed, 24 insertions(+), 13 deletions(-)

Comments

Ville Syrjälä May 6, 2022, 6:05 p.m. UTC | #1 
On Fri, May 06, 2022 at 01:10:24PM +0300, Jani Nikula wrote:
> +int drm_edid_to_sad(const struct edid *edid, struct cea_sad **sads)
> +{
> +	struct drm_edid drm_edid = {
> +		.edid = edid,
> +		.size = edid_size(edid),
> +	};
> +
> +	return _drm_edid_to_sad(&drm_edid, sads);

No need to check for NULL edid in these wrappers?

> +}
>  EXPORT_SYMBOL(drm_edid_to_sad);
>  
>  /**
> -- 
> 2.30.2
Jani Nikula May 7, 2022, 10:21 a.m. UTC | #2 
On Fri, 06 May 2022, Ville Syrjälä <ville.syrjala@linux.intel.com> wrote:
> On Fri, May 06, 2022 at 01:10:24PM +0300, Jani Nikula wrote:
>> +int drm_edid_to_sad(const struct edid *edid, struct cea_sad **sads)
>> +{
>> +	struct drm_edid drm_edid = {
>> +		.edid = edid,
>> +		.size = edid_size(edid),
>> +	};
>> +
>> +	return _drm_edid_to_sad(&drm_edid, sads);
>
> No need to check for NULL edid in these wrappers?

Yeah, we do, and CI concurs. *facepalm*.

BR,
Jani.

>
>> +}
>>  EXPORT_SYMBOL(drm_edid_to_sad);
>>  
>>  /**
>> -- 
>> 2.30.2
diff mbox series

Patch

diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 2017feecbe1c..52ea187394dd 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -4954,24 +4954,14 @@  static void drm_edid_to_eld(struct drm_connector *connector,
 		      drm_eld_size(eld), total_sad_count);
 }
 
-/**
- * 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.
- *
- * Note: The returned pointer needs to be freed using kfree().
- *
- * Return: The number of found SADs or negative number on error.
- */
-int drm_edid_to_sad(const struct edid *edid, struct cea_sad **sads)
+static int _drm_edid_to_sad(const struct drm_edid *drm_edid,
+			    struct cea_sad **sads)
 {
 	const struct cea_db *db;
 	struct cea_db_iter iter;
 	int count = 0;
 
-	cea_db_iter_edid_begin(edid, &iter);
+	cea_db_iter_edid_begin(drm_edid->edid, &iter);
 	cea_db_iter_for_each(db, &iter) {
 		if (cea_db_tag(db) == CTA_DB_AUDIO) {
 			int j;
@@ -4997,6 +4987,27 @@  int drm_edid_to_sad(const struct edid *edid, struct cea_sad **sads)
 
 	return count;
 }
+
+/**
+ * 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.
+ *
+ * Note: The returned pointer needs to be freed using kfree().
+ *
+ * Return: The number of found SADs or negative number on error.
+ */
+int drm_edid_to_sad(const struct edid *edid, struct cea_sad **sads)
+{
+	struct drm_edid drm_edid = {
+		.edid = edid,
+		.size = edid_size(edid),
+	};
+
+	return _drm_edid_to_sad(&drm_edid, sads);
+}
 EXPORT_SYMBOL(drm_edid_to_sad);
 
 /**