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 v5 2/6] drm/edid: Clean up drm_edid_get_panel_id()
Date: Wed, 6 Mar 2024 11:55:52 -0800 [thread overview]
Message-ID: <20240306200353.1436198-3-hsinyi@chromium.org> (raw)
In-Reply-To: <20240306200353.1436198-1-hsinyi@chromium.org>
drm_edid_get_panel_id() now just directly call edid_extract_panel_id().
Merge them into one function.
Signed-off-by: Hsin-Yi Wang <hsinyi@chromium.org>
---
v4->v5: new
---
drivers/gpu/drm/drm_edid.c | 39 ++++++++++++++++++--------------------
1 file changed, 18 insertions(+), 21 deletions(-)
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 8c7e871eff58..febe374fa969 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -2743,8 +2743,24 @@ const struct drm_edid *drm_edid_read(struct drm_connector *connector)
}
EXPORT_SYMBOL(drm_edid_read);
-static u32 edid_extract_panel_id(const struct edid *edid)
+/**
+ * drm_edid_get_panel_id - Get a panel's ID from EDID
+ * @drm_edid: EDID that contains panel ID.
+ *
+ * This function uses the first block of the EDID of a panel and (assuming
+ * that the EDID is valid) extracts the ID out of it. The ID is a 32-bit value
+ * (16 bits of manufacturer ID and 16 bits of per-manufacturer ID) that's
+ * supposed to be different for each different modem of panel.
+ *
+ * Return: A 32-bit ID that should be different for each make/model of panel.
+ * See the functions drm_edid_encode_panel_id() and
+ * drm_edid_decode_panel_id() for some details on the structure of this
+ * ID.
+ */
+u32 drm_edid_get_panel_id(const struct drm_edid *drm_edid)
{
+ const struct edid *edid = drm_edid->edid;
+
/*
* We represent the ID as a 32-bit number so it can easily be compared
* with "==".
@@ -2762,25 +2778,6 @@ static u32 edid_extract_panel_id(const struct edid *edid)
(u32)edid->mfg_id[1] << 16 |
(u32)EDID_PRODUCT_ID(edid);
}
-
-/**
- * drm_edid_get_panel_id - Get a panel's ID from EDID
- * @drm_edid: EDID that contains panel ID.
- *
- * This function uses the first block of the EDID of a panel and (assuming
- * that the EDID is valid) extracts the ID out of it. The ID is a 32-bit value
- * (16 bits of manufacturer ID and 16 bits of per-manufacturer ID) that's
- * supposed to be different for each different modem of panel.
- *
- * Return: A 32-bit ID that should be different for each make/model of panel.
- * See the functions drm_edid_encode_panel_id() and
- * drm_edid_decode_panel_id() for some details on the structure of this
- * ID.
- */
-u32 drm_edid_get_panel_id(const struct drm_edid *drm_edid)
-{
- return edid_extract_panel_id(drm_edid->edid);
-}
EXPORT_SYMBOL(drm_edid_get_panel_id);
/**
@@ -2881,7 +2878,7 @@ EXPORT_SYMBOL(drm_edid_duplicate);
*/
static u32 edid_get_quirks(const struct drm_edid *drm_edid)
{
- u32 panel_id = edid_extract_panel_id(drm_edid->edid);
+ u32 panel_id = drm_edid_get_panel_id(drm_edid);
const struct edid_quirk *quirk;
int i;
--
2.44.0.278.ge034bb2e1d-goog
next prev parent reply other threads:[~2024-03-06 20:03 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-06 19:55 [PATCH v5 0/6] Match panel with identity Hsin-Yi Wang
2024-03-06 19:55 ` [PATCH v5 1/6] drm_edid: Add a function to get EDID base block Hsin-Yi Wang
2024-03-06 23:29 ` Doug Anderson
2024-03-07 12:50 ` Jani Nikula
2024-03-06 19:55 ` Hsin-Yi Wang [this message]
2024-03-06 23:29 ` [PATCH v5 2/6] drm/edid: Clean up drm_edid_get_panel_id() Doug Anderson
2024-03-07 12:51 ` Jani Nikula
2024-03-06 19:55 ` [PATCH v5 3/6] drm/edid: Add a function to match EDID with identity Hsin-Yi Wang
2024-03-06 23:29 ` Doug Anderson
2024-03-07 0:20 ` Hsin-Yi Wang
2024-03-07 0:37 ` Doug Anderson
2024-03-07 13:20 ` Jani Nikula
2024-03-07 19:34 ` Hsin-Yi Wang
2024-03-07 22:36 ` Jani Nikula
2024-03-06 19:55 ` [PATCH v5 4/6] drm/edid: Match edid quirks " Hsin-Yi Wang
2024-03-06 23:29 ` Doug Anderson
2024-03-06 19:55 ` [PATCH v5 5/6] drm/panel-edp: Match edp_panels with panel identity Hsin-Yi Wang
2024-03-06 23:30 ` Doug Anderson
2024-03-06 19:55 ` [PATCH v5 6/6] drm/panel-edp: Fix AUO 0x405c panel naming and add a variant Hsin-Yi Wang
2024-03-06 23:30 ` Doug Anderson
2024-03-07 13:28 ` Jani Nikula
2024-03-07 20:18 ` Hsin-Yi Wang
2024-03-07 20:27 ` Jani Nikula
2024-03-07 21:46 ` Doug Anderson
2024-03-07 22:35 ` Jani Nikula
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=20240306200353.1436198-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;
as well as URLs for NNTP newsgroup(s).