Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74136a3d authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-next-4.21' of git://people.freedesktop.org/~agd5f/linux into drm-next 



Fixes for 4.21. A bit more than usual due to the holidays.  Highlights:
- add new vegaM pci id
- sr-iov fixes
- DC fix for fast cursor updates
- DC freesync fix
- DC display clock fix for polaris
- DC fixes for dongles
- DC fix for some eDP panels
- misc vega20 fixes
- kfd return code fix for dma_buf support
- VCN fixes for PCO
- nbio hw bug workaround

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181229183307.3330-1-alexander.deucher@amd.com
parents 4bcd2ffd f6653a0e

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

+3 −0
Original line number Diff line number Diff line
@@ -1428,6 +1428,9 @@ int amdgpu_cs_fence_to_handle_ioctl(struct drm_device *dev, void *data, 
	if (IS_ERR(fence))

		return PTR_ERR(fence);



	if (!fence)

		fence = dma_fence_get_stub();



	switch (info->in.what) {

	case AMDGPU_FENCE_TO_HANDLE_GET_SYNCOBJ:

		r = drm_syncobj_create(&syncobj, 0, fence);

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

+6 −4
Original line number Diff line number Diff line
@@ -3476,13 +3476,15 @@ static void amdgpu_device_lock_adev(struct amdgpu_device *adev) 
	mutex_lock(&adev->lock_reset);

	atomic_inc(&adev->gpu_reset_counter);

	adev->in_gpu_reset = 1;

	/* Block kfd */

	/* Block kfd: SRIOV would do it separately */

	if (!amdgpu_sriov_vf(adev))

                amdgpu_amdkfd_pre_reset(adev);

}



static void amdgpu_device_unlock_adev(struct amdgpu_device *adev)

{

	/*unlock kfd */

	/*unlock kfd: SRIOV would do it separately */

	if (!amdgpu_sriov_vf(adev))

                amdgpu_amdkfd_post_reset(adev);

	amdgpu_vf_error_trans_all(adev);

	adev->in_gpu_reset = 0;

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

+1 −0
Original line number Diff line number Diff line
@@ -865,6 +865,7 @@ static const struct pci_device_id pciidlist[] = { 
	/* VEGAM */

	{0x1002, 0x694C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGAM},

	{0x1002, 0x694E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGAM},

	{0x1002, 0x694F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGAM},

	/* Vega 10 */

	{0x1002, 0x6860, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA10},

	{0x1002, 0x6861, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA10},

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

+6 −0
Original line number Diff line number Diff line
@@ -32,6 +32,9 @@ static void amdgpu_job_timedout(struct drm_sched_job *s_job) 
{

	struct amdgpu_ring *ring = to_amdgpu_ring(s_job->sched);

	struct amdgpu_job *job = to_amdgpu_job(s_job);

	struct amdgpu_task_info ti;



	memset(&ti, 0, sizeof(struct amdgpu_task_info));



	if (amdgpu_ring_soft_recovery(ring, job->vmid, s_job->s_fence->parent)) {

		DRM_ERROR("ring %s timeout, but soft recovered\n",
@@ -39,9 +42,12 @@ static void amdgpu_job_timedout(struct drm_sched_job *s_job) 
		return;

	}



	amdgpu_vm_get_task_info(ring->adev, job->pasid, &ti);

	DRM_ERROR("ring %s timeout, signaled seq=%u, emitted seq=%u\n",

		  job->base.sched->name, atomic_read(&ring->fence_drv.last_seq),

		  ring->fence_drv.sync_seq);

	DRM_ERROR("Process information: process %s pid %d thread %s pid %d\n",

		  ti.process_name, ti.tgid, ti.task_name, ti.pid);



	if (amdgpu_device_should_recover_gpu(ring->adev))

		amdgpu_device_gpu_recover(ring->adev, job);

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

+1 −1
Original line number Diff line number Diff line
@@ -912,7 +912,7 @@ int amdgpu_bo_unpin(struct amdgpu_bo *bo) 
	struct ttm_operation_ctx ctx = { false, false };

	int r, i;



	if (!bo->pin_count) {

	if (WARN_ON_ONCE(!bo->pin_count)) {

		dev_warn(adev->dev, "%p unpin not necessary\n", bo);

		return 0;

	}