sync with OpenBSD -current
This commit is contained in:
parent
aa342b6fac
commit
f172bc2cf7
7 changed files with 32 additions and 11 deletions
|
@ -209,6 +209,7 @@ static const struct pci_matchid amdgpu_devices[] = {
|
|||
|
||||
/* GC 11.0.0, DCN 3.2.0, dGPU, "Navi 31" */
|
||||
{0x1002, 0x7448 }, /* Radeon Pro W7900 */
|
||||
{0x1002, 0x744a }, /* Radeon Pro W7900 Dual Slot */
|
||||
{0x1002, 0x744c }, /* Radeon RX 7900 XT/XTX/GRE, 7900M */
|
||||
{0x1002, 0x745e }, /* Radeon Pro W7800 */
|
||||
|
||||
|
@ -234,9 +235,13 @@ static const struct pci_matchid amdgpu_devices[] = {
|
|||
/* GC 11.0.4, DCN 3.1.4, APU, Ryzen 8040, "Hawk Point" */
|
||||
{0x1002, 0x1901 }, /* Radeon 740M */
|
||||
|
||||
/* GC 11.5.0, DCN 3.5.0, APU, linux >= 6.7 */
|
||||
/* GC 11.5.1, DCN 3.5.1, APU, linux >= 6.9 */
|
||||
#ifdef notyet
|
||||
/* GC 11.5.0, DCN 3.5.0, APU, Ryzen AI 300, "Strix Point", linux 6.7 */
|
||||
{0x1002, 0x150e }, /* Radeon 880M / 890M */
|
||||
|
||||
/* GC 12.0.0, DCN 4.0.1, dGPU, linux ?, amd-staging-drm-next */
|
||||
/* GC 12.0.1, DCN 4.0.1, dGPU, linux ?, amd-staging-drm-next */
|
||||
/* GC 11.5.1, DCN 3.5.1, APU, linux 6.9 */
|
||||
|
||||
/* GC 12.0.0, DCN 4.0.1, dGPU, linux 6.11 */
|
||||
/* GC 12.0.1, DCN 4.0.1, dGPU, linux 6.11 */
|
||||
#endif
|
||||
};
|
||||
|
|
|
@ -2027,7 +2027,7 @@ static int sdma_v4_0_process_trap_irq(struct amdgpu_device *adev,
|
|||
struct amdgpu_irq_src *source,
|
||||
struct amdgpu_iv_entry *entry)
|
||||
{
|
||||
uint32_t instance;
|
||||
int instance;
|
||||
|
||||
DRM_DEBUG("IH: SDMA trap\n");
|
||||
instance = sdma_v4_0_irq_id_to_seq(entry->client_id);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue