From: Leo Liu Date: Tue, 10 Jan 2017 16:23:23 +0000 (-0500) Subject: drm/amdgpu: add uvd enc rings X-Git-Tag: v4.12-rc1~116^2~23^2~207 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f7243053c24d97565c8de3f31ec3b910e7519e9f;p=karo-tx-linux.git drm/amdgpu: add uvd enc rings And initialize them Reviewed-by: Christian König Signed-off-by: Leo Liu Reviewed-by: Alex Deucher Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h index f0c1a6bbd444..1508c08759dc 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h @@ -27,10 +27,11 @@ #include "gpu_scheduler.h" /* max number of rings */ -#define AMDGPU_MAX_RINGS 16 +#define AMDGPU_MAX_RINGS 18 #define AMDGPU_MAX_GFX_RINGS 1 #define AMDGPU_MAX_COMPUTE_RINGS 8 #define AMDGPU_MAX_VCE_RINGS 3 +#define AMDGPU_MAX_UVD_ENC_RINGS 2 /* some special values for the owner field */ #define AMDGPU_FENCE_OWNER_UNDEFINED ((void*)0ul) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h index 797210dd52de..7b7f46897811 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h @@ -43,11 +43,13 @@ struct amdgpu_uvd { struct delayed_work idle_work; const struct firmware *fw; /* UVD firmware */ struct amdgpu_ring ring; + struct amdgpu_ring ring_enc[AMDGPU_MAX_UVD_ENC_RINGS]; struct amdgpu_irq_src irq; bool address_64_bit; bool use_ctx_buf; struct amd_sched_entity entity; uint32_t srbm_soft_reset; + unsigned num_enc_rings; }; int amdgpu_uvd_sw_init(struct amdgpu_device *adev);