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

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

drm/amdgpu: move vsync_timer_enabled setup to dce virtual early_init 



Put it in one place.

Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent a6be7570

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

+0 −1
Original line number Diff line number Diff line
@@ -2324,7 +2324,6 @@ static const struct amdgpu_ip_block_version kaveri_ip_blocks_vd[] = 
int cik_set_ip_blocks(struct amdgpu_device *adev)

{

	if (amdgpu_virtual_display) {

		adev->mode_info.vsync_timer_enabled = AMDGPU_IRQ_STATE_DISABLE;

		switch (adev->asic_type) {

		case CHIP_BONAIRE:

			adev->ip_blocks = bonaire_ip_blocks_vd;

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

+1 −0
Original line number Diff line number Diff line
@@ -353,6 +353,7 @@ static int dce_virtual_early_init(void *handle) 
{

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



	adev->mode_info.vsync_timer_enabled = AMDGPU_IRQ_STATE_DISABLE;

	dce_virtual_set_display_funcs(adev);

	dce_virtual_set_irq_funcs(adev);

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

+0 −1
Original line number Diff line number Diff line
@@ -1388,7 +1388,6 @@ static const struct amdgpu_ip_block_version cz_ip_blocks_vd[] = 
int vi_set_ip_blocks(struct amdgpu_device *adev)

{

	if (amdgpu_virtual_display) {

		adev->mode_info.vsync_timer_enabled = AMDGPU_IRQ_STATE_DISABLE;

		switch (adev->asic_type) {

		case CHIP_TOPAZ:

			adev->ip_blocks = topaz_ip_blocks;