* [PATCH 1/5] drm: EDID: Remove a mess involving the number 63
2018-11-13 17:10 [PATCH 0/5] Fixes and additions to EDID generation Ben Hutchings
@ 2018-11-13 17:11 ` Ben Hutchings
2018-11-13 17:12 ` [PATCH 2/5] drm: EDID: Fix bit masking of {X,Y}{OFFSET,PULSE} Ben Hutchings
` (4 subsequent siblings)
5 siblings, 0 replies; 12+ messages in thread
From: Ben Hutchings @ 2018-11-13 17:11 UTC (permalink / raw)
To: dri-devel
It appears that the range of the vertical sync offset and pulse (0-63)
was typo'd as '-63)' and this led to writing code that subtracts 63
from each of the field values. This is not the case, and all the EDID
sources counteract it by adding 63 to YOFFSET and YPULSE. Remove the
additions and subtractions and fix the comment.
Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
---
Documentation/EDID/1024x768.S | 4 ++--
Documentation/EDID/1280x1024.S | 4 ++--
Documentation/EDID/1600x1200.S | 4 ++--
Documentation/EDID/1680x1050.S | 4 ++--
Documentation/EDID/1920x1080.S | 4 ++--
Documentation/EDID/800x600.S | 4 ++--
Documentation/EDID/HOWTO.txt | 4 ++--
Documentation/EDID/edid.S | 6 +++---
8 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/Documentation/EDID/1024x768.S b/Documentation/EDID/1024x768.S
index 6f3e4b75e49e..ff4013e5fa49 100644
--- a/Documentation/EDID/1024x768.S
+++ b/Documentation/EDID/1024x768.S
@@ -31,8 +31,8 @@
#define YBLANK 38
#define XOFFSET 8
#define XPULSE 144
-#define YOFFSET (63+3)
-#define YPULSE (63+6)
+#define YOFFSET 3
+#define YPULSE 6
#define DPI 72
#define VFREQ 60 /* Hz */
#define TIMING_NAME "Linux XGA"
diff --git a/Documentation/EDID/1280x1024.S b/Documentation/EDID/1280x1024.S
index bd9bef2a65af..ce0e85be379e 100644
--- a/Documentation/EDID/1280x1024.S
+++ b/Documentation/EDID/1280x1024.S
@@ -31,8 +31,8 @@
#define YBLANK 42
#define XOFFSET 48
#define XPULSE 112
-#define YOFFSET (63+1)
-#define YPULSE (63+3)
+#define YOFFSET 1
+#define YPULSE 3
#define DPI 72
#define VFREQ 60 /* Hz */
#define TIMING_NAME "Linux SXGA"
diff --git a/Documentation/EDID/1600x1200.S b/Documentation/EDID/1600x1200.S
index a45101c6160c..5eeb751ebe1b 100644
--- a/Documentation/EDID/1600x1200.S
+++ b/Documentation/EDID/1600x1200.S
@@ -31,8 +31,8 @@
#define YBLANK 50
#define XOFFSET 64
#define XPULSE 192
-#define YOFFSET (63+1)
-#define YPULSE (63+3)
+#define YOFFSET 1
+#define YPULSE 3
#define DPI 72
#define VFREQ 60 /* Hz */
#define TIMING_NAME "Linux UXGA"
diff --git a/Documentation/EDID/1680x1050.S b/Documentation/EDID/1680x1050.S
index b0d7c69282b4..ec679507e33b 100644
--- a/Documentation/EDID/1680x1050.S
+++ b/Documentation/EDID/1680x1050.S
@@ -31,8 +31,8 @@
#define YBLANK 39
#define XOFFSET 104
#define XPULSE 176
-#define YOFFSET (63+3)
-#define YPULSE (63+6)
+#define YOFFSET 3
+#define YPULSE 6
#define DPI 96
#define VFREQ 60 /* Hz */
#define TIMING_NAME "Linux WSXGA"
diff --git a/Documentation/EDID/1920x1080.S b/Documentation/EDID/1920x1080.S
index 3084355e81e7..e0657af801dd 100644
--- a/Documentation/EDID/1920x1080.S
+++ b/Documentation/EDID/1920x1080.S
@@ -31,8 +31,8 @@
#define YBLANK 45
#define XOFFSET 88
#define XPULSE 44
-#define YOFFSET (63+4)
-#define YPULSE (63+5)
+#define YOFFSET 4
+#define YPULSE 5
#define DPI 96
#define VFREQ 60 /* Hz */
#define TIMING_NAME "Linux FHD"
diff --git a/Documentation/EDID/800x600.S b/Documentation/EDID/800x600.S
index 6644e26d5801..b6853b2db869 100644
--- a/Documentation/EDID/800x600.S
+++ b/Documentation/EDID/800x600.S
@@ -28,8 +28,8 @@
#define YBLANK 28
#define XOFFSET 40
#define XPULSE 128
-#define YOFFSET (63+1)
-#define YPULSE (63+4)
+#define YOFFSET 1
+#define YPULSE 4
#define DPI 72
#define VFREQ 60 /* Hz */
#define TIMING_NAME "Linux SVGA"
diff --git a/Documentation/EDID/HOWTO.txt b/Documentation/EDID/HOWTO.txt
index 835db332289b..d8cb3c24ec98 100644
--- a/Documentation/EDID/HOWTO.txt
+++ b/Documentation/EDID/HOWTO.txt
@@ -45,8 +45,8 @@ EDID:
#define YPIX vdisp
#define YBLANK vtotal-vdisp
-#define YOFFSET (63+(vsyncstart-vdisp))
-#define YPULSE (63+(vsyncend-vsyncstart))
+#define YOFFSET (vsyncstart-vdisp)
+#define YPULSE (vsyncend-vsyncstart)
The CRC value in the last line
#define CRC 0x55
diff --git a/Documentation/EDID/edid.S b/Documentation/EDID/edid.S
index ef082dcc6084..ce4b8b4a20b2 100644
--- a/Documentation/EDID/edid.S
+++ b/Documentation/EDID/edid.S
@@ -200,9 +200,9 @@ y_msbs: .byte msbs2(YPIX,YBLANK)
x_snc_off_lsb: .byte XOFFSET&0xff
/* Horizontal sync pulse width pixels 8 lsbits (0-1023) */
x_snc_pls_lsb: .byte XPULSE&0xff
-/* Bits 7-4 Vertical sync offset lines 4 lsbits -63)
- Bits 3-0 Vertical sync pulse width lines 4 lsbits -63) */
-y_snc_lsb: .byte ((YOFFSET-63)<<4)+(YPULSE-63)
+/* Bits 7-4 Vertical sync offset lines 4 lsbits (0-63)
+ Bits 3-0 Vertical sync pulse width lines 4 lsbits (0-63) */
+y_snc_lsb: .byte (YOFFSET<<4)+YPULSE
/* Bits 7-6 Horizontal sync offset pixels 2 msbits
Bits 5-4 Horizontal sync pulse width pixels 2 msbits
Bits 3-2 Vertical sync offset lines 2 msbits
--
Ben Hutchings, Software Developer Codethink Ltd
https://www.codethink.co.uk/ Dale House, 35 Dale Street
Manchester, M1 2HF, United Kingdom
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 2/5] drm: EDID: Fix bit masking of {X,Y}{OFFSET,PULSE}
2018-11-13 17:10 [PATCH 0/5] Fixes and additions to EDID generation Ben Hutchings
2018-11-13 17:11 ` [PATCH 1/5] drm: EDID: Remove a mess involving the number 63 Ben Hutchings
@ 2018-11-13 17:12 ` Ben Hutchings
2018-11-13 17:12 ` [PATCH 3/5] drm: EDID: Don't force make to be silent Ben Hutchings
` (3 subsequent siblings)
5 siblings, 0 replies; 12+ messages in thread
From: Ben Hutchings @ 2018-11-13 17:12 UTC (permalink / raw)
To: dri-devel
Currently we fail to encode any of these fields correctly if they
are large enough to require the top 2 bits. Thankfully none of
the EDID sources here are affected.
The masking and shifting of the top 2 bits (out of 10 for X, 6 for Y)
is only needed in one place so remove the msbs4() macro.
Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
---
Documentation/EDID/edid.S | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/Documentation/EDID/edid.S b/Documentation/EDID/edid.S
index ce4b8b4a20b2..8abbf6c24d88 100644
--- a/Documentation/EDID/edid.S
+++ b/Documentation/EDID/edid.S
@@ -48,8 +48,6 @@
((((v1-'@')&0x1f)<<10)+(((v2-'@')&0x1f)<<5)+((v3-'@')&0x1f))
#define swap16(v1) ((v1>>8)+((v1&0xff)<<8))
#define msbs2(v1,v2) ((((v1>>8)&0x0f)<<4)+((v2>>8)&0x0f))
-#define msbs4(v1,v2,v3,v4) \
- (((v1&0x03)>>2)+((v2&0x03)>>4)+((v3&0x03)>>6)+((v4&0x03)>>8))
#define pixdpi2mm(pix,dpi) ((pix*25)/dpi)
#define xsize pixdpi2mm(XPIX,DPI)
#define ysize pixdpi2mm(YPIX,DPI)
@@ -202,12 +200,12 @@ x_snc_off_lsb: .byte XOFFSET&0xff
x_snc_pls_lsb: .byte XPULSE&0xff
/* Bits 7-4 Vertical sync offset lines 4 lsbits (0-63)
Bits 3-0 Vertical sync pulse width lines 4 lsbits (0-63) */
-y_snc_lsb: .byte (YOFFSET<<4)+YPULSE
+y_snc_lsb: .byte ((YOFFSET&0x0f)<<4)+(YPULSE&0x0f)
/* Bits 7-6 Horizontal sync offset pixels 2 msbits
Bits 5-4 Horizontal sync pulse width pixels 2 msbits
Bits 3-2 Vertical sync offset lines 2 msbits
Bits 1-0 Vertical sync pulse width lines 2 msbits */
-xy_snc_msbs: .byte msbs4(XOFFSET,XPULSE,YOFFSET,YPULSE)
+xy_snc_msbs: .byte (((XOFFSET>>8)&3)<<6)+(((XPULSE>>8)&3)<<4)+(((YOFFSET>>4)&3)<<2)+((YPULSE>>4)&3)
/* Horizontal display size, mm, 8 lsbits (0-4095 mm, 161 in) */
x_dsp_size: .byte xsize&0xff
--
Ben Hutchings, Software Developer Codethink Ltd
https://www.codethink.co.uk/ Dale House, 35 Dale Street
Manchester, M1 2HF, United Kingdom
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 3/5] drm: EDID: Don't force make to be silent
2018-11-13 17:10 [PATCH 0/5] Fixes and additions to EDID generation Ben Hutchings
2018-11-13 17:11 ` [PATCH 1/5] drm: EDID: Remove a mess involving the number 63 Ben Hutchings
2018-11-13 17:12 ` [PATCH 2/5] drm: EDID: Fix bit masking of {X,Y}{OFFSET,PULSE} Ben Hutchings
@ 2018-11-13 17:12 ` Ben Hutchings
2018-11-13 17:12 ` [PATCH 4/5] drm: EDID: Add a 1280x720 (720p) EDID Ben Hutchings
` (2 subsequent siblings)
5 siblings, 0 replies; 12+ messages in thread
From: Ben Hutchings @ 2018-11-13 17:12 UTC (permalink / raw)
To: dri-devel
Hiding all commands is unhelpful unless there's some way to override
it (e.g. Kbuild's V=1). The -s option is available for those who like
it.
Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
---
Documentation/EDID/Makefile | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/Documentation/EDID/Makefile b/Documentation/EDID/Makefile
index 17763ca3f12b..966fceb58566 100644
--- a/Documentation/EDID/Makefile
+++ b/Documentation/EDID/Makefile
@@ -10,17 +10,17 @@ CODE := $(patsubst %.S, %.c, $(SOURCES))
all: $(BIN) $(IHEX) $(CODE)
clean:
- @rm -f *.o *.bin.ihex *.bin *.c
+ rm -f *.o *.bin.ihex *.bin *.c
%.o: %.S
- @cc -c $^
+ cc -c $^
%.bin: %.o
- @objcopy -Obinary $^ $@
+ objcopy -Obinary $^ $@
%.bin.ihex: %.o
- @objcopy -Oihex $^ $@
- @dos2unix $@ 2>/dev/null
+ objcopy -Oihex $^ $@
+ dos2unix $@ 2>/dev/null
%.c: %.bin
- @echo "{" >$@; hexdump -f hex $^ >>$@; echo "};" >>$@
+ echo "{" >$@; hexdump -f hex $^ >>$@; echo "};" >>$@
--
Ben Hutchings, Software Developer Codethink Ltd
https://www.codethink.co.uk/ Dale House, 35 Dale Street
Manchester, M1 2HF, United Kingdom
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 4/5] drm: EDID: Add a 1280x720 (720p) EDID
2018-11-13 17:10 [PATCH 0/5] Fixes and additions to EDID generation Ben Hutchings
` (2 preceding siblings ...)
2018-11-13 17:12 ` [PATCH 3/5] drm: EDID: Don't force make to be silent Ben Hutchings
@ 2018-11-13 17:12 ` Ben Hutchings
2018-11-13 17:12 ` [PATCH 5/5] drm: EDID: Add a 1280x768 ("WXGA") EDID Ben Hutchings
2018-11-14 10:49 ` Jani Nikula
5 siblings, 0 replies; 12+ messages in thread
From: Ben Hutchings @ 2018-11-13 17:12 UTC (permalink / raw)
To: dri-devel
This should match standard HDTV 720p 60 Hz timings.
Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
---
Documentation/EDID/1280x720.S | 45 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 45 insertions(+)
create mode 100644 Documentation/EDID/1280x720.S
diff --git a/Documentation/EDID/1280x720.S b/Documentation/EDID/1280x720.S
new file mode 100644
index 000000000000..4c17d4d04900
--- /dev/null
+++ b/Documentation/EDID/1280x720.S
@@ -0,0 +1,45 @@
+/*
+ 1280x720.S: EDID data set for standard 720p
+
+ Copyright (C) 2012 Carsten Emde <C.Emde@osadl.org>
+ Copyright 2016 Codethink Ltd.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+/* EDID */
+#define VERSION 1
+#define REVISION 3
+
+/* Display */
+#define CLOCK 74250 /* kHz */
+#define XPIX 1280
+#define YPIX 720
+#define XY_RATIO XY_RATIO_16_9
+#define XBLANK 370
+#define YBLANK 30
+#define XOFFSET 110
+#define XPULSE 40
+#define YOFFSET 20
+#define YPULSE 5
+#define DPI 96
+#define VFREQ 60 /* Hz */
+#define TIMING_NAME "Linux 720p"
+/* No ESTABLISHED_TIMINGx_BITS */
+#define HSYNC_POL 1
+#define VSYNC_POL 1
+#define CRC 0x77
+
+#include "edid.S"
--
Ben Hutchings, Software Developer Codethink Ltd
https://www.codethink.co.uk/ Dale House, 35 Dale Street
Manchester, M1 2HF, United Kingdom
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 5/5] drm: EDID: Add a 1280x768 ("WXGA") EDID
2018-11-13 17:10 [PATCH 0/5] Fixes and additions to EDID generation Ben Hutchings
` (3 preceding siblings ...)
2018-11-13 17:12 ` [PATCH 4/5] drm: EDID: Add a 1280x720 (720p) EDID Ben Hutchings
@ 2018-11-13 17:12 ` Ben Hutchings
2018-11-14 10:49 ` Jani Nikula
5 siblings, 0 replies; 12+ messages in thread
From: Ben Hutchings @ 2018-11-13 17:12 UTC (permalink / raw)
To: dri-devel
This is one of several modes sometimes called WXGA.
Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
---
Documentation/EDID/1280x768.S | 45 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 45 insertions(+)
create mode 100644 Documentation/EDID/1280x768.S
diff --git a/Documentation/EDID/1280x768.S b/Documentation/EDID/1280x768.S
new file mode 100644
index 000000000000..9692c93fbfa3
--- /dev/null
+++ b/Documentation/EDID/1280x768.S
@@ -0,0 +1,45 @@
+/*
+ 1280x768.S: EDID data set for 1280x768@60 with Reduced Blanking
+
+ Copyright (C) 2012 Carsten Emde <C.Emde@osadl.org>
+ Copyright 2016 Codethink Ltd.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+/* EDID */
+#define VERSION 1
+#define REVISION 3
+
+/* Display */
+#define CLOCK 68250 /* kHz */
+#define XPIX 1280
+#define YPIX 768
+#define XY_RATIO XY_RATIO_16_10 /* closest to real ratio 5:3 */
+#define XBLANK 160
+#define YBLANK 22
+#define XOFFSET 48
+#define XPULSE 32
+#define YOFFSET 3
+#define YPULSE 7
+#define DPI 96
+#define VFREQ 60 /* Hz */
+#define TIMING_NAME "1280x768 RB"
+/* No ESTABLISHED_TIMINGx_BITS */
+#define HSYNC_POL 1
+#define VSYNC_POL 0
+#define CRC 0x20
+
+#include "edid.S"
--
Ben Hutchings, Software Developer Codethink Ltd
https://www.codethink.co.uk/ Dale House, 35 Dale Street
Manchester, M1 2HF, United Kingdom
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH 0/5] Fixes and additions to EDID generation
2018-11-13 17:10 [PATCH 0/5] Fixes and additions to EDID generation Ben Hutchings
@ 2018-11-14 10:49 ` Jani Nikula
2018-11-13 17:12 ` [PATCH 2/5] drm: EDID: Fix bit masking of {X,Y}{OFFSET,PULSE} Ben Hutchings
` (4 subsequent siblings)
5 siblings, 0 replies; 12+ messages in thread
From: Jani Nikula @ 2018-11-14 10:49 UTC (permalink / raw)
To: Ben Hutchings, dri-devel; +Cc: linux-doc, Jonathan Corbet, Dave Airlie, C.Emde
On Tue, 13 Nov 2018, Ben Hutchings <ben.hutchings@codethink.co.uk> wrote:
> This series adds two more EDIDs that I needed for a project some time ago,
> and fixes some problems that I found along the way.
See also [1]. The patches there have been applied via the linux-doc
tree.
> There isn't a listed maintainer for Documentation/EDID but it looks
> like it falls under the DRM umbrella. Please let me know if this the
> wrong place.
Cc: linux-doc, Jon and Dave.
The Documentation/EDID directory was merged by Dave along with the EDID
firmware loader mechanism in da0df92b5731 ("drm: allow loading an EDID
as firmware to override broken monitor").
I think it would be reasonable to handle the EDID stuff via dri-devel
and the drm trees, and modify MAINTAINERS to reflect that. Thoughts?
(And in the long run we should use or write a tool to generate EDIDs
instead of using assembly with macros. And like Jon already mentioned in
the other thread, even the assembly probably shouldn't be under
Documentation. But I digress.)
BR,
Jani.
[1] http://mid.mail-archive.com/1541407715-5417-1-git-send-email-cniedermaier@dh-electronics.de
>
> Ben.
>
> Ben Hutchings (5):
> drm: EDID: Remove a mess involving the number 63
> drm: EDID: Fix bit masking of {X,Y}{OFFSET,PULSE}
> drm: EDID: Don't force make to be silent
> drm: EDID: Add a 1280x720 (720p) EDID
> drm: EDID: Add a 1280x768 ("WXGA") EDID
>
> Documentation/EDID/1024x768.S | 4 ++--
> Documentation/EDID/1280x1024.S | 4 ++--
> Documentation/EDID/1280x720.S | 45 ++++++++++++++++++++++++++++++++++++++++++
> Documentation/EDID/1280x768.S | 45 ++++++++++++++++++++++++++++++++++++++++++
> Documentation/EDID/1600x1200.S | 4 ++--
> Documentation/EDID/1680x1050.S | 4 ++--
> Documentation/EDID/1920x1080.S | 4 ++--
> Documentation/EDID/800x600.S | 4 ++--
> Documentation/EDID/HOWTO.txt | 4 ++--
> Documentation/EDID/Makefile | 12 +++++------
> Documentation/EDID/edid.S | 10 ++++------
> 11 files changed, 114 insertions(+), 26 deletions(-)
> create mode 100644 Documentation/EDID/1280x720.S
> create mode 100644 Documentation/EDID/1280x768.S
--
Jani Nikula, Intel Open Source Graphics Center
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH 0/5] Fixes and additions to EDID generation
@ 2018-11-14 10:49 ` Jani Nikula
0 siblings, 0 replies; 12+ messages in thread
From: Jani Nikula @ 2018-11-14 10:49 UTC (permalink / raw)
To: Ben Hutchings, dri-devel; +Cc: Dave Airlie, Jonathan Corbet, linux-doc
On Tue, 13 Nov 2018, Ben Hutchings <ben.hutchings@codethink.co.uk> wrote:
> This series adds two more EDIDs that I needed for a project some time ago,
> and fixes some problems that I found along the way.
See also [1]. The patches there have been applied via the linux-doc
tree.
> There isn't a listed maintainer for Documentation/EDID but it looks
> like it falls under the DRM umbrella. Please let me know if this the
> wrong place.
Cc: linux-doc, Jon and Dave.
The Documentation/EDID directory was merged by Dave along with the EDID
firmware loader mechanism in da0df92b5731 ("drm: allow loading an EDID
as firmware to override broken monitor").
I think it would be reasonable to handle the EDID stuff via dri-devel
and the drm trees, and modify MAINTAINERS to reflect that. Thoughts?
(And in the long run we should use or write a tool to generate EDIDs
instead of using assembly with macros. And like Jon already mentioned in
the other thread, even the assembly probably shouldn't be under
Documentation. But I digress.)
BR,
Jani.
[1] http://mid.mail-archive.com/1541407715-5417-1-git-send-email-cniedermaier@dh-electronics.de
>
> Ben.
>
> Ben Hutchings (5):
> drm: EDID: Remove a mess involving the number 63
> drm: EDID: Fix bit masking of {X,Y}{OFFSET,PULSE}
> drm: EDID: Don't force make to be silent
> drm: EDID: Add a 1280x720 (720p) EDID
> drm: EDID: Add a 1280x768 ("WXGA") EDID
>
> Documentation/EDID/1024x768.S | 4 ++--
> Documentation/EDID/1280x1024.S | 4 ++--
> Documentation/EDID/1280x720.S | 45 ++++++++++++++++++++++++++++++++++++++++++
> Documentation/EDID/1280x768.S | 45 ++++++++++++++++++++++++++++++++++++++++++
> Documentation/EDID/1600x1200.S | 4 ++--
> Documentation/EDID/1680x1050.S | 4 ++--
> Documentation/EDID/1920x1080.S | 4 ++--
> Documentation/EDID/800x600.S | 4 ++--
> Documentation/EDID/HOWTO.txt | 4 ++--
> Documentation/EDID/Makefile | 12 +++++------
> Documentation/EDID/edid.S | 10 ++++------
> 11 files changed, 114 insertions(+), 26 deletions(-)
> create mode 100644 Documentation/EDID/1280x720.S
> create mode 100644 Documentation/EDID/1280x768.S
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH 0/5] Fixes and additions to EDID generation
2018-11-14 10:49 ` Jani Nikula
@ 2018-11-21 9:35 ` Daniel Vetter
-1 siblings, 0 replies; 12+ messages in thread
From: Daniel Vetter @ 2018-11-21 9:35 UTC (permalink / raw)
To: Jani Nikula
Cc: Ben Hutchings, dri-devel, linux-doc, Jonathan Corbet, Dave Airlie,
C.Emde
On Wed, Nov 14, 2018 at 12:49:11PM +0200, Jani Nikula wrote:
> On Tue, 13 Nov 2018, Ben Hutchings <ben.hutchings@codethink.co.uk> wrote:
> > This series adds two more EDIDs that I needed for a project some time ago,
> > and fixes some problems that I found along the way.
>
> See also [1]. The patches there have been applied via the linux-doc
> tree.
>
> > There isn't a listed maintainer for Documentation/EDID but it looks
> > like it falls under the DRM umbrella. Please let me know if this the
> > wrong place.
>
> Cc: linux-doc, Jon and Dave.
>
> The Documentation/EDID directory was merged by Dave along with the EDID
> firmware loader mechanism in da0df92b5731 ("drm: allow loading an EDID
> as firmware to override broken monitor").
>
> I think it would be reasonable to handle the EDID stuff via dri-devel
> and the drm trees, and modify MAINTAINERS to reflect that. Thoughts?
>
> (And in the long run we should use or write a tool to generate EDIDs
> instead of using assembly with macros. And like Jon already mentioned in
> the other thread, even the assembly probably shouldn't be under
> Documentation. But I digress.)
If we do that, maybe stuff the EDID things into Documentation/gpu? Would
need an ack from media folks I think, but imo would make sense.
-Daniel
>
>
> BR,
> Jani.
>
> [1] http://mid.mail-archive.com/1541407715-5417-1-git-send-email-cniedermaier@dh-electronics.de
>
> >
> > Ben.
> >
> > Ben Hutchings (5):
> > drm: EDID: Remove a mess involving the number 63
> > drm: EDID: Fix bit masking of {X,Y}{OFFSET,PULSE}
> > drm: EDID: Don't force make to be silent
> > drm: EDID: Add a 1280x720 (720p) EDID
> > drm: EDID: Add a 1280x768 ("WXGA") EDID
> >
> > Documentation/EDID/1024x768.S | 4 ++--
> > Documentation/EDID/1280x1024.S | 4 ++--
> > Documentation/EDID/1280x720.S | 45 ++++++++++++++++++++++++++++++++++++++++++
> > Documentation/EDID/1280x768.S | 45 ++++++++++++++++++++++++++++++++++++++++++
> > Documentation/EDID/1600x1200.S | 4 ++--
> > Documentation/EDID/1680x1050.S | 4 ++--
> > Documentation/EDID/1920x1080.S | 4 ++--
> > Documentation/EDID/800x600.S | 4 ++--
> > Documentation/EDID/HOWTO.txt | 4 ++--
> > Documentation/EDID/Makefile | 12 +++++------
> > Documentation/EDID/edid.S | 10 ++++------
> > 11 files changed, 114 insertions(+), 26 deletions(-)
> > create mode 100644 Documentation/EDID/1280x720.S
> > create mode 100644 Documentation/EDID/1280x768.S
>
> --
> Jani Nikula, Intel Open Source Graphics Center
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH 0/5] Fixes and additions to EDID generation
@ 2018-11-21 9:35 ` Daniel Vetter
0 siblings, 0 replies; 12+ messages in thread
From: Daniel Vetter @ 2018-11-21 9:35 UTC (permalink / raw)
To: Jani Nikula
Cc: Ben Hutchings, Jonathan Corbet, linux-doc, dri-devel, Dave Airlie
On Wed, Nov 14, 2018 at 12:49:11PM +0200, Jani Nikula wrote:
> On Tue, 13 Nov 2018, Ben Hutchings <ben.hutchings@codethink.co.uk> wrote:
> > This series adds two more EDIDs that I needed for a project some time ago,
> > and fixes some problems that I found along the way.
>
> See also [1]. The patches there have been applied via the linux-doc
> tree.
>
> > There isn't a listed maintainer for Documentation/EDID but it looks
> > like it falls under the DRM umbrella. Please let me know if this the
> > wrong place.
>
> Cc: linux-doc, Jon and Dave.
>
> The Documentation/EDID directory was merged by Dave along with the EDID
> firmware loader mechanism in da0df92b5731 ("drm: allow loading an EDID
> as firmware to override broken monitor").
>
> I think it would be reasonable to handle the EDID stuff via dri-devel
> and the drm trees, and modify MAINTAINERS to reflect that. Thoughts?
>
> (And in the long run we should use or write a tool to generate EDIDs
> instead of using assembly with macros. And like Jon already mentioned in
> the other thread, even the assembly probably shouldn't be under
> Documentation. But I digress.)
If we do that, maybe stuff the EDID things into Documentation/gpu? Would
need an ack from media folks I think, but imo would make sense.
-Daniel
>
>
> BR,
> Jani.
>
> [1] http://mid.mail-archive.com/1541407715-5417-1-git-send-email-cniedermaier@dh-electronics.de
>
> >
> > Ben.
> >
> > Ben Hutchings (5):
> > drm: EDID: Remove a mess involving the number 63
> > drm: EDID: Fix bit masking of {X,Y}{OFFSET,PULSE}
> > drm: EDID: Don't force make to be silent
> > drm: EDID: Add a 1280x720 (720p) EDID
> > drm: EDID: Add a 1280x768 ("WXGA") EDID
> >
> > Documentation/EDID/1024x768.S | 4 ++--
> > Documentation/EDID/1280x1024.S | 4 ++--
> > Documentation/EDID/1280x720.S | 45 ++++++++++++++++++++++++++++++++++++++++++
> > Documentation/EDID/1280x768.S | 45 ++++++++++++++++++++++++++++++++++++++++++
> > Documentation/EDID/1600x1200.S | 4 ++--
> > Documentation/EDID/1680x1050.S | 4 ++--
> > Documentation/EDID/1920x1080.S | 4 ++--
> > Documentation/EDID/800x600.S | 4 ++--
> > Documentation/EDID/HOWTO.txt | 4 ++--
> > Documentation/EDID/Makefile | 12 +++++------
> > Documentation/EDID/edid.S | 10 ++++------
> > 11 files changed, 114 insertions(+), 26 deletions(-)
> > create mode 100644 Documentation/EDID/1280x720.S
> > create mode 100644 Documentation/EDID/1280x768.S
>
> --
> Jani Nikula, Intel Open Source Graphics Center
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH 0/5] Fixes and additions to EDID generation
2018-11-21 9:35 ` Daniel Vetter
@ 2018-11-21 13:36 ` Gerd Hoffmann
-1 siblings, 0 replies; 12+ messages in thread
From: Gerd Hoffmann @ 2018-11-21 13:36 UTC (permalink / raw)
To: Daniel Vetter
Cc: Jani Nikula, Ben Hutchings, Jonathan Corbet, linux-doc, dri-devel,
Dave Airlie
Hi,
> > (And in the long run we should use or write a tool to generate EDIDs
> > instead of using assembly with macros. And like Jon already mentioned in
> > the other thread, even the assembly probably shouldn't be under
> > Documentation. But I digress.)
>
> If we do that, maybe stuff the EDID things into Documentation/gpu? Would
> need an ack from media folks I think, but imo would make sense.
Oh, btw: I've written a edid generator for qemu for the virtual display
devices, and I've also added a small test tool so you don't have to boot
a virtual machine to test the thing. Will ship with the upcoming qemu
3.1 release. You might find this useful ...
cheers,
Gerd
============================== cut here ==============================
# qemu-edid -h
This is a test tool for the qemu edid generator.
Typically you'll pipe the output into edid-decode
to check if the generator works correctly.
usage: qemu-edid <options>
options:
-h print this text
-o <file> set output file (stdout by default)
-v <vendor> set monitor vendor (three letters)
-n <name> set monitor name
-s <serial> set monitor serial
-d <dpi> set display resolution
-x <prefx> set preferred width
-y <prefy> set preferred height
-X <maxx> set maximum width
-Y <maxy> set maximum height
# qemu-edid | edid-decode
Extracted contents:
header: 00 ff ff ff ff ff ff 00
serial number: 49 14 34 12 00 00 00 00 2a 18
version: 01 04
basic params: a5 28 1e 78 06
chroma info: ee 91 a3 54 4c 99 26 0f 50 54
established: 21 08 00
standard: e1 c0 d1 c0 01 01 01 01 01 01 01 01 01 01 01 01
descriptor 1: 25 20 00 66 41 00 1a 30 00 1e 33 40 93 2e 11 00 00 18
descriptor 2: 00 00 00 fd 00 32 7d 1e a0 78 01 0a 20 20 20 20 20 20
descriptor 3: 00 00 00 fc 00 51 45 4d 55 20 4d 6f 6e 69 74 6f 72 0a
descriptor 4: 00 00 00 f7 00 0a 00 4a a2 24 29 20 00 00 00 00 00 00
extensions: 01
checksum: 19
Manufacturer: RHT Model 1234 Serial Number 0
Made week 42 of 2014
EDID version: 1.4
Digital display
8 bits per primary color channel
DisplayPort interface
Maximum image size: 40 cm x 30 cm
Gamma: 2.20
Supported color formats: RGB 4:4:4
Default (sRGB) color space is primary color space
First detailed timing is preferred timing
Established timings supported:
640x480@60Hz
800x600@60Hz
1024x768@60Hz
Standard timings supported:
2048x1152@60Hz
1920x1080@60Hz
Detailed mode: Clock 82.290 MHz, 403 mm x 302 mm
1024 1280 1310 1382 hborder 0
768 771 774 794 vborder 0
-hsync -vsync
Monitor ranges (bare limits): 50-125Hz V, 30-160kHz H, max dotclock 1200MHz
Monitor name: QEMU Monitor
Established timings III
Has 1 extension blocks
Checksum: 0x19 (valid)
CEA extension block
Extension version: 3
6 bytes of CEA data
Video data block
VIC 125 Unknown mode
VIC 101 4096x2160@50Hz
VIC 96 3840x2160@50Hz
VIC 89 2560x1080@50Hz
VIC 31 1920x1080@50Hz
0 native detailed modes
Checksum: 0xf2 (valid)
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH 0/5] Fixes and additions to EDID generation
@ 2018-11-21 13:36 ` Gerd Hoffmann
0 siblings, 0 replies; 12+ messages in thread
From: Gerd Hoffmann @ 2018-11-21 13:36 UTC (permalink / raw)
To: Daniel Vetter
Cc: Ben Hutchings, linux-doc, Jonathan Corbet, dri-devel, Dave Airlie
Hi,
> > (And in the long run we should use or write a tool to generate EDIDs
> > instead of using assembly with macros. And like Jon already mentioned in
> > the other thread, even the assembly probably shouldn't be under
> > Documentation. But I digress.)
>
> If we do that, maybe stuff the EDID things into Documentation/gpu? Would
> need an ack from media folks I think, but imo would make sense.
Oh, btw: I've written a edid generator for qemu for the virtual display
devices, and I've also added a small test tool so you don't have to boot
a virtual machine to test the thing. Will ship with the upcoming qemu
3.1 release. You might find this useful ...
cheers,
Gerd
============================== cut here ==============================
# qemu-edid -h
This is a test tool for the qemu edid generator.
Typically you'll pipe the output into edid-decode
to check if the generator works correctly.
usage: qemu-edid <options>
options:
-h print this text
-o <file> set output file (stdout by default)
-v <vendor> set monitor vendor (three letters)
-n <name> set monitor name
-s <serial> set monitor serial
-d <dpi> set display resolution
-x <prefx> set preferred width
-y <prefy> set preferred height
-X <maxx> set maximum width
-Y <maxy> set maximum height
# qemu-edid | edid-decode
Extracted contents:
header: 00 ff ff ff ff ff ff 00
serial number: 49 14 34 12 00 00 00 00 2a 18
version: 01 04
basic params: a5 28 1e 78 06
chroma info: ee 91 a3 54 4c 99 26 0f 50 54
established: 21 08 00
standard: e1 c0 d1 c0 01 01 01 01 01 01 01 01 01 01 01 01
descriptor 1: 25 20 00 66 41 00 1a 30 00 1e 33 40 93 2e 11 00 00 18
descriptor 2: 00 00 00 fd 00 32 7d 1e a0 78 01 0a 20 20 20 20 20 20
descriptor 3: 00 00 00 fc 00 51 45 4d 55 20 4d 6f 6e 69 74 6f 72 0a
descriptor 4: 00 00 00 f7 00 0a 00 4a a2 24 29 20 00 00 00 00 00 00
extensions: 01
checksum: 19
Manufacturer: RHT Model 1234 Serial Number 0
Made week 42 of 2014
EDID version: 1.4
Digital display
8 bits per primary color channel
DisplayPort interface
Maximum image size: 40 cm x 30 cm
Gamma: 2.20
Supported color formats: RGB 4:4:4
Default (sRGB) color space is primary color space
First detailed timing is preferred timing
Established timings supported:
640x480@60Hz
800x600@60Hz
1024x768@60Hz
Standard timings supported:
2048x1152@60Hz
1920x1080@60Hz
Detailed mode: Clock 82.290 MHz, 403 mm x 302 mm
1024 1280 1310 1382 hborder 0
768 771 774 794 vborder 0
-hsync -vsync
Monitor ranges (bare limits): 50-125Hz V, 30-160kHz H, max dotclock 1200MHz
Monitor name: QEMU Monitor
Established timings III
Has 1 extension blocks
Checksum: 0x19 (valid)
CEA extension block
Extension version: 3
6 bytes of CEA data
Video data block
VIC 125 Unknown mode
VIC 101 4096x2160@50Hz
VIC 96 3840x2160@50Hz
VIC 89 2560x1080@50Hz
VIC 31 1920x1080@50Hz
0 native detailed modes
Checksum: 0xf2 (valid)
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 12+ messages in thread