geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

intel: get gen once for gen >= 9 

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.demarchi@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
main
Lucas De Marchi 2018-09-05 11:32:00 -07:00 committed by Rodrigo Vivi
parent 584ca8fe53
commit c55f1b9b29
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
intel/intel_bufmgr_gem.c
View File

@ -3656,13 +3656,7 @@ drm_intel_bufmgr_gem_init(int fd, int batch_size)
bufmgr_gem->gen = 7; bufmgr_gem->gen = 7;
else if (IS_GEN8(bufmgr_gem->pci_device)) else if (IS_GEN8(bufmgr_gem->pci_device))
bufmgr_gem->gen = 8; bufmgr_gem->gen = 8;
else if (IS_GEN9(bufmgr_gem->pci_device)) else if (!intel_get_genx(bufmgr_gem->pci_device, &bufmgr_gem->gen)) {
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 {
free(bufmgr_gem); free(bufmgr_gem);
bufmgr_gem = NULL; bufmgr_gem = NULL;
goto exit; goto exit;

8
intel/intel_decode.c
View File

@ -3823,12 +3823,8 @@ drm_intel_decode_context_alloc(uint32_t devid)
ctx->devid = devid; ctx->devid = devid;
ctx->out = stdout; ctx->out = stdout;
if (IS_GEN11(devid)) if (intel_get_genx(devid, &ctx->gen))
ctx->gen = 11; ;
else if (IS_GEN10(devid))
ctx->gen = 10;
else if (IS_GEN9(devid))
ctx->gen = 9;
else if (IS_GEN8(devid)) else if (IS_GEN8(devid))
ctx->gen = 8; ctx->gen = 8;
else if (IS_GEN7(devid)) else if (IS_GEN7(devid))