aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm
diff options
context:
space:
mode:
authorCarsten Emde <C.Emde@osadl.org>2013-04-06 12:01:34 -0400
committerDave Airlie <airlied@redhat.com>2013-04-12 00:06:16 -0400
commit8091ee5c092a1e7dab2cb49d02d5f3925ece3995 (patch)
tree8d00b651751ca884c2a18a3642d4f18fbef2ea09 /drivers/gpu/drm
parent96d672e0e5c27cf1d042eceeb3241c45ac8ff600 (diff)
drm: Add 1600x1200 (UXGA) screen resolution to the built-in EDIDs
The 1600x1200 (UXGA) screen resolution was lacking in the set of built-in selectable EDID screen resolutions that can be used to repair misbehaving monitor firmware. This patch adds the related data set and expands the documentation. Signed-off-by: Carsten Emde <C.Emde@osadl.org> Acked-by: Paul Menzel <paulepanter@users.sourceforge.net> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r--drivers/gpu/drm/drm_edid_load.c21
1 files changed, 20 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_edid_load.c b/drivers/gpu/drm/drm_edid_load.c
index 38d3943f72de..fa445dd4dc00 100644
--- a/drivers/gpu/drm/drm_edid_load.c
+++ b/drivers/gpu/drm/drm_edid_load.c
@@ -31,10 +31,11 @@ module_param_string(edid_firmware, edid_firmware, sizeof(edid_firmware), 0644);
31MODULE_PARM_DESC(edid_firmware, "Do not probe monitor, use specified EDID blob " 31MODULE_PARM_DESC(edid_firmware, "Do not probe monitor, use specified EDID blob "
32 "from built-in data or /lib/firmware instead. "); 32 "from built-in data or /lib/firmware instead. ");
33 33
34#define GENERIC_EDIDS 4 34#define GENERIC_EDIDS 5
35static char *generic_edid_name[GENERIC_EDIDS] = { 35static char *generic_edid_name[GENERIC_EDIDS] = {
36 "edid/1024x768.bin", 36 "edid/1024x768.bin",
37 "edid/1280x1024.bin", 37 "edid/1280x1024.bin",
38 "edid/1600x1200.bin",
38 "edid/1680x1050.bin", 39 "edid/1680x1050.bin",
39 "edid/1920x1080.bin", 40 "edid/1920x1080.bin",
40}; 41};
@@ -79,6 +80,24 @@ static u8 generic_edid[GENERIC_EDIDS][128] = {
79 { 80 {
80 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 81 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00,
81 0x31, 0xd8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 82 0x31, 0xd8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
83 0x05, 0x16, 0x01, 0x03, 0x6d, 0x37, 0x29, 0x78,
84 0xea, 0x5e, 0xc0, 0xa4, 0x59, 0x4a, 0x98, 0x25,
85 0x20, 0x50, 0x54, 0x00, 0x00, 0x00, 0xa9, 0x40,
86 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
87 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x48, 0x3f,
88 0x40, 0x30, 0x62, 0xb0, 0x32, 0x40, 0x40, 0xc0,
89 0x13, 0x00, 0x2b, 0xa0, 0x21, 0x00, 0x00, 0x1e,
90 0x00, 0x00, 0x00, 0xff, 0x00, 0x4c, 0x69, 0x6e,
91 0x75, 0x78, 0x20, 0x23, 0x30, 0x0a, 0x20, 0x20,
92 0x20, 0x20, 0x00, 0x00, 0x00, 0xfd, 0x00, 0x3b,
93 0x3d, 0x4a, 0x4c, 0x11, 0x00, 0x0a, 0x20, 0x20,
94 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0xfc,
95 0x00, 0x4c, 0x69, 0x6e, 0x75, 0x78, 0x20, 0x55,
96 0x58, 0x47, 0x41, 0x0a, 0x20, 0x20, 0x00, 0x9d,
97 },
98 {
99 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00,
100 0x31, 0xd8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
82 0x05, 0x16, 0x01, 0x03, 0x6d, 0x2b, 0x1b, 0x78, 101 0x05, 0x16, 0x01, 0x03, 0x6d, 0x2b, 0x1b, 0x78,
83 0xea, 0x5e, 0xc0, 0xa4, 0x59, 0x4a, 0x98, 0x25, 102 0xea, 0x5e, 0xc0, 0xa4, 0x59, 0x4a, 0x98, 0x25,
84 0x20, 0x50, 0x54, 0x00, 0x00, 0x00, 0xb3, 0x00, 103 0x20, 0x50, 0x54, 0x00, 0x00, 0x00, 0xb3, 0x00,