diff options
| author |  Daniel Vetter <daniel.vetter@ffwll.ch>
| 2014-04-09 14:33:47 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch>
| 2014-04-09 14:33:47 +0200 |
| commit | 8cbf3202098f191f8b0a0606b2df0af047f21fe5 (patch) | |
| tree | 8e49e81e1879de78fcd6ac64041b9a72db06caec /drivers/gpu/drm/i915/dvo_ns2501.c | |
| parent | drm/i915: Provide a bit more info when pipestat bits are wrong (diff) | |
| parent | DRM: armada: fix corruption while loading cursors (diff) | |
| download | linux-8cbf3202098f191f8b0a0606b2df0af047f21fe5.tar.gz linux-8cbf3202098f191f8b0a0606b2df0af047f21fe5.tar.bz2 linux-8cbf3202098f191f8b0a0606b2df0af047f21fe5.zip | |
Merge remote-tracking branch 'airlied/drm-next' into HEAD
Backmerge drm-next after the big s/crtc->fb/crtc->primary->fb/
cocinelle patch to avoid endless amounts of conflict hilarity in my
-next queue for 3.16.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/dvo_ns2501.c')
| -rw-r--r-- | drivers/gpu/drm/i915/dvo_ns2501.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/dvo_ns2501.c b/drivers/gpu/drm/i915/dvo_ns2501.c index ce5242f69d80..ccac3a151c6c 100644 --- a/drivers/gpu/drm/i915/dvo_ns2501.c +++ b/drivers/gpu/drm/i915/dvo_ns2501.c @@ -484,15 +484,15 @@ static void ns2501_dump_regs(struct intel_dvo_device *dvo) uint8_t val; ns2501_readb(dvo, NS2501_FREQ_LO, &val); - DRM_LOG_KMS("NS2501_FREQ_LO: 0x%02x\n", val); + DRM_DEBUG_KMS("NS2501_FREQ_LO: 0x%02x\n", val); ns2501_readb(dvo, NS2501_FREQ_HI, &val); - DRM_LOG_KMS("NS2501_FREQ_HI: 0x%02x\n", val); + DRM_DEBUG_KMS("NS2501_FREQ_HI: 0x%02x\n", val); ns2501_readb(dvo, NS2501_REG8, &val); - DRM_LOG_KMS("NS2501_REG8: 0x%02x\n", val); + DRM_DEBUG_KMS("NS2501_REG8: 0x%02x\n", val); ns2501_readb(dvo, NS2501_REG9, &val); - DRM_LOG_KMS("NS2501_REG9: 0x%02x\n", val); + DRM_DEBUG_KMS("NS2501_REG9: 0x%02x\n", val); ns2501_readb(dvo, NS2501_REGC, &val); - DRM_LOG_KMS("NS2501_REGC: 0x%02x\n", val); + DRM_DEBUG_KMS("NS2501_REGC: 0x%02x\n", val); } static void ns2501_destroy(struct intel_dvo_device *dvo) |