summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-04-23 17:40:49 +0100
committerDave Airlie <airlied@redhat.com>2012-04-23 17:41:17 +0100
commit8353e6c632aeaea1470a286b83e68ca233073068 (patch)
tree8d2345f96834e4242adb773dece50cbeee1fc0ed
parentc09dedb7a50e23f0166e0bbae61c75c7ec23cf7f (diff)
downloadlinux-3.10-8353e6c632aeaea1470a286b83e68ca233073068.tar.gz
linux-3.10-8353e6c632aeaea1470a286b83e68ca233073068.tar.bz2
linux-3.10-8353e6c632aeaea1470a286b83e68ca233073068.zip
drm/edid: Add packed attribute to new gtf2 and cvt structs
The new structs added in struct detailed_data_monitor_range must be marked with packed attribute although the outer struct itself is already marked as packed. Otherwise these 7-bytes structs may be aligned, and give the wrong position and size for the data. Signed-off-by: Takashi Iwai <tiwai@suse.de> Acked-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--include/drm/drm_edid.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h
index 8cefbbee996..0cac551c534 100644
--- a/include/drm/drm_edid.h
+++ b/include/drm/drm_edid.h
@@ -99,7 +99,7 @@ struct detailed_data_monitor_range {
__le16 m;
u8 k;
u8 j; /* need to divide by 2 */
- } gtf2;
+ } __attribute__((packed)) gtf2;
struct {
u8 version;
u8 data1; /* high 6 bits: extra clock resolution */
@@ -108,7 +108,7 @@ struct detailed_data_monitor_range {
u8 flags; /* preferred aspect and blanking support */
u8 supported_scalings;
u8 preferred_refresh;
- } cvt;
+ } __attribute__((packed)) cvt;
} formula;
} __attribute__((packed));