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

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

drm/amdgpu: unify some atombios/atomfirmware scratch reg functions 



Now that we use a pointer to the scratch reg start offset,
most of the functions were duplicated.

Acked-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 3164cba3

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

+0 −35
Original line number Diff line number Diff line
@@ -66,41 +66,6 @@ void amdgpu_atomfirmware_scratch_regs_init(struct amdgpu_device *adev) 
	}

}



void amdgpu_atomfirmware_scratch_regs_save(struct amdgpu_device *adev)

{

	int i;



	for (i = 0; i < AMDGPU_BIOS_NUM_SCRATCH; i++)

		adev->bios_scratch[i] = RREG32(adev->bios_scratch_reg_offset + i);

}



void amdgpu_atomfirmware_scratch_regs_restore(struct amdgpu_device *adev)

{

	int i;



	/*

	 * VBIOS will check ASIC_INIT_COMPLETE bit to decide if

	 * execute ASIC_Init posting via driver

	 */

	adev->bios_scratch[7] &= ~ATOM_S7_ASIC_INIT_COMPLETE_MASK;



	for (i = 0; i < AMDGPU_BIOS_NUM_SCRATCH; i++)

		WREG32(adev->bios_scratch_reg_offset + i, adev->bios_scratch[i]);

}



void amdgpu_atomfirmware_scratch_regs_engine_hung(struct amdgpu_device *adev,

						  bool hung)

{

	u32 tmp = RREG32(adev->bios_scratch_reg_offset + 3);



	if (hung)

		tmp |= ATOM_S3_ASIC_GUI_ENGINE_HUNG;

	else

		tmp &= ~ATOM_S3_ASIC_GUI_ENGINE_HUNG;



	WREG32(adev->bios_scratch_reg_offset + 3, tmp);

}



int amdgpu_atomfirmware_allocate_fb_scratch(struct amdgpu_device *adev)

{

	struct atom_context *ctx = adev->mode_info.atom_context;

drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h

+0 −4
Original line number Diff line number Diff line
@@ -26,10 +26,6 @@ 


bool amdgpu_atomfirmware_gpu_supports_virtualization(struct amdgpu_device *adev);

void amdgpu_atomfirmware_scratch_regs_init(struct amdgpu_device *adev);

void amdgpu_atomfirmware_scratch_regs_save(struct amdgpu_device *adev);

void amdgpu_atomfirmware_scratch_regs_restore(struct amdgpu_device *adev);

void amdgpu_atomfirmware_scratch_regs_engine_hung(struct amdgpu_device *adev,

						  bool hung);

int amdgpu_atomfirmware_allocate_fb_scratch(struct amdgpu_device *adev);



#endif

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

+4 −16
Original line number Diff line number Diff line
@@ -2393,9 +2393,6 @@ int amdgpu_device_suspend(struct drm_device *dev, bool suspend, bool fbcon) 
	 */

	amdgpu_bo_evict_vram(adev);



	if (adev->is_atom_fw)

		amdgpu_atomfirmware_scratch_regs_save(adev);

	else

	amdgpu_atombios_scratch_regs_save(adev);

	pci_save_state(dev->pdev);

	if (suspend) {
@@ -2445,9 +2442,6 @@ int amdgpu_device_resume(struct drm_device *dev, bool resume, bool fbcon) 
		if (r)

			goto unlock;

	}

	if (adev->is_atom_fw)

		amdgpu_atomfirmware_scratch_regs_restore(adev);

	else

	amdgpu_atombios_scratch_regs_restore(adev);



	/* post card */
@@ -2861,14 +2855,8 @@ int amdgpu_gpu_reset(struct amdgpu_device *adev) 
		r = amdgpu_suspend(adev);



retry:

		if (adev->is_atom_fw)

			amdgpu_atomfirmware_scratch_regs_save(adev);

		else

		amdgpu_atombios_scratch_regs_save(adev);

		r = amdgpu_asic_reset(adev);

		if (adev->is_atom_fw)

			amdgpu_atomfirmware_scratch_regs_restore(adev);

		else

		amdgpu_atombios_scratch_regs_restore(adev);

		/* post card */

		amdgpu_atom_asic_init(adev->mode_info.atom_context);

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

+3 −3
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
#include <linux/module.h>

#include <drm/drmP.h>

#include "amdgpu.h"

#include "amdgpu_atomfirmware.h"

#include "amdgpu_atombios.h"

#include "amdgpu_ih.h"

#include "amdgpu_uvd.h"

#include "amdgpu_vce.h"
@@ -392,11 +392,11 @@ static void soc15_gpu_pci_config_reset(struct amdgpu_device *adev) 


static int soc15_asic_reset(struct amdgpu_device *adev)

{

	amdgpu_atomfirmware_scratch_regs_engine_hung(adev, true);

	amdgpu_atombios_scratch_regs_engine_hung(adev, true);



	soc15_gpu_pci_config_reset(adev);



	amdgpu_atomfirmware_scratch_regs_engine_hung(adev, false);

	amdgpu_atombios_scratch_regs_engine_hung(adev, false);



	return 0;

}