mirros/rockchip-kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "drm: fix EDID struct for old ARM OABI format"

Browse Source 
This reverts commit 61bbbde9b6 which is
commit 47f15561b6 upstream.

It breaks the Android kernel ABI CRC signatures and is not needed for
Android devices, so it is safe to revert for now.  If it is determined
that it is needed in the future, it can be brought back in an
abi-preserving way.

Bug: 161946584
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ib4225a2aa2b9ad6eac9af856a6230eb34f2a42f4
This commit is contained in:
Greg Kroah-Hartman
2022-07-28 14:24:19 +02:00
parent dca272b05d
commit 0ced6946ac
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/drm/drm_edid.h
View File

@@ -121,7 +121,7 @@ struct detailed_data_monitor_range {
u8 supported_scalings; u8 supported_scalings;
u8 preferred_refresh; u8 preferred_refresh;
} __attribute__((packed)) cvt; } __attribute__((packed)) cvt;
} __attribute__((packed)) formula; } formula;
} __attribute__((packed)); } __attribute__((packed));
struct detailed_data_wpindex { struct detailed_data_wpindex {
@@ -154,7 +154,7 @@ struct detailed_non_pixel {
struct detailed_data_wpindex color; struct detailed_data_wpindex color;
struct std_timing timings[6]; struct std_timing timings[6];
struct cvt_timing cvt[4]; struct cvt_timing cvt[4];
} __attribute__((packed)) data; } data;
} __attribute__((packed)); } __attribute__((packed));
#define EDID_DETAIL_EST_TIMINGS 0xf7 #define EDID_DETAIL_EST_TIMINGS 0xf7
@@ -172,7 +172,7 @@ struct detailed_timing {
union { union {
struct detailed_pixel_timing pixel_data; struct detailed_pixel_timing pixel_data;
struct detailed_non_pixel other_data; struct detailed_non_pixel other_data;
} __attribute__((packed)) data; } data;
} __attribute__((packed)); } __attribute__((packed));
#define DRM_EDID_INPUT_SERRATION_VSYNC (1 << 0) #define DRM_EDID_INPUT_SERRATION_VSYNC (1 << 0)