diff options
| author | Chad Versace <chad.versace@linux.intel.com> | 2012-01-27 10:02:16 -0800 |
|---|---|---|
| committer | Chad Versace <chad.versace@linux.intel.com> | 2012-01-30 13:03:35 -0800 |
| commit | 592ac67626f6d69bd8b518a33e80e9c4d223eba2 (patch) | |
| tree | 22688a538e8c21b3b56260f7ae1ec3ed584bd90b /intel | |
| parent | b643b0713aefdc0611e47654e88263b53b0de6f5 (diff) | |
intel: Fix bufmgr_gem->gen for gen > 4
If the pci_device's actual gen was > 4, then we stupidly set
bufmgr_gem->gen = 6. Luckily this caused no bugs, and this fix shouldn't
change any behavior, because all checks against the gen currently have one
of the forms below:
gen == 2
gen == 3
gen >= 4
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
Diffstat (limited to 'intel')
| -rw-r--r-- | intel/intel_bufmgr_gem.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c index 2b4fab13..26e3a5ce 100644 --- a/intel/intel_bufmgr_gem.c +++ b/intel/intel_bufmgr_gem.c @@ -2321,8 +2321,14 @@ drm_intel_bufmgr_gem_init(int fd, int batch_size) bufmgr_gem->gen = 3; else if (IS_GEN4(bufmgr_gem->pci_device)) bufmgr_gem->gen = 4; - else + else if (IS_GEN5(bufmgr_gem->pci_device)) + bufmgr_gem->gen = 5; + else if (IS_GEN6(bufmgr_gem->pci_device)) bufmgr_gem->gen = 6; + else if (IS_GEN7(bufmgr_gem->pci_device)) + bufmgr_gem->gen = 7; + else + assert(0); if (IS_GEN3(bufmgr_gem->pci_device) && bufmgr_gem->gtt_size > 256*1024*1024) { |