Module Name: src
Committed By: riastradh
Date: Sun Dec 19 09:46:13 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm: drm_edid.c
src/sys/external/bsd/drm2/dist/include/drm: drm_displayid.h
Log Message:
const const const const
Author: Maya Rashish <[email protected]>
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/external/bsd/drm2/dist/drm/drm_edid.c
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/include/drm/drm_displayid.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/drm_edid.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_edid.c:1.13 src/sys/external/bsd/drm2/dist/drm/drm_edid.c:1.14
--- src/sys/external/bsd/drm2/dist/drm/drm_edid.c:1.13 Sun Dec 19 01:02:54 2021
+++ src/sys/external/bsd/drm2/dist/drm/drm_edid.c Sun Dec 19 09:46:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_edid.c,v 1.13 2021/12/19 01:02:54 riastradh Exp $ */
+/* $NetBSD: drm_edid.c,v 1.14 2021/12/19 09:46:13 riastradh Exp $ */
/*
* Copyright (c) 2006 Luc Verhaegen (quirks list)
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_edid.c,v 1.13 2021/12/19 01:02:54 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_edid.c,v 1.14 2021/12/19 09:46:13 riastradh Exp $");
#include <linux/hdmi.h>
#include <linux/i2c.h>
@@ -1593,7 +1593,7 @@ MODULE_PARM_DESC(edid_fixup,
static void drm_get_displayid(struct drm_connector *connector,
struct edid *edid);
-static int validate_displayid(u8 *displayid, int length, int idx);
+static int validate_displayid(const u8 *displayid, int length, int idx);
static int drm_edid_block_checksum(const u8 *raw_edid)
{
@@ -3186,7 +3186,7 @@ static const u8 *drm_find_edid_extension
}
-static u8 *drm_find_displayid_extension(const struct edid *edid)
+static const u8 *drm_find_displayid_extension(const struct edid *edid)
{
return drm_find_edid_extension(edid, DISPLAYID_EXT);
}
@@ -3196,9 +3196,9 @@ static const u8 *drm_find_cea_extension(
int ret;
int idx = 1;
int length = EDID_LENGTH;
- struct displayid_block *block;
- u8 *cea;
- u8 *displayid;
+ const struct displayid_block *block;
+ const u8 *cea;
+ const u8 *displayid;
/* Look for a top level CEA extension block */
cea = drm_find_edid_extension(edid, CEA_EXT);
@@ -3217,7 +3217,7 @@ static const u8 *drm_find_cea_extension(
idx += sizeof(struct displayid_hdr);
for_each_displayid_db(displayid, block, idx, length) {
if (block->tag == DATA_BLOCK_CTA) {
- cea = (u8 *)block;
+ cea = (const u8 *)block;
break;
}
}
Index: src/sys/external/bsd/drm2/dist/include/drm/drm_displayid.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/drm_displayid.h:1.3 src/sys/external/bsd/drm2/dist/include/drm/drm_displayid.h:1.4
--- src/sys/external/bsd/drm2/dist/include/drm/drm_displayid.h:1.3 Sat Dec 18 23:45:45 2021
+++ src/sys/external/bsd/drm2/dist/include/drm/drm_displayid.h Sun Dec 19 09:46:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_displayid.h,v 1.3 2021/12/18 23:45:45 riastradh Exp $ */
+/* $NetBSD: drm_displayid.h,v 1.4 2021/12/19 09:46:13 riastradh Exp $ */
/*
* Copyright © 2014 Red Hat Inc.
@@ -95,11 +95,11 @@ struct displayid_detailed_timing_block {
};
#define for_each_displayid_db(displayid, block, idx, length) \
- for ((block) = (struct displayid_block *)&(displayid)[idx]; \
+ for ((block) = (const struct displayid_block *)&(displayid)[idx]; \
(idx) + sizeof(struct displayid_block) <= (length) && \
(idx) + sizeof(struct displayid_block) + (block)->num_bytes <= (length) && \
(block)->num_bytes > 0; \
(idx) += (block)->num_bytes + sizeof(struct displayid_block), \
- (block) = (struct displayid_block *)&(displayid)[idx])
+ (block) = (const struct displayid_block *)&(displayid)[idx])
#endif
