diff options
| author | Ben Widawsky <ben@bwidawsk.net> | 2013-04-05 16:12:41 -0400 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-04-08 14:53:00 -0400 |
| commit | ab5c608b2d96c8db80b9c7df072f18f3a4226b55 (patch) | |
| tree | f25192e8a98fafcc3e1481feb53e985594e05692 /drivers/gpu/drm/i915/intel_bios.c | |
| parent | 40c7ead980945ac96eadbd6d99b050458d797e2b (diff) | |
drm/i915: Don't touch South Display when PCH_NOP
Interrupts, clock gating, LVDS, and GMBUS are all within the, "this will
be bad for CPU" range when we have PCH_NOP.
There is a bit of a hack in init clock gating. We want to do most of the
clock gating, but the part we skip will hang the system. It could
probably be abstracted a bit better, but I don't feel it's too
unsightly.
v2: Use inverse HAS_PCH_NOP check (Jani)
v3: Actually do what I claimed in v2 (spotted by Daniel)
Merge Ivybridge IRQ handler PCH check to decrease whitespace (Daniel)
Move LVDS bail into this patch (Ben)
v4: logical rebase conflict resolution with SDEIIR (Ben)
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Brush up patch a bit and resolve conflicts:
- Adjust PCH_NOP checks due to Egbert's hpd handling rework.
- Addd a PCH_NOP check in the irq uninstall code.
- Resolve conflicts with Paulo's SDE irq handling race fix.
v5: Drop the added hunks in the ilk irq handler again, they're bogus.
OOps.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_bios.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_bios.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c index 55ffba1f5818..194df27c89eb 100644 --- a/drivers/gpu/drm/i915/intel_bios.c +++ b/drivers/gpu/drm/i915/intel_bios.c | |||
| @@ -692,6 +692,9 @@ intel_parse_bios(struct drm_device *dev) | |||
| 692 | struct bdb_header *bdb = NULL; | 692 | struct bdb_header *bdb = NULL; |
| 693 | u8 __iomem *bios = NULL; | 693 | u8 __iomem *bios = NULL; |
| 694 | 694 | ||
| 695 | if (HAS_PCH_NOP(dev)) | ||
| 696 | return -ENODEV; | ||
| 697 | |||
| 695 | init_vbt_defaults(dev_priv); | 698 | init_vbt_defaults(dev_priv); |
| 696 | 699 | ||
| 697 | /* XXX Should this validation be moved to intel_opregion.c? */ | 700 | /* XXX Should this validation be moved to intel_opregion.c? */ |