Fix the build with DRMDEBUG. Committing now instead of after unlock to

make it easier for people running release to diagnose drm problems.
ok deraadt@

6 files changed, 46 insertions, 46 deletions

diff --git a/sys/dev/pci/drm/i915/dvo_ch7017.c b/sys/dev/pci/drm/i915/dvo_ch7017.c
index 81ecd99a4b0..672d24015ae 100644
--- a/sys/dev/pci/drm/i915/dvo_ch7017.c
+++ b/sys/dev/pci/drm/i915/dvo_ch7017.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dvo_ch7017.c,v 1.5 2015/09/23 23:12:11 kettenis Exp $	*/
+/*	$OpenBSD: dvo_ch7017.c,v 1.6 2016/02/24 21:06:13 jsg Exp $	*/
 /*
  * Copyright © 2006 Intel Corporation
  *
@@ -226,14 +226,14 @@ static bool ch7017_init(struct intel_dvo_device *dvo,
 		str = "ch7019";
 		break;
 	default:
-		DRM_DEBUG_KMS("ch701x not detected, got %d: from %s "
+		DRM_DEBUG_KMS("ch701x not detected, got %d: from  "
 			      "slave %d.\n",
-			      val, adapter->name, dvo->slave_addr);
+			      val, dvo->slave_addr);
 		goto fail;
 	}
 
-	DRM_DEBUG_KMS("%s detected on %s, addr %d\n",
-		      str, adapter->name, dvo->slave_addr);
+	DRM_DEBUG_KMS("%s detected, addr %d\n",
+		      str, dvo->slave_addr);
 	return true;
 
 fail:
diff --git a/sys/dev/pci/drm/i915/dvo_ch7xxx.c b/sys/dev/pci/drm/i915/dvo_ch7xxx.c
index 77d27e19e17..3dc1e727f0d 100644
--- a/sys/dev/pci/drm/i915/dvo_ch7xxx.c
+++ b/sys/dev/pci/drm/i915/dvo_ch7xxx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dvo_ch7xxx.c,v 1.5 2015/09/23 23:12:11 kettenis Exp $	*/
+/*	$OpenBSD: dvo_ch7xxx.c,v 1.6 2016/02/24 21:06:13 jsg Exp $	*/
 /**************************************************************************
 
 Copyright © 2006 Dave Airlie
@@ -157,8 +157,8 @@ static bool ch7xxx_readb(struct intel_dvo_device *dvo, int addr, uint8_t *ch)
 read_err:
 	iic_release_bus(adapter, 0);
 	if (!ch7xxx->quiet) {
-		DRM_DEBUG_KMS("Unable to read register 0x%02x from %s:%02x.\n",
-			  addr, adapter->name, dvo->slave_addr);
+		DRM_DEBUG_KMS("Unable to read register 0x%02x from %02x.\n",
+			  addr, dvo->slave_addr);
 	}
 	return false;
 }
@@ -185,8 +185,8 @@ static bool ch7xxx_writeb(struct intel_dvo_device *dvo, int addr, uint8_t ch)
 
 write_err:
 	if (!ch7xxx->quiet) {
-		DRM_DEBUG_KMS("Unable to write register 0x%02x to %s:%d.\n",
-			  addr, adapter->name, dvo->slave_addr);
+		DRM_DEBUG_KMS("Unable to write register 0x%02x to %d.\n",
+			  addr, dvo->slave_addr);
 	}
 
 	return false;
@@ -213,9 +213,9 @@ static bool ch7xxx_init(struct intel_dvo_device *dvo,
 
 	name = ch7xxx_get_id(vendor);
 	if (!name) {
-		DRM_DEBUG_KMS("ch7xxx not detected; got 0x%02x from %s "
+		DRM_DEBUG_KMS("ch7xxx not detected; got 0x%02x from "
 				"slave %d.\n",
-			  vendor, adapter->name, dvo->slave_addr);
+			  vendor, dvo->slave_addr);
 		goto out;
 	}
 
@@ -225,9 +225,9 @@ static bool ch7xxx_init(struct intel_dvo_device *dvo,
 
 	devid = ch7xxx_get_did(device);
 	if (!devid) {
-		DRM_DEBUG_KMS("ch7xxx not detected; got 0x%02x from %s "
+		DRM_DEBUG_KMS("ch7xxx not detected; got 0x%02x from "
 				"slave %d.\n",
-			  vendor, adapter->name, dvo->slave_addr);
+			  vendor, dvo->slave_addr);
 		goto out;
 	}
 
diff --git a/sys/dev/pci/drm/i915/dvo_ivch.c b/sys/dev/pci/drm/i915/dvo_ivch.c
index 075a59c2b7b..e0e0f924f54 100644
--- a/sys/dev/pci/drm/i915/dvo_ivch.c
+++ b/sys/dev/pci/drm/i915/dvo_ivch.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dvo_ivch.c,v 1.6 2015/09/23 23:12:11 kettenis Exp $	*/
+/*	$OpenBSD: dvo_ivch.c,v 1.7 2016/02/24 21:06:13 jsg Exp $	*/
 /*
  * Copyright © 2006 Intel Corporation
  *
@@ -196,8 +196,8 @@ read_err:
 	iic_release_bus(adapter, 0);
 	if (!priv->quiet) {
 		DRM_DEBUG_KMS("Unable to read register 0x%02x from "
-				"%s:%02x.\n",
-			  addr, adapter->name, dvo->slave_addr);
+				"%02x.\n",
+			  addr, dvo->slave_addr);
 	}
 	return false;
 }
@@ -225,8 +225,8 @@ static bool ivch_write(struct intel_dvo_device *dvo, int addr, uint16_t data)
 
 write_err:
 	if (!priv->quiet) {
-		DRM_DEBUG_KMS("Unable to write register 0x%02x to %s:%d.\n",
-			  addr, adapter->name, dvo->slave_addr);
+		DRM_DEBUG_KMS("Unable to write register 0x%02x to %d.\n",
+			  addr, dvo->slave_addr);
 	}
 
 	return false;
diff --git a/sys/dev/pci/drm/i915/dvo_ns2501.c b/sys/dev/pci/drm/i915/dvo_ns2501.c
index 770d9698d22..c74dbe45511 100644
--- a/sys/dev/pci/drm/i915/dvo_ns2501.c
+++ b/sys/dev/pci/drm/i915/dvo_ns2501.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dvo_ns2501.c,v 1.7 2015/09/23 23:12:11 kettenis Exp $	*/
+/*	$OpenBSD: dvo_ns2501.c,v 1.8 2016/02/24 21:06:13 jsg Exp $	*/
 /*
  *
  * Copyright (c) 2012 Gilles Dartiguelongue, Thomas Richter
@@ -119,8 +119,8 @@ read_err:
 	iic_release_bus(adapter, 0);
 	if (!ns->quiet) {
 		DRM_DEBUG_KMS
-		    ("Unable to read register 0x%02x from %s:0x%02x.\n", addr,
-		     adapter->name, dvo->slave_addr);
+		    ("Unable to read register 0x%02x from 0x%02x.\n", addr,
+		     dvo->slave_addr);
 	}
 
 	return false;
@@ -153,8 +153,8 @@ static bool ns2501_writeb(struct intel_dvo_device *dvo, int addr, uint8_t ch)
 
 write_err:
 	if (!ns->quiet) {
-		DRM_DEBUG_KMS("Unable to write register 0x%02x to %s:%d\n",
-			      addr, adapter->name, dvo->slave_addr);
+		DRM_DEBUG_KMS("Unable to write register 0x%02x to %d\n",
+			      addr, dvo->slave_addr);
 	}
 
 	return false;
@@ -185,8 +185,8 @@ static bool ns2501_init(struct intel_dvo_device *dvo,
 		goto out;
 
 	if (ch != (NS2501_VID & 0xff)) {
-		DRM_DEBUG_KMS("ns2501 not detected got %d: from %s Slave %d.\n",
-			      ch, adapter->name, dvo->slave_addr);
+		DRM_DEBUG_KMS("ns2501 not detected got %d: from Slave %d.\n",
+			      ch, dvo->slave_addr);
 		goto out;
 	}
 
@@ -194,8 +194,8 @@ static bool ns2501_init(struct intel_dvo_device *dvo,
 		goto out;
 
 	if (ch != (NS2501_DID & 0xff)) {
-		DRM_DEBUG_KMS("ns2501 not detected got %d: from %s Slave %d.\n",
-			      ch, adapter->name, dvo->slave_addr);
+		DRM_DEBUG_KMS("ns2501 not detected got %d: from Slave %d.\n",
+			      ch, dvo->slave_addr);
 		goto out;
 	}
 	ns->quiet = false;
diff --git a/sys/dev/pci/drm/i915/dvo_sil164.c b/sys/dev/pci/drm/i915/dvo_sil164.c
index 316776a08b6..ee36b61347f 100644
--- a/sys/dev/pci/drm/i915/dvo_sil164.c
+++ b/sys/dev/pci/drm/i915/dvo_sil164.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dvo_sil164.c,v 1.5 2015/09/23 23:12:11 kettenis Exp $	*/
+/*	$OpenBSD: dvo_sil164.c,v 1.6 2016/02/24 21:06:13 jsg Exp $	*/
 /**************************************************************************
 
 Copyright © 2006 Dave Airlie
@@ -90,8 +90,8 @@ static bool sil164_readb(struct intel_dvo_device *dvo, int addr, uint8_t *ch)
 read_err:
 	iic_release_bus(adapter, 0);
 	if (!sil->quiet) {
-		DRM_DEBUG_KMS("Unable to read register 0x%02x from %s:%02x.\n",
-			  addr, adapter->name, dvo->slave_addr);
+		DRM_DEBUG_KMS("Unable to read register 0x%02x from %02x.\n",
+			  addr, dvo->slave_addr);
 	}
 	return false;
 }
@@ -117,8 +117,8 @@ static bool sil164_writeb(struct intel_dvo_device *dvo, int addr, uint8_t ch)
 
 write_err:
 	if (!sil->quiet) {
-		DRM_DEBUG_KMS("Unable to write register 0x%02x to %s:%d.\n",
-			  addr, adapter->name, dvo->slave_addr);
+		DRM_DEBUG_KMS("Unable to write register 0x%02x to %d.\n",
+			  addr, dvo->slave_addr);
 	}
 
 	return false;
@@ -144,8 +144,8 @@ static bool sil164_init(struct intel_dvo_device *dvo,
 		goto out;
 
 	if (ch != (SIL164_VID & 0xff)) {
-		DRM_DEBUG_KMS("sil164 not detected got %d: from %s Slave %d.\n",
-			  ch, adapter->name, dvo->slave_addr);
+		DRM_DEBUG_KMS("sil164 not detected got %d: from Slave %d.\n",
+			  ch, dvo->slave_addr);
 		goto out;
 	}
 
@@ -153,8 +153,8 @@ static bool sil164_init(struct intel_dvo_device *dvo,
 		goto out;
 
 	if (ch != (SIL164_DID & 0xff)) {
-		DRM_DEBUG_KMS("sil164 not detected got %d: from %s Slave %d.\n",
-			  ch, adapter->name, dvo->slave_addr);
+		DRM_DEBUG_KMS("sil164 not detected got %d: from Slave %d.\n",
+			  ch, dvo->slave_addr);
 		goto out;
 	}
 	sil->quiet = false;
diff --git a/sys/dev/pci/drm/i915/dvo_tfp410.c b/sys/dev/pci/drm/i915/dvo_tfp410.c
index cbd91e85656..b24e1544419 100644
--- a/sys/dev/pci/drm/i915/dvo_tfp410.c
+++ b/sys/dev/pci/drm/i915/dvo_tfp410.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dvo_tfp410.c,v 1.5 2015/09/23 23:12:11 kettenis Exp $	*/
+/*	$OpenBSD: dvo_tfp410.c,v 1.6 2016/02/24 21:06:13 jsg Exp $	*/
 /*
  * Copyright © 2007 Dave Mueller
  *
@@ -115,8 +115,8 @@ static bool tfp410_readb(struct intel_dvo_device *dvo, int addr, uint8_t *ch)
 read_err:
 	iic_release_bus(adapter, 0);
 	if (!tfp->quiet) {
-		DRM_DEBUG_KMS("Unable to read register 0x%02x from %s:%02x.\n",
-			  addr, adapter->name, dvo->slave_addr);
+		DRM_DEBUG_KMS("Unable to read register 0x%02x from %02x.\n",
+			  addr, dvo->slave_addr);
 	}
 	return false;
 }
@@ -142,8 +142,8 @@ static bool tfp410_writeb(struct intel_dvo_device *dvo, int addr, uint8_t ch)
 
 write_err:
 	if (!tfp->quiet) {
-		DRM_DEBUG_KMS("Unable to write register 0x%02x to %s:%d.\n",
-			  addr, adapter->name, dvo->slave_addr);
+		DRM_DEBUG_KMS("Unable to write register 0x%02x to %d.\n",
+			  addr, dvo->slave_addr);
 	}
 
 	return false;
@@ -177,16 +177,16 @@ static bool tfp410_init(struct intel_dvo_device *dvo,
 	tfp->quiet = true;
 
 	if ((id = tfp410_getid(dvo, TFP410_VID_LO)) != TFP410_VID) {
-		DRM_DEBUG_KMS("tfp410 not detected got VID %X: from %s "
+		DRM_DEBUG_KMS("tfp410 not detected got VID %X: from "
 				"Slave %d.\n",
-			  id, adapter->name, dvo->slave_addr);
+			  id, dvo->slave_addr);
 		goto out;
 	}
 
 	if ((id = tfp410_getid(dvo, TFP410_DID_LO)) != TFP410_DID) {
-		DRM_DEBUG_KMS("tfp410 not detected got DID %X: from %s "
+		DRM_DEBUG_KMS("tfp410 not detected got DID %X: from "
 				"Slave %d.\n",
-			  id, adapter->name, dvo->slave_addr);
+			  id, dvo->slave_addr);
 		goto out;
 	}
 	tfp->quiet = false;