Unverified Commit cc3283f8 authored by Simon Ser's avatar Simon Ser
Browse files

drm/fourcc: fix Amlogic format modifier masks 

The comment says the layout and options use 8 bits, and the shift
uses 8 bits. However the mask is 0xf, ie. 0b00001111 (4 bits).

This could be surprising when introducing new layouts or options
that take more than 4 bits, as this would silently drop the high
bits.

Make the masks consistent with the comment and the shift.

Found when writing a drm_info patch [1].

[1]: https://github.com/ascent12/drm_info/pull/67



Signed-off-by: default avatarSimon Ser <contact@emersion.fr>
Fixes: d6528ec8 ("drm/fourcc: Add modifier definitions for describing Amlogic Video Framebuffer Compression")
Cc: Neil Armstrong <narmstrong@baylibre.com>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Kevin Hilman <khilman@baylibre.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210110125103.15447-1-contact@emersion.fr
parent dc25e377

include/uapi/drm/drm_fourcc.h

+2 −2
Original line number Diff line number Diff line
@@ -1036,9 +1036,9 @@ drm_fourcc_canonicalize_nvidia_format_mod(__u64 modifier) 
 * Not all combinations are valid, and different SoCs may support different

 * combinations of layout and options.

 */

#define __fourcc_mod_amlogic_layout_mask 0xf

#define __fourcc_mod_amlogic_layout_mask 0xff

#define __fourcc_mod_amlogic_options_shift 8

#define __fourcc_mod_amlogic_options_mask 0xf

#define __fourcc_mod_amlogic_options_mask 0xff



#define DRM_FORMAT_MOD_AMLOGIC_FBC(__layout, __options) \

	fourcc_mod_code(AMLOGIC, \