Module Name: src
Committed By: riastradh
Date: Sun Dec 19 12:44:04 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm: drm_edid.c
src/sys/external/bsd/drm2/dist/include/drm: drm_connector.h
Log Message:
drm: Restore local patch for struct drm_connector::physical_address.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/external/bsd/drm2/dist/drm/drm_edid.c
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/drm2/dist/include/drm/drm_connector.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.14 src/sys/external/bsd/drm2/dist/drm/drm_edid.c:1.15
--- src/sys/external/bsd/drm2/dist/drm/drm_edid.c:1.14 Sun Dec 19 09:46:13 2021
+++ src/sys/external/bsd/drm2/dist/drm/drm_edid.c Sun Dec 19 12:44:04 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_edid.c,v 1.14 2021/12/19 09:46:13 riastradh Exp $ */
+/* $NetBSD: drm_edid.c,v 1.15 2021/12/19 12:44:04 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.14 2021/12/19 09:46:13 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_edid.c,v 1.15 2021/12/19 12:44:04 riastradh Exp $");
#include <linux/hdmi.h>
#include <linux/i2c.h>
@@ -4267,6 +4267,9 @@ drm_parse_hdmi_vsdb_audio(struct drm_con
{
u8 len = cea_db_payload_len(db);
+ if (len >= 5) {
+ connector->physical_address = (db[4] << 8) | db[5];
+ }
if (len >= 6 && (db[6] & (1 << 7)))
connector->eld[DRM_ELD_SAD_COUNT_CONN_TYPE] |= DRM_ELD_SUPPORTS_AI;
if (len >= 8) {
Index: src/sys/external/bsd/drm2/dist/include/drm/drm_connector.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/drm_connector.h:1.4 src/sys/external/bsd/drm2/dist/include/drm/drm_connector.h:1.5
--- src/sys/external/bsd/drm2/dist/include/drm/drm_connector.h:1.4 Sun Dec 19 09:43:13 2021
+++ src/sys/external/bsd/drm2/dist/include/drm/drm_connector.h Sun Dec 19 12:44:04 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_connector.h,v 1.4 2021/12/19 09:43:13 riastradh Exp $ */
+/* $NetBSD: drm_connector.h,v 1.5 2021/12/19 12:44:04 riastradh Exp $ */
/*
* Copyright (c) 2016 Intel Corporation
@@ -1317,6 +1317,9 @@ struct drm_connector {
*/
struct drm_encoder *encoder;
+ /** @physical_address: HDMI physical address */
+ uint16_t physical_address;
+
#define MAX_ELD_BYTES 128
/** @eld: EDID-like data, if present */
uint8_t eld[MAX_ELD_BYTES];
