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

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

[Stephen Rothwell]

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

Hi all,

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

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

between commit:

  5e791166d377 ("drm/ttm: nuke invalidate_caches callback")

from the drm tree and commit:

  58e6933fa53e ("drm/amdgpu/ttm: move debugfs init into core amdgpu debugfs")

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/amdgpu/amdgpu_ttm.c
index 3ab46d4647e4,660867cf2597..000000000000
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@@ -66,9 -68,11 +68,6 @@@ static int amdgpu_map_buffer(struct ttm
  			     struct amdgpu_ring *ring,
  			     uint64_t *addr);
  
- static int amdgpu_ttm_debugfs_init(struct amdgpu_device *adev);
- static void amdgpu_ttm_debugfs_fini(struct amdgpu_device *adev);
 -static int amdgpu_invalidate_caches(struct ttm_bo_device *bdev, uint32_t flags)
 -{
 -	return 0;
 -}
--
  /**
   * amdgpu_init_mem_type - Initialize a memory manager for a specific type of
   * memory request.

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

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

[Stephen Rothwell]

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

Hi all,

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

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

between commit:

  8a206685d36f ("drm/amdgpu: use drm_exec for GEM and CSA handling v2")

from the drm tree and commit:

  30953c4d000b ("drm/amdgpu: Fix style issues in amdgpu_gem.c")

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/amdgpu/amdgpu_gem.c
index 7da871972a8e,992dfd3de49c..000000000000
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
@@@ -226,9 -229,6 +225,9 @@@ static void amdgpu_gem_object_close(str
  		goto out_unlock;
  
  	r = amdgpu_vm_clear_freed(adev, vm, &fence);
 +	if (unlikely(r < 0))
- 		dev_err(adev->dev, "failed to clear page "
- 			"tables on GEM object close (%ld)\n", r);
++		dev_err(adev->dev, "failed to clear page tables on GEM object close (%ld)\n",
++			r);
  	if (r || !fence)
  		goto out_unlock;
  

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

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

[Stephen Rothwell]

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

Hi all,

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

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

between commits:

  1b2d5eda5ad7 ("drm/amdgpu: move explicit sync check into the CS")
  1728baa7e4e6 ("drm/amdgpu: use scheduler dependencies for CS")

from the drm tree and commit:

  a61bf2f7299a ("drm/amdgpu: fix use-after-free during gpu recovery")

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/amdgpu/amdgpu_job.c
index ffaac1c21c91,f4a3122352de..000000000000
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
@@@ -173,8 -166,14 +173,13 @@@ static void amdgpu_job_free_cb(struct d
  
  	drm_sched_job_cleanup(s_job);
  
 -	amdgpu_sync_free(&job->sync);
 -	amdgpu_sync_free(&job->sched_sync);
 +	amdgpu_sync_free(&job->explicit_sync);
- 	dma_fence_put(&job->hw_fence);
+ 
+ 	/* only put the hw fence if has embedded fence */
+ 	if (!job->hw_fence.ops)
+ 		kfree(job);
+ 	else
+ 		dma_fence_put(&job->hw_fence);
  }
  
  void amdgpu_job_set_gang_leader(struct amdgpu_job *job,

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

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

[Stephen Rothwell]

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

Hi all,

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

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

between commit:

  7c99616e3fe7 ("drm: Remove drm_mode_config::fb_base")

from the drm tree and commit:

  887e8cec55f2 ("drm/amdgpu: set fb_modifiers_not_supported in vkms")

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/amdgpu/amdgpu_vkms.c
index 09dec2561adf,500a1dc4fe02..000000000000
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
@@@ -498,6 -498,10 +498,8 @@@ static int amdgpu_vkms_sw_init(void *ha
  	adev_to_drm(adev)->mode_config.preferred_depth = 24;
  	adev_to_drm(adev)->mode_config.prefer_shadow = 1;
  
 -	adev_to_drm(adev)->mode_config.fb_base = adev->gmc.aper_base;
 -
+ 	adev_to_drm(adev)->mode_config.fb_modifiers_not_supported = true;
+ 
  	r = amdgpu_display_modeset_create_props(adev);
  	if (r)
  		return r;

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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1621 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:

  047a1b877ed4 ("dma-buf & drm/amdgpu: remove dma_resv workaround")

from the drm tree and commit:

  3da2c38231a4 ("drm/amdgpu: Free user pages if amdgpu_cs_parser_bos failed")

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/amdgpu/amdgpu_cs.c
index 01853431249d,67bd506fa141..000000000000
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@@ -636,9 -642,26 +636,21 @@@ static int amdgpu_cs_parser_bos(struct 
  	}
  
  error_validate:
 -	if (r) {
 -		amdgpu_bo_list_for_each_entry(e, p->bo_list) {
 -			dma_fence_chain_free(e->chain);
 -			e->chain = NULL;
 -		}
 +	if (r)
  		ttm_eu_backoff_reservation(&p->ticket, &p->validated);
- out:
 -	}
+ 
+ out_free_user_pages:
+ 	if (r) {
+ 		amdgpu_bo_list_for_each_userptr_entry(e, p->bo_list) {
+ 			struct amdgpu_bo *bo = ttm_to_amdgpu_bo(e->tv.bo);
+ 
+ 			if (!e->user_pages)
+ 				continue;
+ 			amdgpu_ttm_tt_get_user_pages_done(bo->tbo.ttm);
+ 			kvfree(e->user_pages);
+ 			e->user_pages = NULL;
+ 		}
+ 	}
  	return r;
  }
  

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

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

[Alex Deucher]

On Wed, Oct 27, 2021 at 11:06 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the amdgpu tree got conflicts in:
>
>   drivers/gpu/drm/amd/display/dc/core/dc_link.c
>   drivers/gpu/drm/drm_dp_mst_topology.c
>   drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
>
> between commits:
>
>   d740e0bf8ed4 ("drm/amd/display: Add DP 2.0 MST DC Support")
>   41724ea273cd ("drm/amd/display: Add DP 2.0 MST DM Support")
>   00f965e700ef ("drm/amdgpu/display: fix build when CONFIG_DRM_AMD_DC_DCN is not set")
>
> from the drm tree and commits:
>
>   6d23be5bc661 ("drm/amd/display: Add DP 2.0 MST DC Support")
>   39b3c728e5ca ("drm/amd/display: Add DP 2.0 MST DM Support")
>   8bc3824f0ee2 ("drm/amdgpu/display: fix build when CONFIG_DRM_AMD_DC_DCN is not set")
>
> from the amdgpu tree.
>
> The conflicts between these different versions of the same patches,
> and some other changes in the amdgpu tree are just a mess today, do I
> have just dropped the amdgpu tree completely for today.

Those patches were just in my tree while I was waiting for the topic
branch to land in drm-next.  I'll drop them from my tree tomorrow.

Alex

>
> --
> Cheers,
> Stephen Rothwell

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

[Stephen Rothwell]

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

Hi all,

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

  drivers/gpu/drm/amd/display/dc/core/dc_link.c
  drivers/gpu/drm/drm_dp_mst_topology.c
  drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

between commits:

  d740e0bf8ed4 ("drm/amd/display: Add DP 2.0 MST DC Support")
  41724ea273cd ("drm/amd/display: Add DP 2.0 MST DM Support")
  00f965e700ef ("drm/amdgpu/display: fix build when CONFIG_DRM_AMD_DC_DCN is not set")

from the drm tree and commits:

  6d23be5bc661 ("drm/amd/display: Add DP 2.0 MST DC Support")
  39b3c728e5ca ("drm/amd/display: Add DP 2.0 MST DM Support")
  8bc3824f0ee2 ("drm/amdgpu/display: fix build when CONFIG_DRM_AMD_DC_DCN is not set")

from the amdgpu tree.

The conflicts between these different versions of the same patches,
and some other changes in the amdgpu tree are just a mess today, do I
have just dropped the amdgpu tree completely for today.

-- 
Cheers,
Stephen Rothwell

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

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

[Stephen Rothwell]

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

Hi all,

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

  drivers/gpu/drm/radeon/radeon_drv.c

between commit:

  384bc5e059d4 ("drm/radeon: Stop changing the drm_driver struct")

from the drm tree and commits:

  4d3efadd374a ("drm/radeon/radeon: Move prototype into shared header")
  0a2e8d51e4da ("drm/radeon/radeon_drv: Move 'radeon_mmap()'s prototype to shared header")
  f3723ad110c5 ("drm/radeon/radeon_drv: Move 'radeon_driver_irq_handler_kms's prototype into shared header")
  4138b62b8a79 ("drm/radeon/radeon_drv: Move 'radeon_gem_prime_import_sg_table()'s prototype to shared header")

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/radeon/radeon_drv.c
index bfadb799d6a3,84f5d56528ee..000000000000
--- a/drivers/gpu/drm/radeon/radeon_drv.c
+++ b/drivers/gpu/drm/radeon/radeon_drv.c
@@@ -51,7 -51,10 +51,11 @@@
  #include <drm/radeon_drm.h>
  
  #include "radeon_drv.h"
 +#include "radeon.h"
+ #include "radeon_kms.h"
+ #include "radeon_ttm.h"
+ #include "radeon_device.h"
+ #include "radeon_prime.h"
  
  /*
   * KMS wrapper.
@@@ -130,7 -123,8 +124,6 @@@ extern int radeon_get_crtc_scanoutpos(s
  				      ktime_t *stime, ktime_t *etime,
  				      const struct drm_display_mode *mode);
  extern bool radeon_is_px(struct drm_device *dev);
- int radeon_mmap(struct file *filp, struct vm_area_struct *vma);
 -extern const struct drm_ioctl_desc radeon_ioctls_kms[];
 -extern int radeon_max_kms_ioctl;
  int radeon_mode_dumb_mmap(struct drm_file *filp,
  			  struct drm_device *dev,
  			  uint32_t handle, uint64_t *offset_p);
@@@ -297,10 -288,8 +287,8 @@@ static struct pci_device_id pciidlist[
  
  MODULE_DEVICE_TABLE(pci, pciidlist);
  
 -static struct drm_driver kms_driver;
 +static const struct drm_driver kms_driver;
  
- bool radeon_device_is_virtual(void);
- 
  static int radeon_pci_probe(struct pci_dev *pdev,
  			    const struct pci_device_id *ent)
  {

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

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

[Stephen Rothwell]

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

Hi all,

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

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

between commit:

  f5a89a5cae81 ("drm/amdgpu/ttm: use multihop")

from the drm tree and commit:

  75501872b4af ("drm/amd/amdgpu/amdgpu_ttm: Demote non-conformant kernel-doc headers, fix slightly lacking ones")

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/amdgpu/amdgpu_ttm.c
index 676fb520e044,761dd68d7ced..000000000000
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@@ -512,7 -512,120 +512,7 @@@ error
  	return r;
  }
  
 -/**
 - * amdgpu_move_vram_ram - Copy VRAM buffer to RAM buffer
 - *
 - * Called by amdgpu_bo_move().
 - */
 -static int amdgpu_move_vram_ram(struct ttm_buffer_object *bo, bool evict,
 -				struct ttm_operation_ctx *ctx,
 -				struct ttm_resource *new_mem)
 -{
 -	struct ttm_resource *old_mem = &bo->mem;
 -	struct ttm_resource tmp_mem;
 -	struct ttm_place placements;
 -	struct ttm_placement placement;
 -	int r;
 -
 -	/* create space/pages for new_mem in GTT space */
 -	tmp_mem = *new_mem;
 -	tmp_mem.mm_node = NULL;
 -	placement.num_placement = 1;
 -	placement.placement = &placements;
 -	placement.num_busy_placement = 1;
 -	placement.busy_placement = &placements;
 -	placements.fpfn = 0;
 -	placements.lpfn = 0;
 -	placements.mem_type = TTM_PL_TT;
 -	placements.flags = 0;
 -	r = ttm_bo_mem_space(bo, &placement, &tmp_mem, ctx);
 -	if (unlikely(r)) {
 -		pr_err("Failed to find GTT space for blit from VRAM\n");
 -		return r;
 -	}
 -
 -	r = ttm_tt_populate(bo->bdev, bo->ttm, ctx);
 -	if (unlikely(r))
 -		goto out_cleanup;
 -
 -	/* Bind the memory to the GTT space */
 -	r = amdgpu_ttm_backend_bind(bo->bdev, bo->ttm, &tmp_mem);
 -	if (unlikely(r)) {
 -		goto out_cleanup;
 -	}
 -
 -	/* blit VRAM to GTT */
 -	r = amdgpu_move_blit(bo, evict, &tmp_mem, old_mem);
 -	if (unlikely(r)) {
 -		goto out_cleanup;
 -	}
 -
 -	r = ttm_bo_wait_ctx(bo, ctx);
 -	if (unlikely(r))
 -		goto out_cleanup;
 -
 -	amdgpu_ttm_backend_unbind(bo->bdev, bo->ttm);
 -	ttm_resource_free(bo, &bo->mem);
 -	ttm_bo_assign_mem(bo, new_mem);
 -out_cleanup:
 -	ttm_resource_free(bo, &tmp_mem);
 -	return r;
 -}
 -
--/**
 - * amdgpu_move_ram_vram - Copy buffer from RAM to VRAM
 - *
 - * Called by amdgpu_bo_move().
 - */
 -static int amdgpu_move_ram_vram(struct ttm_buffer_object *bo, bool evict,
 -				struct ttm_operation_ctx *ctx,
 -				struct ttm_resource *new_mem)
 -{
 -	struct ttm_resource *old_mem = &bo->mem;
 -	struct ttm_resource tmp_mem;
 -	struct ttm_placement placement;
 -	struct ttm_place placements;
 -	int r;
 -
 -	/* make space in GTT for old_mem buffer */
 -	tmp_mem = *new_mem;
 -	tmp_mem.mm_node = NULL;
 -	placement.num_placement = 1;
 -	placement.placement = &placements;
 -	placement.num_busy_placement = 1;
 -	placement.busy_placement = &placements;
 -	placements.fpfn = 0;
 -	placements.lpfn = 0;
 -	placements.mem_type = TTM_PL_TT;
 -	placements.flags = 0;
 -	r = ttm_bo_mem_space(bo, &placement, &tmp_mem, ctx);
 -	if (unlikely(r)) {
 -		pr_err("Failed to find GTT space for blit to VRAM\n");
 -		return r;
 -	}
 -
 -	/* move/bind old memory to GTT space */
 -	r = ttm_tt_populate(bo->bdev, bo->ttm, ctx);
 -	if (unlikely(r))
 -		return r;
 -
 -	r = amdgpu_ttm_backend_bind(bo->bdev, bo->ttm, &tmp_mem);
 -	if (unlikely(r)) {
 -		goto out_cleanup;
 -	}
 -
 -	ttm_bo_assign_mem(bo, &tmp_mem);
 -	/* copy to VRAM */
 -	r = amdgpu_move_blit(bo, evict, new_mem, old_mem);
 -	if (unlikely(r)) {
 -		goto out_cleanup;
 -	}
 -out_cleanup:
 -	ttm_resource_free(bo, &tmp_mem);
 -	return r;
 -}
 -
+ /*
   * amdgpu_mem_visible - Check that memory can be accessed by ttm_bo_move_memcpy
   *
   * Called by amdgpu_bo_move()

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

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

[Stephen Rothwell]

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

Hi all,

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

  drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c

between commit:

  09b974e8983a ("drm/amd/amdgpu_dm/mst: Remove ->destroy_connector() callback")

from the drm tree and commit:

  c33f212c0c92 ("drm/amdgpu/display: create fake mst encoders ahead of time")

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/amdgpu_dm/amdgpu_dm_mst_types.c
index 3db1ec35d2b4,4f0072a9396b..000000000000
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
@@@ -136,23 -93,14 +93,20 @@@ static ssize_t dm_dp_aux_transfer(struc
  static void
  dm_dp_mst_connector_destroy(struct drm_connector *connector)
  {
 -	struct amdgpu_dm_connector *amdgpu_dm_connector = to_amdgpu_dm_connector(connector);
 +	struct amdgpu_dm_connector *aconnector =
 +		to_amdgpu_dm_connector(connector);
- 	struct amdgpu_encoder *amdgpu_encoder = aconnector->mst_encoder;
 +
 +	if (aconnector->dc_sink) {
 +		dc_link_remove_remote_sink(aconnector->dc_link,
 +					   aconnector->dc_sink);
 +		dc_sink_release(aconnector->dc_sink);
 +	}
  
 -	kfree(amdgpu_dm_connector->edid);
 -	amdgpu_dm_connector->edid = NULL;
 +	kfree(aconnector->edid);
  
- 	drm_encoder_cleanup(&amdgpu_encoder->base);
- 	kfree(amdgpu_encoder);
  	drm_connector_cleanup(connector);
 -	drm_dp_mst_put_port_malloc(amdgpu_dm_connector->port);
 -	kfree(amdgpu_dm_connector);
 +	drm_dp_mst_put_port_malloc(aconnector->port);
 +	kfree(aconnector);
  }
  
  static int
@@@ -412,10 -358,11 +364,19 @@@ dm_dp_add_mst_connector(struct drm_dp_m
  		master->dc_link,
  		master->connector_id);
  
- 	aconnector->mst_encoder = dm_dp_create_fake_mst_encoder(master);
- 	drm_connector_attach_encoder(&aconnector->base,
- 				     &aconnector->mst_encoder->base);
+ 	for (i = 0; i < AMDGPU_DM_MAX_CRTC; i++) {
+ 		drm_connector_attach_encoder(&aconnector->base,
+ 					     &aconnector->mst_encoders[i].base);
+ 	}
+ 
++	connector->max_bpc_property = master->base.max_bpc_property;
++	if (connector->max_bpc_property)
++		drm_connector_attach_max_bpc_property(connector, 8, 16);
++
++	connector->vrr_capable_property = master->base.vrr_capable_property;
++	if (connector->vrr_capable_property)
++		drm_connector_attach_vrr_capable_property(connector);
 +
  	connector->max_bpc_property = master->base.max_bpc_property;
  	if (connector->max_bpc_property)
  		drm_connector_attach_max_bpc_property(connector, 8, 16);

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

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

[Stephen Rothwell]

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

Hi all,

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

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

between commits:

  ea702333e567 ("drm/amdgpu: Convert to struct drm_crtc_helper_funcs.get_scanout_position()")
  e3eff4b5d91e ("drm/amdgpu: Convert to CRTC VBLANK callbacks")

from the drm tree and commit:

  c6385e503aea ("drm/amdgpu: drop legacy drm load and unload callbacks")

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/amdgpu/amdgpu_drv.c
index 4598836c5fa4,4e868229e3b7..000000000000
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@@ -1377,17 -1434,30 +1434,15 @@@ int amdgpu_file_to_fpriv(struct file *f
  	return 0;
  }
  
 -static bool
 -amdgpu_get_crtc_scanout_position(struct drm_device *dev, unsigned int pipe,
 -				 bool in_vblank_irq, int *vpos, int *hpos,
 -				 ktime_t *stime, ktime_t *etime,
 -				 const struct drm_display_mode *mode)
 -{
 -	return amdgpu_display_get_crtc_scanoutpos(dev, pipe, 0, vpos, hpos,
 -						  stime, etime, mode);
 -}
 -
  static struct drm_driver kms_driver = {
  	.driver_features =
- 	    DRIVER_USE_AGP | DRIVER_ATOMIC |
+ 	    DRIVER_ATOMIC |
  	    DRIVER_GEM |
  	    DRIVER_RENDER | DRIVER_MODESET | DRIVER_SYNCOBJ |
  	    DRIVER_SYNCOBJ_TIMELINE,
  	.open = amdgpu_driver_open_kms,
  	.postclose = amdgpu_driver_postclose_kms,
  	.lastclose = amdgpu_driver_lastclose_kms,
- 	.unload = amdgpu_driver_unload_kms,
 -	.get_vblank_counter = amdgpu_get_vblank_counter_kms,
 -	.enable_vblank = amdgpu_enable_vblank_kms,
 -	.disable_vblank = amdgpu_disable_vblank_kms,
 -	.get_vblank_timestamp = drm_calc_vbltimestamp_from_scanoutpos,
 -	.get_scanout_position = amdgpu_get_crtc_scanout_position,
  	.irq_handler = amdgpu_irq_handler,
  	.ioctls = amdgpu_ioctls_kms,
  	.gem_free_object_unlocked = amdgpu_gem_object_free,

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