From: Ben Widawsky <ben@bwidawsk.net>
Date: Sat, 27 Jul 2013 22:30:41 +0000 (-0700)
Subject: lib/intel_mmio: Fix the fixed fix (register access)
X-Git-Tag: intel-gpu-tools-1.4~279
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a85548910cbb5f9f9c90b99a178e3b5bc1034730;p=profile%2Fextras%2Fintel-gpu-tools.git

lib/intel_mmio: Fix the fixed fix (register access)

When I moved code around here:
commit 57bc7631e161a7bdcf7f68e1a46049dcb49c2256
Author: Ben Widawsky <ben@bwidawsk.net>
Date:   Thu May 23 11:09:55 2013 -0700

    lib/intel_mmio: Fix the fix

I accidently dropped the intel_gen() for the PCI id.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=67289
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
---

diff --git a/lib/intel_mmio.c b/lib/intel_mmio.c
index 21a84d4..7b1bcac 100644
--- a/lib/intel_mmio.c
+++ b/lib/intel_mmio.c
@@ -191,8 +191,8 @@ intel_register_access_init(struct pci_device *pci_dev, int safe)
 	if (mmio_data.inited)
 		return -1;
 
-
-	mmio_data.safe = (safe != 0  && pci_dev->device_id >= 4) ? true : false;
+	mmio_data.safe = (safe != 0 &&
+			intel_gen(pci_dev->device_id) >= 4) ? true : false;
 	mmio_data.i915_devid = pci_dev->device_id;
 	if (mmio_data.safe)
 		mmio_data.map = intel_get_register_map(mmio_data.i915_devid);