From 0207c318e0d03fb641e0a35b979a92479b1d53e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Tue, 20 Aug 2019 18:57:36 -0400 Subject: [PATCH] radeonsi/gfx10: finish up Navi14, add PCI ID --- include/pci_ids/radeonsi_pci_ids.h | 2 ++ src/gallium/drivers/radeonsi/si_pipe.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/include/pci_ids/radeonsi_pci_ids.h b/include/pci_ids/radeonsi_pci_ids.h index fc545a1af0c..6de361024c0 100644 --- a/include/pci_ids/radeonsi_pci_ids.h +++ b/include/pci_ids/radeonsi_pci_ids.h @@ -267,3 +267,5 @@ CHIPSET(0x7319, NAVI10) CHIPSET(0x731A, NAVI10) CHIPSET(0x731B, NAVI10) CHIPSET(0x731F, NAVI10) + +CHIPSET(0x7340, NAVI14) diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c index b44d4ba9a24..ef1963824ef 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.c +++ b/src/gallium/drivers/radeonsi/si_pipe.c @@ -1136,7 +1136,8 @@ radeonsi_screen_create_impl(struct radeon_winsys *ws, sscreen->has_dcc_constant_encode = sscreen->info.family == CHIP_RAVEN2 || sscreen->info.family == CHIP_RENOIR || sscreen->info.chip_class >= GFX10; - sscreen->use_ngg = sscreen->info.chip_class >= GFX10; + sscreen->use_ngg = sscreen->info.chip_class >= GFX10 && + sscreen->info.family != CHIP_NAVI14; sscreen->use_ngg_streamout = false; /* Only enable primitive binning on APUs by default. */