← Back to branch summary

~ubuntu-branches/ubuntu/raring/mesa/raring-proposed

« back to all changes in this revision

Viewing changes to debian/patches/fix-missing-gt3-id.diff

  • Committer: Package Import Robot
  • Author(s): Timo Aaltonen
  • Date: 2013-07-03 13:54:33 UTC
  • mfrom: (1.7.17)
  • Revision ID: package-import@ubuntu.com-20130703135433-2lmjx7p6q8p13jqf
Tags: 9.1.4-0ubuntu0.1
https://launchpad.net/bugs/1197363
https://launchpad.net/bugs/1197316
* New upstream bugfix release 9.1.4. (LP: #1197363)
  - fix a GPU hang with GT3. (LP: #1197316)
* Dropped patches that are included in this release
* revert-a64c1eb9b110.diff: updated.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/fix-missing-gt3-id.diff
1
 
commit 888fc7a89197972aac614fc19d1c82ed1adbb3f2
2
 
Author: Rodrigo Vivi <rodrigo.vivi@gmail.com>
3
 
Date:   Mon May 13 17:53:38 2013 -0300
4
 
 
5
 
    i965: Add missing Haswell GT3 Desktop to IS_HSW_GT3 check.
6
 
    
7
 
    NOTE: This is a candidate for stable branches.
8
 
    
9
 
    Signed-off-by: Rodrigo Vivi <rodrigo.vivi@gmail.com>
10
 
    Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
11
 
 
12
 
diff --git a/src/mesa/drivers/dri/intel/intel_chipset.h b/src/mesa/drivers/dri/intel/intel_chipset.h
13
 
index df025ac..ee735bb 100644
14
 
--- a/src/mesa/drivers/dri/intel/intel_chipset.h
15
 
+++ b/src/mesa/drivers/dri/intel/intel_chipset.h
16
 
@@ -230,8 +230,8 @@
17
 
                                 devid == PCI_CHIP_HASWELL_CRW_GT2 || \
18
 
                                 devid == PCI_CHIP_HASWELL_CRW_M_GT2 || \
19
 
                                 devid == PCI_CHIP_HASWELL_CRW_S_GT2)
20
 
-
21
 
-#define IS_HSW_GT3(devid)      (devid == PCI_CHIP_HASWELL_M_GT3 || \
22
 
+#define IS_HSW_GT3(devid)      (devid == PCI_CHIP_HASWELL_GT3 || \
23
 
+                                devid == PCI_CHIP_HASWELL_M_GT3 || \
24
 
                                 devid == PCI_CHIP_HASWELL_S_GT3 || \
25
 
                                 devid == PCI_CHIP_HASWELL_SDV_GT3 || \
26
 
                                 devid == PCI_CHIP_HASWELL_SDV_M_GT3 || \