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

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

[Stephen Rothwell]

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

Hi all,

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

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

between commit:

  df561f6688fe ("treewide: Use fallthrough pseudo-keyword")

from Linus' tree and commit:

  2fb7487aaf71 ("drm/msm: Get rid of the REG_ADRENO offsets")

from the drm-msm tree.

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

[Stephen Rothwell]

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

Hi all,

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

  drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c

between commit:

  c228cb343a6d ("drm/msm/mdp5: Remove redundant zpos initialisation")

from Linus' tree and commit:

  047ae6655777 ("drm/msm/mdp5: check the return of kzalloc()")

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/mdp5/mdp5_plane.c
index 1ee824600995,85ef10b888e9..000000000000
--- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c
+++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c
@@@ -98,7 -91,17 +98,11 @@@ static void mdp5_plane_reset(struct drm
  		__drm_atomic_helper_plane_destroy_state(plane->state);
  
  	kfree(to_mdp5_plane_state(plane->state));
+ 	plane->state = NULL;
  	mdp5_state = kzalloc(sizeof(*mdp5_state), GFP_KERNEL);
+ 	if (!mdp5_state)
+ 		return;
+ 
 -	if (plane->type == DRM_PLANE_TYPE_PRIMARY)
 -		mdp5_state->base.zpos = STAGE_BASE;
 -	else
 -		mdp5_state->base.zpos = STAGE0 + drm_plane_index(plane);
 -	mdp5_state->base.normalized_zpos = mdp5_state->base.zpos;
 -
  	__drm_atomic_helper_plane_reset(plane, &mdp5_state->base);
  }
  

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

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

[Stephen Rothwell]

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

Hi all,

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

  drivers/gpu/drm/msm/dp/dp_display.c

between commit:

  afc9b8b6bab8 ("drm/msm/dp: signal audio plugged change at dp_pm_resume")

from Linus' tree and commit:

  26ae419cd9ec ("drm/msm/dp: add drm debug logs to dp_pm_resume/suspend")

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/dp/dp_display.c
index 867388a399ad,419fd4a14cbf..000000000000
--- a/drivers/gpu/drm/msm/dp/dp_display.c
+++ b/drivers/gpu/drm/msm/dp/dp_display.c
@@@ -1312,10 -1314,10 +1315,14 @@@ static int dp_pm_resume(struct device *
  	else
  		dp->dp_display.is_connected = false;
  
 +	dp_display_handle_plugged_change(g_dp_display,
 +				dp->dp_display.is_connected);
 +
 +
+ 	DRM_DEBUG_DP("After, sink_count=%d is_connected=%d core_inited=%d power_on=%d\n",
+ 			dp->link->sink_count, dp->dp_display.is_connected,
+ 			dp->core_initialized, dp_display->power_on);
+ 
  	mutex_unlock(&dp->event_mutex);
  
  	return 0;

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

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

[Mark Brown]

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

Hi Rob,

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

  drivers/gpu/drm/msm/msm_gem_submit.c

between commit:

  06451a3d1d7771 ("drm/msm: fix _NO_IMPLICIT fencing case")

from Linus' tree and commit:

  642e5ef8c6c496 ("drm/msm: fix _NO_IMPLICIT fencing case")

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.

(null diff)

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

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

[Mark Brown]

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

Hi Rob,

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

  drivers/gpu/drm/msm/msm_gpu.c

between commit:

  6bd6ae2dfc7e09 ("drm/msm: fix error path cleanup")

from Linus' tree and commit:

  0502a625c2ee0c ("drm/msm: fix error path cleanup")

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.

diff --cc drivers/gpu/drm/msm/msm_gpu.c
index 6a887032c66a,fac688bdddb1..000000000000
--- a/drivers/gpu/drm/msm/msm_gpu.c
+++ b/drivers/gpu/drm/msm/msm_gpu.c
@@@ -713,12 -795,17 +795,11 @@@ void msm_gpu_cleanup(struct msm_gpu *gp
  
  	bs_fini(gpu);
  
- 	if (gpu->rb) {
- 		if (gpu->rb_iova)
- 			msm_gem_put_iova(gpu->rb->bo, gpu->aspace);
- 		msm_ringbuffer_destroy(gpu->rb);
+ 	for (i = 0; i < ARRAY_SIZE(gpu->rb); i++) {
+ 		msm_ringbuffer_destroy(gpu->rb[i]);
+ 		gpu->rb[i] = NULL;
  	}
  
 -	if (gpu->memptrs_bo) {
 -		msm_gem_put_vaddr(gpu->memptrs_bo);
 -		msm_gem_put_iova(gpu->memptrs_bo, gpu->aspace);
 -		drm_gem_object_unreference_unlocked(gpu->memptrs_bo);
 -	}
 -
  	if (!IS_ERR_OR_NULL(gpu->aspace)) {
  		gpu->aspace->mmu->funcs->detach(gpu->aspace->mmu,
  			NULL, 0);

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

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

[Stephen Rothwell]

Hi Rob,

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

  drivers/gpu/drm/msm/msm_gem_submit.c

between commit:

  d78d383ab354 ("drm/msm: protect against faults from copy_from_user() in submit ioctl")

from Linus' tree and commits:

  4cd0945901a6 ("drm/msm: submit support for out-fences")

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_submit.c
index 880d6a9af7c8,3ac14cd1e5b9..000000000000
--- a/drivers/gpu/drm/msm/msm_gem_submit.c
+++ b/drivers/gpu/drm/msm/msm_gem_submit.c
@@@ -394,8 -385,14 +402,16 @@@ int msm_ioctl_gem_submit(struct drm_dev
  	if (ret)
  		return ret;
  
 +	priv->struct_mutex_task = current;
 +
+ 	if (args->flags & MSM_SUBMIT_FENCE_FD_OUT) {
+ 		out_fence_fd = get_unused_fd_flags(O_CLOEXEC);
+ 		if (out_fence_fd < 0) {
+ 			ret = out_fence_fd;
+ 			goto out_unlock;
+ 		}
+ 	}
+ 
  	submit = submit_create(dev, gpu, args->nr_bos, args->nr_cmds);
  	if (!submit) {
  		ret = -ENOMEM;
@@@ -487,7 -529,8 +548,9 @@@ out
  	if (ret)
  		msm_gem_submit_free(submit);
  out_unlock:
+ 	if (ret && (out_fence_fd >= 0))
+ 		put_unused_fd(out_fence_fd);
 +	priv->struct_mutex_task = NULL;
  	mutex_unlock(&dev->struct_mutex);
  	return ret;
  }