lkml.org 
[lkml]   [2019]   [Aug]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the drm-msm tree with the drm tree
Hi all,

On Wed, 14 Aug 2019 12:58:59 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the drm-msm tree got a conflict in:
>
> drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
>
> between commit:
>
> e78ad7654179 ("drm/msm: Use drm_gem_fb_prepare_fb")
>
> from the drm tree and commit:
>
> ddc73f32ba95 ("drm/msm: drop use of drmP.h")
>
> from the drm-msm tree.
>
> I fixed it up (see below) 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.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
> index 8cf0b8a4ed03,cd6e9bb1fedf..000000000000
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
> @@@ -10,9 -21,9 +10,10 @@@
> #include <linux/debugfs.h>
> #include <linux/dma-buf.h>
>
> - #include <drm/drm_damage_helper.h>
> #include <drm/drm_atomic_uapi.h>
> +#include <drm/drm_gem_framebuffer_helper.h>
> + #include <drm/drm_damage_helper.h>
> + #include <drm/drm_file.h>
>
> #include "msm_drv.h"
> #include "dpu_kms.h"

Also in file

drivers/gpu/drm/msm/msm_atomic.c

with resolution:

diff --cc drivers/gpu/drm/msm/msm_atomic.c
index 169d5f915e68,20387be1b810..000000000000
--- a/drivers/gpu/drm/msm/msm_atomic.c
+++ b/drivers/gpu/drm/msm/msm_atomic.c
@@@ -5,7 -4,19 +5,8 @@@
*/

#include <drm/drm_atomic_uapi.h>
+#include <drm/drm_gem_framebuffer_helper.h>
+ #include <drm/drm_vblank.h>

#include "msm_drv.h"
#include "msm_gem.h"

--
Cheers,
Stephen Rothwell
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2019-08-14 05:02    [W:0.026 / U:0.432 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site