Commit ee3942d9 authored by David (Ming Qiang) Wu's avatar David (Ming Qiang) Wu Committed by Alex Deucher
Browse files

drm/amdgpu: drop some kernel messages in VCN code 



Similar to commit 813e7d4c where some kernel log
messages are dropped. With this commit, more log
messages in older version of VCN/JPEG code are dropped.

Acked-by: default avatarLeo Liu <leo.liu@amd.com>
Signed-off-by: default avatarDavid (Ming Qiang) Wu <David.Wu3@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 778e3979

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

+0 −1
Original line number Diff line number Diff line
@@ -581,7 +581,6 @@ static const struct amdgpu_ring_funcs jpeg_v1_0_decode_ring_vm_funcs = { 
static void jpeg_v1_0_set_dec_ring_funcs(struct amdgpu_device *adev)

{

	adev->jpeg.inst->ring_dec->funcs = &jpeg_v1_0_decode_ring_vm_funcs;

	DRM_INFO("JPEG decode is enabled in VM mode\n");

}



static const struct amdgpu_irq_src_funcs jpeg_v1_0_irq_funcs = {

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

+1 −7
Original line number Diff line number Diff line
@@ -131,16 +131,11 @@ static int jpeg_v2_0_hw_init(void *handle) 
{

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

	struct amdgpu_ring *ring = adev->jpeg.inst->ring_dec;

	int r;



	adev->nbio.funcs->vcn_doorbell_range(adev, ring->use_doorbell,

		(adev->doorbell_index.vcn.vcn_ring0_1 << 1), 0);



	r = amdgpu_ring_test_helper(ring);

	if (!r)

		DRM_INFO("JPEG decode initialized successfully.\n");



	return r;

	return amdgpu_ring_test_helper(ring);

}



/**
@@ -795,7 +790,6 @@ static const struct amdgpu_ring_funcs jpeg_v2_0_dec_ring_vm_funcs = { 
static void jpeg_v2_0_set_dec_ring_funcs(struct amdgpu_device *adev)

{

	adev->jpeg.inst->ring_dec->funcs = &jpeg_v2_0_dec_ring_vm_funcs;

	DRM_INFO("JPEG decode is enabled in VM mode\n");

}



static const struct amdgpu_irq_src_funcs jpeg_v2_0_irq_funcs = {

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

+0 −3
Original line number Diff line number Diff line
@@ -196,8 +196,6 @@ static int jpeg_v2_5_hw_init(void *handle) 
			return r;

	}



	DRM_INFO("JPEG decode initialized successfully.\n");



	return 0;

}
@@ -728,7 +726,6 @@ static void jpeg_v2_5_set_dec_ring_funcs(struct amdgpu_device *adev) 
		else  /* CHIP_ALDEBARAN */

			adev->jpeg.inst[i].ring_dec->funcs = &jpeg_v2_6_dec_ring_vm_funcs;

		adev->jpeg.inst[i].ring_dec->me = i;

		DRM_INFO("JPEG(%d) JPEG decode is enabled in VM mode\n", i);

	}

}

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

+1 −9
Original line number Diff line number Diff line
@@ -146,18 +146,11 @@ static int jpeg_v3_0_hw_init(void *handle) 
{

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

	struct amdgpu_ring *ring = adev->jpeg.inst->ring_dec;

	int r;



	adev->nbio.funcs->vcn_doorbell_range(adev, ring->use_doorbell,

		(adev->doorbell_index.vcn.vcn_ring0_1 << 1), 0);



	r = amdgpu_ring_test_helper(ring);

	if (r)

		return r;



	DRM_INFO("JPEG decode initialized successfully.\n");



	return 0;

	return amdgpu_ring_test_helper(ring);

}



/**
@@ -593,7 +586,6 @@ static const struct amdgpu_ring_funcs jpeg_v3_0_dec_ring_vm_funcs = { 
static void jpeg_v3_0_set_dec_ring_funcs(struct amdgpu_device *adev)

{

	adev->jpeg.inst->ring_dec->funcs = &jpeg_v3_0_dec_ring_vm_funcs;

	DRM_INFO("JPEG decode is enabled in VM mode\n");

}



static const struct amdgpu_irq_src_funcs jpeg_v3_0_irq_funcs = {

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

+0 −3
Original line number Diff line number Diff line
@@ -181,8 +181,6 @@ static int jpeg_v4_0_hw_init(void *handle) 
			return r;

	}



	DRM_DEV_INFO(adev->dev, "JPEG decode initialized successfully.\n");



	return 0;

}
@@ -755,7 +753,6 @@ static const struct amdgpu_ring_funcs jpeg_v4_0_dec_ring_vm_funcs = { 
static void jpeg_v4_0_set_dec_ring_funcs(struct amdgpu_device *adev)

{

	adev->jpeg.inst->ring_dec->funcs = &jpeg_v4_0_dec_ring_vm_funcs;

	DRM_DEV_INFO(adev->dev, "JPEG decode is enabled in VM mode\n");

}



static const struct amdgpu_irq_src_funcs jpeg_v4_0_irq_funcs = {