From nobody Tue Sep 9 21:20:37 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AC758C7EE30 for ; Tue, 28 Feb 2023 09:26:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231343AbjB1J0k (ORCPT ); Tue, 28 Feb 2023 04:26:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40848 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231292AbjB1J0T (ORCPT ); Tue, 28 Feb 2023 04:26:19 -0500 Received: from sender-of-o50.zoho.in (sender-of-o50.zoho.in [103.117.158.50]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B96152BEE2 for ; Tue, 28 Feb 2023 01:26:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677576332; cv=none; d=zohomail.in; s=zohoarc; b=bRCVEXB0pLMBkqhyXWzPIcxrTu4GCoz23usLnpDRS3RPjsNuxw+gLpthQVZ7Ek7cUqJn13hS491Mxf1mMPKs8eTE6O647FBB/N6YC3gRVI0gFc+QfHiwnekNtf532JwbucfHOFgIZAuN0RV6cRo/xTi6kd3NiGkzBWDTVWb0atk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.in; s=zohoarc; t=1677576332; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=MYtK0EW2JWdqn1FNP7fQ3J4lJoJ0CS1qUq1oOPCsMCE=; b=bIOrxfiu6HxEG60ssPDZ0rFsYGIBnX+Dz7ZkfATeZje1cIkmh81R0aSP5ZkLIdwzTcHKXctxvNvtLPSSZpis633a1NSTVXGIZ6B/MOIDB8+nSK3ZE0O1BOGqiMMVeuL4L97N8hDtFwXuOfEs67jBvraJM/vT4OG6eqMcYgbOvKU= ARC-Authentication-Results: i=1; mx.zohomail.in; dkim=pass header.i=siddh.me; spf=pass smtp.mailfrom=code@siddh.me; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1677576332; s=zmail; d=siddh.me; i=code@siddh.me; h=From:From:To:To:Cc:Cc:Message-ID:Subject:Subject:Date:Date:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Content-Type:Message-Id:Reply-To; bh=MYtK0EW2JWdqn1FNP7fQ3J4lJoJ0CS1qUq1oOPCsMCE=; b=LJXL+Du4o2g4Hw2wHU8X59C4onFzsgJvyxMqWhH4fFStGE2JHXVpH0V+dy2ZVFvl vhNrRXFmu1yUF3KiKSdnY689F1876+CGxWPjX/VLbeUI3wiz3FmIaXHrDY0t5OAOAYj KHVij2O90DRbdeKqmggb01wazN0kxg4M37M/Aee0= Received: from kampyooter.. (106.213.255.81 [106.213.255.81]) by mx.zoho.in with SMTPS id 1677576331354928.3260286230446; Tue, 28 Feb 2023 14:55:31 +0530 (IST) From: Siddh Raman Pant To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Jim Cromie , Sam Ravnborg , Jani Nikula , Suraj Upadhyay Cc: linux-kernel , dri-devel Message-ID: Subject: [PATCH v8 8/8] drm: Remove usage of deprecated DRM_DEBUG_KMS Date: Tue, 28 Feb 2023 14:55:12 +0530 X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMailClient: External Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" drm_print.h says DRM_DEBUG_KMS is deprecated in favor of drm_dbg_kms(). Signed-off-by: Siddh Raman Pant --- drivers/gpu/drm/drm_client_modeset.c | 112 ++++++++++++++----------- drivers/gpu/drm/drm_color_mgmt.c | 4 +- drivers/gpu/drm/drm_connector.c | 21 ++--- drivers/gpu/drm/drm_crtc.c | 36 ++++---- drivers/gpu/drm/drm_crtc_helper.c | 54 ++++++------ drivers/gpu/drm/drm_debugfs_crc.c | 5 +- drivers/gpu/drm/drm_displayid.c | 4 +- drivers/gpu/drm/drm_edid.c | 17 ++-- drivers/gpu/drm/drm_gem_shmem_helper.c | 4 +- drivers/gpu/drm/drm_lease.c | 2 +- drivers/gpu/drm/drm_mipi_dbi.c | 7 +- drivers/gpu/drm/drm_modes.c | 10 +-- drivers/gpu/drm/drm_plane.c | 32 +++---- drivers/gpu/drm/drm_probe_helper.c | 39 ++++----- drivers/gpu/drm/drm_rect.c | 4 +- drivers/gpu/drm/drm_sysfs.c | 8 +- 16 files changed, 189 insertions(+), 170 deletions(-) diff --git a/drivers/gpu/drm/drm_client_modeset.c b/drivers/gpu/drm/drm_cli= ent_modeset.c index e2403b8c6347..4e08ae688b83 100644 --- a/drivers/gpu/drm/drm_client_modeset.c +++ b/drivers/gpu/drm/drm_client_modeset.c @@ -242,8 +242,9 @@ static void drm_client_connectors_enabled(struct drm_co= nnector **connectors, for (i =3D 0; i < connector_count; i++) { connector =3D connectors[i]; enabled[i] =3D drm_connector_enabled(connector, true); - DRM_DEBUG_KMS("connector %d enabled? %s\n", connector->base.id, - connector->display_info.non_desktop ? "non desktop" : str_yes_no(= enabled[i])); + drm_dbg_kms(connector->dev, "connector %d enabled? %s\n", + connector->base.id, + connector->display_info.non_desktop ? "non desktop" : str_yes_no(en= abled[i])); =20 any_enabled |=3D enabled[i]; } @@ -303,7 +304,7 @@ static bool drm_client_target_cloned(struct drm_device = *dev, } =20 if (can_clone) { - DRM_DEBUG_KMS("can clone using command line\n"); + drm_dbg_kms(dev, "can clone using command line\n"); return true; } =20 @@ -328,7 +329,7 @@ static bool drm_client_target_cloned(struct drm_device = *dev, } =20 if (can_clone) { - DRM_DEBUG_KMS("can clone using 1024x768\n"); + drm_dbg_kms(dev, "can clone using 1024x768\n"); return true; } drm_info(dev, "kms: can't enable cloning when we probably wanted to.\n"); @@ -352,8 +353,9 @@ static int drm_client_get_tile_offsets(struct drm_conne= ctor **connectors, continue; =20 if (!modes[i] && (h_idx || v_idx)) { - DRM_DEBUG_KMS("no modes for connector tiled %d %d\n", i, - connector->base.id); + drm_dbg_kms(connector->dev, + "no modes for connector tiled %d %d\n", + i, connector->base.id); continue; } if (connector->tile_h_loc < h_idx) @@ -364,7 +366,8 @@ static int drm_client_get_tile_offsets(struct drm_conne= ctor **connectors, } offsets[idx].x =3D hoffset; offsets[idx].y =3D voffset; - DRM_DEBUG_KMS("returned %d %d for %d %d\n", hoffset, voffset, h_idx, v_id= x); + drm_dbg_kms(NULL, "returned %d %d for %d %d\n", + hoffset, voffset, h_idx, v_idx); return 0; } =20 @@ -421,14 +424,16 @@ static bool drm_client_target_preferred(struct drm_co= nnector **connectors, drm_client_get_tile_offsets(connectors, connector_count, modes, offsets= , i, connector->tile_h_loc, connector->tile_v_loc); } - DRM_DEBUG_KMS("looking for cmdline mode on connector %d\n", - connector->base.id); + drm_dbg_kms(connector->dev, + "looking for cmdline mode on connector %d\n", + connector->base.id); =20 /* got for command line mode first */ modes[i] =3D drm_connector_pick_cmdline_mode(connector); if (!modes[i]) { - DRM_DEBUG_KMS("looking for preferred mode on connector %d %d\n", - connector->base.id, connector->tile_group ? connector->tile_grou= p->id : 0); + drm_dbg_kms(connector->dev, + "looking for preferred mode on connector %d %d\n", + connector->base.id, connector->tile_group ? connector->tile_group-= >id : 0); modes[i] =3D drm_connector_has_preferred_mode(connector, width, height); } /* No preferred modes, pick one off the list */ @@ -450,16 +455,17 @@ static bool drm_client_target_preferred(struct drm_co= nnector **connectors, (connector->tile_h_loc =3D=3D 0 && connector->tile_v_loc =3D=3D 0 && !drm_connector_get_tiled_mode(connector))) { - DRM_DEBUG_KMS("Falling back to non tiled mode on Connector %d\n", - connector->base.id); + drm_dbg_kms(connector->dev, + "Falling back to non tiled mode on Connector %d\n", + connector->base.id); modes[i] =3D drm_connector_fallback_non_tiled_mode(connector); } else { modes[i] =3D drm_connector_get_tiled_mode(connector); } } =20 - DRM_DEBUG_KMS("found mode %s\n", modes[i] ? modes[i]->name : - "none"); + drm_dbg_kms(connector->dev, "found mode %s\n", + modes[i] ? modes[i]->name : "none"); conn_configured |=3D BIT_ULL(i); } =20 @@ -619,15 +625,17 @@ static bool drm_client_firmware_config(struct drm_cli= ent_dev *client, num_connectors_detected++; =20 if (!enabled[i]) { - DRM_DEBUG_KMS("connector %s not enabled, skipping\n", - connector->name); + drm_dbg_kms(connector->dev, + "connector %s not enabled, skipping\n", + connector->name); conn_configured |=3D BIT(i); continue; } =20 if (connector->force =3D=3D DRM_FORCE_OFF) { - DRM_DEBUG_KMS("connector %s is disabled by user, skipping\n", - connector->name); + drm_dbg_kms(connector->dev, + "connector %s is disabled by user, skipping\n", + connector->name); enabled[i] =3D false; continue; } @@ -637,8 +645,9 @@ static bool drm_client_firmware_config(struct drm_clien= t_dev *client, if (connector->force > DRM_FORCE_OFF) goto bail; =20 - DRM_DEBUG_KMS("connector %s has no encoder or crtc, skipping\n", - connector->name); + drm_dbg_kms(connector->dev, + "connector %s has no encoder or crtc, skipping\n", + connector->name); enabled[i] =3D false; conn_configured |=3D BIT(i); continue; @@ -655,28 +664,32 @@ static bool drm_client_firmware_config(struct drm_cli= ent_dev *client, */ for (j =3D 0; j < count; j++) { if (crtcs[j] =3D=3D new_crtc) { - DRM_DEBUG_KMS("fallback: cloned configuration\n"); + drm_dbg_kms(connector->dev, + "fallback: cloned configuration\n"); goto bail; } } =20 - DRM_DEBUG_KMS("looking for cmdline mode on connector %s\n", - connector->name); + drm_dbg_kms(connector->dev, + "looking for cmdline mode on connector %s\n", + connector->name); =20 /* go for command line mode first */ modes[i] =3D drm_connector_pick_cmdline_mode(connector); =20 /* try for preferred next */ if (!modes[i]) { - DRM_DEBUG_KMS("looking for preferred mode on connector %s %d\n", - connector->name, connector->has_tile); + drm_dbg_kms(connector->dev, + "looking for preferred mode on connector %s %d\n", + connector->name, connector->has_tile); modes[i] =3D drm_connector_has_preferred_mode(connector, width, height); } =20 /* No preferred mode marked by the EDID? Are there any modes? */ if (!modes[i] && !list_empty(&connector->modes)) { - DRM_DEBUG_KMS("using first mode listed on connector %s\n", - connector->name); + drm_dbg_kms(connector->dev, + "using first mode listed on connector %s\n", + connector->name); modes[i] =3D list_first_entry(&connector->modes, struct drm_display_mode, head); @@ -695,8 +708,9 @@ static bool drm_client_firmware_config(struct drm_clien= t_dev *client, * This is crtc->mode and not crtc->state->mode for the * fastboot check to work correctly. */ - DRM_DEBUG_KMS("looking for current mode on connector %s\n", - connector->name); + drm_dbg_kms(connector->dev, + "looking for current mode on connector %s\n", + connector->name); modes[i] =3D &connector->state->crtc->mode; } /* @@ -705,18 +719,20 @@ static bool drm_client_firmware_config(struct drm_cli= ent_dev *client, */ if (connector->has_tile && num_tiled_conns < connector->num_h_tile * connector->num_v_tile) { - DRM_DEBUG_KMS("Falling back to non tiled mode on Connector %d\n", - connector->base.id); + drm_dbg_kms(connector->dev, + "Falling back to non tiled mode on Connector %d\n", + connector->base.id); modes[i] =3D drm_connector_fallback_non_tiled_mode(connector); } crtcs[i] =3D new_crtc; =20 - DRM_DEBUG_KMS("connector %s on [CRTC:%d:%s]: %dx%d%s\n", - connector->name, - connector->state->crtc->base.id, - connector->state->crtc->name, - modes[i]->hdisplay, modes[i]->vdisplay, - modes[i]->flags & DRM_MODE_FLAG_INTERLACE ? "i" : ""); + drm_dbg_kms(connector->dev, + "connector %s on [CRTC:%d:%s]: %dx%d%s\n", + connector->name, + connector->state->crtc->base.id, + connector->state->crtc->name, + modes[i]->hdisplay, modes[i]->vdisplay, + modes[i]->flags & DRM_MODE_FLAG_INTERLACE ? "i" : ""); =20 fallback =3D false; conn_configured |=3D BIT(i); @@ -732,15 +748,15 @@ static bool drm_client_firmware_config(struct drm_cli= ent_dev *client, */ if (num_connectors_enabled !=3D num_connectors_detected && num_connectors_enabled < dev->mode_config.num_crtc) { - DRM_DEBUG_KMS("fallback: Not all outputs enabled\n"); - DRM_DEBUG_KMS("Enabled: %i, detected: %i\n", num_connectors_enabled, - num_connectors_detected); + drm_dbg_kms(NULL, "fallback: Not all outputs enabled\n"); + drm_dbg_kms(NULL, "Enabled: %i, detected: %i\n", + num_connectors_enabled, num_connectors_detected); fallback =3D true; } =20 if (fallback) { bail: - DRM_DEBUG_KMS("Not using firmware configuration\n"); + drm_dbg_kms(NULL, "Not using firmware configuration\n"); memcpy(enabled, save_enabled, count); ret =3D false; } @@ -777,7 +793,7 @@ int drm_client_modeset_probe(struct drm_client_dev *cli= ent, unsigned int width, int i, ret =3D 0; bool *enabled; =20 - DRM_DEBUG_KMS("\n"); + drm_dbg_kms(dev, "\n"); =20 if (!width) width =3D dev->mode_config.max_width; @@ -819,7 +835,7 @@ int drm_client_modeset_probe(struct drm_client_dev *cli= ent, unsigned int width, for (i =3D 0; i < connector_count; i++) total_modes_count +=3D connectors[i]->funcs->fill_modes(connectors[i], w= idth, height); if (!total_modes_count) - DRM_DEBUG_KMS("No connectors reported connected with modes\n"); + drm_dbg_kms(dev, "No connectors reported connected with modes\n"); drm_client_connectors_enabled(connectors, connector_count, enabled); =20 if (!drm_client_firmware_config(client, connectors, connector_count, crtc= s, @@ -834,8 +850,8 @@ int drm_client_modeset_probe(struct drm_client_dev *cli= ent, unsigned int width, offsets, enabled, width, height)) drm_err(client->dev, "Unable to find initial modes\n"); =20 - DRM_DEBUG_KMS("picking CRTCs for %dx%d config\n", - width, height); + drm_dbg_kms(dev, "picking CRTCs for %dx%d config\n", + width, height); =20 drm_client_pick_crtcs(client, connectors, connector_count, crtcs, modes, 0, width, height); @@ -853,8 +869,8 @@ int drm_client_modeset_probe(struct drm_client_dev *cli= ent, unsigned int width, struct drm_mode_set *modeset =3D drm_client_find_modeset(client, crtc); struct drm_connector *connector =3D connectors[i]; =20 - DRM_DEBUG_KMS("desired mode %s set on crtc %d (%d,%d)\n", - mode->name, crtc->base.id, offset->x, offset->y); + drm_dbg_kms(dev, "desired mode %s set on crtc %d (%d,%d)\n", + mode->name, crtc->base.id, offset->x, offset->y); =20 if (WARN_ON_ONCE(modeset->num_connectors =3D=3D DRM_CLIENT_MAX_CLONED_C= ONNECTORS || (dev->mode_config.num_crtc > 1 && modeset->num_connectors =3D=3D 1))= ) { diff --git a/drivers/gpu/drm/drm_color_mgmt.c b/drivers/gpu/drm/drm_color_m= gmt.c index d021497841b8..a2761a6ce11f 100644 --- a/drivers/gpu/drm/drm_color_mgmt.c +++ b/drivers/gpu/drm/drm_color_mgmt.c @@ -612,7 +612,7 @@ int drm_color_lut_check(const struct drm_property_blob = *lut, u32 tests) if (tests & DRM_COLOR_LUT_EQUAL_CHANNELS) { if (entry[i].red !=3D entry[i].blue || entry[i].red !=3D entry[i].green) { - DRM_DEBUG_KMS("All LUT entries must have equal r/g/b\n"); + drm_dbg_kms(NULL, "All LUT entries must have equal r/g/b\n"); return -EINVAL; } } @@ -621,7 +621,7 @@ int drm_color_lut_check(const struct drm_property_blob = *lut, u32 tests) if (entry[i].red < entry[i - 1].red || entry[i].green < entry[i - 1].green || entry[i].blue < entry[i - 1].blue) { - DRM_DEBUG_KMS("LUT entries must never decrease.\n"); + drm_dbg_kms(NULL, "LUT entries must never decrease.\n"); return -EINVAL; } } diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connecto= r.c index cd1a23fc82e1..457bf4c205c3 100644 --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c @@ -181,13 +181,14 @@ static void drm_connector_get_cmdline_mode(struct drm= _connector *connector) mode->panel_orientation); } =20 - DRM_DEBUG_KMS("cmdline mode for connector %s %s %dx%d@%dHz%s%s%s\n", - connector->name, mode->name, - mode->xres, mode->yres, - mode->refresh_specified ? mode->refresh : 60, - mode->rb ? " reduced blanking" : "", - mode->margins ? " with margins" : "", - mode->interlace ? " interlaced" : ""); + drm_dbg_kms(connector->dev, + "cmdline mode for connector %s %s %dx%d@%dHz%s%s%s\n", + connector->name, mode->name, + mode->xres, mode->yres, + mode->refresh_specified ? mode->refresh : 60, + mode->rb ? " reduced blanking" : "", + mode->margins ? " with margins" : "", + mode->interlace ? " interlaced" : ""); } =20 static void drm_connector_free(struct kref *kref) @@ -247,9 +248,9 @@ static int __drm_connector_init(struct drm_device *dev, /* connector index is used with 32bit bitmasks */ ret =3D ida_alloc_max(&config->connector_ida, 31, GFP_KERNEL); if (ret < 0) { - DRM_DEBUG_KMS("Failed to allocate %s connector index: %d\n", - drm_connector_enum_list[connector_type].name, - ret); + drm_dbg_kms(dev, "Failed to allocate %s connector index: %d\n", + drm_connector_enum_list[connector_type].name, + ret); goto out_put; } connector->index =3D ret; diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index df9bf3c9206e..adc426561e17 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -730,10 +730,10 @@ int drm_mode_setcrtc(struct drm_device *dev, void *da= ta, =20 crtc =3D drm_crtc_find(dev, file_priv, crtc_req->crtc_id); if (!crtc) { - DRM_DEBUG_KMS("Unknown CRTC ID %d\n", crtc_req->crtc_id); + drm_dbg_kms(dev, "Unknown CRTC ID %d\n", crtc_req->crtc_id); return -ENOENT; } - DRM_DEBUG_KMS("[CRTC:%d:%s]\n", crtc->base.id, crtc->name); + drm_dbg_kms(dev, "[CRTC:%d:%s]\n", crtc->base.id, crtc->name); =20 plane =3D crtc->primary; =20 @@ -756,7 +756,7 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data, old_fb =3D plane->fb; =20 if (!old_fb) { - DRM_DEBUG_KMS("CRTC doesn't have current FB\n"); + drm_dbg_kms(dev, "CRTC doesn't have current FB\n"); ret =3D -EINVAL; goto out; } @@ -767,8 +767,7 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data, } else { fb =3D drm_framebuffer_lookup(dev, file_priv, crtc_req->fb_id); if (!fb) { - DRM_DEBUG_KMS("Unknown FB ID%d\n", - crtc_req->fb_id); + drm_dbg_kms(dev, "Unknown FB ID%d\n", crtc_req->fb_id); ret =3D -ENOENT; goto out; } @@ -781,7 +780,7 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data, } if (!file_priv->aspect_ratio_allowed && (crtc_req->mode.flags & DRM_MODE_FLAG_PIC_AR_MASK) !=3D DRM_MODE_FLA= G_PIC_AR_NONE) { - DRM_DEBUG_KMS("Unexpected aspect-ratio flag bits\n"); + drm_dbg_kms(dev, "Unexpected aspect-ratio flag bits\n"); ret =3D -EINVAL; goto out; } @@ -789,8 +788,8 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data, =20 ret =3D drm_mode_convert_umode(dev, mode, &crtc_req->mode); if (ret) { - DRM_DEBUG_KMS("Invalid mode (ret=3D%d, status=3D%s)\n", - ret, drm_get_mode_status_name(mode->status)); + drm_dbg_kms(dev, "Invalid mode (ret=3D%d, status=3D%s)\n", + ret, drm_get_mode_status_name(mode->status)); drm_mode_debug_printmodeline(mode); goto out; } @@ -807,9 +806,8 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data, fb->format->format, fb->modifier); if (ret) { - DRM_DEBUG_KMS("Invalid pixel format %p4cc, modifier 0x%llx\n", - &fb->format->format, - fb->modifier); + drm_dbg_kms(dev, "Invalid pixel format %p4cc, modifier 0x%llx\n", + &fb->format->format, fb->modifier); goto out; } } @@ -822,14 +820,14 @@ int drm_mode_setcrtc(struct drm_device *dev, void *da= ta, } =20 if (crtc_req->count_connectors =3D=3D 0 && mode) { - DRM_DEBUG_KMS("Count connectors is 0 but mode set\n"); + drm_dbg_kms(dev, "Count connectors is 0 but mode set\n"); ret =3D -EINVAL; goto out; } =20 if (crtc_req->count_connectors > 0 && (!mode || !fb)) { - DRM_DEBUG_KMS("Count connectors is %d but no mode or fb set\n", - crtc_req->count_connectors); + drm_dbg_kms(dev, "Count connectors is %d but no mode or fb set\n", + crtc_req->count_connectors); ret =3D -EINVAL; goto out; } @@ -861,14 +859,14 @@ int drm_mode_setcrtc(struct drm_device *dev, void *da= ta, =20 connector =3D drm_connector_lookup(dev, file_priv, out_id); if (!connector) { - DRM_DEBUG_KMS("Connector id %d unknown\n", - out_id); + drm_dbg_kms(dev, "Connector id %d unknown\n", + out_id); ret =3D -ENOENT; goto out; } - DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n", - connector->base.id, - connector->name); + drm_dbg_kms(dev, "[CONNECTOR:%d:%s]\n", + connector->base.id, + connector->name); =20 connector_set[i] =3D connector; } diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_h= elper.c index b74b4301a471..59e7b86eab93 100644 --- a/drivers/gpu/drm/drm_crtc_helper.c +++ b/drivers/gpu/drm/drm_crtc_helper.c @@ -338,7 +338,7 @@ bool drm_crtc_helper_set_mode(struct drm_crtc *crtc, if (encoder_funcs->mode_fixup) { if (!(ret =3D encoder_funcs->mode_fixup(encoder, mode, adjusted_mode))) { - DRM_DEBUG_KMS("Encoder fixup failed\n"); + drm_dbg_kms(dev, "Encoder fixup failed\n"); goto done; } } @@ -347,11 +347,11 @@ bool drm_crtc_helper_set_mode(struct drm_crtc *crtc, if (crtc_funcs->mode_fixup) { if (!(ret =3D crtc_funcs->mode_fixup(crtc, mode, adjusted_mode))) { - DRM_DEBUG_KMS("CRTC fixup failed\n"); + drm_dbg_kms(dev, "CRTC fixup failed\n"); goto done; } } - DRM_DEBUG_KMS("[CRTC:%d:%s]\n", crtc->base.id, crtc->name); + drm_dbg_kms(dev, "[CRTC:%d:%s]\n", crtc->base.id, crtc->name); =20 drm_mode_copy(&crtc->hwmode, adjusted_mode); =20 @@ -390,8 +390,8 @@ bool drm_crtc_helper_set_mode(struct drm_crtc *crtc, if (!encoder_funcs) continue; =20 - DRM_DEBUG_KMS("[ENCODER:%d:%s] set [MODE:%s]\n", - encoder->base.id, encoder->name, mode->name); + drm_dbg_kms(dev, "[ENCODER:%d:%s] set [MODE:%s]\n", + encoder->base.id, encoder->name, mode->name); if (encoder_funcs->mode_set) encoder_funcs->mode_set(encoder, mode, adjusted_mode); } @@ -567,7 +567,7 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set, int ret; int i; =20 - DRM_DEBUG_KMS("\n"); + drm_dbg_kms(NULL, "\n"); =20 BUG_ON(!set); BUG_ON(!set->crtc); @@ -586,13 +586,13 @@ int drm_crtc_helper_set_config(struct drm_mode_set *s= et, set->fb =3D NULL; =20 if (set->fb) { - DRM_DEBUG_KMS("[CRTC:%d:%s] [FB:%d] #connectors=3D%d (x y) (%i %i)\n", - set->crtc->base.id, set->crtc->name, - set->fb->base.id, - (int)set->num_connectors, set->x, set->y); + drm_dbg_kms(dev, "[CRTC:%d:%s] [FB:%d] #connectors=3D%d (x y) (%i %i)\n", + set->crtc->base.id, set->crtc->name, + set->fb->base.id, + (int)set->num_connectors, set->x, set->y); } else { - DRM_DEBUG_KMS("[CRTC:%d:%s] [NOFB]\n", - set->crtc->base.id, set->crtc->name); + drm_dbg_kms(dev, "[CRTC:%d:%s] [NOFB]\n", + set->crtc->base.id, set->crtc->name); drm_crtc_helper_disable(set->crtc); return 0; } @@ -642,7 +642,7 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set, if (set->crtc->primary->fb !=3D set->fb) { /* If we have no fb then treat it as a full mode set */ if (set->crtc->primary->fb =3D=3D NULL) { - DRM_DEBUG_KMS("crtc has no fb, full mode set\n"); + drm_dbg_kms(dev, "crtc has no fb, full mode set\n"); mode_changed =3D true; } else if (set->fb->format !=3D set->crtc->primary->fb->format) { mode_changed =3D true; @@ -654,7 +654,7 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set, fb_changed =3D true; =20 if (!drm_mode_equal(set->mode, &set->crtc->mode)) { - DRM_DEBUG_KMS("modes are different, full mode set\n"); + drm_dbg_kms(dev, "modes are different, full mode set\n"); drm_mode_debug_printmodeline(&set->crtc->mode); drm_mode_debug_printmodeline(set->mode); mode_changed =3D true; @@ -690,7 +690,7 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set, fail =3D 1; =20 if (connector->dpms !=3D DRM_MODE_DPMS_ON) { - DRM_DEBUG_KMS("connector dpms not on, full mode switch\n"); + drm_dbg_kms(dev, "connector dpms not on, full mode switch\n"); mode_changed =3D true; } =20 @@ -699,7 +699,7 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set, } =20 if (new_encoder !=3D connector->encoder) { - DRM_DEBUG_KMS("encoder changed, full mode switch\n"); + drm_dbg_kms(dev, "encoder changed, full mode switch\n"); mode_changed =3D true; /* If the encoder is reused for another connector, then * the appropriate crtc will be set later. @@ -740,17 +740,17 @@ int drm_crtc_helper_set_config(struct drm_mode_set *s= et, goto fail; } if (new_crtc !=3D connector->encoder->crtc) { - DRM_DEBUG_KMS("crtc changed, full mode switch\n"); + drm_dbg_kms(dev, "crtc changed, full mode switch\n"); mode_changed =3D true; connector->encoder->crtc =3D new_crtc; } if (new_crtc) { - DRM_DEBUG_KMS("[CONNECTOR:%d:%s] to [CRTC:%d:%s]\n", - connector->base.id, connector->name, - new_crtc->base.id, new_crtc->name); + drm_dbg_kms(dev, "[CONNECTOR:%d:%s] to [CRTC:%d:%s]\n", + connector->base.id, connector->name, + new_crtc->base.id, new_crtc->name); } else { - DRM_DEBUG_KMS("[CONNECTOR:%d:%s] to [NOCRTC]\n", - connector->base.id, connector->name); + drm_dbg_kms(dev, "[CONNECTOR:%d:%s] to [NOCRTC]\n", + connector->base.id, connector->name); } } drm_connector_list_iter_end(&conn_iter); @@ -761,8 +761,7 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set, =20 if (mode_changed) { if (drm_helper_crtc_in_use(set->crtc)) { - DRM_DEBUG_KMS("attempting to set mode from" - " userspace\n"); + drm_dbg_kms(dev, "attempting to set mode from userspace\n"); drm_mode_debug_printmodeline(set->mode); set->crtc->primary->fb =3D set->fb; if (!drm_crtc_helper_set_mode(set->crtc, set->mode, @@ -774,10 +773,11 @@ int drm_crtc_helper_set_config(struct drm_mode_set *s= et, ret =3D -EINVAL; goto fail; } - DRM_DEBUG_KMS("Setting connector DPMS state to on\n"); + drm_dbg_kms(dev, "Setting connector DPMS state to on\n"); for (i =3D 0; i < set->num_connectors; i++) { - DRM_DEBUG_KMS("\t[CONNECTOR:%d:%s] set DPMS on\n", set->connectors[i]-= >base.id, - set->connectors[i]->name); + drm_dbg_kms(dev, "\t[CONNECTOR:%d:%s] set DPMS on\n", + set->connectors[i]->base.id, + set->connectors[i]->name); set->connectors[i]->funcs->dpms(set->connectors[i], DRM_MODE_DPMS_ON); } } diff --git a/drivers/gpu/drm/drm_debugfs_crc.c b/drivers/gpu/drm/drm_debugf= s_crc.c index a59ef3f0e4a1..f29d286f4760 100644 --- a/drivers/gpu/drm/drm_debugfs_crc.c +++ b/drivers/gpu/drm/drm_debugfs_crc.c @@ -131,8 +131,9 @@ static ssize_t crc_control_write(struct file *file, con= st char __user *ubuf, return 0; =20 if (len > PAGE_SIZE - 1) { - DRM_DEBUG_KMS("Expected < %lu bytes into crtc crc control\n", - PAGE_SIZE); + drm_dbg_kms(crtc->dev, + "Expected < %lu bytes into crtc crc control\n", + PAGE_SIZE); return -E2BIG; } =20 diff --git a/drivers/gpu/drm/drm_displayid.c b/drivers/gpu/drm/drm_displayi= d.c index 67fed6cee9e9..5304ab4337b3 100644 --- a/drivers/gpu/drm/drm_displayid.c +++ b/drivers/gpu/drm/drm_displayid.c @@ -15,8 +15,8 @@ static int validate_displayid(const u8 *displayid, int le= ngth, int idx) =20 base =3D (const struct displayid_header *)&displayid[idx]; =20 - DRM_DEBUG_KMS("base revision 0x%x, length %d, %d %d\n", - base->rev, base->bytes, base->prod_id, base->ext_count); + drm_dbg_kms(NULL, "base revision 0x%x, length %d, %d %d\n", + base->rev, base->bytes, base->prod_id, base->ext_count); =20 /* +1 for DispID checksum */ dispid_length =3D sizeof(*base) + base->bytes + 1; diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index 3d0a4da661bc..71adb2e6bffd 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -1986,7 +1986,7 @@ bool drm_edid_block_valid(u8 *_block, int block_num, = bool print_bad_edid, =20 status =3D edid_block_check(block, is_base_block); if (status =3D=3D EDID_BLOCK_HEADER_REPAIR) { - DRM_DEBUG_KMS("Fixing EDID header, your hardware may be failing\n"); + drm_dbg_kms(NULL, "Fixing EDID header, your hardware may be failing\n"); edid_header_fix(block); =20 /* Retry with fixed header, update status if that worked. */ @@ -2172,8 +2172,9 @@ drm_do_probe_ddc_edid(void *data, u8 *buf, unsigned i= nt block, size_t len) ret =3D i2c_transfer(adapter, &msgs[3 - xfers], xfers); =20 if (ret =3D=3D -ENXIO) { - DRM_DEBUG_KMS("drm: skipping non-existent adapter %s\n", - adapter->name); + drm_dbg_kms(NULL, + "drm: skipping non-existent adapter %s\n", + adapter->name); break; } } while (ret !=3D xfers && --retries); @@ -5576,7 +5577,7 @@ static int _drm_edid_to_sad(const struct drm_edid *dr= m_edid, } cea_db_iter_end(&iter); =20 - DRM_DEBUG_KMS("Found %d Short Audio Descriptors\n", count); + drm_dbg_kms(NULL, "Found %d Short Audio Descriptors\n", count); =20 return count; } @@ -5621,7 +5622,7 @@ static int _drm_edid_to_speaker_allocation(const stru= ct drm_edid *drm_edid, } cea_db_iter_end(&iter); =20 - DRM_DEBUG_KMS("Found %d Speaker Allocation Data Blocks\n", count); + drm_dbg_kms(NULL, "Found %d Speaker Allocation Data Blocks\n", count); =20 return count; } @@ -5748,7 +5749,7 @@ static bool _drm_detect_monitor_audio(const struct dr= m_edid *drm_edid) drm_edid_iter_end(&edid_iter); =20 if (has_audio) { - DRM_DEBUG_KMS("Monitor has basic audio support\n"); + drm_dbg_kms(NULL, "Monitor has basic audio support\n"); goto end; } =20 @@ -5759,8 +5760,8 @@ static bool _drm_detect_monitor_audio(const struct dr= m_edid *drm_edid) int i; =20 for (i =3D 0; i < cea_db_payload_len(db); i +=3D 3) - DRM_DEBUG_KMS("CEA audio format %d\n", - (data[i] >> 3) & 0xf); + drm_dbg_kms(NULL, "CEA audio format %d\n", + (data[i] >> 3) & 0xf); has_audio =3D true; break; } diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_g= em_shmem_helper.c index 259176d78f3b..032b9f7926dd 100644 --- a/drivers/gpu/drm/drm_gem_shmem_helper.c +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c @@ -175,7 +175,7 @@ static int drm_gem_shmem_get_pages_locked(struct drm_ge= m_shmem_object *shmem) =20 pages =3D drm_gem_get_pages(obj); if (IS_ERR(pages)) { - DRM_DEBUG_KMS("Failed to get pages (%ld)\n", PTR_ERR(pages)); + drm_dbg_kms(NULL, "Failed to get pages (%ld)\n", PTR_ERR(pages)); shmem->pages_use_count =3D 0; return PTR_ERR(pages); } @@ -328,7 +328,7 @@ static int drm_gem_shmem_vmap_locked(struct drm_gem_shm= em_object *shmem, } =20 if (ret) { - DRM_DEBUG_KMS("Failed to vmap pages, error %d\n", ret); + drm_dbg_kms(NULL, "Failed to vmap pages, error %d\n", ret); goto err_put_pages; } =20 diff --git a/drivers/gpu/drm/drm_lease.c b/drivers/gpu/drm/drm_lease.c index af72fc38bb7c..c1b8717b5794 100644 --- a/drivers/gpu/drm/drm_lease.c +++ b/drivers/gpu/drm/drm_lease.c @@ -403,7 +403,7 @@ static int fill_object_idr(struct drm_device *dev, } =20 if (!drm_mode_object_lease_required(objects[o]->type)) { - DRM_DEBUG_KMS("invalid object for lease\n"); + drm_dbg_kms(dev, "invalid object for lease\n"); ret =3D -EINVAL; goto out_free_objects; } diff --git a/drivers/gpu/drm/drm_mipi_dbi.c b/drivers/gpu/drm/drm_mipi_dbi.c index ab5dd5933a1a..793fdd7da1d0 100644 --- a/drivers/gpu/drm/drm_mipi_dbi.c +++ b/drivers/gpu/drm/drm_mipi_dbi.c @@ -265,7 +265,8 @@ static void mipi_dbi_fb_dirty(struct iosys_map *src, st= ruct drm_framebuffer *fb, =20 full =3D width =3D=3D fb->width && height =3D=3D fb->height; =20 - DRM_DEBUG_KMS("Flushing [FB:%d] " DRM_RECT_FMT "\n", fb->base.id, DRM_REC= T_ARG(rect)); + drm_dbg_kms(fb->dev, "Flushing [FB:%d] " DRM_RECT_FMT "\n", + fb->base.id, DRM_RECT_ARG(rect)); =20 if (!dbi->dc || !full || swap || fb->format->format =3D=3D DRM_FORMAT_XRGB8888) { @@ -408,7 +409,7 @@ void mipi_dbi_pipe_disable(struct drm_simple_display_pi= pe *pipe) { struct mipi_dbi_dev *dbidev =3D drm_to_mipi_dbi_dev(pipe->crtc.dev); =20 - DRM_DEBUG_KMS("\n"); + drm_dbg_kms(&dbidev->drm, "\n"); =20 if (dbidev->backlight) backlight_disable(dbidev->backlight); @@ -627,7 +628,7 @@ int mipi_dbi_dev_init_with_formats(struct mipi_dbi_dev = *dbidev, drm->mode_config.max_height =3D dbidev->mode.vdisplay; dbidev->rotation =3D rotation; =20 - DRM_DEBUG_KMS("rotation =3D %u\n", rotation); + drm_dbg_kms(drm, "rotation =3D %u\n", rotation); =20 return 0; } diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c index f5171bf91eae..440e3b015cc6 100644 --- a/drivers/gpu/drm/drm_modes.c +++ b/drivers/gpu/drm/drm_modes.c @@ -53,11 +53,11 @@ * drm_mode_debug_printmodeline - print a mode to dmesg * @mode: mode to print * - * Describe @mode using DRM_DEBUG. + * Describe @mode using drm_dbg_kms(). */ void drm_mode_debug_printmodeline(const struct drm_display_mode *mode) { - DRM_DEBUG_KMS("Modeline " DRM_MODE_FMT "\n", DRM_MODE_ARG(mode)); + drm_dbg_kms(NULL, "Modeline " DRM_MODE_FMT "\n", DRM_MODE_ARG(mode)); } EXPORT_SYMBOL(drm_mode_debug_printmodeline); =20 @@ -1813,9 +1813,9 @@ void drm_mode_prune_invalid(struct drm_device *dev, } if (verbose) { drm_mode_debug_printmodeline(mode); - DRM_DEBUG_KMS("Not using %s mode: %s\n", - mode->name, - drm_get_mode_status_name(mode->status)); + drm_dbg_kms(dev, "Not using %s mode: %s\n", + mode->name, + drm_get_mode_status_name(mode->status)); } drm_mode_destroy(dev, mode); } diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c index 1e8727b7bce9..12fed5f812a1 100644 --- a/drivers/gpu/drm/drm_plane.c +++ b/drivers/gpu/drm/drm_plane.c @@ -275,7 +275,7 @@ static int __drm_universal_plane_init(struct drm_device= *dev, plane->format_types =3D kmalloc_array(format_count, sizeof(uint32_t), GFP_KERNEL); if (!plane->format_types) { - DRM_DEBUG_KMS("out of memory when allocating plane\n"); + drm_dbg_kms(dev, "out of memory when allocating plane\n"); drm_mode_object_unregister(dev, &plane->base); return -ENOMEM; } @@ -302,7 +302,7 @@ static int __drm_universal_plane_init(struct drm_device= *dev, GFP_KERNEL); =20 if (format_modifier_count && !plane->modifiers) { - DRM_DEBUG_KMS("out of memory when allocating plane\n"); + drm_dbg_kms(dev, "out of memory when allocating plane\n"); kfree(plane->format_types); drm_mode_object_unregister(dev, &plane->base); return -ENOMEM; @@ -786,7 +786,7 @@ static int __setplane_check(struct drm_plane *plane, =20 /* Check whether this plane is usable on this CRTC */ if (!(plane->possible_crtcs & drm_crtc_mask(crtc))) { - DRM_DEBUG_KMS("Invalid crtc for plane\n"); + drm_dbg_kms(plane->dev, "Invalid crtc for plane\n"); return -EINVAL; } =20 @@ -794,8 +794,9 @@ static int __setplane_check(struct drm_plane *plane, ret =3D drm_plane_check_pixel_format(plane, fb->format->format, fb->modifier); if (ret) { - DRM_DEBUG_KMS("Invalid pixel format %p4cc, modifier 0x%llx\n", - &fb->format->format, fb->modifier); + drm_dbg_kms(fb->dev, + "Invalid pixel format %p4cc, modifier 0x%llx\n", + &fb->format->format, fb->modifier); return ret; } =20 @@ -804,8 +805,8 @@ static int __setplane_check(struct drm_plane *plane, crtc_x > INT_MAX - (int32_t) crtc_w || crtc_h > INT_MAX || crtc_y > INT_MAX - (int32_t) crtc_h) { - DRM_DEBUG_KMS("Invalid CRTC coordinates %ux%u+%d+%d\n", - crtc_w, crtc_h, crtc_x, crtc_y); + drm_dbg_kms(crtc->dev, "Invalid CRTC coordinates %ux%u+%d+%d\n", + crtc_w, crtc_h, crtc_x, crtc_y); return -ERANGE; } =20 @@ -982,24 +983,23 @@ int drm_mode_setplane(struct drm_device *dev, void *d= ata, */ plane =3D drm_plane_find(dev, file_priv, plane_req->plane_id); if (!plane) { - DRM_DEBUG_KMS("Unknown plane ID %d\n", - plane_req->plane_id); + drm_dbg_kms(dev, "Unknown plane ID %d\n", plane_req->plane_id); return -ENOENT; } =20 if (plane_req->fb_id) { fb =3D drm_framebuffer_lookup(dev, file_priv, plane_req->fb_id); if (!fb) { - DRM_DEBUG_KMS("Unknown framebuffer ID %d\n", - plane_req->fb_id); + drm_dbg_kms(dev, "Unknown framebuffer ID %d\n", + plane_req->fb_id); return -ENOENT; } =20 crtc =3D drm_crtc_find(dev, file_priv, plane_req->crtc_id); if (!crtc) { drm_framebuffer_put(fb); - DRM_DEBUG_KMS("Unknown crtc ID %d\n", - plane_req->crtc_id); + drm_dbg_kms(dev, "Unknown crtc ID %d\n", + plane_req->crtc_id); return -ENOENT; } } @@ -1048,7 +1048,7 @@ static int drm_mode_cursor_universal(struct drm_crtc = *crtc, if (req->handle) { fb =3D drm_internal_framebuffer_create(dev, &fbreq, file_priv); if (IS_ERR(fb)) { - DRM_DEBUG_KMS("failed to wrap cursor buffer in drm framebuffer\n"); + drm_dbg_kms(dev, "failed to wrap cursor buffer in drm framebuffer\n"); return PTR_ERR(fb); } =20 @@ -1119,7 +1119,7 @@ static int drm_mode_cursor_common(struct drm_device *= dev, =20 crtc =3D drm_crtc_find(dev, file_priv, req->crtc_id); if (!crtc) { - DRM_DEBUG_KMS("Unknown CRTC ID %d\n", req->crtc_id); + drm_dbg_kms(dev, "Unknown CRTC ID %d\n", req->crtc_id); return -ENOENT; } =20 @@ -1340,7 +1340,7 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev, * to modifier changes. */ if (old_fb->format->format !=3D fb->format->format) { - DRM_DEBUG_KMS("Page flip is not allowed to change frame buffer format.\n= "); + drm_dbg_kms(dev, "Page flip is not allowed to change frame buffer format= .\n"); ret =3D -EINVAL; goto out; } diff --git a/drivers/gpu/drm/drm_probe_helper.c b/drivers/gpu/drm/drm_probe= _helper.c index 8127be134c39..8f3174107141 100644 --- a/drivers/gpu/drm/drm_probe_helper.c +++ b/drivers/gpu/drm/drm_probe_helper.c @@ -532,8 +532,8 @@ int drm_helper_probe_single_connector_modes(struct drm_= connector *connector, =20 drm_modeset_acquire_init(&ctx, 0); =20 - DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n", connector->base.id, - connector->name); + drm_dbg_kms(dev, "[CONNECTOR:%d:%s]\n", connector->base.id, + connector->name); =20 retry: ret =3D drm_modeset_lock(&dev->mode_config.connection_mutex, &ctx); @@ -576,11 +576,12 @@ int drm_helper_probe_single_connector_modes(struct dr= m_connector *connector, * check here, and if anything changed start the hotplug code. */ if (old_status !=3D connector->status) { - DRM_DEBUG_KMS("[CONNECTOR:%d:%s] status updated from %s to %s\n", - connector->base.id, - connector->name, - drm_get_connector_status_name(old_status), - drm_get_connector_status_name(connector->status)); + drm_dbg_kms(dev, + "[CONNECTOR:%d:%s] status updated from %s to %s\n", + connector->base.id, + connector->name, + drm_get_connector_status_name(old_status), + drm_get_connector_status_name(connector->status)); =20 /* * The hotplug event code might call into the fb @@ -598,8 +599,8 @@ int drm_helper_probe_single_connector_modes(struct drm_= connector *connector, drm_kms_helper_poll_enable(dev); =20 if (connector->status =3D=3D connector_status_disconnected) { - DRM_DEBUG_KMS("[CONNECTOR:%d:%s] disconnected\n", - connector->base.id, connector->name); + drm_dbg_kms(dev, "[CONNECTOR:%d:%s] disconnected\n", + connector->base.id, connector->name); drm_connector_update_edid_property(connector, NULL); drm_mode_prune_invalid(dev, &connector->modes, false); goto exit; @@ -657,8 +658,8 @@ int drm_helper_probe_single_connector_modes(struct drm_= connector *connector, =20 drm_mode_sort(&connector->modes); =20 - DRM_DEBUG_KMS("[CONNECTOR:%d:%s] probed modes :\n", connector->base.id, - connector->name); + drm_dbg_kms(dev, "[CONNECTOR:%d:%s] probed modes :\n", + connector->base.id, connector->name); list_for_each_entry(mode, &connector->modes, head) { drm_mode_set_crtcinfo(mode, CRTC_INTERLACE_HALVE_V); drm_mode_debug_printmodeline(mode); @@ -792,14 +793,14 @@ static void output_poll_execute(struct work_struct *w= ork) old =3D drm_get_connector_status_name(old_status); new =3D drm_get_connector_status_name(connector->status); =20 - DRM_DEBUG_KMS("[CONNECTOR:%d:%s] " - "status updated from %s to %s\n", - connector->base.id, - connector->name, - old, new); - DRM_DEBUG_KMS("[CONNECTOR:%d:%s] epoch counter %llu -> %llu\n", - connector->base.id, connector->name, - old_epoch_counter, connector->epoch_counter); + drm_dbg_kms(dev, "[CONNECTOR:%d:%s] " + "status updated from %s to %s\n", + connector->base.id, + connector->name, + old, new); + drm_dbg_kms(dev, "[CONNECTOR:%d:%s] epoch counter %llu -> %llu\n", + connector->base.id, connector->name, + old_epoch_counter, connector->epoch_counter); =20 changed =3D true; } diff --git a/drivers/gpu/drm/drm_rect.c b/drivers/gpu/drm/drm_rect.c index 85c79a38c13a..8f4abcb1cbd8 100644 --- a/drivers/gpu/drm/drm_rect.c +++ b/drivers/gpu/drm/drm_rect.c @@ -228,9 +228,9 @@ EXPORT_SYMBOL(drm_rect_calc_vscale); void drm_rect_debug_print(const char *prefix, const struct drm_rect *r, bo= ol fixed_point) { if (fixed_point) - DRM_DEBUG_KMS("%s" DRM_RECT_FP_FMT "\n", prefix, DRM_RECT_FP_ARG(r)); + drm_dbg_kms(NULL, "%s" DRM_RECT_FP_FMT "\n", prefix, DRM_RECT_FP_ARG(r)); else - DRM_DEBUG_KMS("%s" DRM_RECT_FMT "\n", prefix, DRM_RECT_ARG(r)); + drm_dbg_kms(NULL, "%s" DRM_RECT_FMT "\n", prefix, DRM_RECT_ARG(r)); } EXPORT_SYMBOL(drm_rect_debug_print); =20 diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c index 6b090d71d45a..873818348bb4 100644 --- a/drivers/gpu/drm/drm_sysfs.c +++ b/drivers/gpu/drm/drm_sysfs.c @@ -179,10 +179,10 @@ static ssize_t status_store(struct device *device, ret =3D -EINVAL; =20 if (old_force !=3D connector->force || !connector->force) { - DRM_DEBUG_KMS("[CONNECTOR:%d:%s] force updated from %d to %d or reprobin= g\n", - connector->base.id, - connector->name, - old_force, connector->force); + drm_dbg_kms(dev, "[CONNECTOR:%d:%s] force updated from %d to %d or repro= bing\n", + connector->base.id, + connector->name, + old_force, connector->force); =20 connector->funcs->fill_modes(connector, dev->mode_config.max_width, --=20 2.39.2