Commit 5d062270 authored by Srinivasan Shanmugam's avatar Srinivasan Shanmugam Committed by Alex Deucher
Browse files

drm/amd/amdgpu: Fix errors & warnings in amdgpu_vcn.c 



Fix below checkpatch insisted error & warnings:

ERROR: space required before the open brace '{'
WARNING: braces {} are not necessary for any arm of this statement
+       if ((type == VCN_ENCODE_RING) && (vcn_config & VCN_BLOCK_ENCODE_DISABLE_MASK)) {
[...]
+       } else if ((type == VCN_DECODE_RING) && (vcn_config & VCN_BLOCK_DECODE_DISABLE_MASK)) {
[...]
+       } else if ((type == VCN_UNIFIED_RING) && (vcn_config & VCN_BLOCK_QUEUE_DISABLE_MASK)) {
[...]
ERROR: code indent should use tabs where possible
WARNING: Prefer 'unsigned int' to bare use of 'unsigned'
WARNING: braces {} are not necessary for single statement blocks
+               for (i = 0; i < adev->vcn.num_enc_rings; ++i) {
+                       fence[j] += amdgpu_fence_count_emitted(&adev->vcn.inst[j].ring_enc[i]);
+
ERROR: space required before the open parenthesis '('
WARNING: Missing a blank line after declarations
WARNING: please, no spaces at the start of a line
WARNING: Symbolic permissions 'S_IRUGO' are not preferred. Consider using octal permissions '0444'.

Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: Christian König <christian.koenig@amd.com>
Signed-off-by: default avatarSrinivasan Shanmugam <srinivasan.shanmugam@amd.com>
Acked-by: default avatarLuben Tuikov <luben.tuikov@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 29f187f7

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

+17 −18
Original line number Diff line number Diff line
@@ -276,20 +276,19 @@ bool amdgpu_vcn_is_disabled_vcn(struct amdgpu_device *adev, enum vcn_ring_type t 
	bool ret = false;

	int vcn_config = adev->vcn.vcn_config[vcn_instance];



	if ((type == VCN_ENCODE_RING) && (vcn_config & VCN_BLOCK_ENCODE_DISABLE_MASK)) {

	if ((type == VCN_ENCODE_RING) && (vcn_config & VCN_BLOCK_ENCODE_DISABLE_MASK))

		ret = true;

	} else if ((type == VCN_DECODE_RING) && (vcn_config & VCN_BLOCK_DECODE_DISABLE_MASK)) {

	else if ((type == VCN_DECODE_RING) && (vcn_config & VCN_BLOCK_DECODE_DISABLE_MASK))

		ret = true;

	} else if ((type == VCN_UNIFIED_RING) && (vcn_config & VCN_BLOCK_QUEUE_DISABLE_MASK)) {

	else if ((type == VCN_UNIFIED_RING) && (vcn_config & VCN_BLOCK_QUEUE_DISABLE_MASK))

		ret = true;

	}



	return ret;

}



int amdgpu_vcn_suspend(struct amdgpu_device *adev)

{

	unsigned size;

	unsigned int size;

	void *ptr;

	int i, idx;
@@ -318,7 +317,7 @@ int amdgpu_vcn_suspend(struct amdgpu_device *adev) 


int amdgpu_vcn_resume(struct amdgpu_device *adev)

{

	unsigned size;

	unsigned int size;

	void *ptr;

	int i, idx;
@@ -340,7 +339,7 @@ int amdgpu_vcn_resume(struct amdgpu_device *adev) 
			adev->vcn.inst[i].saved_bo = NULL;

		} else {

			const struct common_firmware_header *hdr;

			unsigned offset;

			unsigned int offset;



			hdr = (const struct common_firmware_header *)adev->vcn.fw->data;

			if (adev->firmware.load_type != AMDGPU_FW_LOAD_PSP) {
@@ -371,9 +370,8 @@ static void amdgpu_vcn_idle_work_handler(struct work_struct *work) 
		if (adev->vcn.harvest_config & (1 << j))

			continue;



		for (i = 0; i < adev->vcn.num_enc_rings; ++i) {

		for (i = 0; i < adev->vcn.num_enc_rings; ++i)

			fence[j] += amdgpu_fence_count_emitted(&adev->vcn.inst[j].ring_enc[i]);

		}



		if (adev->pg_flags & AMD_PG_SUPPORT_VCN_DPG)	{

			struct dpg_pause_state new_state;
@@ -460,7 +458,7 @@ int amdgpu_vcn_dec_ring_test_ring(struct amdgpu_ring *ring) 
{

	struct amdgpu_device *adev = ring->adev;

	uint32_t tmp = 0;

	unsigned i;

	unsigned int i;

	int r;



	/* VCN in SRIOV does not support direct register read/write */
@@ -797,7 +795,7 @@ int amdgpu_vcn_enc_ring_test_ring(struct amdgpu_ring *ring) 
{

	struct amdgpu_device *adev = ring->adev;

	uint32_t rptr;

	unsigned i;

	unsigned int i;

	int r;



	if (amdgpu_sriov_vf(adev))
@@ -1031,6 +1029,7 @@ void amdgpu_vcn_setup_ucode(struct amdgpu_device *adev) 


	if (adev->firmware.load_type == AMDGPU_FW_LOAD_PSP) {

		const struct common_firmware_header *hdr;



		hdr = (const struct common_firmware_header *)adev->vcn.fw->data;



		for (i = 0; i < adev->vcn.num_vcn_inst; i++) {
@@ -1134,7 +1133,7 @@ void amdgpu_debugfs_vcn_fwlog_init(struct amdgpu_device *adev, uint8_t i, 
	char name[32];



	sprintf(name, "amdgpu_vcn_%d_fwlog", i);

	debugfs_create_file_size(name, S_IFREG | S_IRUGO, root, vcn,

	debugfs_create_file_size(name, S_IFREG | 0444, root, vcn,

				 &amdgpu_debugfs_vcnfwlog_fops,

				 AMDGPU_VCNFW_LOG_SIZE);

#endif