sync with OpenBSD -current
This commit is contained in:
parent
ee68147dcd
commit
1cefe29c7e
1651 changed files with 283292 additions and 68089 deletions
|
@ -26,19 +26,22 @@
|
|||
|
||||
#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{
|
||||
unsigned jpeg_pitch;
|
||||
unsigned jpeg_pitch[AMDGPU_MAX_JPEG_RINGS];
|
||||
};
|
||||
|
||||
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;
|
||||
uint8_t aid_id;
|
||||
};
|
||||
|
||||
struct amdgpu_jpeg_ras {
|
||||
|
@ -48,6 +51,7 @@ struct amdgpu_jpeg_ras {
|
|||
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;
|
||||
|
@ -56,6 +60,9 @@ struct amdgpu_jpeg {
|
|||
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);
|
||||
|
@ -72,5 +79,8 @@ int amdgpu_jpeg_dec_ring_test_ib(struct amdgpu_ring *ring, long timeout);
|
|||
int amdgpu_jpeg_process_poison_irq(struct amdgpu_device *adev,
|
||||
struct amdgpu_irq_src *source,
|
||||
struct amdgpu_iv_entry *entry);
|
||||
int amdgpu_jpeg_ras_late_init(struct amdgpu_device *adev,
|
||||
struct ras_common_if *ras_block);
|
||||
int amdgpu_jpeg_ras_sw_init(struct amdgpu_device *adev);
|
||||
|
||||
#endif /*__AMDGPU_JPEG_H__*/
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue