Commit 18f769ff authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu: remove non-DC DCE 11 code 



DC has been the default for ~8 years now and supports
many things that the non-DC code does not (audio, DP MST, etc.).
No DCE 11.x IPs ever supported analog encoders so that is not
an issue.  Finally drop this code.

Acked-by: default avatarTimur Kristóf <timur.kristof@gmail.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 34f10da6

drivers/gpu/drm/amd/amdgpu/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -138,7 +138,6 @@ amdgpu-y += \ 
# add DCE block

amdgpu-y += \

	dce_v10_0.o \

	dce_v11_0.o \

	amdgpu_vkms.o



# add GFX block

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

+0 −8
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
#include "dce_v8_0.h"

#endif

#include "dce_v10_0.h"

#include "dce_v11_0.h"

#include "ivsrcid/ivsrcid_vislands30.h"

#include "amdgpu_vkms.h"

#include "amdgpu_display.h"
@@ -581,13 +580,6 @@ static int amdgpu_vkms_hw_init(struct amdgpu_ip_block *ip_block) 
	case CHIP_TONGA:

		dce_v10_0_disable_dce(adev);

		break;

	case CHIP_CARRIZO:

	case CHIP_STONEY:

	case CHIP_POLARIS10:

	case CHIP_POLARIS11:

	case CHIP_VEGAM:

		dce_v11_0_disable_dce(adev);

		break;

	case CHIP_TOPAZ:

#ifdef CONFIG_DRM_AMDGPU_SI

	case CHIP_HAINAN:

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

deleted100644 → 0
+0 −3817

File deleted.

Preview size limit exceeded, changes collapsed.

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

deleted100644 → 0
+0 −32
Original line number Diff line number Diff line 
/*

 * Copyright 2014 Advanced Micro Devices, Inc.

 *

 * Permission is hereby granted, free of charge, to any person obtaining a

 * copy of this software and associated documentation files (the "Software"),

 * to deal in the Software without restriction, including without limitation

 * the rights to use, copy, modify, merge, publish, distribute, sublicense,

 * and/or sell copies of the Software, and to permit persons to whom the

 * Software is furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice shall be included in

 * all copies or substantial portions of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

 * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 * OTHER DEALINGS IN THE SOFTWARE.

 *

 */



#ifndef __DCE_V11_0_H__

#define __DCE_V11_0_H__



extern const struct amdgpu_ip_block_version dce_v11_0_ip_block;

extern const struct amdgpu_ip_block_version dce_v11_2_ip_block;



void dce_v11_0_disable_dce(struct amdgpu_device *adev);



#endif

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

+0 −7
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ 
#include "sdma_v2_4.h"

#include "sdma_v3_0.h"

#include "dce_v10_0.h"

#include "dce_v11_0.h"

#include "iceland_ih.h"

#include "tonga_ih.h"

#include "cz_ih.h"
@@ -2124,8 +2123,6 @@ int vi_set_ip_blocks(struct amdgpu_device *adev) 
		else if (amdgpu_device_has_dc_support(adev))

			amdgpu_device_ip_block_add(adev, &dm_ip_block);

#endif

		else

			amdgpu_device_ip_block_add(adev, &dce_v11_2_ip_block);

		amdgpu_device_ip_block_add(adev, &uvd_v6_3_ip_block);

		amdgpu_device_ip_block_add(adev, &vce_v3_4_ip_block);

		break;
@@ -2142,8 +2139,6 @@ int vi_set_ip_blocks(struct amdgpu_device *adev) 
		else if (amdgpu_device_has_dc_support(adev))

			amdgpu_device_ip_block_add(adev, &dm_ip_block);

#endif

		else

			amdgpu_device_ip_block_add(adev, &dce_v11_0_ip_block);

		amdgpu_device_ip_block_add(adev, &uvd_v6_0_ip_block);

		amdgpu_device_ip_block_add(adev, &vce_v3_1_ip_block);

#if defined(CONFIG_DRM_AMD_ACP)
@@ -2163,8 +2158,6 @@ int vi_set_ip_blocks(struct amdgpu_device *adev) 
		else if (amdgpu_device_has_dc_support(adev))

			amdgpu_device_ip_block_add(adev, &dm_ip_block);

#endif

		else

			amdgpu_device_ip_block_add(adev, &dce_v11_0_ip_block);

		amdgpu_device_ip_block_add(adev, &uvd_v6_2_ip_block);

		amdgpu_device_ip_block_add(adev, &vce_v3_4_ip_block);

#if defined(CONFIG_DRM_AMD_ACP)