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

Commit c1dc356a authored by Leo Liu's avatar Leo Liu Committed by Alex Deucher
Browse files

drm/amdgpu: add initial vce 4.0 support for vega10 



Signed-off-by: default avatarLeo Liu <leo.liu@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 09bfb891

drivers/gpu/drm/amd/amdgpu/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -84,7 +84,8 @@ amdgpu-y += \ 
# add VCE block

amdgpu-y += \

	amdgpu_vce.o \

	vce_v3_0.o

	vce_v3_0.o \

	vce_v4_0.o



# add amdkfd interfaces

amdgpu-y += \

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

+7 −0
Original line number Diff line number Diff line
@@ -54,6 +54,8 @@ 
#define FIRMWARE_POLARIS11         "amdgpu/polaris11_vce.bin"

#define FIRMWARE_POLARIS12         "amdgpu/polaris12_vce.bin"



#define FIRMWARE_VEGA10		"amdgpu/vega10_vce.bin"



#ifdef CONFIG_DRM_AMDGPU_CIK

MODULE_FIRMWARE(FIRMWARE_BONAIRE);

MODULE_FIRMWARE(FIRMWARE_KABINI);
@@ -69,6 +71,8 @@ MODULE_FIRMWARE(FIRMWARE_POLARIS10); 
MODULE_FIRMWARE(FIRMWARE_POLARIS11);

MODULE_FIRMWARE(FIRMWARE_POLARIS12);



MODULE_FIRMWARE(FIRMWARE_VEGA10);



static void amdgpu_vce_idle_work_handler(struct work_struct *work);



/**
@@ -123,6 +127,9 @@ int amdgpu_vce_sw_init(struct amdgpu_device *adev, unsigned long size) 
	case CHIP_POLARIS11:

		fw_name = FIRMWARE_POLARIS11;

		break;

	case CHIP_VEGA10:

		fw_name = FIRMWARE_VEGA10;

		break;

	case CHIP_POLARIS12:

		fw_name = FIRMWARE_POLARIS12;

		break;

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

0 → 100644
+894 −0

File added.

Preview size limit exceeded, changes collapsed.

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

0 → 100644
+29 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2016 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 __VCE_V4_0_H__

#define __VCE_V4_0_H__



extern const struct amdgpu_ip_block_version vce_v4_0_ip_block;



#endif