diff options
author | Paulo Zanoni <paulo.r.zanoni@intel.com> | 2012-07-03 17:48:16 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-07-05 03:56:05 -0400 |
commit | f035083055555f8ab200f086c755d361830e3140 (patch) | |
tree | a11d609169185bf10e29de81dd99af8b80fa7c1b /drivers/gpu/drm/i915/i915_drv.h | |
parent | 2514bc510d0c3aadcc5204056bb440fa36845147 (diff) |
drm/i915: add PCH_NONE to enum intel_pch
And rely on the fact that it's 0 to assume that machines without a PCH
will have PCH_NONE as dev_priv->pch_type.
Just today I finally realized that HAS_PCH_IBX is true for machines
without a PCH. IMHO this is totally counter-intuitive and I don't
think it's a good idea to assume that we're going to check for
HAS_PCH_IBX only after we check for HAS_PCH_SPLIT.
I believe that in the future we'll have more PCH types and checks
like:
if (HAS_PCH_IBX(dev) || HAS_PCH_CPT(dev))
will become more and more common. There's a good chance that we may
break non-PCH machines by adding these checks in code that runs on all
machines. I also believe that the HAS_PCH_SPLIT check will become less
common as we add more and more different PCH types. We'll probably
start replacing checks like:
if (HAS_PCH_SPLIT(dev))
foo();
else
bar();
with:
if (HAS_PCH_NEW(dev))
baz();
else if (HAS_PCH_OLD(dev) || HAS_PCH_IBX(dev))
foo();
else
bar();
and this may break gen 2/3/4.
As far as we have investigated, this patch will affect the behavior of
intel_hdmi_dpms and intel_dp_link_down on gen 4. In both functions the
code inside the HAS_PCH_IBX check is for IBX-specific workarounds, so
we should be safe. If we start bisecting gen 2/3/4 bugs to this commit
we should consider replacing the HAS_PCH_IBX checks with something
else.
V2: Improve commit message, list possible side effects and solution.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
-rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 5a529b69110f..57d05c798c4b 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h | |||
@@ -336,6 +336,7 @@ enum no_fbc_reason { | |||
336 | }; | 336 | }; |
337 | 337 | ||
338 | enum intel_pch { | 338 | enum intel_pch { |
339 | PCH_NONE = 0, /* No PCH present */ | ||
339 | PCH_IBX, /* Ibexpeak PCH */ | 340 | PCH_IBX, /* Ibexpeak PCH */ |
340 | PCH_CPT, /* Cougarpoint PCH */ | 341 | PCH_CPT, /* Cougarpoint PCH */ |
341 | PCH_LPT, /* Lynxpoint PCH */ | 342 | PCH_LPT, /* Lynxpoint PCH */ |