Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 829ffaa7 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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



This reverts commit ebede9aa 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: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: If766583203be987e5623598aa0bbd30934d5ccf7
parent 864659cb

include/drm/drm_edid.h

+3 −3
Original line number Diff line number Diff line
@@ -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)