From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chad Versace Subject: [PATCH] intel: Fix bufmgr_gem->gen for gen > 4 Date: Mon, 30 Jan 2012 09:41:50 -0800 Message-ID: <1327945310-24565-1-git-send-email-chad.versace@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id C115A9E7B5 for ; Mon, 30 Jan 2012 09:41:51 -0800 (PST) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org If the pci_device's actual gen was > 4, then we stupidly set bufmgr_gem->gen = 6. Signed-off-by: Chad Versace --- 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 2b4fab1..26e3a5c 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) { -- 1.7.7.5