[src/trunk]: src/sys/external/bsd/drm2/dist drm: Restore local patch for stru...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c6f89acf9611
branches:  trunk
changeset: 1029020:c6f89acf9611
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 12:44:04 2021 +0000

description:
drm: Restore local patch for struct drm_connector::physical_address.

diffstat:

 sys/external/bsd/drm2/dist/drm/drm_edid.c              |  7 +++++--
 sys/external/bsd/drm2/dist/include/drm/drm_connector.h |  5 ++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diffs (47 lines):

diff -r 2636bf355271 -r c6f89acf9611 sys/external/bsd/drm2/dist/drm/drm_edid.c
--- a/sys/external/bsd/drm2/dist/drm/drm_edid.c Sun Dec 19 12:43:52 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/drm_edid.c Sun Dec 19 12:44:04 2021 +0000
@@ -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 @@
 {
        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) {
diff -r 2636bf355271 -r c6f89acf9611 sys/external/bsd/drm2/dist/include/drm/drm_connector.h
--- a/sys/external/bsd/drm2/dist/include/drm/drm_connector.h    Sun Dec 19 12:43:52 2021 +0000
+++ b/sys/external/bsd/drm2/dist/include/drm/drm_connector.h    Sun Dec 19 12:44:04 2021 +0000
@@ -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_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];