Commit b46ce98d authored by Dave Airlie's avatar Dave Airlie
Browse files

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

Some radeon fixes for 3.19:
    - GPUVM stability fixes
    - SI dpm quirks
    - Regression fixes

* 'drm-fixes-3.19' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon: use rv515_ring_start on r5xx
  drm/radeon: add si dpm quirk list
  drm/radeon: don't print error on -ERESTARTSYS
  drm/radeon: add a dpm quirk list
  drm/radeon: fix VM flush on CIK (v3)
  drm/radeon: fix VM flush on SI (v3)
  drm/radeon: fix VM flush on cayman/aruba (v3)
parents ec6f34e5 d8a74e18

drivers/gpu/drm/radeon/cik.c

+11 −0
Original line number Diff line number Diff line
@@ -6033,6 +6033,17 @@ void cik_vm_flush(struct radeon_device *rdev, struct radeon_ring *ring, 
	radeon_ring_write(ring, 0);

	radeon_ring_write(ring, 1 << vm_id);



	/* wait for the invalidate to complete */

	radeon_ring_write(ring, PACKET3(PACKET3_WAIT_REG_MEM, 5));

	radeon_ring_write(ring, (WAIT_REG_MEM_OPERATION(0) | /* wait */

				 WAIT_REG_MEM_FUNCTION(0) |  /* always */

				 WAIT_REG_MEM_ENGINE(0))); /* me */

	radeon_ring_write(ring, VM_INVALIDATE_REQUEST >> 2);

	radeon_ring_write(ring, 0);

	radeon_ring_write(ring, 0); /* ref */

	radeon_ring_write(ring, 0); /* mask */

	radeon_ring_write(ring, 0x20); /* poll interval */



	/* compute doesn't have PFP */

	if (usepfp) {

		/* sync PFP to ME, otherwise we might get invalid PFP reads */

drivers/gpu/drm/radeon/cik_sdma.c

+10 −0
Original line number Diff line number Diff line
@@ -903,6 +903,9 @@ void cik_sdma_vm_pad_ib(struct radeon_ib *ib) 
void cik_dma_vm_flush(struct radeon_device *rdev, struct radeon_ring *ring,

		      unsigned vm_id, uint64_t pd_addr)

{

	u32 extra_bits = (SDMA_POLL_REG_MEM_EXTRA_OP(0) |

			  SDMA_POLL_REG_MEM_EXTRA_FUNC(0)); /* always */



	radeon_ring_write(ring, SDMA_PACKET(SDMA_OPCODE_SRBM_WRITE, 0, 0xf000));

	if (vm_id < 8) {

		radeon_ring_write(ring, (VM_CONTEXT0_PAGE_TABLE_BASE_ADDR + (vm_id << 2)) >> 2);
@@ -943,5 +946,12 @@ void cik_dma_vm_flush(struct radeon_device *rdev, struct radeon_ring *ring, 
	radeon_ring_write(ring, SDMA_PACKET(SDMA_OPCODE_SRBM_WRITE, 0, 0xf000));

	radeon_ring_write(ring, VM_INVALIDATE_REQUEST >> 2);

	radeon_ring_write(ring, 1 << vm_id);



	radeon_ring_write(ring, SDMA_PACKET(SDMA_OPCODE_POLL_REG_MEM, 0, extra_bits));

	radeon_ring_write(ring, VM_INVALIDATE_REQUEST >> 2);

	radeon_ring_write(ring, 0);

	radeon_ring_write(ring, 0); /* reference */

	radeon_ring_write(ring, 0); /* mask */

	radeon_ring_write(ring, (0xfff << 16) | 10); /* retry count, poll interval */

}

drivers/gpu/drm/radeon/ni.c

+10 −0
Original line number Diff line number Diff line
@@ -2516,6 +2516,16 @@ void cayman_vm_flush(struct radeon_device *rdev, struct radeon_ring *ring, 
	radeon_ring_write(ring, PACKET0(VM_INVALIDATE_REQUEST, 0));

	radeon_ring_write(ring, 1 << vm_id);



	/* wait for the invalidate to complete */

	radeon_ring_write(ring, PACKET3(PACKET3_WAIT_REG_MEM, 5));

	radeon_ring_write(ring, (WAIT_REG_MEM_FUNCTION(0) |  /* always */

				 WAIT_REG_MEM_ENGINE(0))); /* me */

	radeon_ring_write(ring, VM_INVALIDATE_REQUEST >> 2);

	radeon_ring_write(ring, 0);

	radeon_ring_write(ring, 0); /* ref */

	radeon_ring_write(ring, 0); /* mask */

	radeon_ring_write(ring, 0x20); /* poll interval */



	/* sync PFP to ME, otherwise we might get invalid PFP reads */

	radeon_ring_write(ring, PACKET3(PACKET3_PFP_SYNC_ME, 0));

	radeon_ring_write(ring, 0x0);

drivers/gpu/drm/radeon/ni_dma.c

+6 −0
Original line number Diff line number Diff line
@@ -463,5 +463,11 @@ void cayman_dma_vm_flush(struct radeon_device *rdev, struct radeon_ring *ring, 
	radeon_ring_write(ring, DMA_PACKET(DMA_PACKET_SRBM_WRITE, 0, 0, 0));

	radeon_ring_write(ring, (0xf << 16) | (VM_INVALIDATE_REQUEST >> 2));

	radeon_ring_write(ring, 1 << vm_id);



	/* wait for invalidate to complete */

	radeon_ring_write(ring, DMA_SRBM_READ_PACKET);

	radeon_ring_write(ring, (0xff << 20) | (VM_INVALIDATE_REQUEST >> 2));

	radeon_ring_write(ring, 0); /* mask */

	radeon_ring_write(ring, 0); /* value */

}

drivers/gpu/drm/radeon/nid.h

+24 −0
Original line number Diff line number Diff line
@@ -1133,6 +1133,23 @@ 
#define	PACKET3_MEM_SEMAPHORE				0x39

#define	PACKET3_MPEG_INDEX				0x3A

#define	PACKET3_WAIT_REG_MEM				0x3C

#define		WAIT_REG_MEM_FUNCTION(x)                ((x) << 0)

                /* 0 - always

		 * 1 - <

		 * 2 - <=

		 * 3 - ==

		 * 4 - !=

		 * 5 - >=

		 * 6 - >

		 */

#define		WAIT_REG_MEM_MEM_SPACE(x)               ((x) << 4)

                /* 0 - reg

		 * 1 - mem

		 */

#define		WAIT_REG_MEM_ENGINE(x)                  ((x) << 8)

                /* 0 - me

		 * 1 - pfp

		 */

#define	PACKET3_MEM_WRITE				0x3D

#define	PACKET3_PFP_SYNC_ME				0x42

#define	PACKET3_SURFACE_SYNC				0x43
@@ -1272,6 +1289,13 @@ 
					 (1 << 21) |			\

					 (((n) & 0xFFFFF) << 0))



#define DMA_SRBM_POLL_PACKET		((9 << 28) |			\

					 (1 << 27) |			\

					 (1 << 26))



#define DMA_SRBM_READ_PACKET		((9 << 28) |			\

					 (1 << 27))



/* async DMA Packet types */

#define	DMA_PACKET_WRITE				  0x2

#define	DMA_PACKET_COPY					  0x3

CRA Git | Maintained and supported by SUSTech CRA and CCSE