From: jsg <jsg@openbsd.org>
Date: Fri, 10 Jun 2022 01:13:38 +0000 (+0000)
Subject: drm: fix EDID struct for old ARM OABI format
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=7ffa83c80b1cd24d692562ce2e18214020ecea0b;p=openbsd

drm: fix EDID struct for old ARM OABI format

From Linus Torvalds
710051ebb77b785d637417564be7fed4c13c6ce0 in linux 5.15.y/5.15.46
47f15561b69e226bfc034e94ff6dbec51a4662af in mainline linux
---

diff --git a/sys/dev/pci/drm/include/drm/drm_edid.h b/sys/dev/pci/drm/include/drm/drm_edid.h
index deccfd39e6d..c24559f5329 100644
--- a/sys/dev/pci/drm/include/drm/drm_edid.h
+++ b/sys/dev/pci/drm/include/drm/drm_edid.h
@@ -121,7 +121,7 @@ struct detailed_data_monitor_range {
 			u8 supported_scalings;
 			u8 preferred_refresh;
 		} __attribute__((packed)) cvt;
-	} formula;
+	} __attribute__((packed)) formula;
 } __attribute__((packed));
 
 struct detailed_data_wpindex {
@@ -154,7 +154,7 @@ struct detailed_non_pixel {
 		struct detailed_data_wpindex color;
 		struct std_timing timings[6];
 		struct cvt_timing cvt[4];
-	} data;
+	} __attribute__((packed)) data;
 } __attribute__((packed));
 
 #define EDID_DETAIL_EST_TIMINGS 0xf7
@@ -172,7 +172,7 @@ struct detailed_timing {
 	union {
 		struct detailed_pixel_timing pixel_data;
 		struct detailed_non_pixel other_data;
-	} data;
+	} __attribute__((packed)) data;
 } __attribute__((packed));
 
 #define DRM_EDID_INPUT_SERRATION_VSYNC (1 << 0)