On Mon, Mar 29, 2021 at 04:37:22PM +0300, Jani Nikula wrote:
Avoid any confusion with High Dynamic Range. No functional changes.
Signed-off-by: Jani Nikula jani.nikula@intel.com
Reviewed-by: Ville Syrjälä ville.syrjala@linux.intel.com
drivers/gpu/drm/drm_displayid.c | 10 +++++----- include/drm/drm_displayid.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/drm_displayid.c b/drivers/gpu/drm/drm_displayid.c index e0b9e58a9dc8..32da557b960f 100644 --- a/drivers/gpu/drm/drm_displayid.c +++ b/drivers/gpu/drm/drm_displayid.c @@ -11,9 +11,9 @@ static int validate_displayid(const u8 *displayid, int length, int idx) { int i, dispid_length; u8 csum = 0;
- const struct displayid_hdr *base;
- const struct displayid_header *base;
- base = (const struct displayid_hdr *)&displayid[idx];
base = (const struct displayid_header *)&displayid[idx];
DRM_DEBUG_KMS("base revision 0x%x, length %d, %d %d\n", base->rev, base->bytes, base->prod_id, base->ext_count);
@@ -38,7 +38,7 @@ static const u8 *drm_find_displayid_extension(const struct edid *edid, int *ext_index) { const u8 *displayid = drm_find_edid_extension(edid, DISPLAYID_EXT, ext_index);
- const struct displayid_hdr *base;
const struct displayid_header *base; int ret;
if (!displayid)
@@ -52,7 +52,7 @@ static const u8 *drm_find_displayid_extension(const struct edid *edid, if (ret) return NULL;
- base = (const struct displayid_hdr *)&displayid[*idx];
base = (const struct displayid_header *)&displayid[*idx]; *length = *idx + sizeof(*base) + base->bytes;
return displayid;
@@ -118,7 +118,7 @@ __displayid_iter_next(struct displayid_iter *iter) return NULL; }
iter->idx += sizeof(struct displayid_hdr);
iter->idx += sizeof(struct displayid_header);
block = displayid_iter_block(iter); if (block)
diff --git a/include/drm/drm_displayid.h b/include/drm/drm_displayid.h index 10ee863f1734..ec64d141f578 100644 --- a/include/drm/drm_displayid.h +++ b/include/drm/drm_displayid.h @@ -56,7 +56,7 @@ struct edid; #define PRODUCT_TYPE_REPEATER 5 #define PRODUCT_TYPE_DIRECT_DRIVE 6
-struct displayid_hdr { +struct displayid_header { u8 rev; u8 bytes; u8 prod_id; -- 2.20.1