drm/amdgpu: move amdgpu_vce structure to vce header

Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Leo Liu <leo.liu@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index d7f9f1e6ae60c66c88e7ede6dacd6e654f878326..a17a54fc8f273eb083113a71401b3fb756baa4f4 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -60,6 +60,7 @@
 #include "amdgpu_dpm.h"
 #include "amdgpu_acp.h"
 #include "amdgpu_uvd.h"
+#include "amdgpu_vce.h"
 
 #include "gpu_scheduler.h"
 #include "amdgpu_virt.h"
@@ -1034,34 +1035,6 @@ void amdgpu_wb_free_64bit(struct amdgpu_device *adev, u32 wb);
 
 void amdgpu_get_pcie_info(struct amdgpu_device *adev);
 
-/*
- * VCE
- */
-#define AMDGPU_MAX_VCE_HANDLES 16
-#define AMDGPU_VCE_FIRMWARE_OFFSET 256
-
-#define AMDGPU_VCE_HARVEST_VCE0 (1 << 0)
-#define AMDGPU_VCE_HARVEST_VCE1 (1 << 1)
-
-struct amdgpu_vce {
-       struct amdgpu_bo        *vcpu_bo;
-       uint64_t                gpu_addr;
-       unsigned                fw_version;
-       unsigned                fb_version;
-       atomic_t                handles[AMDGPU_MAX_VCE_HANDLES];
-       struct drm_file         *filp[AMDGPU_MAX_VCE_HANDLES];
-       uint32_t                img_size[AMDGPU_MAX_VCE_HANDLES];
-       struct delayed_work     idle_work;
-       struct mutex            idle_mutex;
-       const struct firmware   *fw;    /* VCE firmware */
-       struct amdgpu_ring      ring[AMDGPU_MAX_VCE_RINGS];
-       struct amdgpu_irq_src   irq;
-       unsigned                harvest_config;
-       struct amd_sched_entity entity;
-       uint32_t                srbm_soft_reset;
-       unsigned                num_rings;
-};
-
 /*
  * SDMA
  */

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h
index d98041f7508dd37aedf61f06c03271819514a6c9..0a7f18c461e44a8e6cfffca505f56e52fe8aec27 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h
@@ -24,6 +24,31 @@
 #ifndef __AMDGPU_VCE_H__
 #define __AMDGPU_VCE_H__
 
+#define AMDGPU_MAX_VCE_HANDLES 16
+#define AMDGPU_VCE_FIRMWARE_OFFSET 256
+
+#define AMDGPU_VCE_HARVEST_VCE0 (1 << 0)
+#define AMDGPU_VCE_HARVEST_VCE1 (1 << 1)
+
+struct amdgpu_vce {
+       struct amdgpu_bo        *vcpu_bo;
+       uint64_t                gpu_addr;
+       unsigned                fw_version;
+       unsigned                fb_version;
+       atomic_t                handles[AMDGPU_MAX_VCE_HANDLES];
+       struct drm_file         *filp[AMDGPU_MAX_VCE_HANDLES];
+       uint32_t                img_size[AMDGPU_MAX_VCE_HANDLES];
+       struct delayed_work     idle_work;
+       struct mutex            idle_mutex;
+       const struct firmware   *fw;    /* VCE firmware */
+       struct amdgpu_ring      ring[AMDGPU_MAX_VCE_RINGS];
+       struct amdgpu_irq_src   irq;
+       unsigned                harvest_config;
+       struct amd_sched_entity entity;
+       uint32_t                srbm_soft_reset;
+       unsigned                num_rings;
+};
+
 int amdgpu_vce_sw_init(struct amdgpu_device *adev, unsigned long size);
 int amdgpu_vce_sw_fini(struct amdgpu_device *adev);
 int amdgpu_vce_suspend(struct amdgpu_device *adev);