linux-next: manual merge of the drm-msm tree with the drm tree

linux-next: manual merge of the drm-msm tree with the drm tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 790 bytes --]

Hi Rob,

Today's linux-next merge of the drm-msm tree got a conflict in:

  drivers/gpu/drm/msm/dsi/dsi_manager.c

between commit:

  97e14fbeb53f ("drm: drop _mode_ from remaining connector functions")

from the drm tree and commit:

  b6a221993e7c ("drm/msm/dsi: Use one connector for dual DSI mode")

from the drm-msm tree.

I fixed it up (the latter removed code modified by the former) 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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the drm-msm tree with the drm tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 768 bytes --]

Hi all,

Today's linux-next merge of the drm-msm tree got conflicts in:

  drivers/gpu/drm/msm/edp/edp.h
  drivers/gpu/drm/msm/edp/edp_ctrl.c

between commit:

  da68386d9edb ("drm: Rename dp/ to display/")

from the drm tree and commit:

  f1fc2b87de47 ("drm/msm: drop old eDP block support (again)")

from the drm-msm tree.

I fixed it up (I just removed the files) 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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the drm-msm tree with the drm tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1219 bytes --]

Hi all,

Today's linux-next merge of the drm-msm tree got a conflict in:

  drivers/gpu/drm/msm/Kconfig

between commit:

  1e0f66420b13 ("drm/display: Introduce a DRM display-helper module")

from the drm tree and commit:

  f5d01644921b ("drm/msm: select DRM_DP_AUX_BUS for the AUX bus support")

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/Kconfig
index 864fdc20afef,a6110fc67ac4..000000000000
--- a/drivers/gpu/drm/msm/Kconfig
+++ b/drivers/gpu/drm/msm/Kconfig
@@@ -12,8 -12,8 +12,9 @@@ config DRM_MS
  	select IOMMU_IO_PGTABLE
  	select QCOM_MDT_LOADER if ARCH_QCOM
  	select REGULATOR
+ 	select DRM_DP_AUX_BUS
 -	select DRM_DP_HELPER
 +	select DRM_DISPLAY_DP_HELPER
 +	select DRM_DISPLAY_HELPER
  	select DRM_KMS_HELPER
  	select DRM_PANEL
  	select DRM_BRIDGE

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the drm-msm tree with the drm tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1100 bytes --]

Hi all,

Today's linux-next merge of the drm-msm tree got a conflict in:

  drivers/gpu/drm/msm/msm_gem_submit.c

between commit:

  0e10e9a1db23 ("drm/sched: drop entity parameter from drm_sched_push_job")

from the drm tree and commit:

  68002469e571 ("drm/msm: One sched entity per process per priority")

from the drm-msm tree.

The conflict was this:

        /* The scheduler owns a ref now: */
        msm_gem_submit_get(submit);

<<<<<<< HEAD
        drm_sched_entity_push_job(&submit->base);
======= 
        drm_sched_entity_push_job(&submit->base, queue->entity);
>>>>>>> drm-msm/msm-next

        args->fence = submit->fence_id;

I fixed it up (I just used the HEAD version) 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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the drm-msm tree with the drm tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1706 bytes --]

Hi all,

Today's linux-next merge of the drm-msm tree got a conflict in:

  drivers/gpu/drm/msm/msm_drv.h

between commit:

  3c9edd9c85f5 ("drm/msm: Introduce GEM object funcs")

from the drm tree and commit:

  8f642378bfe5 ("drm/msm/gem: Move prototypes to msm_gem.h")

from the drm-msm tree.

I fixed it up (I used the former version of this flie and added the
following fix 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 <sfr@canb.auug.org.au>
Date: Thu, 5 Nov 2020 12:10:23 +1100
Subject: [PATCH] drm/msm/gem: fix up for "drm/msm: Introduce GEM object funcs"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/gpu/drm/msm/msm_gem.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/gpu/drm/msm/msm_gem.h b/drivers/gpu/drm/msm/msm_gem.h
index d79e7019cc88..9c422af6dd49 100644
--- a/drivers/gpu/drm/msm/msm_gem.h
+++ b/drivers/gpu/drm/msm/msm_gem.h
@@ -94,7 +94,6 @@ struct msm_gem_object {
 int msm_gem_mmap_obj(struct drm_gem_object *obj,
 			struct vm_area_struct *vma);
 int msm_gem_mmap(struct file *filp, struct vm_area_struct *vma);
-vm_fault_t msm_gem_fault(struct vm_fault *vmf);
 uint64_t msm_gem_mmap_offset(struct drm_gem_object *obj);
 int msm_gem_get_iova(struct drm_gem_object *obj,
 		struct msm_gem_address_space *aspace, uint64_t *iova);
-- 
2.28.0

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the drm-msm tree with the drm tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1574 bytes --]

Hi all,

Today's linux-next merge of the drm-msm tree got a conflict in:

  include/drm/drm_crtc.h

between commit:

  5c759eda9b04 ("drm: Introduce plane and CRTC scaling filter properties")

from the drm tree and commit:

  cb21f3f882ad ("drm/msm/atomic: Drop per-CRTC locks in reverse order")

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 include/drm/drm_crtc.h
index ba839e5e357d,cd42f79b2890..000000000000
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@@ -1279,7 -1266,14 +1279,17 @@@ static inline struct drm_crtc *drm_crtc
  #define drm_for_each_crtc(crtc, dev) \
  	list_for_each_entry(crtc, &(dev)->mode_config.crtc_list, head)
  
+ /**
+  * drm_for_each_crtc_reverse - iterate over all CRTCs in reverse order
+  * @crtc: a &struct drm_crtc as the loop cursor
+  * @dev: the &struct drm_device
+  *
+  * Iterate over all CRTCs of @dev.
+  */
+ #define drm_for_each_crtc_reverse(crtc, dev) \
+ 	list_for_each_entry_reverse(crtc, &(dev)->mode_config.crtc_list, head)
+ 
 +int drm_crtc_create_scaling_filter_property(struct drm_crtc *crtc,
 +					    unsigned int supported_filters);
 +
  #endif /* __DRM_CRTC_H__ */

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the drm-msm tree with the drm tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1409 bytes --]

Hi all,

Today's linux-next merge of the drm-msm tree got a conflict in:

  drivers/gpu/drm/msm/msm_iommu.c

between commit:

  7690a33f22ab ("drm: msm: fix common struct sg_table related issues")

from the drm tree and commit:

  e3c64c7221f6 ("drm/msm: Set the global virtual address range from the IOMMU domain")

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/msm_iommu.c
index 6c31e65834c6,697cc0a059d6..000000000000
--- a/drivers/gpu/drm/msm/msm_iommu.c
+++ b/drivers/gpu/drm/msm/msm_iommu.c
@@@ -36,7 -231,11 +231,11 @@@ static int msm_iommu_map(struct msm_mm
  	struct msm_iommu *iommu = to_msm_iommu(mmu);
  	size_t ret;
  
+ 	/* The arm-smmu driver expects the addresses to be sign extended */
+ 	if (iova & BIT_ULL(48))
+ 		iova |= GENMASK_ULL(63, 49);
+ 
 -	ret = iommu_map_sg(iommu->domain, iova, sgt->sgl, sgt->nents, prot);
 +	ret = iommu_map_sgtable(iommu->domain, iova, sgt, prot);
  	WARN_ON(!ret);
  
  	return (ret == len) ? 0 : -EINVAL;

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the drm-msm tree with the drm tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1947 bytes --]

Hi all,

Today's linux-next merge of the drm-msm tree got a conflict in:

  drivers/gpu/drm/msm/msm_gem.c

between commit:

  7690a33f22ab ("drm: msm: fix common struct sg_table related issues")

from the drm tree and commit:

  e1bf29e022fb ("drm/msm: drop cache sync hack")

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/msm_gem.c
index e47958c3704a,3cb7aeb93fd3..000000000000
--- a/drivers/gpu/drm/msm/msm_gem.c
+++ b/drivers/gpu/drm/msm/msm_gem.c
@@@ -52,23 -52,16 +52,14 @@@ static void sync_for_device(struct msm_
  {
  	struct device *dev = msm_obj->base.dev->dev;
  
- 	if (get_dma_ops(dev) && IS_ENABLED(CONFIG_ARM64)) {
- 		dma_sync_sgtable_for_device(dev, msm_obj->sgt,
- 					    DMA_BIDIRECTIONAL);
- 	} else {
- 		dma_map_sgtable(dev, msm_obj->sgt, DMA_BIDIRECTIONAL, 0);
- 	}
 -	dma_map_sg(dev, msm_obj->sgt->sgl,
 -		msm_obj->sgt->nents, DMA_BIDIRECTIONAL);
++	dma_map_sgtable(dev, msm_obj->sgt, DMA_BIDIRECTIONAL, 0);
  }
  
  static void sync_for_cpu(struct msm_gem_object *msm_obj)
  {
  	struct device *dev = msm_obj->base.dev->dev;
  
- 	if (get_dma_ops(dev) && IS_ENABLED(CONFIG_ARM64)) {
- 		dma_sync_sgtable_for_cpu(dev, msm_obj->sgt, DMA_BIDIRECTIONAL);
- 	} else {
- 		dma_unmap_sgtable(dev, msm_obj->sgt, DMA_BIDIRECTIONAL, 0);
- 	}
 -	dma_unmap_sg(dev, msm_obj->sgt->sgl,
 -		msm_obj->sgt->nents, DMA_BIDIRECTIONAL);
++	dma_unmap_sgtable(dev, msm_obj->sgt, DMA_BIDIRECTIONAL, 0);
  }
  
  /* allocate pages from VRAM carveout, used when no IOMMU: */

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the drm-msm tree with the drm tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 827 bytes --]

Hi all,

Today's linux-next merge of the drm-msm tree got conflicts in:

  drivers/gpu/drm/msm/edp/edp.c
  drivers/gpu/drm/msm/hdmi/hdmi.c

between commit:

  a25b988ff83f ("drm/bridge: Extend bridge API to disable connector creation")

from the drm tree and commit:

  c479017faa3a ("drm/msm: avoid double-attaching hdmi/edp bridges")

from the drm-msm tree.

I fixed it up (the latter removed the code updated by the former) 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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the drm-msm tree with the drm tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1251 bytes --]

Hi all,

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"

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the drm-msm tree with the drm tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1902 bytes --]

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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the drm-msm tree with the drm tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 872 bytes --]

Hi all,

Today's linux-next merge of the drm-msm tree got a conflict in:

  drivers/gpu/drm/msm/adreno/a5xx_gpu.c

between commit:

  c97ea6a61b5e ("drm: msm: adreno: Use PTR_ERR_OR_ZERO rather than if(IS_ERR(...)) +PTR_ERR")

from the drm tree and commits:

  dadb36b7ec42 ("drm/msm: Add a common function to free kernel buffer objects")
  7799a98edd80 ("drm/msm: Add a name field for gem objects")

from the drm-msm tree.

I fixed it up (I just used the latter version) 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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the drm-msm tree with the drm tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the drm-msm tree got a conflict in:

  drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c

between commits:

  0b20a0f8c3cb ("drm: Add old state pointer to CRTC .enable() helper function")
  64581714b58b ("drm: Convert atomic drivers from CRTC .disable() to .atomic_disable()")

from the drm tree and commit:

  710e7a448783 ("drm/msm/mdp5: Don't use mode_set helper funcs for encoders and CRTCs")

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/mdp/mdp5/mdp5_crtc.c
index 4322a502555a,aefe6d2cfa94..000000000000
--- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c
+++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c
@@@ -940,7 -954,8 +956,6 @@@ static const struct drm_crtc_funcs mdp5
  };
  
  static const struct drm_crtc_helper_funcs mdp5_crtc_helper_funcs = {
- 	.mode_set_nofb = mdp5_crtc_mode_set_nofb,
 -	.disable = mdp5_crtc_disable,
 -	.enable = mdp5_crtc_enable,
  	.atomic_check = mdp5_crtc_atomic_check,
  	.atomic_begin = mdp5_crtc_atomic_begin,
  	.atomic_flush = mdp5_crtc_atomic_flush,