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

Commit c8b4f288 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu: switch UVD code to use UVD_NO_OP for padding 



Replace packet2's with packet0 writes to UVD_NO_OP.  The
value written to UVD_NO_OP does not matter.

Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 4d6bdbad

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

+4 −2
Original line number Diff line number Diff line
@@ -957,8 +957,10 @@ static int amdgpu_uvd_send_msg(struct amdgpu_ring *ring, struct amdgpu_bo *bo, 
	ib->ptr[3] = addr >> 32;

	ib->ptr[4] = PACKET0(mmUVD_GPCOM_VCPU_CMD, 0);

	ib->ptr[5] = 0;

	for (i = 6; i < 16; ++i)

		ib->ptr[i] = PACKET2(0);

	for (i = 6; i < 16; i += 2) {

		ib->ptr[i] = PACKET0(mmUVD_NO_OP, 0);

		ib->ptr[i+1] = 0;

	}

	ib->length_dw = 16;



	if (direct) {

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

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ static int uvd_v4_2_sw_init(void *handle) 


	ring = &adev->uvd.ring;

	sprintf(ring->name, "uvd");

	r = amdgpu_ring_init(adev, ring, 512, CP_PACKET2, 0xf,

	r = amdgpu_ring_init(adev, ring, 512, PACKET0(mmUVD_NO_OP, 0), 0xf,

			     &adev->uvd.irq, 0, AMDGPU_RING_TYPE_UVD);



	return r;

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

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ static int uvd_v5_0_sw_init(void *handle) 


	ring = &adev->uvd.ring;

	sprintf(ring->name, "uvd");

	r = amdgpu_ring_init(adev, ring, 512, CP_PACKET2, 0xf,

	r = amdgpu_ring_init(adev, ring, 512, PACKET0(mmUVD_NO_OP, 0), 0xf,

			     &adev->uvd.irq, 0, AMDGPU_RING_TYPE_UVD);



	return r;

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

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ static int uvd_v6_0_sw_init(void *handle) 


	ring = &adev->uvd.ring;

	sprintf(ring->name, "uvd");

	r = amdgpu_ring_init(adev, ring, 512, CP_PACKET2, 0xf,

	r = amdgpu_ring_init(adev, ring, 512, PACKET0(mmUVD_NO_OP, 0), 0xf,

			     &adev->uvd.irq, 0, AMDGPU_RING_TYPE_UVD);



	return r;

drivers/gpu/drm/amd/include/asic_reg/uvd/uvd_5_0_d.h

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#define mmUVD_UDEC_ADDR_CONFIG                                                  0x3bd3

#define mmUVD_UDEC_DB_ADDR_CONFIG                                               0x3bd4

#define mmUVD_UDEC_DBW_ADDR_CONFIG                                              0x3bd5

#define mmUVD_NO_OP                                                             0x3bff

#define mmUVD_LMI_RBC_RB_64BIT_BAR_LOW                                          0x3c69

#define mmUVD_LMI_RBC_RB_64BIT_BAR_HIGH                                         0x3c68

#define mmUVD_LMI_RBC_IB_64BIT_BAR_LOW                                          0x3c67