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

Commit 8509eb19 authored by Dave Airlie's avatar Dave Airlie
Browse files

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

Fixes for 4.8:
- 2 CI S4 fixes
- error handling fix

* 'drm-fixes-4.8' of git://people.freedesktop.org/~agd5f/linux:
  drm/amdgpu: record error code when ring test failed
  drm/amd/amdgpu: compute ring test fail during S4 on CI
  drm/amd/amdgpu: sdma resume fail during S4 on CI
parents 279cf3f2 1f703e66

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

+3 −2
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ void amdgpu_ib_pool_fini(struct amdgpu_device *adev) 
int amdgpu_ib_ring_tests(struct amdgpu_device *adev)

{

	unsigned i;

	int r;

	int r, ret = 0;



	for (i = 0; i < AMDGPU_MAX_RINGS; ++i) {

		struct amdgpu_ring *ring = adev->rings[i];
@@ -301,10 +301,11 @@ int amdgpu_ib_ring_tests(struct amdgpu_device *adev) 
			} else {

				/* still not good, but we can live with it */

				DRM_ERROR("amdgpu: failed testing IB on ring %d (%d).\n", i, r);

				ret = r;

			}

		}

	}

	return 0;

	return ret;

}



/*

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

+3 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ static void cik_sdma_set_ring_funcs(struct amdgpu_device *adev); 
static void cik_sdma_set_irq_funcs(struct amdgpu_device *adev);

static void cik_sdma_set_buffer_funcs(struct amdgpu_device *adev);

static void cik_sdma_set_vm_pte_funcs(struct amdgpu_device *adev);

static int cik_sdma_soft_reset(void *handle);



MODULE_FIRMWARE("radeon/bonaire_sdma.bin");

MODULE_FIRMWARE("radeon/bonaire_sdma1.bin");
@@ -1037,6 +1038,8 @@ static int cik_sdma_resume(void *handle) 
{

	struct amdgpu_device *adev = (struct amdgpu_device *)handle;



	cik_sdma_soft_reset(handle);



	return cik_sdma_hw_init(adev);

}

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

+9 −3
Original line number Diff line number Diff line
@@ -2755,8 +2755,7 @@ static int gfx_v7_0_cp_compute_resume(struct amdgpu_device *adev) 
	u64 wb_gpu_addr;

	u32 *buf;

	struct bonaire_mqd *mqd;



	gfx_v7_0_cp_compute_enable(adev, true);

	struct amdgpu_ring *ring;



	/* fix up chicken bits */

	tmp = RREG32(mmCP_CPF_DEBUG);
@@ -2791,7 +2790,7 @@ static int gfx_v7_0_cp_compute_resume(struct amdgpu_device *adev) 


	/* init the queues.  Just two for now. */

	for (i = 0; i < adev->gfx.num_compute_rings; i++) {

		struct amdgpu_ring *ring = &adev->gfx.compute_ring[i];

		ring = &adev->gfx.compute_ring[i];



		if (ring->mqd_obj == NULL) {

			r = amdgpu_bo_create(adev,
@@ -2970,6 +2969,13 @@ static int gfx_v7_0_cp_compute_resume(struct amdgpu_device *adev) 
		amdgpu_bo_unreserve(ring->mqd_obj);



		ring->ready = true;

	}



	gfx_v7_0_cp_compute_enable(adev, true);



	for (i = 0; i < adev->gfx.num_compute_rings; i++) {

		ring = &adev->gfx.compute_ring[i];



		r = amdgpu_ring_test_ring(ring);

		if (r)

			ring->ready = false;