[Intel-gfx] [PATCH] drm/fourcc: Fix conflicting Y41x definitions

[Maarten Lankhorst]

Op 20-03-2019 om 19:22 schreef Sean Paul:
> On Tue, Mar 19, 2019 at 01:17:02PM +0100, Maarten Lankhorst wrote:
>> There has unfortunately been a conflict with the following 3 commits:
>>
>> commit e9961ab95af81b8d29054361cd5f0c575102cf87
>> Author: Ayan Kumar Halder <ayan.halder at arm.com>
>> Date:   Fri Nov 9 17:21:12 2018 +0000
>>     drm: Added a new format DRM_FORMAT_XVYU2101010
>>
>> commit 7ba0fee247ee7a36b3bfbed68f6988d980aa3aa3
>> Author: Brian Starkey <brian.starkey at arm.com>
>> Date:   Fri Oct 5 10:27:00 2018 +0100
>>
>>     drm/fourcc: Add AFBC yuv fourccs for Mali
>>
>> and
>>
>> commit 50bf5d7d595fd0705ef3785f80e679b6da501e5b
>> Author: Swati Sharma <swati2.sharma at 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
>>
>> 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 at linux.intel.com>
> Please fixup the commit message oops that ajax pointed out. With that,
>
> Acked-by: Sean Paul <sean at poorly.run>

Thanks, pushed to drm-misc-next. :)

~Maarten