* [v2 1/4] drm/edid: seek for available CEA block from specific EDID block index
2022-03-01 8:12 [v2 0/4] enhanced edid driver compatibility Lee Shawn C
@ 2022-03-01 8:12 ` Lee Shawn C
2022-03-01 8:12 ` [v2 2/4] drm/edid: parse multiple CEA extension block Lee Shawn C
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Lee Shawn C @ 2022-03-01 8:12 UTC (permalink / raw)
To: dri-devel; +Cc: jani.nikula, ankit.k.nautiyal, Lee Shawn C
drm_find_cea_extension() always look for a top level CEA block. Pass
ext_index from caller then this function to search next available
CEA ext block from a specific EDID block pointer.
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Ville Syrjala <ville.syrjala@linux.intel.com>
Cc: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
Signed-off-by: Lee Shawn C <shawn.c.lee@intel.com>
---
drivers/gpu/drm/drm_edid.c | 42 ++++++++++++++++++--------------------
1 file changed, 20 insertions(+), 22 deletions(-)
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index a504542238ed..375e70d9de86 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -3353,16 +3353,14 @@ const u8 *drm_find_edid_extension(const struct edid *edid,
return edid_ext;
}
-static const u8 *drm_find_cea_extension(const struct edid *edid)
+static const u8 *drm_find_cea_extension(const struct edid *edid, int *ext_index)
{
const struct displayid_block *block;
struct displayid_iter iter;
const u8 *cea;
- int ext_index = 0;
- /* Look for a top level CEA extension block */
- /* FIXME: make callers iterate through multiple CEA ext blocks? */
- cea = drm_find_edid_extension(edid, CEA_EXT, &ext_index);
+ /* Look for a CEA extension block from ext_index */
+ cea = drm_find_edid_extension(edid, CEA_EXT, ext_index);
if (cea)
return cea;
@@ -3643,10 +3641,10 @@ add_alternate_cea_modes(struct drm_connector *connector, struct edid *edid)
struct drm_device *dev = connector->dev;
struct drm_display_mode *mode, *tmp;
LIST_HEAD(list);
- int modes = 0;
+ int modes = 0, ext_index = 0;
/* Don't add CEA modes if the CEA extension block is missing */
- if (!drm_find_cea_extension(edid))
+ if (!drm_find_cea_extension(edid, &ext_index))
return 0;
/*
@@ -4321,11 +4319,11 @@ static void drm_parse_y420cmdb_bitmap(struct drm_connector *connector,
static int
add_cea_modes(struct drm_connector *connector, struct edid *edid)
{
- const u8 *cea = drm_find_cea_extension(edid);
- const u8 *db, *hdmi = NULL, *video = NULL;
+ const u8 *cea, *db, *hdmi = NULL, *video = NULL;
u8 dbl, hdmi_len, video_len = 0;
- int modes = 0;
+ int modes = 0, ext_index = 0;
+ cea = drm_find_cea_extension(edid, &ext_index);
if (cea && cea_revision(cea) >= 3) {
int i, start, end;
@@ -4562,7 +4560,7 @@ static void drm_edid_to_eld(struct drm_connector *connector, struct edid *edid)
uint8_t *eld = connector->eld;
const u8 *cea;
const u8 *db;
- int total_sad_count = 0;
+ int total_sad_count = 0, ext_index = 0;
int mnl;
int dbl;
@@ -4571,7 +4569,7 @@ static void drm_edid_to_eld(struct drm_connector *connector, struct edid *edid)
if (!edid)
return;
- cea = drm_find_cea_extension(edid);
+ cea = drm_find_cea_extension(edid, &ext_index);
if (!cea) {
DRM_DEBUG_KMS("ELD: no CEA Extension found\n");
return;
@@ -4655,11 +4653,11 @@ static 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 count = 0;
+ int count = 0, ext_index = 0;
int i, start, end, dbl;
const u8 *cea;
- cea = drm_find_cea_extension(edid);
+ cea = drm_find_cea_extension(edid, &ext_index);
if (!cea) {
DRM_DEBUG_KMS("SAD: no CEA Extension found\n");
return 0;
@@ -4717,11 +4715,11 @@ EXPORT_SYMBOL(drm_edid_to_sad);
*/
int drm_edid_to_speaker_allocation(struct edid *edid, u8 **sadb)
{
- int count = 0;
+ int count = 0, ext_index = 0;
int i, start, end, dbl;
const u8 *cea;
- cea = drm_find_cea_extension(edid);
+ cea = drm_find_cea_extension(edid, &ext_index);
if (!cea) {
DRM_DEBUG_KMS("SAD: no CEA Extension found\n");
return 0;
@@ -4814,9 +4812,9 @@ bool drm_detect_hdmi_monitor(struct edid *edid)
{
const u8 *edid_ext;
int i;
- int start_offset, end_offset;
+ int start_offset, end_offset, ext_index = 0;
- edid_ext = drm_find_cea_extension(edid);
+ edid_ext = drm_find_cea_extension(edid, &ext_index);
if (!edid_ext)
return false;
@@ -4853,9 +4851,9 @@ bool drm_detect_monitor_audio(struct edid *edid)
const u8 *edid_ext;
int i, j;
bool has_audio = false;
- int start_offset, end_offset;
+ int start_offset, end_offset, ext_index = 0;
- edid_ext = drm_find_cea_extension(edid);
+ edid_ext = drm_find_cea_extension(edid, &ext_index);
if (!edid_ext)
goto end;
@@ -5177,9 +5175,9 @@ static void drm_parse_cea_ext(struct drm_connector *connector,
{
struct drm_display_info *info = &connector->display_info;
const u8 *edid_ext;
- int i, start, end;
+ int i, start, end, ext_index = 0;
- edid_ext = drm_find_cea_extension(edid);
+ edid_ext = drm_find_cea_extension(edid, &ext_index);
if (!edid_ext)
return;
--
2.31.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [v2 2/4] drm/edid: parse multiple CEA extension block
2022-03-01 8:12 [v2 0/4] enhanced edid driver compatibility Lee Shawn C
2022-03-01 8:12 ` [v2 1/4] drm/edid: seek for available CEA block from specific EDID block index Lee Shawn C
@ 2022-03-01 8:12 ` Lee Shawn C
2022-03-01 14:38 ` Ville Syrjälä
2022-03-01 8:12 ` [v2 3/4] drm/edid: read HF-EEODB ext block Lee Shawn C
2022-03-01 8:12 ` [v2 4/4] drm/edid: parse HF-EEODB CEA extension block Lee Shawn C
3 siblings, 1 reply; 6+ messages in thread
From: Lee Shawn C @ 2022-03-01 8:12 UTC (permalink / raw)
To: dri-devel; +Cc: jani.nikula, ankit.k.nautiyal, Lee Shawn C
Try to find and parse more CEA ext blocks if edid->extensions
is greater than one.
v2: split prvious patch to two. And do CEA block parsing
in this one.
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Ville Syrjala <ville.syrjala@linux.intel.com>
Cc: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
Signed-off-by: Lee Shawn C <shawn.c.lee@intel.com>
---
drivers/gpu/drm/drm_edid.c | 70 +++++++++++++++++++++-----------------
1 file changed, 38 insertions(+), 32 deletions(-)
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 375e70d9de86..e2cfde02f837 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -4319,47 +4319,53 @@ static void drm_parse_y420cmdb_bitmap(struct drm_connector *connector,
static int
add_cea_modes(struct drm_connector *connector, struct edid *edid)
{
- const u8 *cea, *db, *hdmi = NULL, *video = NULL;
- u8 dbl, hdmi_len, video_len = 0;
+ const u8 *cea;
int modes = 0, ext_index = 0;
- cea = drm_find_cea_extension(edid, &ext_index);
- if (cea && cea_revision(cea) >= 3) {
- int i, start, end;
+ for (;;) {
+ cea = drm_find_cea_extension(edid, &ext_index);
+ if (!cea)
+ break;
- if (cea_db_offsets(cea, &start, &end))
- return 0;
+ if (cea && cea_revision(cea) >= 3) {
+ const u8 *db, *hdmi = NULL, *video = NULL;
+ u8 dbl, hdmi_len, video_len = 0;
+ int i, start, end;
- for_each_cea_db(cea, i, start, end) {
- db = &cea[i];
- dbl = cea_db_payload_len(db);
+ if (cea_db_offsets(cea, &start, &end))
+ continue;
- if (cea_db_tag(db) == VIDEO_BLOCK) {
- video = db + 1;
- video_len = dbl;
- modes += do_cea_modes(connector, video, dbl);
- } else if (cea_db_is_hdmi_vsdb(db)) {
- hdmi = db;
- hdmi_len = dbl;
- } else if (cea_db_is_y420vdb(db)) {
- const u8 *vdb420 = &db[2];
-
- /* Add 4:2:0(only) modes present in EDID */
- modes += do_y420vdb_modes(connector,
- vdb420,
- dbl - 1);
+ for_each_cea_db(cea, i, start, end) {
+ db = &cea[i];
+ dbl = cea_db_payload_len(db);
+
+ if (cea_db_tag(db) == VIDEO_BLOCK) {
+ video = db + 1;
+ video_len = dbl;
+ modes += do_cea_modes(connector, video, dbl);
+ } else if (cea_db_is_hdmi_vsdb(db)) {
+ hdmi = db;
+ hdmi_len = dbl;
+ } else if (cea_db_is_y420vdb(db)) {
+ const u8 *vdb420 = &db[2];
+
+ /* Add 4:2:0(only) modes present in EDID */
+ modes += do_y420vdb_modes(connector,
+ vdb420,
+ dbl - 1);
+ }
}
+
+ /*
+ * We parse the HDMI VSDB after having added the cea modes as we will
+ * be patching their flags when the sink supports stereo 3D.
+ */
+ if (hdmi)
+ modes += do_hdmi_vsdb_modes(connector, hdmi, hdmi_len, video,
+ video_len);
}
}
- /*
- * We parse the HDMI VSDB after having added the cea modes as we will
- * be patching their flags when the sink supports stereo 3D.
- */
- if (hdmi)
- modes += do_hdmi_vsdb_modes(connector, hdmi, hdmi_len, video,
- video_len);
-
return modes;
}
--
2.31.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [v2 2/4] drm/edid: parse multiple CEA extension block
2022-03-01 8:12 ` [v2 2/4] drm/edid: parse multiple CEA extension block Lee Shawn C
@ 2022-03-01 14:38 ` Ville Syrjälä
0 siblings, 0 replies; 6+ messages in thread
From: Ville Syrjälä @ 2022-03-01 14:38 UTC (permalink / raw)
To: Lee Shawn C; +Cc: jani.nikula, ankit.k.nautiyal, dri-devel
On Tue, Mar 01, 2022 at 04:12:14PM +0800, Lee Shawn C wrote:
> Try to find and parse more CEA ext blocks if edid->extensions
> is greater than one.
>
> v2: split prvious patch to two. And do CEA block parsing
> in this one.
>
> Cc: Jani Nikula <jani.nikula@linux.intel.com>
> Cc: Ville Syrjala <ville.syrjala@linux.intel.com>
> Cc: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
> Signed-off-by: Lee Shawn C <shawn.c.lee@intel.com>
> ---
> drivers/gpu/drm/drm_edid.c | 70 +++++++++++++++++++++-----------------
> 1 file changed, 38 insertions(+), 32 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
> index 375e70d9de86..e2cfde02f837 100644
> --- a/drivers/gpu/drm/drm_edid.c
> +++ b/drivers/gpu/drm/drm_edid.c
> @@ -4319,47 +4319,53 @@ static void drm_parse_y420cmdb_bitmap(struct drm_connector *connector,
> static int
> add_cea_modes(struct drm_connector *connector, struct edid *edid)
> {
> - const u8 *cea, *db, *hdmi = NULL, *video = NULL;
> - u8 dbl, hdmi_len, video_len = 0;
> + const u8 *cea;
> int modes = 0, ext_index = 0;
>
> - cea = drm_find_cea_extension(edid, &ext_index);
> - if (cea && cea_revision(cea) >= 3) {
> - int i, start, end;
> + for (;;) {
> + cea = drm_find_cea_extension(edid, &ext_index);
> + if (!cea)
> + break;
>
> - if (cea_db_offsets(cea, &start, &end))
> - return 0;
> + if (cea && cea_revision(cea) >= 3) {
> + const u8 *db, *hdmi = NULL, *video = NULL;
> + u8 dbl, hdmi_len, video_len = 0;
> + int i, start, end;
This amount of indentation is pretty horrible. Pls reverse
this if-clause to get rid of one level. Should also make
the diff much nicer.
>
> - for_each_cea_db(cea, i, start, end) {
> - db = &cea[i];
> - dbl = cea_db_payload_len(db);
> + if (cea_db_offsets(cea, &start, &end))
> + continue;
>
> - if (cea_db_tag(db) == VIDEO_BLOCK) {
> - video = db + 1;
> - video_len = dbl;
> - modes += do_cea_modes(connector, video, dbl);
> - } else if (cea_db_is_hdmi_vsdb(db)) {
> - hdmi = db;
> - hdmi_len = dbl;
> - } else if (cea_db_is_y420vdb(db)) {
> - const u8 *vdb420 = &db[2];
> -
> - /* Add 4:2:0(only) modes present in EDID */
> - modes += do_y420vdb_modes(connector,
> - vdb420,
> - dbl - 1);
> + for_each_cea_db(cea, i, start, end) {
> + db = &cea[i];
> + dbl = cea_db_payload_len(db);
> +
> + if (cea_db_tag(db) == VIDEO_BLOCK) {
> + video = db + 1;
> + video_len = dbl;
> + modes += do_cea_modes(connector, video, dbl);
> + } else if (cea_db_is_hdmi_vsdb(db)) {
> + hdmi = db;
> + hdmi_len = dbl;
> + } else if (cea_db_is_y420vdb(db)) {
> + const u8 *vdb420 = &db[2];
> +
> + /* Add 4:2:0(only) modes present in EDID */
> + modes += do_y420vdb_modes(connector,
> + vdb420,
> + dbl - 1);
> + }
> }
> +
> + /*
> + * We parse the HDMI VSDB after having added the cea modes as we will
> + * be patching their flags when the sink supports stereo 3D.
> + */
> + if (hdmi)
> + modes += do_hdmi_vsdb_modes(connector, hdmi, hdmi_len, video,
> + video_len);
> }
> }
>
> - /*
> - * We parse the HDMI VSDB after having added the cea modes as we will
> - * be patching their flags when the sink supports stereo 3D.
> - */
> - if (hdmi)
> - modes += do_hdmi_vsdb_modes(connector, hdmi, hdmi_len, video,
> - video_len);
> -
> return modes;
> }
>
> --
> 2.31.1
--
Ville Syrjälä
Intel
^ permalink raw reply [flat|nested] 6+ messages in thread
* [v2 3/4] drm/edid: read HF-EEODB ext block
2022-03-01 8:12 [v2 0/4] enhanced edid driver compatibility Lee Shawn C
2022-03-01 8:12 ` [v2 1/4] drm/edid: seek for available CEA block from specific EDID block index Lee Shawn C
2022-03-01 8:12 ` [v2 2/4] drm/edid: parse multiple CEA extension block Lee Shawn C
@ 2022-03-01 8:12 ` Lee Shawn C
2022-03-01 8:12 ` [v2 4/4] drm/edid: parse HF-EEODB CEA extension block Lee Shawn C
3 siblings, 0 replies; 6+ messages in thread
From: Lee Shawn C @ 2022-03-01 8:12 UTC (permalink / raw)
To: dri-devel; +Cc: jani.nikula, ankit.k.nautiyal, Lee Shawn C
According to HDMI 2.1 spec.
"The HDMI Forum EDID Extension Override Data Block (HF-EEODB)
is utilized by Sink Devices to provide an alternate method to
indicate an EDID Extension Block count larger than 1, while
avoiding the need to present a VESA Block Map in the first
E-EDID Extension Block."
It is a mandatory for HDMI 2.1 protocol compliance as well.
This patch help to know how many HF_EEODB blocks report by sink
and read allo HF_EEODB blocks back.
v2: support to find CEA block, check EEODB block format, and return
available block number in drm_edid_read_hf_eeodb_blk_count().
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Ville Syrjala <ville.syrjala@linux.intel.com>
Cc: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
Signed-off-by: Lee Shawn C <shawn.c.lee@intel.com>
---
drivers/gpu/drm/drm_connector.c | 8 +++-
drivers/gpu/drm/drm_edid.c | 79 +++++++++++++++++++++++++++++++--
include/drm/drm_edid.h | 2 +-
3 files changed, 82 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c
index a50c82bc2b2f..16011023c12e 100644
--- a/drivers/gpu/drm/drm_connector.c
+++ b/drivers/gpu/drm/drm_connector.c
@@ -2129,7 +2129,7 @@ int drm_connector_update_edid_property(struct drm_connector *connector,
const struct edid *edid)
{
struct drm_device *dev = connector->dev;
- size_t size = 0;
+ size_t size = 0, hf_eeodb_blk_count;
int ret;
const struct edid *old_edid;
@@ -2137,8 +2137,12 @@ int drm_connector_update_edid_property(struct drm_connector *connector,
if (connector->override_edid)
return 0;
- if (edid)
+ if (edid) {
size = EDID_LENGTH * (1 + edid->extensions);
+ hf_eeodb_blk_count = drm_edid_read_hf_eeodb_blk_count(edid);
+ if (hf_eeodb_blk_count)
+ size = EDID_LENGTH * (1 + hf_eeodb_blk_count);
+ }
/* Set the display info, using edid if available, otherwise
* resetting the values to defaults. This duplicates the work
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index e2cfde02f837..8e6e25b52e44 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -1992,6 +1992,7 @@ struct edid *drm_do_get_edid(struct drm_connector *connector,
{
int i, j = 0, valid_extensions = 0;
u8 *edid, *new;
+ size_t hf_eeodb_blk_count;
struct edid *override;
override = drm_get_override_edid(connector);
@@ -2051,7 +2052,39 @@ struct edid *drm_do_get_edid(struct drm_connector *connector,
}
kfree(edid);
+ return (struct edid *)new;
+ }
+
+ hf_eeodb_blk_count = drm_edid_read_hf_eeodb_blk_count((struct edid *)edid);
+ if (hf_eeodb_blk_count) {
+ // no more ext blk wait for read
+ if (hf_eeodb_blk_count <= 1)
+ return (struct edid *)edid;
+
+ new = krealloc(edid, (hf_eeodb_blk_count + 1) * EDID_LENGTH, GFP_KERNEL);
+ if (!new)
+ goto out;
edid = new;
+
+ valid_extensions = hf_eeodb_blk_count - 1;
+ for (j = 2; j <= hf_eeodb_blk_count; j++) {
+ u8 *block = edid + j * EDID_LENGTH;
+
+ for (i = 0; i < 4; i++) {
+ if (get_edid_block(data, block, j, EDID_LENGTH))
+ goto out;
+ if (drm_edid_block_valid(block, j, false, NULL))
+ break;
+ }
+
+ if (i == 4)
+ valid_extensions--;
+ }
+
+ if (valid_extensions != hf_eeodb_blk_count - 1) {
+ DRM_ERROR("Not able to retrieve proper EDID contain HF-EEODB data.\n");
+ goto out;
+ }
}
return (struct edid *)edid;
@@ -3315,15 +3348,17 @@ add_detailed_modes(struct drm_connector *connector, struct edid *edid,
#define VIDEO_BLOCK 0x02
#define VENDOR_BLOCK 0x03
#define SPEAKER_BLOCK 0x04
-#define HDR_STATIC_METADATA_BLOCK 0x6
-#define USE_EXTENDED_TAG 0x07
-#define EXT_VIDEO_CAPABILITY_BLOCK 0x00
+#define EXT_VIDEO_CAPABILITY_BLOCK 0x00
+#define HDR_STATIC_METADATA_BLOCK 0x06
+#define USE_EXTENDED_TAG 0x07
#define EXT_VIDEO_DATA_BLOCK_420 0x0E
-#define EXT_VIDEO_CAP_BLOCK_Y420CMDB 0x0F
+#define EXT_VIDEO_CAP_BLOCK_Y420CMDB 0x0F
+#define EXT_VIDEO_HF_EEODB_DATA_BLOCK 0x78
#define EDID_BASIC_AUDIO (1 << 6)
#define EDID_CEA_YCRCB444 (1 << 5)
#define EDID_CEA_YCRCB422 (1 << 4)
#define EDID_CEA_VCDB_QS (1 << 6)
+#define HF_EEODB_LENGTH 2
/*
* Search EDID for CEA extension block.
@@ -4231,6 +4266,20 @@ static bool cea_db_is_microsoft_vsdb(const u8 *db)
return oui(db[3], db[2], db[1]) == MICROSOFT_IEEE_OUI;
}
+static bool cea_db_is_hdmi_forum_eeodb(const u8 *db)
+{
+ if (cea_db_tag(db) != USE_EXTENDED_TAG)
+ return false;
+
+ if (cea_db_payload_len(db) != HF_EEODB_LENGTH)
+ return false;
+
+ if (cea_db_extended_tag(db) != EXT_VIDEO_HF_EEODB_DATA_BLOCK)
+ return false;
+
+ return true;
+}
+
static bool cea_db_is_vcdb(const u8 *db)
{
if (cea_db_tag(db) != USE_EXTENDED_TAG)
@@ -4276,6 +4325,28 @@ static bool cea_db_is_y420vdb(const u8 *db)
#define for_each_cea_db(cea, i, start, end) \
for ((i) = (start); (i) < (end) && (i) + cea_db_payload_len(&(cea)[(i)]) < (end); (i) += cea_db_payload_len(&(cea)[(i)]) + 1)
+size_t drm_edid_read_hf_eeodb_blk_count(const struct edid *edid)
+{
+ const u8 *cea;
+ int ext_index = 0;
+
+ if (edid->extensions) {
+ cea = drm_find_cea_extension(edid, &ext_index);
+
+ if (cea) {
+ int i, start, end;
+
+ if (!cea_db_offsets(cea, &start, &end))
+ for_each_cea_db(cea, i, start, end)
+ if (cea_db_is_hdmi_forum_eeodb(&cea[i]))
+ return cea[i + 2];
+ }
+ }
+
+ return 0;
+}
+EXPORT_SYMBOL_GPL(drm_edid_read_hf_eeodb_blk_count);
+
static void drm_parse_y420cmdb_bitmap(struct drm_connector *connector,
const u8 *db)
{
diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h
index 144c495b99c4..5549da7bd7be 100644
--- a/include/drm/drm_edid.h
+++ b/include/drm/drm_edid.h
@@ -592,6 +592,6 @@ drm_display_mode_from_cea_vic(struct drm_device *dev,
u8 video_code);
const u8 *drm_find_edid_extension(const struct edid *edid,
int ext_id, int *ext_index);
-
+size_t drm_edid_read_hf_eeodb_blk_count(const struct edid *edid);
#endif /* __DRM_EDID_H__ */
--
2.31.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [v2 4/4] drm/edid: parse HF-EEODB CEA extension block
2022-03-01 8:12 [v2 0/4] enhanced edid driver compatibility Lee Shawn C
` (2 preceding siblings ...)
2022-03-01 8:12 ` [v2 3/4] drm/edid: read HF-EEODB ext block Lee Shawn C
@ 2022-03-01 8:12 ` Lee Shawn C
3 siblings, 0 replies; 6+ messages in thread
From: Lee Shawn C @ 2022-03-01 8:12 UTC (permalink / raw)
To: dri-devel; +Cc: jani.nikula, ankit.k.nautiyal, Lee Shawn C
While adding CEA modes, try to get available EEODB block
number. Then based on it to parse numbers of ext blocks,
retrieve CEA information and add more CEA modes.
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Ville Syrjala <ville.syrjala@linux.intel.com>
Cc: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
Signed-off-by: Lee Shawn C <shawn.c.lee@intel.com>
---
drivers/gpu/drm/drm_displayid.c | 5 ++++-
drivers/gpu/drm/drm_edid.c | 35 +++++++++++++++++++--------------
include/drm/drm_edid.h | 2 +-
3 files changed, 25 insertions(+), 17 deletions(-)
diff --git a/drivers/gpu/drm/drm_displayid.c b/drivers/gpu/drm/drm_displayid.c
index 32da557b960f..dc649a9efaa2 100644
--- a/drivers/gpu/drm/drm_displayid.c
+++ b/drivers/gpu/drm/drm_displayid.c
@@ -37,7 +37,10 @@ static const u8 *drm_find_displayid_extension(const struct edid *edid,
int *length, int *idx,
int *ext_index)
{
- const u8 *displayid = drm_find_edid_extension(edid, DISPLAYID_EXT, ext_index);
+ const u8 *displayid = drm_find_edid_extension(edid,
+ DISPLAYID_EXT,
+ ext_index,
+ edid->extensions);
const struct displayid_header *base;
int ret;
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 8e6e25b52e44..d06914f30d45 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -3364,23 +3364,23 @@ add_detailed_modes(struct drm_connector *connector, struct edid *edid,
* Search EDID for CEA extension block.
*/
const u8 *drm_find_edid_extension(const struct edid *edid,
- int ext_id, int *ext_index)
+ int ext_id, int *ext_index, int ext_blk_num)
{
const u8 *edid_ext = NULL;
int i;
/* No EDID or EDID extensions */
- if (edid == NULL || edid->extensions == 0)
+ if (edid == NULL || edid->extensions == 0 || *ext_index >= ext_blk_num)
return NULL;
/* Find CEA extension */
- for (i = *ext_index; i < edid->extensions; i++) {
+ for (i = *ext_index; i < ext_blk_num; i++) {
edid_ext = (const u8 *)edid + EDID_LENGTH * (i + 1);
if (edid_ext[0] == ext_id)
break;
}
- if (i >= edid->extensions)
+ if (i >= ext_blk_num)
return NULL;
*ext_index = i + 1;
@@ -3388,14 +3388,15 @@ const u8 *drm_find_edid_extension(const struct edid *edid,
return edid_ext;
}
-static const u8 *drm_find_cea_extension(const struct edid *edid, int *ext_index)
+static const u8 *drm_find_cea_extension(const struct edid *edid,
+ int *ext_index, int ext_blk_num)
{
const struct displayid_block *block;
struct displayid_iter iter;
const u8 *cea;
/* Look for a CEA extension block from ext_index */
- cea = drm_find_edid_extension(edid, CEA_EXT, ext_index);
+ cea = drm_find_edid_extension(edid, CEA_EXT, ext_index, ext_blk_num);
if (cea)
return cea;
@@ -3679,7 +3680,7 @@ add_alternate_cea_modes(struct drm_connector *connector, struct edid *edid)
int modes = 0, ext_index = 0;
/* Don't add CEA modes if the CEA extension block is missing */
- if (!drm_find_cea_extension(edid, &ext_index))
+ if (!drm_find_cea_extension(edid, &ext_index, edid->extensions))
return 0;
/*
@@ -4331,7 +4332,7 @@ size_t drm_edid_read_hf_eeodb_blk_count(const struct edid *edid)
int ext_index = 0;
if (edid->extensions) {
- cea = drm_find_cea_extension(edid, &ext_index);
+ cea = drm_find_cea_extension(edid, &ext_index, edid->extensions);
if (cea) {
int i, start, end;
@@ -4392,9 +4393,13 @@ add_cea_modes(struct drm_connector *connector, struct edid *edid)
{
const u8 *cea;
int modes = 0, ext_index = 0;
+ int ext_blk_num = drm_edid_read_hf_eeodb_blk_count(edid);
+
+ if (!ext_blk_num)
+ ext_blk_num = edid->extensions;
for (;;) {
- cea = drm_find_cea_extension(edid, &ext_index);
+ cea = drm_find_cea_extension(edid, &ext_index, ext_blk_num);
if (!cea)
break;
@@ -4646,7 +4651,7 @@ static void drm_edid_to_eld(struct drm_connector *connector, struct edid *edid)
if (!edid)
return;
- cea = drm_find_cea_extension(edid, &ext_index);
+ cea = drm_find_cea_extension(edid, &ext_index, edid->extensions);
if (!cea) {
DRM_DEBUG_KMS("ELD: no CEA Extension found\n");
return;
@@ -4734,7 +4739,7 @@ int drm_edid_to_sad(struct edid *edid, struct cea_sad **sads)
int i, start, end, dbl;
const u8 *cea;
- cea = drm_find_cea_extension(edid, &ext_index);
+ cea = drm_find_cea_extension(edid, &ext_index, edid->extensions);
if (!cea) {
DRM_DEBUG_KMS("SAD: no CEA Extension found\n");
return 0;
@@ -4796,7 +4801,7 @@ int drm_edid_to_speaker_allocation(struct edid *edid, u8 **sadb)
int i, start, end, dbl;
const u8 *cea;
- cea = drm_find_cea_extension(edid, &ext_index);
+ cea = drm_find_cea_extension(edid, &ext_index, edid->extensions);
if (!cea) {
DRM_DEBUG_KMS("SAD: no CEA Extension found\n");
return 0;
@@ -4891,7 +4896,7 @@ bool drm_detect_hdmi_monitor(struct edid *edid)
int i;
int start_offset, end_offset, ext_index = 0;
- edid_ext = drm_find_cea_extension(edid, &ext_index);
+ edid_ext = drm_find_cea_extension(edid, &ext_index, edid->extensions);
if (!edid_ext)
return false;
@@ -4930,7 +4935,7 @@ bool drm_detect_monitor_audio(struct edid *edid)
bool has_audio = false;
int start_offset, end_offset, ext_index = 0;
- edid_ext = drm_find_cea_extension(edid, &ext_index);
+ edid_ext = drm_find_cea_extension(edid, &ext_index, edid->extensions);
if (!edid_ext)
goto end;
@@ -5254,7 +5259,7 @@ static void drm_parse_cea_ext(struct drm_connector *connector,
const u8 *edid_ext;
int i, start, end, ext_index = 0;
- edid_ext = drm_find_cea_extension(edid, &ext_index);
+ edid_ext = drm_find_cea_extension(edid, &ext_index, edid->extensions);
if (!edid_ext)
return;
diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h
index 5549da7bd7be..5555b27e92f9 100644
--- a/include/drm/drm_edid.h
+++ b/include/drm/drm_edid.h
@@ -591,7 +591,7 @@ struct drm_display_mode *
drm_display_mode_from_cea_vic(struct drm_device *dev,
u8 video_code);
const u8 *drm_find_edid_extension(const struct edid *edid,
- int ext_id, int *ext_index);
+ int ext_id, int *ext_index, int ext_blk_num);
size_t drm_edid_read_hf_eeodb_blk_count(const struct edid *edid);
#endif /* __DRM_EDID_H__ */
--
2.31.1
^ permalink raw reply related [flat|nested] 6+ messages in thread