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

Commit 004e29cc authored by Edward O'Callaghan's avatar Edward O'Callaghan Committed by Alex Deucher
Browse files

drivers/amdgpu: Use canonical form in branch predicates 



Found-by: Coccinelle
Signed-off-by: default avatarEdward O'Callaghan <funfunctor@folklore1984.net>
Reviewed-by: default avatarTom St Denis <tom.stdenis@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent ed5121a3

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

+7 −7
Original line number Diff line number Diff line
@@ -352,22 +352,22 @@ bool amdgpu_get_bios(struct amdgpu_device *adev) 
	uint16_t tmp, bios_header_start;



	r = amdgpu_atrm_get_bios(adev);

	if (r == false)

	if (!r)

		r = amdgpu_acpi_vfct_bios(adev);

	if (r == false)

	if (!r)

		r = igp_read_bios_from_vram(adev);

	if (r == false)

	if (!r)

		r = amdgpu_read_bios(adev);

	if (r == false) {

	if (!r) {

		r = amdgpu_read_bios_from_rom(adev);

	}

	if (r == false) {

	if (!r) {

		r = amdgpu_read_disabled_bios(adev);

	}

	if (r == false) {

	if (!r) {

		r = amdgpu_read_platform_bios(adev);

	}

	if (r == false || adev->bios == NULL) {

	if (!r || adev->bios == NULL) {

		DRM_ERROR("Unable to locate a BIOS ROM\n");

		adev->bios = NULL;

		return false;

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

+1 −1
Original line number Diff line number Diff line
@@ -3034,7 +3034,7 @@ static int ci_populate_single_memory_level(struct amdgpu_device *adev, 


	if (pi->mclk_stutter_mode_threshold &&

	    (memory_clock <= pi->mclk_stutter_mode_threshold) &&

	    (pi->uvd_enabled == false) &&

	    (!pi->uvd_enabled) &&

	    (RREG32(mmDPG_PIPE_STUTTER_CONTROL) & DPG_PIPE_STUTTER_CONTROL__STUTTER_ENABLE_MASK) &&

	    (adev->pm.dpm.new_active_crtc_count <= 2))

		memory_level->StutterEnable = true;

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

+1 −1
Original line number Diff line number Diff line
@@ -879,7 +879,7 @@ static void cik_vga_set_state(struct amdgpu_device *adev, bool state) 
	uint32_t tmp;



	tmp = RREG32(mmCONFIG_CNTL);

	if (state == false)

	if (!state)

		tmp |= CONFIG_CNTL__VGA_DIS_MASK;

	else

		tmp &= ~CONFIG_CNTL__VGA_DIS_MASK;

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

+1 −1
Original line number Diff line number Diff line
@@ -354,7 +354,7 @@ static void cik_sdma_enable(struct amdgpu_device *adev, bool enable) 
	u32 me_cntl;

	int i;



	if (enable == false) {

	if (!enable) {

		cik_sdma_gfx_stop(adev);

		cik_sdma_rlc_stop(adev);

	}

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

+1 −1
Original line number Diff line number Diff line
@@ -393,7 +393,7 @@ static void sdma_v2_4_enable(struct amdgpu_device *adev, bool enable) 
	u32 f32_cntl;

	int i;



	if (enable == false) {

	if (!enable) {

		sdma_v2_4_gfx_stop(adev);

		sdma_v2_4_rlc_stop(adev);

	}