diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-10-11 18:43:52 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-10-12 10:59:11 +0200 |
| commit | 4afa0ace429624fde392b29d05a803672a41192e (patch) | |
| tree | 97c09c51159e1bea8992d446499c921ddf1aba3f /drivers/gpu/drm/i915/dvo_ch7xxx.c | |
| parent | drm/i915: fixup the plane->pipe fixup code (diff) | |
| download | linux-4afa0ace429624fde392b29d05a803672a41192e.tar.xz linux-4afa0ace429624fde392b29d05a803672a41192e.zip | |
drm/i915/dvo-ch7xxx: fix get_hw_state
The boot-up state seems to be all-zeros, so it's safer to check for
the bits that need to be set when the dvo encoder is in the dpms on
state, than checking the bits we set when it's in the off state.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=55047
Tested-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/dvo_ch7xxx.c')
| -rw-r--r-- | drivers/gpu/drm/i915/dvo_ch7xxx.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/dvo_ch7xxx.c b/drivers/gpu/drm/i915/dvo_ch7xxx.c index 38f3a6cb8c7d..3edd981e0770 100644 --- a/drivers/gpu/drm/i915/dvo_ch7xxx.c +++ b/drivers/gpu/drm/i915/dvo_ch7xxx.c @@ -303,10 +303,10 @@ static bool ch7xxx_get_hw_state(struct intel_dvo_device *dvo) ch7xxx_readb(dvo, CH7xxx_PM, &val); - if (val & CH7xxx_PM_FPD) - return false; - else + if (val & (CH7xxx_PM_DVIL | CH7xxx_PM_DVIP)) return true; + else + return false; } static void ch7xxx_dump_regs(struct intel_dvo_device *dvo) |