From 671649e89ea6813c3f4a57fed24f123e583146c2 Mon Sep 17 00:00:00 2001 From: Jesse Barnes Date: Wed, 6 Apr 2011 12:11:14 -0700 Subject: [PATCH] --- yaml --- r: 250615 b: refs/heads/master c: 85436696fefd55afdf8f4ce26ac044be72f2d492 h: refs/heads/master i: 250613: c090804f5f0d3d33ae410bce7c3609a9bb92905f 250611: 8f0efb8d7958c8e3426b5e284fb79119c2e8b051 250607: 13a7879d67f4bbc7e71d94bf407dfe2a366a353e v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/i915_drv.h | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 33d17eb7b3a9..3a9ff13d2827 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f796cf8f517f13826bb691432b03c7b5da13e530 +refs/heads/master: 85436696fefd55afdf8f4ce26ac044be72f2d492 diff --git a/trunk/drivers/gpu/drm/i915/i915_drv.h b/trunk/drivers/gpu/drm/i915/i915_drv.h index 4359697d2894..8a0fa14ee714 100644 --- a/trunk/drivers/gpu/drm/i915/i915_drv.h +++ b/trunk/drivers/gpu/drm/i915/i915_drv.h @@ -935,11 +935,18 @@ enum intel_chip_family { #define IS_IRONLAKE_M(dev) ((dev)->pci_device == 0x0046) #define IS_MOBILE(dev) (INTEL_INFO(dev)->is_mobile) +/* + * The genX designation typically refers to the render engine, so render + * capability related checks should use IS_GEN, while display and other checks + * have their own (e.g. HAS_PCH_SPLIT for ILK+ display, IS_foo for particular + * chips, etc.). + */ #define IS_GEN2(dev) (INTEL_INFO(dev)->gen == 2) #define IS_GEN3(dev) (INTEL_INFO(dev)->gen == 3) #define IS_GEN4(dev) (INTEL_INFO(dev)->gen == 4) #define IS_GEN5(dev) (INTEL_INFO(dev)->gen == 5) #define IS_GEN6(dev) (INTEL_INFO(dev)->gen == 6) +#define IS_GEN7(dev) (INTEL_INFO(dev)->gen == 7) #define HAS_BSD(dev) (INTEL_INFO(dev)->has_bsd_ring) #define HAS_BLT(dev) (INTEL_INFO(dev)->has_blt_ring)