From 829ffaa71cda424f2823245b1448d701fdc7f117 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 21 Jun 2022 20:51:43 +0200 Subject: [PATCH] Revert "drm: fix EDID struct for old ARM OABI format" This reverts commit ebede9aadfa3a387e5b014b6535bcb4af16d2e82 which is commit 47f15561b69e226bfc034e94ff6dbec51a4662af upstream. This is not relevant for the specific Android ARM64 systems, and it causes a CRC issue when present, so revert it. Signed-off-by: Greg Kroah-Hartman Change-Id: If766583203be987e5623598aa0bbd30934d5ccf7 --- include/drm/drm_edid.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h index f40a97417b68..b9719418c3d2 100644 --- a/include/drm/drm_edid.h +++ b/include/drm/drm_edid.h @@ -116,7 +116,7 @@ struct detailed_data_monitor_range { u8 supported_scalings; u8 preferred_refresh; } __attribute__((packed)) cvt; - } __attribute__((packed)) formula; + } formula; } __attribute__((packed)); struct detailed_data_wpindex { @@ -149,7 +149,7 @@ struct detailed_non_pixel { struct detailed_data_wpindex color; struct std_timing timings[6]; struct cvt_timing cvt[4]; - } __attribute__((packed)) data; + } data; } __attribute__((packed)); #define EDID_DETAIL_EST_TIMINGS 0xf7 @@ -167,7 +167,7 @@ struct detailed_timing { union { struct detailed_pixel_timing pixel_data; struct detailed_non_pixel other_data; - } __attribute__((packed)) data; + } data; } __attribute__((packed)); #define DRM_EDID_INPUT_SERRATION_VSYNC (1 << 0)