Skip to content

Commit d4a640d

Browse files
Timur Kristófalexdeucher
authored andcommitted
drm/amdgpu/vce1: Implement VCE1 IP block (v2)
Implement the necessary functionality to support the VCE1. This implementation is based on: - VCE2 code from amdgpu - VCE1 code from radeon (the old driver) - Some trial and error A subsequent commit will ensure correct mapping for the VCPU BO, which will make this actually work. v2: - Use memset_io more. - Use memcpy_toio more. - Remove __func__ from warnings. - Don't reserve and map the VCPU BO anymore. - Add empty line to multi-line comments Signed-off-by: Timur Kristóf <timur.kristof@gmail.com> Co-developed-by: Alexandre Demers <alexandre.f.demers@gmail.com> Signed-off-by: Alexandre Demers <alexandre.f.demers@gmail.com> Acked-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent e402519 commit d4a640d

4 files changed

Lines changed: 818 additions & 1 deletion

File tree

drivers/gpu/drm/amd/amdgpu/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ amdgpu-$(CONFIG_DRM_AMDGPU_CIK)+= cik.o cik_ih.o \
7878
dce_v8_0.o gfx_v7_0.o cik_sdma.o uvd_v4_2.o vce_v2_0.o
7979

8080
amdgpu-$(CONFIG_DRM_AMDGPU_SI)+= si.o gmc_v6_0.o gfx_v6_0.o si_ih.o si_dma.o dce_v6_0.o \
81-
uvd_v3_1.o
81+
uvd_v3_1.o vce_v1_0.o
8282

8383
amdgpu-y += \
8484
vi.o mxgpu_vi.o nbio_v6_1.o soc15.o emu_soc.o mxgpu_ai.o nbio_v7_0.o vega10_reg_init.o \

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ struct amdgpu_vce {
5151
struct drm_sched_entity entity;
5252
uint32_t srbm_soft_reset;
5353
unsigned num_rings;
54+
uint32_t keyselect;
5455
};
5556

5657
int amdgpu_vce_early_init(struct amdgpu_device *adev);

0 commit comments

Comments
 (0)