From: Dong Aisheng Date: Thu, 12 Sep 2019 07:29:10 +0000 (+0800) Subject: drm: drm_fourcc.h: change DRM_FORMAT_MOD_VENDOR_AMPHION to 0xf0 X-Git-Tag: rel_imx_4.19.35_1.1.0~54 X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=6022121bd11e19a8d23ed1f82f81ff6f1f3aa207;p=linux.git drm: drm_fourcc.h: change DRM_FORMAT_MOD_VENDOR_AMPHION to 0xf0 change DRM_FORMAT_MOD_VENDOR_AMPHION to 0xf0 to avoid conflicts with upstream in the future. Reviewed-by: Liu Ying Signed-off-by: Dong Aisheng (cherry picked from commit c91d6eb654f557f683e5cdd44181581adbe15378) --- diff --git a/include/uapi/drm/drm_fourcc.h b/include/uapi/drm/drm_fourcc.h index 53591a092e4a..59b0b3283479 100644 --- a/include/uapi/drm/drm_fourcc.h +++ b/include/uapi/drm/drm_fourcc.h @@ -185,7 +185,7 @@ extern "C" { #define DRM_FORMAT_MOD_VENDOR_VIVANTE 0x06 #define DRM_FORMAT_MOD_VENDOR_BROADCOM 0x07 #define DRM_FORMAT_MOD_VENDOR_ARM 0x08 -#define DRM_FORMAT_MOD_VENDOR_AMPHION 0x09 +#define DRM_FORMAT_MOD_VENDOR_AMPHION 0xf0 #define DRM_FORMAT_MOD_VENDOR_VSI 0x0a /* add more to the end as needed */