Skip to contentSkip to conversation

Documentation/EDID fixes

PATCH Superseded Javi Merino 2 participants 6 messages Mar 6, 2017 – Mar 8, 2017 Documentation

lore
Share & tools
lore
#0 lore raw

cover Documentation/EDID fixes

Hi,

I found these two minor issues while building an EDID. I'm not sure whether the second patch (Add O= to support) is upstream material, but I'm sending it just in case.

Thanks,
Javi

Javi Merino (2):
drm: use .hword to represent 16-bit numbers
drm: Add O= support

 Documentation/EDID/Makefile | 21 ++++++++++++---------
 Documentation/EDID/edid.S   |  6 +++---
 2 files changed, 15 insertions(+), 12 deletions(-)
Signature · 1 line
2.1.4
#1 lore raw

PATCH 1/2 drm: use .hword to represent 16-bit numbers

The size of .word is the size of a word in the given platform, which for intel systems is 16-bits but other architectures use different sizes. However, .hword emits 16-bit numbers regardless of the platform (and despite the name). The quantities specified in EDID are platform independent, so they should work in spite of the default target of the cc you are using, so use .hword where EDID specifies 16-bit numbers.

Cc Carsten Emde <[email protected]>
Cc David Airlie <[email protected]>
---
 Documentation/EDID/edid.S | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
Documentation/EDID/edid.S +3 -3
index 7ac0327..ef082dc 100644
@@ -59,9 +59,9 @@
 /* Fixed header pattern */
 header:		.byte	0x00,0xff,0xff,0xff,0xff,0xff,0xff,0x00
 
-mfg_id:		.word	swap16(mfgname2id(MFG_LNX1, MFG_LNX2, MFG_LNX3))
+mfg_id:		.hword	swap16(mfgname2id(MFG_LNX1, MFG_LNX2, MFG_LNX3))
 
-prod_code:	.word	0
+prod_code:	.hword	0
 
 /* Serial number. 32 bits, little endian. */
 serial_number:	.long	SERIAL
@@ -177,7 +177,7 @@ std_vres:	.byte	(XY_RATIO<<6)+VFREQ-60
 
 descriptor1:
 /* Pixel clock in 10 kHz units. (0.-655.35 MHz, little-endian) */
-clock:		.word	CLOCK/10
+clock:		.hword	CLOCK/10
 
 /* Horizontal active pixels 8 lsbits (0-4095) */
 x_act_lsb:	.byte	XPIX&0xff
Signature · 1 line
2.1.4
#2 lore raw

PATCH 2/2 drm: Add O= support

In reply to Javi Merino

Add an option to put all output files in a given directory, similar to what kbuild does.

Cc Carsten Emde <[email protected]>
Cc David Airlie <[email protected]>
---
 Documentation/EDID/Makefile | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)
Documentation/EDID/Makefile +12 -9
index 17763ca..76e8ef5 100644
@@ -1,26 +1,29 @@
 
+# use "make O=dir" to locate all output files in "dir"
+O ?= .
+
 SOURCES	:= $(wildcard [0-9]*x[0-9]*.S)
 
-BIN	:= $(patsubst %.S, %.bin, $(SOURCES))
+BIN	:= $(patsubst %.S, $(O)/%.bin, $(SOURCES))
 
-IHEX	:= $(patsubst %.S, %.bin.ihex, $(SOURCES))
+IHEX	:= $(patsubst %.S, $(O)/%.bin.ihex, $(SOURCES))
 
-CODE	:= $(patsubst %.S, %.c, $(SOURCES))
+CODE	:= $(patsubst %.S, $(O)/%.c, $(SOURCES))
 
 all:	$(BIN) $(IHEX) $(CODE)
 
 clean:
-	@rm -f *.o *.bin.ihex *.bin *.c
+	@rm -f $(O)/*.o $(O)/*.bin.ihex $(O)/*.bin $(O)/*.c
 
-%.o:	%.S
-	@cc -c $^
+$(O)/%.o:	%.S
+	@cc -c $^ -o $@
 
-%.bin:	%.o
+$(O)/%.bin:	$(O)/%.o
 	@objcopy -Obinary $^ $@
 
-%.bin.ihex:	%.o
+$(O)/%.bin.ihex:	$(O)/%.o
 	@objcopy -Oihex $^ $@
 	@dos2unix $@ 2>/dev/null
 
-%.c:	%.bin
+$(O)/%.c:	$(O)/%.bin
 	@echo "{" >$@; hexdump -f hex $^ >>$@; echo "};" >>$@
Signature · 1 line
2.1.4
#3 lore raw
In reply to Javi Merino
Quoted 3 lines · Javi Merino

I found these two minor issues while building an EDID. I'm not sure whether the second patch (Add O= to support) is upstream material, but I'm sending it just in case.

I'm not opposed to fixing existing issues like this, but really I think there should be an userspace tool for this. Definitely outside of the Documentation directory, perhaps even outside the kernel tree altogether.

BR,
Jani.

Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#4 lore raw
Quoted 9 lines · Jani Nikula
Quoted 3 lines · Javi Merino

I found these two minor issues while building an EDID. I'm not sure whether the second patch (Add O= to support) is upstream material, but I'm sending it just in case.

I'm not opposed to fixing existing issues like this, but really I think there should be an userspace tool for this. Definitely outside of the Documentation directory, perhaps even outside the kernel tree altogether.

I am not sure whether this should be in the kernel or not, but I agree that Documentation/ doesn't look like the right place to build these files.

Cheers,
Javi

#5 lore raw
Quoted 6 lines · Javi Merino
Quoted 5 lines · Jani Nikula
Quoted 3 lines · Javi Merino

I found these two minor issues while building an EDID. I'm not sure whether the second patch (Add O= to support) is upstream material, but I'm sending it just in case.

Quoted 8 lines
Quoted 4 lines

I'm not opposed to fixing existing issues like this, but really I think there should be an userspace tool for this. Definitely outside of the Documentation directory, perhaps even outside the kernel tree altogether.

I am not sure whether this should be in the kernel or not, but I agree that Documentation/ doesn't look like the right place to build these files.

Just so there's no confusion: I'm just saying what I think should be done in the long run. I'm not opposed to the fixes at hand, but someone else needs to review them.

BR,
Jani.

Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel