mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Hsin-Yi Wang <hsinyi@chromium.org>
To: Jani Nikula <jani.nikula@linux.intel.com>,
	Dmitry Baryshkov <dmitry.baryshkov@linaro.org>,
	Douglas Anderson <dianders@chromium.org>
Cc: Neil Armstrong <neil.armstrong@linaro.org>,
	Jessica Zhang <quic_jesszhan@quicinc.com>,
	Sam Ravnborg <sam@ravnborg.org>,
	Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
	Maxime Ripard <mripard@kernel.org>,
	Thomas Zimmermann <tzimmermann@suse.de>,
	David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch>,
	dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org
Subject: [PATCH v4 2/5] drm/edid: Add a function to match EDID with identity
Date: Tue,  5 Mar 2024 16:34:02 -0800	[thread overview]
Message-ID: <20240306004347.974304-3-hsinyi@chromium.org> (raw)
In-Reply-To: <20240306004347.974304-1-hsinyi@chromium.org>

Create a type drm_edid_ident as the identity of an EDID. Currently it
contains panel id and monitor name.

Create a function that can match a given EDID and an identity:
1. Reject if the panel id doesn't match.
2. If name is not null in identity, try to match it in the detailed timing
   blocks. Note that some panel vendors put the monitor name after
   EDID_DETAIL_MONITOR_STRING.

Signed-off-by: Hsin-Yi Wang <hsinyi@chromium.org>
---
v3->v4:
1. add a type drm_edid_ident
2. match name -> match identity. Modify function to use edid iterators.
---
 drivers/gpu/drm/drm_edid.c | 76 ++++++++++++++++++++++++++++++++++++++
 include/drm/drm_edid.h     |  8 ++++
 2 files changed, 84 insertions(+)

diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index f9e09f327f81..5e7e69e0e345 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -102,6 +102,11 @@ struct detailed_mode_closure {
 	int modes;
 };
 
+struct drm_edid_ident_closure {
+	const struct drm_edid_ident *ident;
+	bool matched;
+};
+
 #define LEVEL_DMT	0
 #define LEVEL_GTF	1
 #define LEVEL_GTF2	2
@@ -5455,6 +5460,77 @@ drm_parse_hdmi_vsdb_audio(struct drm_connector *connector, const u8 *db)
 		    connector->audio_latency[0], connector->audio_latency[1]);
 }
 
+static void
+match_identity(const struct detailed_timing *timing, void *data)
+{
+	struct drm_edid_ident_closure *closure = data;
+	unsigned int i, j;
+	const char *str = closure->ident->name;
+	unsigned int buflen = strlen(str);
+	unsigned int size = ARRAY_SIZE(timing->data.other_data.data.str.str);
+
+	if (buflen > size ||
+	    !(is_display_descriptor(timing, EDID_DETAIL_MONITOR_NAME) ||
+	      is_display_descriptor(timing, EDID_DETAIL_MONITOR_STRING)))
+		return;
+
+	for (i = 0; i < buflen; i++) {
+		char c = timing->data.other_data.data.str.str[i];
+
+		if (c != str[i] ||  c == '\n')
+			break;
+		}
+
+		if (i == buflen) {
+			/* Allow trailing white spaces. */
+			for (j = i; j < size; j++) {
+				char c = timing->data.other_data.data.str.str[j];
+
+				if (c == '\n') {
+					closure->matched = true;
+					return;
+				} else if (c != ' ') {
+					break;
+				}
+			}
+			if (j == size) {
+				closure->matched = true;
+				return;
+			}
+	}
+}
+
+/**
+ * drm_edid_match_identity - match drm_edid with given identity
+ * @drm_edid: EDID
+ * @ident: the EDID identity to match with
+ *
+ * Check if the EDID matches with the given identity.
+ *
+ * Return: True if the given identity matched with EDID, false otherwise.
+ */
+bool drm_edid_match_identity(const struct drm_edid *drm_edid,
+			     const struct drm_edid_ident *ident)
+{
+	if (!drm_edid || edid_extract_panel_id(drm_edid->edid) != ident->panel_id)
+		return false;
+
+	/* Match with name only if it's not NULL. */
+	if (ident->name) {
+		struct drm_edid_ident_closure closure = {
+			.ident = ident,
+			.matched = false,
+		};
+
+		drm_for_each_detailed_block(drm_edid, match_identity, &closure);
+
+		return closure.matched;
+	}
+
+	return true;
+}
+EXPORT_SYMBOL(drm_edid_match_identity);
+
 static void
 monitor_name(const struct detailed_timing *timing, void *data)
 {
diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h
index 9686a7cee6a6..01825a8954b6 100644
--- a/include/drm/drm_edid.h
+++ b/include/drm/drm_edid.h
@@ -312,6 +312,12 @@ struct edid {
 	u8 checksum;
 } __packed;
 
+/* EDID matching */
+struct drm_edid_ident {
+	u32 panel_id;
+	const char *name;
+};
+
 #define EDID_PRODUCT_ID(e) ((e)->prod_code[0] | ((e)->prod_code[1] << 8))
 
 /* Short Audio Descriptor */
@@ -412,6 +418,8 @@ struct edid *drm_get_edid(struct drm_connector *connector,
 			  struct i2c_adapter *adapter);
 const struct drm_edid *drm_edid_read_base_block(struct i2c_adapter *adapter);
 u32 drm_edid_get_panel_id(const struct drm_edid *drm_edid);
+bool drm_edid_match_identity(const struct drm_edid *drm_edid,
+			     const struct drm_edid_ident *ident);
 struct edid *drm_get_edid_switcheroo(struct drm_connector *connector,
 				     struct i2c_adapter *adapter);
 struct edid *drm_edid_duplicate(const struct edid *edid);
-- 
2.44.0.278.ge034bb2e1d-goog


  parent reply	other threads:[~2024-03-06  0:43 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-06  0:34 [PATCH v4 0/5] Match panel " Hsin-Yi Wang
2024-03-06  0:34 ` [PATCH v4 1/5] drm_edid: Add a function to get EDID base block Hsin-Yi Wang
2024-03-06  8:43   ` Jani Nikula
2024-03-06  0:34 ` Hsin-Yi Wang [this message]
2024-03-06  9:16   ` [PATCH v4 2/5] drm/edid: Add a function to match EDID with identity Jani Nikula
2024-03-06 19:08     ` Hsin-Yi Wang
2024-03-06  0:34 ` [PATCH v4 3/5] drm/edid: Match edid quirks " Hsin-Yi Wang
2024-03-06  9:18   ` Jani Nikula
2024-03-06  0:34 ` [PATCH v4 4/5] drm/panel-edp: Match edp_panels with panel identity Hsin-Yi Wang
2024-03-06  9:23   ` Jani Nikula
2024-03-06 18:48     ` Hsin-Yi Wang
2024-03-06  0:34 ` [PATCH v4 5/5] drm/panel-edp: Fix AUO 0x405c panel naming and add a variant Hsin-Yi Wang

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240306004347.974304-3-hsinyi@chromium.org \
    --to=hsinyi@chromium.org \
    --cc=airlied@gmail.com \
    --cc=daniel@ffwll.ch \
    --cc=dianders@chromium.org \
    --cc=dmitry.baryshkov@linaro.org \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=jani.nikula@linux.intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=maarten.lankhorst@linux.intel.com \
    --cc=mripard@kernel.org \
    --cc=neil.armstrong@linaro.org \
    --cc=quic_jesszhan@quicinc.com \
    --cc=sam@ravnborg.org \
    --cc=tzimmermann@suse.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®