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

Commit 78c5560a authored by Alex Deucher's avatar Alex Deucher Committed by Dave Airlie
Browse files

drm/radeon/kms: add some new ring params to better handle other ring types 



Some rptr/wptrs fields have different offsets and not all rings are pm4
so add a new nop field.

Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarChristian König <deathsimple@vodafone.de>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent ce954884

drivers/gpu/drm/radeon/evergreen.c

+2 −1
Original line number Diff line number Diff line
@@ -3127,7 +3127,8 @@ static int evergreen_startup(struct radeon_device *rdev) 
	evergreen_irq_set(rdev);



	r = radeon_ring_init(rdev, ring, ring->ring_size, RADEON_WB_CP_RPTR_OFFSET,

			     R600_CP_RB_RPTR, R600_CP_RB_WPTR);

			     R600_CP_RB_RPTR, R600_CP_RB_WPTR,

			     0, 0xfffff, RADEON_CP_PACKET2);

	if (r)

		return r;

	r = evergreen_cp_load_microcode(rdev);

drivers/gpu/drm/radeon/ni.c

+2 −1
Original line number Diff line number Diff line
@@ -1412,7 +1412,8 @@ static int cayman_startup(struct radeon_device *rdev) 
	evergreen_irq_set(rdev);



	r = radeon_ring_init(rdev, ring, ring->ring_size, RADEON_WB_CP_RPTR_OFFSET,

			     CP_RB0_RPTR, CP_RB0_WPTR);

			     CP_RB0_RPTR, CP_RB0_WPTR,

			     0, 0xfffff, RADEON_CP_PACKET2);

	if (r)

		return r;

	r = cayman_cp_load_microcode(rdev);

drivers/gpu/drm/radeon/r100.c

+2 −1
Original line number Diff line number Diff line
@@ -1075,7 +1075,8 @@ int r100_cp_init(struct radeon_device *rdev, unsigned ring_size) 
	ring_size = (1 << (rb_bufsz + 1)) * 4;

	r100_cp_load_microcode(rdev);

	r = radeon_ring_init(rdev, ring, ring_size, RADEON_WB_CP_RPTR_OFFSET,

			     RADEON_CP_RB_RPTR, RADEON_CP_RB_WPTR);

			     RADEON_CP_RB_RPTR, RADEON_CP_RB_WPTR,

			     0, 0x7fffff, RADEON_CP_PACKET2);

	if (r) {

		return r;

	}

drivers/gpu/drm/radeon/r600.c

+2 −1
Original line number Diff line number Diff line
@@ -2474,7 +2474,8 @@ int r600_startup(struct radeon_device *rdev) 
	r600_irq_set(rdev);



	r = radeon_ring_init(rdev, ring, ring->ring_size, RADEON_WB_CP_RPTR_OFFSET,

			     R600_CP_RB_RPTR, R600_CP_RB_WPTR);

			     R600_CP_RB_RPTR, R600_CP_RB_WPTR,

			     0, 0xfffff, RADEON_CP_PACKET2);



	if (r)

		return r;

drivers/gpu/drm/radeon/radeon.h

+5 −1
Original line number Diff line number Diff line
@@ -542,6 +542,9 @@ struct radeon_ring { 
	uint32_t		ptr_mask;

	struct mutex		mutex;

	bool			ready;

	u32			ptr_reg_shift;

	u32			ptr_reg_mask;

	u32			nop;

};



/*
@@ -612,7 +615,8 @@ void radeon_ring_unlock_commit(struct radeon_device *rdev, struct radeon_ring *c 
void radeon_ring_unlock_undo(struct radeon_device *rdev, struct radeon_ring *cp);

int radeon_ring_test(struct radeon_device *rdev, struct radeon_ring *cp);

int radeon_ring_init(struct radeon_device *rdev, struct radeon_ring *cp, unsigned ring_size,

		     unsigned rptr_offs, unsigned rptr_reg, unsigned wptr_reg);

		     unsigned rptr_offs, unsigned rptr_reg, unsigned wptr_reg,

		     u32 ptr_reg_shift, u32 ptr_reg_mask, u32 nop);

void radeon_ring_fini(struct radeon_device *rdev, struct radeon_ring *cp);