]> git.baikalelectronics.ru Git - kernel.git/commit
drm/fourcc: Fix conflicting Y41x definitions
authorMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Tue, 19 Mar 2019 12:17:02 +0000 (13:17 +0100)
committerMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Thu, 21 Mar 2019 08:49:04 +0000 (09:49 +0100)
commitd698c4e8c84d600cb1a836a9320bef1169556e89
tree2d9ea57fe069f751141297e3d8a34e755e46da2c
parenta0ef38dd4ec1ecd69847b0bd2963babbc528cb8d
drm/fourcc: Fix conflicting Y41x definitions

There has unfortunately been a conflict with the following 3 commits:

commit 4e3494a28b29aff9f0ee13f1be60406036cb5f67
Author: Ayan Kumar Halder <ayan.halder@arm.com>
Date:   Fri Nov 9 17:21:12 2018 +0000
    drm: Added a new format DRM_FORMAT_XVYU2101010

commit 97c05d4d673fa8b4a0e12ad862e8db0cdfbcb1a9
Author: Brian Starkey <brian.starkey@arm.com>
Date:   Fri Oct 5 10:27:00 2018 +0100

    drm/fourcc: Add AFBC yuv fourccs for Mali

and

commit cdc4beb983f71caccf5cdb000d17e34ed28cd38c
Author: Swati Sharma <swati2.sharma@intel.com>
Date:   Mon Mar 4 17:26:33 2019 +0530

    drm: Add Y2xx and Y4xx (xx:10/12/16) format definitions and fourcc

Unfortunately gcc didn't warn about the redefinitions, because the
double defines were the set to same value, and gcc apparently no longer
warns about that.

Fix this by using new XYVU for i915, without alpha, and making the
Y41x definitions match msdn, with alpha.

Fortunately we caught it early, and the conflict hasn't even landed in
drm-next yet.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Brian Starkey <Brian.Starkey@arm.com>
Cc: Swati Sharma <swati2.sharma@intel.com>
Cc: Ayan Kumar Halder <ayan.halder@arm.com>
Cc: malidp@foss.arm.com
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Maxime Ripard <maxime.ripard@bootlin.com>
Cc: Sean Paul <sean@poorly.run>
Cc: Dave Airlie <airlied@linux.ie>
Cc: Liviu Dudau <Liviu.Dudau@arm.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190319121702.6814-1-maarten.lankhorst@linux.intel.com
Acked-by: Jani Nikula <jani.nikula@intel.com> #irc
Acked-by: Sean Paul <sean@poorly.run>
Reviewed-by: Ayan Kumar halder <ayan.halder@arm.com>
drivers/gpu/drm/drm_fourcc.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_sprite.c
include/uapi/drm/drm_fourcc.h