[PATCH RESEND] drm: use .hword to represent 16-bit numbers

[PATCH RESEND] drm: use .hword to represent 16-bit numbers

[Javi Merino]

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 <C.Emde@osadl.org>
Cc: David Airlie <airlied@linux.ie>
Signed-off-by: Javi Merino <javi.merino@kernel.org>
---
 Documentation/EDID/edid.S | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Documentation/EDID/edid.S b/Documentation/EDID/edid.S
index 7ac0327..ef082dc 100644
--- a/Documentation/EDID/edid.S
+++ b/Documentation/EDID/edid.S
@@ -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
-- 
2.1.4

Re: [PATCH RESEND] drm: use .hword to represent 16-bit numbers

[Daniel Vetter]

On Wed, Mar 29, 2017 at 02:45:23PM +0100, Javi Merino wrote:
> 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 <C.Emde@osadl.org>
> Cc: David Airlie <airlied@linux.ie>
> Signed-off-by: Javi Merino <javi.merino@kernel.org>

Applied to drm-misc, thanks.
-Daniel

> ---
>  Documentation/EDID/edid.S | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/Documentation/EDID/edid.S b/Documentation/EDID/edid.S
> index 7ac0327..ef082dc 100644
> --- a/Documentation/EDID/edid.S
> +++ b/Documentation/EDID/edid.S
> @@ -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
> -- 
> 2.1.4
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch