From ed25a10dc35a9e1c0ae691e782d8d2caedc4ab21 Mon Sep 17 00:00:00 2001 From: Ben Widawsky Date: Fri, 5 Apr 2013 13:12:40 -0700 Subject: [PATCH] --- yaml --- r: 371439 b: refs/heads/master c: 40c7ead980945ac96eadbd6d99b050458d797e2b h: refs/heads/master i: 371437: 58b45b7fee20b3d93c433ee9ed808f0858a4d568 371435: aa11d422a80678a03888e8e5845de7d3e38fa0d4 371431: d3af506328af97e769660939509dde6e93065a61 371423: 1c7f9a5703b2d3e90b395498a5792679a441775b v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/i915_drv.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 0932a785a972..46653ba31cfd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e3c74757c23cbbbb0c64b34c107732f3e2d67fa3 +refs/heads/master: 40c7ead980945ac96eadbd6d99b050458d797e2b diff --git a/trunk/drivers/gpu/drm/i915/i915_drv.h b/trunk/drivers/gpu/drm/i915/i915_drv.h index 44fca0b69473..69ddfd1c18f5 100644 --- a/trunk/drivers/gpu/drm/i915/i915_drv.h +++ b/trunk/drivers/gpu/drm/i915/i915_drv.h @@ -479,6 +479,7 @@ enum intel_pch { PCH_IBX, /* Ibexpeak PCH */ PCH_CPT, /* Cougarpoint PCH */ PCH_LPT, /* Lynxpoint PCH */ + PCH_NOP, }; enum intel_sbi_destination { @@ -1373,6 +1374,7 @@ struct drm_i915_file_private { #define HAS_PCH_LPT(dev) (INTEL_PCH_TYPE(dev) == PCH_LPT) #define HAS_PCH_CPT(dev) (INTEL_PCH_TYPE(dev) == PCH_CPT) #define HAS_PCH_IBX(dev) (INTEL_PCH_TYPE(dev) == PCH_IBX) +#define HAS_PCH_NOP(dev) (INTEL_PCH_TYPE(dev) == PCH_NOP) #define HAS_PCH_SPLIT(dev) (INTEL_PCH_TYPE(dev) != PCH_NONE) #define HAS_FORCE_WAKE(dev) (INTEL_INFO(dev)->has_force_wake)