diff options
Diffstat (limited to 'drivers/gpu/drm/i915/dvo_ch7xxx.c')
-rw-r--r-- | drivers/gpu/drm/i915/dvo_ch7xxx.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/drivers/gpu/drm/i915/dvo_ch7xxx.c b/drivers/gpu/drm/i915/dvo_ch7xxx.c index a9b896289680..d56ff5cc22b2 100644 --- a/drivers/gpu/drm/i915/dvo_ch7xxx.c +++ b/drivers/gpu/drm/i915/dvo_ch7xxx.c | |||
@@ -152,7 +152,7 @@ static bool ch7xxx_readb(struct intel_dvo_device *dvo, int addr, uint8_t *ch) | |||
152 | }; | 152 | }; |
153 | 153 | ||
154 | if (!ch7xxx->quiet) { | 154 | if (!ch7xxx->quiet) { |
155 | DRM_DEBUG("Unable to read register 0x%02x from %s:%02x.\n", | 155 | DRM_DEBUG_KMS("Unable to read register 0x%02x from %s:%02x.\n", |
156 | addr, i2cbus->adapter.name, dvo->slave_addr); | 156 | addr, i2cbus->adapter.name, dvo->slave_addr); |
157 | } | 157 | } |
158 | return false; | 158 | return false; |
@@ -179,7 +179,7 @@ static bool ch7xxx_writeb(struct intel_dvo_device *dvo, int addr, uint8_t ch) | |||
179 | return true; | 179 | return true; |
180 | 180 | ||
181 | if (!ch7xxx->quiet) { | 181 | if (!ch7xxx->quiet) { |
182 | DRM_DEBUG("Unable to write register 0x%02x to %s:%d.\n", | 182 | DRM_DEBUG_KMS("Unable to write register 0x%02x to %s:%d.\n", |
183 | addr, i2cbus->adapter.name, dvo->slave_addr); | 183 | addr, i2cbus->adapter.name, dvo->slave_addr); |
184 | } | 184 | } |
185 | 185 | ||
@@ -207,7 +207,8 @@ static bool ch7xxx_init(struct intel_dvo_device *dvo, | |||
207 | 207 | ||
208 | name = ch7xxx_get_id(vendor); | 208 | name = ch7xxx_get_id(vendor); |
209 | if (!name) { | 209 | if (!name) { |
210 | DRM_DEBUG("ch7xxx not detected; got 0x%02x from %s slave %d.\n", | 210 | DRM_DEBUG_KMS("ch7xxx not detected; got 0x%02x from %s " |
211 | "slave %d.\n", | ||
211 | vendor, adapter->name, dvo->slave_addr); | 212 | vendor, adapter->name, dvo->slave_addr); |
212 | goto out; | 213 | goto out; |
213 | } | 214 | } |
@@ -217,13 +218,14 @@ static bool ch7xxx_init(struct intel_dvo_device *dvo, | |||
217 | goto out; | 218 | goto out; |
218 | 219 | ||
219 | if (device != CH7xxx_DID) { | 220 | if (device != CH7xxx_DID) { |
220 | DRM_DEBUG("ch7xxx not detected; got 0x%02x from %s slave %d.\n", | 221 | DRM_DEBUG_KMS("ch7xxx not detected; got 0x%02x from %s " |
222 | "slave %d.\n", | ||
221 | vendor, adapter->name, dvo->slave_addr); | 223 | vendor, adapter->name, dvo->slave_addr); |
222 | goto out; | 224 | goto out; |
223 | } | 225 | } |
224 | 226 | ||
225 | ch7xxx->quiet = false; | 227 | ch7xxx->quiet = false; |
226 | DRM_DEBUG("Detected %s chipset, vendor/device ID 0x%02x/0x%02x\n", | 228 | DRM_DEBUG_KMS("Detected %s chipset, vendor/device ID 0x%02x/0x%02x\n", |
227 | name, vendor, device); | 229 | name, vendor, device); |
228 | return true; | 230 | return true; |
229 | out: | 231 | out: |
@@ -315,8 +317,8 @@ static void ch7xxx_dump_regs(struct intel_dvo_device *dvo) | |||
315 | 317 | ||
316 | for (i = 0; i < CH7xxx_NUM_REGS; i++) { | 318 | for (i = 0; i < CH7xxx_NUM_REGS; i++) { |
317 | if ((i % 8) == 0 ) | 319 | if ((i % 8) == 0 ) |
318 | DRM_DEBUG("\n %02X: ", i); | 320 | DRM_LOG_KMS("\n %02X: ", i); |
319 | DRM_DEBUG("%02X ", ch7xxx->mode_reg.regs[i]); | 321 | DRM_LOG_KMS("%02X ", ch7xxx->mode_reg.regs[i]); |
320 | } | 322 | } |
321 | } | 323 | } |
322 | 324 | ||