From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
To: Sean Paul <sean@poorly.run>
Cc: Maxime Ripard <maxime.ripard@bootlin.com>,
intel-gfx@lists.freedesktop.org, Dave Airlie <airlied@linux.ie>,
malidp@foss.arm.com, dri-devel@lists.freedesktop.org,
Ayan Kumar Halder <ayan.halder@arm.com>
Subject: Re: [PATCH] drm/fourcc: Fix conflicting Y41x definitions
Date: Thu, 21 Mar 2019 10:14:07 +0100 [thread overview]
Message-ID: <88d80752-ea8e-d079-dc57-24a0dc0a65bd@linux.intel.com> (raw)
In-Reply-To: <20190320182207.GL114153@art_vandelay>
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@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@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@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@linux.intel.com>
> Please fixup the commit message oops that ajax pointed out. With that,
>
> Acked-by: Sean Paul <sean@poorly.run>
Thanks, pushed to drm-misc-next. :)
~Maarten
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
prev parent reply other threads:[~2019-03-21 9:14 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-19 12:17 [PATCH] drm/fourcc: Fix conflicting Y41x definitions Maarten Lankhorst
2019-03-19 12:40 ` ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
2019-03-19 13:02 ` [PATCH] " Ville Syrjälä
2019-03-19 16:06 ` Maarten Lankhorst
2019-03-19 16:18 ` Ville Syrjälä
2019-03-20 10:28 ` Maarten Lankhorst
2019-03-19 13:09 ` ✓ Fi.CI.BAT: success for " Patchwork
2019-03-19 13:58 ` [PATCH] " Ayan Halder
2019-03-19 20:12 ` ✗ Fi.CI.IGT: failure for " Patchwork
2019-03-20 15:48 ` [PATCH] " Adam Jackson
2019-03-20 16:00 ` Maarten Lankhorst
[not found] ` <20190320182207.GL114153@art_vandelay>
2019-03-21 9:14 ` Maarten Lankhorst [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=88d80752-ea8e-d079-dc57-24a0dc0a65bd@linux.intel.com \
--to=maarten.lankhorst@linux.intel.com \
--cc=airlied@linux.ie \
--cc=ayan.halder@arm.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=malidp@foss.arm.com \
--cc=maxime.ripard@bootlin.com \
--cc=sean@poorly.run \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.