Hi Am 14.05.21 um 03:53 schrieb Stephen Rothwell: > Hi all, > > On Fri, 30 Apr 2021 08:23:21 +1000 Stephen Rothwell wrote: >> >> On Thu, 18 Mar 2021 12:52:41 +1100 Stephen Rothwell wrote: >>> >>> On Wed, 17 Mar 2021 14:08:24 +1100 Stephen Rothwell wrote: >>>> >>>> Today's linux-next merge of the drm-intel tree got a conflict in: >>>> >>>> drivers/gpu/drm/i915/display/intel_sprite.c >>>> >>>> between commit: >>>> >>>> 92f1d09ca4ed ("drm: Switch to %p4cc format modifier") >>>> >>>> from the drm tree and commit: >>>> >>>> 46d12f911821 ("drm/i915: migrate skl planes code new file (v5)") >>>> >>>> from the drm-intel tree. >>>> >>>> I fixed it up (I used the latter version of the file and applied the >>>> following patch) and can carry the fix as necessary. This is now fixed >>>> as far as linux-next is concerned, but any non trivial conflicts should >>>> be mentioned to your upstream maintainer when your tree is submitted for >>>> merging. You may also want to consider cooperating with the maintainer >>>> of the conflicting tree to minimise any particularly complex conflicts. >>>> >>>> From: Stephen Rothwell >>>> Date: Wed, 17 Mar 2021 14:05:42 +1100 >>>> Subject: [PATCH] merge fix for "drm: Switch to %p4cc format modifier" >>>> >>>> Signed-off-by: Stephen Rothwell >>>> --- >>>> drivers/gpu/drm/i915/display/skl_universal_plane.c | 6 ++---- >>>> 1 file changed, 2 insertions(+), 4 deletions(-) >>>> >>>> diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c >>>> index 1f335cb09149..45ceff436bf7 100644 >>>> --- a/drivers/gpu/drm/i915/display/skl_universal_plane.c >>>> +++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c >>>> @@ -1120,7 +1120,6 @@ static int skl_plane_check_fb(const struct intel_crtc_state *crtc_state, >>>> struct drm_i915_private *dev_priv = to_i915(plane->base.dev); >>>> const struct drm_framebuffer *fb = plane_state->hw.fb; >>>> unsigned int rotation = plane_state->hw.rotation; >>>> - struct drm_format_name_buf format_name; >>>> >>>> if (!fb) >>>> return 0; >>>> @@ -1168,9 +1167,8 @@ static int skl_plane_check_fb(const struct intel_crtc_state *crtc_state, >>>> case DRM_FORMAT_XVYU12_16161616: >>>> case DRM_FORMAT_XVYU16161616: >>>> drm_dbg_kms(&dev_priv->drm, >>>> - "Unsupported pixel format %s for 90/270!\n", >>>> - drm_get_format_name(fb->format->format, >>>> - &format_name)); >>>> + "Unsupported pixel format %p4cc for 90/270!\n", >>>> + &fb->format->format); >>>> return -EINVAL; >>>> default: >>>> break; >>>> -- >>>> 2.30.0 >>> >>> The above fix up patch now needs to be applied to the drm tree. >> >> I am still applying the above patch, but it applies to Linus' tree now. > > I am going to stop applying this. You guys can apply it if you want to > some time. > Sorry, this got lost several times. I've applied your patch to drm-misc-next now. Thanks a lot. Best regards Thomas -- Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Maxfeldstr. 5, 90409 Nürnberg, Germany (HRB 36809, AG Nürnberg) Geschäftsführer: Felix Imendörffer