From: Jani Nikula <jani.nikula@intel.com>
To: dri-devel@lists.freedesktop.org
Cc: intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org,
Jani Nikula <jani.nikula@intel.com>
Subject: [REBASE 4/7] drm/edid: rename drm_find_edid_extension() to drm_edid_find_extension()
Date: Tue, 16 Apr 2024 12:19:57 +0300 [thread overview]
Message-ID: <b7a2c2509409de02bbd751541206586424a34725.1713259151.git.jani.nikula@intel.com> (raw)
In-Reply-To: <cover.1713259151.git.jani.nikula@intel.com>
Follow the drm_edid_ naming convention.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/drm_crtc_internal.h | 2 +-
drivers/gpu/drm/drm_displayid.c | 3 ++-
drivers/gpu/drm/drm_edid.c | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/drm_crtc_internal.h b/drivers/gpu/drm/drm_crtc_internal.h
index 2256893d7d67..25aaae937ceb 100644
--- a/drivers/gpu/drm/drm_crtc_internal.h
+++ b/drivers/gpu/drm/drm_crtc_internal.h
@@ -299,7 +299,7 @@ void drm_mode_fixup_1366x768(struct drm_display_mode *mode);
int drm_edid_override_show(struct drm_connector *connector, struct seq_file *m);
int drm_edid_override_set(struct drm_connector *connector, const void *edid, size_t size);
int drm_edid_override_reset(struct drm_connector *connector);
-const u8 *drm_find_edid_extension(const struct drm_edid *drm_edid,
+const u8 *drm_edid_find_extension(const struct drm_edid *drm_edid,
int ext_id, int *ext_index);
void drm_edid_cta_sad_get(const struct cea_sad *cta_sad, u8 *sad);
void drm_edid_cta_sad_set(struct cea_sad *cta_sad, const u8 *sad);
diff --git a/drivers/gpu/drm/drm_displayid.c b/drivers/gpu/drm/drm_displayid.c
index f800dc0906d5..9d01d762801f 100644
--- a/drivers/gpu/drm/drm_displayid.c
+++ b/drivers/gpu/drm/drm_displayid.c
@@ -55,9 +55,10 @@ static const u8 *drm_find_displayid_extension(const struct drm_edid *drm_edid,
int *length, int *idx,
int *ext_index)
{
- const u8 *displayid = drm_find_edid_extension(drm_edid, DISPLAYID_EXT, ext_index);
const struct displayid_header *base;
+ const u8 *displayid;
+ displayid = drm_edid_find_extension(drm_edid, DISPLAYID_EXT, ext_index);
if (!displayid)
return NULL;
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index c4f799059522..c29f31dcc818 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -4200,7 +4200,7 @@ static int add_detailed_modes(struct drm_connector *connector,
*
* FIXME: Prefer not returning pointers to raw EDID data.
*/
-const u8 *drm_find_edid_extension(const struct drm_edid *drm_edid,
+const u8 *drm_edid_find_extension(const struct drm_edid *drm_edid,
int ext_id, int *ext_index)
{
const u8 *edid_ext = NULL;
@@ -4234,7 +4234,7 @@ static bool drm_edid_has_cta_extension(const struct drm_edid *drm_edid)
bool found = false;
/* Look for a top level CEA extension block */
- if (drm_find_edid_extension(drm_edid, CEA_EXT, &ext_index))
+ if (drm_edid_find_extension(drm_edid, CEA_EXT, &ext_index))
return true;
/* CEA blocks can also be found embedded in a DisplayID block */
--
2.39.2
next prev parent reply other threads:[~2024-04-16 9:20 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-16 9:19 [REBASE 0/7] drm/edid: cleanups, rebase Jani Nikula
2024-04-16 9:19 ` [REBASE 1/7] drm/displayid: move drm_displayid.h to drm_displayd_internal.h Jani Nikula
2024-04-16 9:19 ` [REBASE 2/7] drm/edid: move all internal declarations to drm_crtc_internal.h Jani Nikula
2024-04-16 9:19 ` [REBASE 3/7] drm/edid: group struct drm_edid based declarations together Jani Nikula
2024-04-16 9:19 ` Jani Nikula [this message]
2024-04-16 9:19 ` [REBASE 5/7] drm/edid: avoid drm_edid_find_extension() internally Jani Nikula
2024-04-16 12:19 ` Thomas Zimmermann
2024-04-16 12:24 ` Jani Nikula
2024-04-16 9:19 ` [REBASE 6/7] drm/edid: make drm_edid_are_equal() static Jani Nikula
2024-04-16 9:20 ` [REBASE 7/7] drm/edid: make drm_edid_are_equal() more convenient for its single user Jani Nikula
2024-04-16 12:21 ` Thomas Zimmermann
2024-04-16 12:27 ` Jani Nikula
2024-04-16 12:47 ` Thomas Zimmermann
2024-04-17 8:21 ` Jani Nikula
2024-04-17 11:13 ` Thomas Zimmermann
2024-04-17 15:20 ` Jani Nikula
2024-04-16 9:30 ` ✓ CI.Patch_applied: success for drm/edid: cleanups, rebase Patchwork
2024-04-16 9:30 ` ✗ CI.checkpatch: warning " Patchwork
2024-04-16 9:31 ` ✓ CI.KUnit: success " Patchwork
2024-04-16 9:43 ` ✓ CI.Build: " Patchwork
2024-04-16 9:51 ` ✓ CI.Hooks: " Patchwork
2024-04-16 9:52 ` ✗ CI.checksparse: warning " Patchwork
2024-04-16 10:13 ` ✗ Fi.CI.CHECKPATCH: " Patchwork
2024-04-16 10:13 ` ✗ Fi.CI.SPARSE: " Patchwork
2024-04-16 10:21 ` ✗ Fi.CI.BAT: failure " Patchwork
2024-04-16 10:28 ` ✓ CI.BAT: success " Patchwork
2024-04-17 6:32 ` ✗ CI.FULL: failure " Patchwork
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=b7a2c2509409de02bbd751541206586424a34725.1713259151.git.jani.nikula@intel.com \
--to=jani.nikula@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=intel-xe@lists.freedesktop.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.