Maarten Lankhorst ff01e6971e drm/fourcc: Fix conflicting Y41x definitions ... There has unfortunately been a conflict with the following 3 commits: commit e9961ab95a 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 7ba0fee247 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 50bf5d7d59 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>		2019-03-21 09:49:04 +01:00
..
amdgpu_drm.h	drm/amdgpu: Add command to override the context priority.	2019-02-15 11:15:43 -05:00
armada_drm.h
drm_fourcc.h	drm/fourcc: Fix conflicting Y41x definitions	2019-03-21 09:49:04 +01:00
drm_mode.h	drm: Add a new plane property to send damage during plane update	2018-12-05 10:00:35 +01:00
drm_sarea.h
drm.h	drm/syncobj: disable the timeline UAPI for now v2	2018-11-08 11:31:34 +01:00
etnaviv_drm.h
exynos_drm.h
i810_drm.h
i915_drm.h	drm/i915: Expose RPCS (SSEU) configuration to userspace (Gen11 only)	2019-02-05 11:32:03 +00:00
mga_drm.h
msm_drm.h	drm/msm: add uapi to get/set debug name	2018-12-11 13:07:05 -05:00
nouveau_drm.h	drm/nouveau/svm: new ioctl to migrate process memory to GPU memory	2019-02-20 09:00:03 +10:00
omap_drm.h
qxl_drm.h
r128_drm.h
radeon_drm.h
savage_drm.h
sis_drm.h
tegra_drm.h
v3d_drm.h	drm/v3d: Document cache flushing ABI.	2018-12-07 10:55:48 -08:00
vc4_drm.h
vgem_drm.h
via_drm.h
virtgpu_drm.h	drm/virtio: add in/out fence support for explicit synchronization	2018-11-14 14:21:02 +01:00
vmwgfx_drm.h	drm/vmwgfx: Expose SM4_1 param to user space	2018-07-06 20:16:09 +02:00