diff options
| -rw-r--r-- | sys/dev/pci/drm/drm_fb_helper.c | 4 | ||||
| -rw-r--r-- | sys/dev/pci/drm/i915/intel_display.c | 4 | ||||
| -rw-r--r-- | sys/dev/pci/drm/i915/intel_fb.c | 4 | ||||
| -rw-r--r-- | sys/dev/pci/drm/i915/intel_pm.c | 4 | ||||
| -rw-r--r-- | sys/dev/pci/drm/i915/intel_sdvo.c | 24 |
5 files changed, 21 insertions, 19 deletions
diff --git a/sys/dev/pci/drm/drm_fb_helper.c b/sys/dev/pci/drm/drm_fb_helper.c index 2d01ff85adf..31af94e7fa3 100644 --- a/sys/dev/pci/drm/drm_fb_helper.c +++ b/sys/dev/pci/drm/drm_fb_helper.c @@ -1,4 +1,4 @@ -/* $OpenBSD: drm_fb_helper.c,v 1.1 2013/03/18 12:36:51 jsg Exp $ */ +/* $OpenBSD: drm_fb_helper.c,v 1.2 2013/03/19 03:58:10 jsg Exp $ */ /* * Copyright (c) 2006-2009 Red Hat Inc. * Copyright (c) 2006-2008 Intel Corporation @@ -1064,7 +1064,7 @@ struct drm_display_mode * drm_pick_cmdline_mode(struct drm_fb_helper_connector *fb_helper_conn, int width, int height) { - printf("%s stub\n", __func__); + DRM_DEBUG_KMS("stub\n"); return (NULL); #ifdef notyet struct drm_cmdline_mode *cmdline_mode; diff --git a/sys/dev/pci/drm/i915/intel_display.c b/sys/dev/pci/drm/i915/intel_display.c index 84d342fd2b0..84c2d5ae739 100644 --- a/sys/dev/pci/drm/i915/intel_display.c +++ b/sys/dev/pci/drm/i915/intel_display.c @@ -1,4 +1,4 @@ -/* $OpenBSD: intel_display.c,v 1.1 2013/03/18 12:36:52 jsg Exp $ */ +/* $OpenBSD: intel_display.c,v 1.2 2013/03/19 03:58:10 jsg Exp $ */ /* * Copyright © 2006-2007 Intel Corporation * @@ -9622,7 +9622,7 @@ intel_modeset_init(struct drm_device *dev) #ifdef notyet dev->mode_config.fb_base = dev_priv->mm.gtt_base_addr; #else - printf("%s todo set fb base\n", __func__); + DRM_DEBUG_KMS("todo set fb base\n"); #endif DRM_DEBUG_KMS("%d display pipe%s available.\n", diff --git a/sys/dev/pci/drm/i915/intel_fb.c b/sys/dev/pci/drm/i915/intel_fb.c index 77e48dfe1b0..d415bb82509 100644 --- a/sys/dev/pci/drm/i915/intel_fb.c +++ b/sys/dev/pci/drm/i915/intel_fb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: intel_fb.c,v 1.1 2013/03/18 12:36:52 jsg Exp $ */ +/* $OpenBSD: intel_fb.c,v 1.2 2013/03/19 03:58:10 jsg Exp $ */ /* * Copyright © 2007 David Airlie * @@ -176,7 +176,7 @@ intelfb_create(struct intel_fbdev *ifbdev, DRM_UNLOCK(); #if 1 - printf("skipping call to vga_switcheroo_client_fb_set\n"); + DRM_DEBUG_KMS("skipping call to vga_switcheroo_client_fb_set\n"); #else vga_switcheroo_client_fb_set(dev->pdev, info); #endif diff --git a/sys/dev/pci/drm/i915/intel_pm.c b/sys/dev/pci/drm/i915/intel_pm.c index acfda003567..902854c389d 100644 --- a/sys/dev/pci/drm/i915/intel_pm.c +++ b/sys/dev/pci/drm/i915/intel_pm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: intel_pm.c,v 1.1 2013/03/18 12:36:52 jsg Exp $ */ +/* $OpenBSD: intel_pm.c,v 1.2 2013/03/19 03:58:10 jsg Exp $ */ /* * Copyright © 2012 Intel Corporation * @@ -2772,7 +2772,7 @@ gen6_enable_rps(struct drm_device *dev) rc6_mask |= GEN6_RC_CTL_RC6pp_ENABLE; } - DRM_INFO("Enabling RC6 states: RC6 %s, RC6p %s, RC6pp %s\n", + DRM_DEBUG("Enabling RC6 states: RC6 %s, RC6p %s, RC6pp %s\n", (rc6_mask & GEN6_RC_CTL_RC6_ENABLE) ? "on" : "off", (rc6_mask & GEN6_RC_CTL_RC6p_ENABLE) ? "on" : "off", (rc6_mask & GEN6_RC_CTL_RC6pp_ENABLE) ? "on" : "off"); diff --git a/sys/dev/pci/drm/i915/intel_sdvo.c b/sys/dev/pci/drm/i915/intel_sdvo.c index 094cc292cde..d8921f3768f 100644 --- a/sys/dev/pci/drm/i915/intel_sdvo.c +++ b/sys/dev/pci/drm/i915/intel_sdvo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: intel_sdvo.c,v 1.1 2013/03/18 12:36:52 jsg Exp $ */ +/* $OpenBSD: intel_sdvo.c,v 1.2 2013/03/19 03:58:10 jsg Exp $ */ /* * Copyright 2006 Dave Airlie <airlied@linux.ie> * Copyright © 2006-2007 Intel Corporation @@ -531,20 +531,21 @@ intel_sdvo_debug_write(struct intel_sdvo *intel_sdvo, u8 cmd, DRM_DEBUG_KMS("%s: W: %02X ", SDVO_NAME(intel_sdvo), cmd); for (i = 0; i < args_len; i++) - printf("%02X ", ((u8 *)args)[i]); + DRM_LOG_KMS("%02X ", ((u8 *)args)[i]); for (; i < 8; i++) - printf(" "); + DRM_LOG_KMS(" "); for (i = 0; i < ARRAY_SIZE(sdvo_cmd_names); i++) { if (cmd == sdvo_cmd_names[i].cmd) { - printf("(%s)", sdvo_cmd_names[i].name); + DRM_LOG_KMS("(%s)", sdvo_cmd_names[i].name); break; } } if (i == ARRAY_SIZE(sdvo_cmd_names)) - printf("(%02X)", cmd); - printf("\n"); + DRM_LOG_KMS("(%02X)", cmd); + DRM_LOG_KMS("\n"); } +#ifdef DRMDEBUG static const char *cmd_status_names[] = { "Power on", "Success", @@ -554,6 +555,7 @@ static const char *cmd_status_names[] = { "Target not specified", "Scaling not supported" }; +#endif struct i2c_msg { i2c_op_t op; @@ -675,9 +677,9 @@ intel_sdvo_read_response(struct intel_sdvo *intel_sdvo, } if (status <= SDVO_CMD_STATUS_SCALING_NOT_SUPP) - printf("(%s)", cmd_status_names[status]); + DRM_LOG_KMS("(%s)", cmd_status_names[status]); else - printf("(??? %d)", status); + DRM_LOG_KMS("(??? %d)", status); if (status != SDVO_CMD_STATUS_SUCCESS) goto log_fail; @@ -688,13 +690,13 @@ intel_sdvo_read_response(struct intel_sdvo *intel_sdvo, SDVO_I2C_RETURN_0 + i, &((u8 *)response)[i])) goto log_fail; - printf(" %02X", ((u8 *)response)[i]); + DRM_LOG_KMS(" %02X", ((u8 *)response)[i]); } - printf("\n"); + DRM_LOG_KMS("\n"); return true; log_fail: - printf("... failed\n"); + DRM_LOG_KMS("... failed\n"); return false; } |