[Intel-gfx] [PATCH libdrm v2 5/5] intel: get gen once for gen >= 9

[Lucas De Marchi]

We don't need to call IS_GEN() for each gen >= 9: we can rather use the
new intel_is_genx() helper to iterate the pciids array once.

Signed-off-by: Lucas De Marchi <lucas.demar...@intel.com>
---
 intel/intel_bufmgr_gem.c | 8 +-------
 intel/intel_decode.c     | 8 ++------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c
index 8c3a4b20..d6587b76 100644
--- a/intel/intel_bufmgr_gem.c
+++ b/intel/intel_bufmgr_gem.c
@@ -3656,13 +3656,7 @@ drm_intel_bufmgr_gem_init(int fd, int batch_size)
                bufmgr_gem->gen = 7;
        else if (IS_GEN8(bufmgr_gem->pci_device))
                bufmgr_gem->gen = 8;
-       else if (IS_GEN9(bufmgr_gem->pci_device))
-               bufmgr_gem->gen = 9;
-       else if (IS_GEN10(bufmgr_gem->pci_device))
-               bufmgr_gem->gen = 10;
-       else if (IS_GEN11(bufmgr_gem->pci_device))
-               bufmgr_gem->gen = 11;
-       else {
+       else if (!intel_get_genx(bufmgr_gem->pci_device, &bufmgr_gem->gen)) {
                free(bufmgr_gem);
                bufmgr_gem = NULL;
                goto exit;
diff --git a/intel/intel_decode.c b/intel/intel_decode.c
index b24861b1..0ff095bc 100644
--- a/intel/intel_decode.c
+++ b/intel/intel_decode.c
@@ -3823,12 +3823,8 @@ drm_intel_decode_context_alloc(uint32_t devid)
        ctx->devid = devid;
        ctx->out = stdout;
 
-       if (IS_GEN11(devid))
-               ctx->gen = 11;
-       else if (IS_GEN10(devid))
-               ctx->gen = 10;
-       else if (IS_GEN9(devid))
-               ctx->gen = 9;
+       if (intel_get_genx(devid, &ctx->gen))
+               ;
        else if (IS_GEN8(devid))
                ctx->gen = 8;
        else if (IS_GEN7(devid))
-- 
2.17.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx