radeonsi/gfx10: finish up Navi14, add PCI ID

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>

diff --git a/include/pci_ids/radeonsi_pci_ids.h b/include/pci_ids/radeonsi_pci_ids.h
index fc545a1..6de3610 100644 (file)
--- 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 260fafa..a0ad774 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_pipe.c
+++ b/src/gallium/drivers/radeonsi/si_pipe.c
@@ -1122,7 +1122,8 @@ radeonsi_screen_create_impl(struct radeon_winsys *ws,
 #include "si_debug_options.h"
        }
 
-       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. */