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

Commit 70a033d2 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/radeon: 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 c8b4f288

drivers/gpu/drm/radeon/cik.c

+1 −1
Original line number Diff line number Diff line
@@ -8207,7 +8207,7 @@ static void cik_uvd_resume(struct radeon_device *rdev) 
		return;



	ring = &rdev->ring[R600_RING_TYPE_UVD_INDEX];

	r = radeon_ring_init(rdev, ring, ring->ring_size, 0, RADEON_CP_PACKET2);

	r = radeon_ring_init(rdev, ring, ring->ring_size, 0, PACKET0(UVD_NO_OP, 0));

	if (r) {

		dev_err(rdev->dev, "failed initializing UVD ring (%d).\n", r);

		return;

drivers/gpu/drm/radeon/cikd.h

+1 −0
Original line number Diff line number Diff line
@@ -2069,6 +2069,7 @@ 
#define UVD_UDEC_ADDR_CONFIG		0xef4c

#define UVD_UDEC_DB_ADDR_CONFIG		0xef50

#define UVD_UDEC_DBW_ADDR_CONFIG	0xef54

#define UVD_NO_OP			0xeffc



#define UVD_LMI_EXT40_ADDR		0xf498

#define UVD_GP_SCRATCH4			0xf4e0

drivers/gpu/drm/radeon/evergreen.c

+1 −1
Original line number Diff line number Diff line
@@ -5579,7 +5579,7 @@ static void evergreen_uvd_resume(struct radeon_device *rdev) 
		return;



	ring = &rdev->ring[R600_RING_TYPE_UVD_INDEX];

	r = radeon_ring_init(rdev, ring, ring->ring_size, 0, RADEON_CP_PACKET2);

	r = radeon_ring_init(rdev, ring, ring->ring_size, 0, PACKET0(UVD_NO_OP, 0));

	if (r) {

		dev_err(rdev->dev, "failed initializing UVD ring (%d).\n", r);

		return;

drivers/gpu/drm/radeon/evergreend.h

+1 −0
Original line number Diff line number Diff line
@@ -1523,6 +1523,7 @@ 
#define UVD_UDEC_ADDR_CONFIG				0xef4c

#define UVD_UDEC_DB_ADDR_CONFIG				0xef50

#define UVD_UDEC_DBW_ADDR_CONFIG			0xef54

#define UVD_NO_OP					0xeffc

#define UVD_RBC_RB_RPTR					0xf690

#define UVD_RBC_RB_WPTR					0xf694

#define UVD_STATUS					0xf6bc

drivers/gpu/drm/radeon/ni.c

+1 −1
Original line number Diff line number Diff line
@@ -2062,7 +2062,7 @@ static void cayman_uvd_resume(struct radeon_device *rdev) 
		return;



	ring = &rdev->ring[R600_RING_TYPE_UVD_INDEX];

	r = radeon_ring_init(rdev, ring, ring->ring_size, 0, RADEON_CP_PACKET2);

	r = radeon_ring_init(rdev, ring, ring->ring_size, 0, PACKET0(UVD_NO_OP, 0));

	if (r) {

		dev_err(rdev->dev, "failed initializing UVD ring (%d).\n", r);

		return;