linux-next: manual merge of the amdgpu tree with the drm-fixes tree

linux-next: manual merge of the amdgpu tree with the drm-fixes tree

[Mark Brown]

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

Hi all,

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

  drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c

between commit:

  64ac7c09fc449 ("drm/amdgpu: add upper bound check on user inputs in wait ioctl")

from the drm-fixes tree and commits:

  fcec012c66424 ("drm/amdgpu: add upper bound check on user inputs in wait ioctl")
  4ca06f6fb45da ("drm/amdgpu/userq: Use drm_gem_objects_lookup in amdgpu_userq_signal_ioctl")
  2de9353e193fd ("drm/amdgpu/userq: Use drm_gem_objects_lookup in amdgpu_userq_wait_ioctl")

from the amdgpu 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/amd/amdgpu/amdgpu_userq_fence.c
index 7e9cf1868cc9f,844c2db35e4a1..0000000000000
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c

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

linux-next: manual merge of the amdgpu tree with the drm-fixes tree

[Mark Brown]

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

Hi all,

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

  drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c

between commit:

  40396ffdf6120 ("drm/amdgpu: restart the CS if some parts of the VM are still invalidated")

from the drm-fixes tree and commit:

  59720bfd8c6db ("drm/amdgpu: restart the CS if some parts of the VM are still invalidated")

from the amdgpu 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 --combined drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index 548a4f14a9f81,fc071efd4c255..0000000000000
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@@ -60,11 -60,6 +60,6 @@@ static int amdgpu_cs_parser_init(struc
  	if (!p->ctx)
  		return -EINVAL;
  
- 	if (atomic_read(&p->ctx->guilty)) {
- 		amdgpu_ctx_put(p->ctx);
- 		return -ECANCELED;
- 	}
- 
  	amdgpu_sync_create(&p->sync);
  	drm_exec_init(&p->exec, DRM_EXEC_INTERRUPTIBLE_WAIT |
  		      DRM_EXEC_IGNORE_DUPLICATES, 0);
@@@ -850,6 -845,7 +845,6 @@@ static int amdgpu_cs_parser_bos(struct 
  	struct amdgpu_vm *vm = &fpriv->vm;
  	struct amdgpu_bo_list_entry *e;
  	struct drm_gem_object *obj;
 -	unsigned long index;
  	unsigned int i;
  	int r;
  
@@@ -960,7 -956,7 +955,7 @@@
  		goto out_free_user_pages;
  	}
  
 -	drm_exec_for_each_locked_object(&p->exec, index, obj) {
 +	drm_exec_for_each_locked_object(&p->exec, obj) {
  		r = amdgpu_cs_bo_validate(p, gem_to_amdgpu_bo(obj));
  		if (unlikely(r))
  			goto out_free_user_pages;
@@@ -1157,7 -1153,7 +1152,7 @@@ static int amdgpu_cs_vm_handling(struc
  			return r;
  	}
  
 -	r = amdgpu_vm_handle_moved(adev, vm, &p->exec.ticket);
 +	r = amdgpu_vm_handle_moved(adev, vm, drm_exec_ticket(&p->exec));
  	if (r)
  		return r;
  
@@@ -1200,6 -1196,7 +1195,6 @@@ static int amdgpu_cs_sync_rings(struct 
  	struct drm_gpu_scheduler *sched;
  	struct drm_gem_object *obj;
  	struct dma_fence *fence;
 -	unsigned long index;
  	unsigned int i;
  	int r;
  
@@@ -1210,7 -1207,7 +1205,7 @@@
  		return r;
  	}
  
 -	drm_exec_for_each_locked_object(&p->exec, index, obj) {
 +	drm_exec_for_each_locked_object(&p->exec, obj) {
  		struct amdgpu_bo *bo = gem_to_amdgpu_bo(obj);
  
  		struct dma_resv *resv = bo->tbo.base.resv;
@@@ -1280,6 -1277,7 +1275,6 @@@ static int amdgpu_cs_submit(struct amdg
  	struct amdgpu_vm *vm = &fpriv->vm;
  	struct amdgpu_bo_list_entry *e;
  	struct drm_gem_object *gobj;
 -	unsigned long index;
  	unsigned int i;
  	uint64_t seq;
  	int r;
@@@ -1323,14 -1321,14 +1318,14 @@@
  		e->range = NULL;
  	}
  
- 	if (r || !list_empty(&vm->invalidated)) {
+ 	if (r || !list_empty(&vm->individual.moved)) {
  		r = -EAGAIN;
  		mutex_unlock(&p->adev->notifier_lock);
  		return r;
  	}
  
  	p->fence = dma_fence_get(&leader->base.s_fence->finished);
 -	drm_exec_for_each_locked_object(&p->exec, index, gobj) {
 +	drm_exec_for_each_locked_object(&p->exec, gobj) {
  
  		ttm_bo_move_to_lru_tail_unlocked(&gem_to_amdgpu_bo(gobj)->tbo);
  
@@@ -1361,7 -1359,7 +1356,7 @@@
  	cs->out.handle = seq;
  	leader->uf_sequence = seq;
  
 -	amdgpu_vm_bo_trace_cs(&fpriv->vm, &p->exec.ticket);
 +	amdgpu_vm_bo_trace_cs(&fpriv->vm, drm_exec_ticket(&p->exec));
  	for (i = 0; i < p->gang_size; ++i) {
  		amdgpu_job_free_resources(p->jobs[i]);
  		trace_amdgpu_cs_ioctl(p->jobs[i]);
@@@ -1796,7 -1794,7 +1791,7 @@@ int amdgpu_cs_find_mapping(struct amdgp
  	*map = mapping;
  
  	/* Double check that the BO is reserved by this CS */
 -	if (dma_resv_locking_ctx((*bo)->tbo.base.resv) != &parser->exec.ticket)
 +	if (dma_resv_locking_ctx((*bo)->tbo.base.resv) != drm_exec_ticket(&parser->exec))
  		return -EINVAL;
  
  	/* Make sure VRAM is allocated contigiously */

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

linux-next: manual merge of the amdgpu tree with the drm-fixes tree

[Mark Brown]

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

Hi all,

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

  drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c

between commits:

  65b5c326ce410 ("drm/amdgpu/userq: refcount userqueues to avoid any race conditions")
  64ac7c09fc449 ("drm/amdgpu: add upper bound check on user inputs in wait ioctl")

from the drm-fixes tree and commits:

  750cbc4fbd490 ("drm/amdgpu: Drop redundant syncobj handle limit checks in userq ioctls")
  4952189b284d4 ("drm/amdgpu/userq: refcount userqueues to avoid any race conditions")

from the amdgpu 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/amd/amdgpu/amdgpu_userq_fence.c
index 5239b06b9ab03,d8ce7b3733e75..0000000000000
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c

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

linux-next: manual merge of the amdgpu tree with the drm-fixes tree

[Stephen Rothwell]

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

Hi all,

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

  drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c

between commit:

  6be50f5d83ad ("drm/amd/display: Fix ASSR regression on embedded panels")

from the drm-fixes tree and commit:

  fb85f280bf40 ("drm/amd/display: Re-enable "Guard ASSR with internal display flag"")

from the amdgpu 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/amd/display/dc/core/dc_link_dp.c
index 9fb8c46dc606,036a87af6c5b..000000000000
--- a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
@@@ -1761,6 -1752,38 +1752,36 @@@ enum link_training_result dc_link_dp_pe
  	return status;
  }
  
+ static enum dp_panel_mode try_enable_assr(struct dc_stream_state *stream)
+ {
+ 	struct dc_link *link = stream->link;
+ 	enum dp_panel_mode panel_mode = dp_get_panel_mode(link);
+ #ifdef CONFIG_DRM_AMD_DC_HDCP
+ 	struct cp_psp *cp_psp = &stream->ctx->cp_psp;
+ #endif
+ 
+ 	/* ASSR must be supported on the panel */
+ 	if (panel_mode == DP_PANEL_MODE_DEFAULT)
+ 		return panel_mode;
+ 
+ 	/* eDP or internal DP only */
+ 	if (link->connector_signal != SIGNAL_TYPE_EDP &&
+ 		!(link->connector_signal == SIGNAL_TYPE_DISPLAY_PORT &&
+ 		 link->is_internal_display))
+ 		return DP_PANEL_MODE_DEFAULT;
+ 
+ #ifdef CONFIG_DRM_AMD_DC_HDCP
+ 	if (cp_psp && cp_psp->funcs.enable_assr) {
+ 		if (!cp_psp->funcs.enable_assr(cp_psp->handle, link)) {
+ 			/* since eDP implies ASSR on, change panel
+ 			 * mode to disable ASSR
+ 			 */
+ 			panel_mode = DP_PANEL_MODE_DEFAULT;
+ 		}
 -	} else
 -		panel_mode = DP_PANEL_MODE_DEFAULT;
+ #endif
+ 	return panel_mode;
+ }
+ 
  bool perform_link_training_with_retries(
  	const struct dc_link_settings *link_setting,
  	bool skip_video_pattern,

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

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

[Stephen Rothwell]

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

Hi all,

On Fri, 23 Jul 2021 12:58:07 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>

> + #ifdef CONFIG_DRM_AMD_DC_HDCP
> + 	if (cp_psp && cp_psp->funcs.enable_assr) {
> + 		if (!cp_psp->funcs.enable_assr(cp_psp->handle, link)) {
> + 			/* since eDP implies ASSR on, change panel
> + 			 * mode to disable ASSR
> + 			 */
> + 			panel_mode = DP_PANEL_MODE_DEFAULT;
> + 		}
>  -	} else
>  -		panel_mode = DP_PANEL_MODE_DEFAULT;
> + #endif

I corrected that to put back just the closing '}'.

-- 
Cheers,
Stephen Rothwell

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