Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[linux.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_jpeg.h

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h
index 1471a1ebb03449fd939cbd8aa6a6501fd9c9b9c3..ffe47e9f5bf2f6bf6728ed394330d521306e06b8 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h
@@ -26,20 +26,22 @@
 
 #include "amdgpu_ras.h"
 
 
 #include "amdgpu_ras.h"
 

-#define AMDGPU_MAX_JPEG_INSTANCES      2
+#define AMDGPU_MAX_JPEG_INSTANCES      4
+#define AMDGPU_MAX_JPEG_RINGS          8

 
 #define AMDGPU_JPEG_HARVEST_JPEG0 (1 << 0)
 #define AMDGPU_JPEG_HARVEST_JPEG1 (1 << 1)
 
 struct amdgpu_jpeg_reg{
 
 #define AMDGPU_JPEG_HARVEST_JPEG0 (1 << 0)
 #define AMDGPU_JPEG_HARVEST_JPEG1 (1 << 1)
 
 struct amdgpu_jpeg_reg{

-       unsigned jpeg_pitch;
+       unsigned jpeg_pitch[AMDGPU_MAX_JPEG_RINGS];

 };
 
 struct amdgpu_jpeg_inst {
 };
 
 struct amdgpu_jpeg_inst {

-       struct amdgpu_ring ring_dec;
+       struct amdgpu_ring ring_dec[AMDGPU_MAX_JPEG_RINGS];

        struct amdgpu_irq_src irq;
        struct amdgpu_irq_src ras_poison_irq;
        struct amdgpu_jpeg_reg external;
        struct amdgpu_irq_src irq;
        struct amdgpu_irq_src ras_poison_irq;
        struct amdgpu_jpeg_reg external;

+       uint8_t aid_id;

 };
 
 struct amdgpu_jpeg_ras {
 };
 
 struct amdgpu_jpeg_ras {


@@ -49,6 +51,7 @@ struct amdgpu_jpeg_ras {
 struct amdgpu_jpeg {
        uint8_t num_jpeg_inst;
        struct amdgpu_jpeg_inst inst[AMDGPU_MAX_JPEG_INSTANCES];
 struct amdgpu_jpeg {
        uint8_t num_jpeg_inst;
        struct amdgpu_jpeg_inst inst[AMDGPU_MAX_JPEG_INSTANCES];

+       unsigned num_jpeg_rings;

        struct amdgpu_jpeg_reg internal;
        unsigned harvest_config;
        struct delayed_work idle_work;
        struct amdgpu_jpeg_reg internal;
        unsigned harvest_config;
        struct delayed_work idle_work;


@@ -57,6 +60,9 @@ struct amdgpu_jpeg {
        atomic_t total_submission_cnt;
        struct ras_common_if    *ras_if;
        struct amdgpu_jpeg_ras  *ras;
        atomic_t total_submission_cnt;
        struct ras_common_if    *ras_if;
        struct amdgpu_jpeg_ras  *ras;

+
+       uint16_t inst_mask;
+       uint8_t num_inst_per_aid;

 };
 
 int amdgpu_jpeg_sw_init(struct amdgpu_device *adev);
 };
 
 int amdgpu_jpeg_sw_init(struct amdgpu_device *adev);