← Back to branch summary

~ubuntu-branches/ubuntu/precise/xserver-xorg-video-intel/precise

« back to all changes in this revision

Viewing changes to src/intel_driver.h

  • Committer: Bazaar Package Importer
  • Author(s): Christopher James Halse Rogers, Robert Hooker, Christopher James Halse Rogers
  • Date: 2011-08-09 10:10:02 UTC
  • mfrom: (0.1.21 experimental)
  • Revision ID: james.westby@ubuntu.com-20110809101002-pguc3kc6pzh1cp5h
Tags: 2:2.15.901-1ubuntu1
[ Robert Hooker ]
* Merge from debian-experimental, remaining changes:
  - 101_copy-fb.patch
    + Plymouth integration patch
  - 120_check_privates.patch
    + Check for null privates pointer on render_dest_picture.
  - debian/xserver-xorg-video-intel.preinst.in:
  - debian/xserver-xorg-video-intel.postinst.in:
    + Remove obsolete /etc/modprobe.d/i915-kms.conf file on upgrades.
      KMS is the kernel default.
* Dropped patches:
  - 121_fdo-28798-fix.patch (upstream)

[ Christopher James Halse Rogers ]
* Refresh 101_copy-fb.patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/intel_driver.h
184
184
#define PCI_CHIP_SANDYBRIDGE_M_GT2_PLUS 0x0126
185
185
#define PCI_CHIP_SANDYBRIDGE_BRIDGE_S   0x0108  /* Server */
186
186
#define PCI_CHIP_SANDYBRIDGE_S_GT       0x010A
 
187
 
 
188
#define PCI_CHIP_IVYBRIDGE_M_GT1        0x0156
 
189
#define PCI_CHIP_IVYBRIDGE_M_GT2        0x0166
 
190
#define PCI_CHIP_IVYBRIDGE_D_GT1        0x0152
 
191
#define PCI_CHIP_IVYBRIDGE_D_GT2        0x0162
 
192
#define PCI_CHIP_IVYBRIDGE_S_GT1        0x015a
 
193
 
187
194
#endif
188
195
 
189
196
#define I85X_CAPID                      0x44
209
216
#define IS_GEN4(intel) IS_GENx(intel, 4)
210
217
#define IS_GEN5(intel) IS_GENx(intel, 5)
211
218
#define IS_GEN6(intel) IS_GENx(intel, 6)
 
219
#define IS_GEN7(intel) IS_GENx(intel, 7)
212
220
 
213
221
/* Some chips have specific errata (or limits) that we need to workaround. */
214
222
#define IS_I830(intel) (DEVICE_ID((intel)->PciInfo) == PCI_CHIP_I830_M)
222
230
 
223
231
/* supports Y tiled surfaces (pre-965 Mesa isn't ready yet) */
224
232
#define SUPPORTS_YTILING(pI810) (INTEL_INFO(intel)->gen >= 40)
 
233
#define HAS_BLT(pI810) (INTEL_INFO(intel)->gen >= 60)
225
234
 
226
235
extern SymTabRec *intel_chipsets;
227
236