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

[Mark Brown]

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: signature.asc
Description: PGP signature