From nobody Wed Sep 17 06:31:35 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 3932BC4332F for ; Thu, 22 Dec 2022 15:41:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230302AbiLVPlf (ORCPT ); Thu, 22 Dec 2022 10:41:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47924 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230265AbiLVPl2 (ORCPT ); Thu, 22 Dec 2022 10:41:28 -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 8019D12624 for ; Thu, 22 Dec 2022 07:41:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671723648; cv=none; d=zohomail.in; s=zohoarc; b=YUf/aAK+XueTpDbsE5JiQPzpFtG+Dt7G9LQQeYfQkUVTzWdeO9rQKj2sBlo7tBbHTY3YYJmjqLh8sYlJFkCoJGJZgQMihcSF689eSK+LnLsHj+7QBikYhqsfEp9/wWK9sov6Dy0mrMywbgzqn4Gg3bulwKk6lIvMY5WBfCf4lcM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.in; s=zohoarc; t=1671723648; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=cZpLol3O64MpX9GcARERJaN7Outep6VKOujvjh1UXWE=; b=N4bnZENKws2QAnzihKXK5cep8D+vFXC0cCm/Vf0Yb+Jarqmhi2g2wm6T4+Q5Wh33Y1q0kpr56EANcuyvuXRbZsW/y3c59UewBgJG+IsVFhO+nzF2YWuuTFuv3TfITxFouaM29YreeIlLG1fZnL/uWa9honFeAN9KE68KtqbnkbU= 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=1671723648; 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=cZpLol3O64MpX9GcARERJaN7Outep6VKOujvjh1UXWE=; b=Cem6nmyQ30GAesomLEqIANWPXqsBHoii9xI0XyQL72UgMGOz03mMTUb2b7Tag+UQ TNPsY+wdFCYBJYi2WGxg1MrqWc1E5Sjh8LUs98Dtap0LmtOeWQD2RniP50vcIzstygn ZHj1Ku3pH5r20lNstdWW8kmy/dD9d45GF14n6Xds= Received: from kampyooter.. (110.226.31.37 [110.226.31.37]) by mx.zoho.in with SMTPS id 1671723647546491.26266579948185; Thu, 22 Dec 2022 21:10:47 +0530 (IST) From: Siddh Raman Pant To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Simon Ser Cc: dri-devel , linux-kernel Message-ID: Subject: [PATCH v2 1/9] drm: Remove usage of deprecated DRM_INFO Date: Thu, 22 Dec 2022 21:10:35 +0530 X-Mailer: git-send-email 2.35.1 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_INFO is deprecated. Thus, use newer printing macros drm_info() and pr_info(). Signed-off-by: Siddh Raman Pant --- drivers/gpu/drm/drm_client_modeset.c | 2 +- drivers/gpu/drm/drm_connector.c | 7 ++++--- drivers/gpu/drm/drm_drv.c | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/drm_client_modeset.c b/drivers/gpu/drm/drm_cli= ent_modeset.c index d553e793e673..2b76d4828c5f 100644 --- a/drivers/gpu/drm/drm_client_modeset.c +++ b/drivers/gpu/drm/drm_client_modeset.c @@ -335,7 +335,7 @@ static bool drm_client_target_cloned(struct drm_device = *dev, DRM_DEBUG_KMS("can clone using 1024x768\n"); return true; } - DRM_INFO("kms: can't enable cloning when we probably wanted to.\n"); + drm_info(dev, "kms: can't enable cloning when we probably wanted to.\n"); return false; } =20 diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connecto= r.c index 547356e00341..34c26b2a974e 100644 --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c @@ -165,13 +165,14 @@ static void drm_connector_get_cmdline_mode(struct drm= _connector *connector) return; =20 if (mode->force) { - DRM_INFO("forcing %s connector %s\n", connector->name, - drm_get_connector_force_name(mode->force)); + drm_info(connector->dev, "forcing %s connector %s\n", + connector->name, drm_get_connector_force_name(mode->force)); connector->force =3D mode->force; } =20 if (mode->panel_orientation !=3D DRM_MODE_PANEL_ORIENTATION_UNKNOWN) { - DRM_INFO("cmdline forces connector %s panel_orientation to %d\n", + drm_info(connector->dev, + "cmdline forces connector %s panel_orientation to %d\n", connector->name, mode->panel_orientation); drm_connector_set_panel_orientation(connector, mode->panel_orientation); diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c index 73b845a75d52..bc98e4bcf2c1 100644 --- a/drivers/gpu/drm/drm_drv.c +++ b/drivers/gpu/drm/drm_drv.c @@ -938,7 +938,7 @@ int drm_dev_register(struct drm_device *dev, unsigned l= ong flags) if (drm_core_check_feature(dev, DRIVER_MODESET)) drm_modeset_register_all(dev); =20 - DRM_INFO("Initialized %s %d.%d.%d %s for %s on minor %d\n", + drm_info(dev, "Initialized %s %d.%d.%d %s for %s on minor %d\n", driver->name, driver->major, driver->minor, driver->patchlevel, driver->date, dev->dev ? dev_name(dev->dev) : "virtual device", --=20 2.35.1 From nobody Wed Sep 17 06:31:35 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 C022BC4332F for ; Thu, 22 Dec 2022 15:41:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235335AbiLVPlu (ORCPT ); Thu, 22 Dec 2022 10:41:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48036 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230194AbiLVPlb (ORCPT ); Thu, 22 Dec 2022 10:41:31 -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 90C10BE23 for ; Thu, 22 Dec 2022 07:41:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671723649; cv=none; d=zohomail.in; s=zohoarc; b=OGc3S6BSVkB0Xxj7+TdALZC8ijXyM3l18GGKS2MQDM070otYGmHGMsHQn9FwEw2d89MTQKG27QvfeRXwKgXqeGnb46n/z0LihKj8EdFFgkUf85VoZp4kg6HMRH6FpfOKJKbskQjTkjni916jgFVeM/l8HQBS/3AEHmBXU3GMWAc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.in; s=zohoarc; t=1671723649; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=5Ezsab/SJIPW8msHLb3IbOWyHUXiaEELHWoNOzQwCYY=; b=CazyLRHmBGsM2eHMkxAa3A5D2RSja61XQh2wbp/bOSI+ZweMQdAMQHjDNUZD7pB7/XZqfBVnO/fnauSBSKgQO77oDIzd88PjBQDyEBnmeJSJT7rhKbeXGtGynA/rb6HOPBkHo5q0M2F3hWid/7214gBUzEAZlcNFyTbA5smMBg0= 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=1671723649; 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=5Ezsab/SJIPW8msHLb3IbOWyHUXiaEELHWoNOzQwCYY=; b=coaSX8YfbwkyLiC/oYoiI0GgafNIE2Q0S9dMrg5n5GBGCprAjgJ9KeFPMz/bOcaq +IoM0IcJE1g7pcTnjIH/RHMLRSY1EAxJ0SOXcLle6az5TxPvUw8+fGOChbMDdm/E9z6 yQBO1bXv9VE4R0F171Tw3TX68cSmiGiTJ3d+UBXI= Received: from kampyooter.. (110.226.31.37 [110.226.31.37]) by mx.zoho.in with SMTPS id 1671723647969829.3605120340601; Thu, 22 Dec 2022 21:10:47 +0530 (IST) From: Siddh Raman Pant To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Simon Ser Cc: dri-devel , linux-kernel Message-ID: <17b19f99a11d80febc21a7dbcd4fe60b4b9d694f.1671723195.git.code@siddh.me> Subject: [PATCH v2 2/9] drm: Remove usage of deprecated DRM_ERROR Date: Thu, 22 Dec 2022 21:10:36 +0530 X-Mailer: git-send-email 2.35.1 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_ERROR is deprecated. Thus, use newer printing macros drm_err() and pr_err(). Signed-off-by: Siddh Raman Pant --- drivers/gpu/drm/drm_bridge.c | 8 ++++---- drivers/gpu/drm/drm_bufs.c | 8 ++++---- drivers/gpu/drm/drm_client_modeset.c | 4 ++-- drivers/gpu/drm/drm_context.c | 4 ++-- drivers/gpu/drm/drm_crtc_helper.c | 6 +++--- drivers/gpu/drm/drm_debugfs_crc.c | 3 ++- drivers/gpu/drm/drm_drv.c | 8 ++++---- drivers/gpu/drm/drm_framebuffer.c | 3 ++- drivers/gpu/drm/drm_gem.c | 2 +- drivers/gpu/drm/drm_gem_dma_helper.c | 2 +- drivers/gpu/drm/drm_mipi_dbi.c | 2 +- drivers/gpu/drm/drm_mode_config.c | 2 +- drivers/gpu/drm/drm_modeset_helper.c | 2 +- drivers/gpu/drm/drm_plane.c | 2 +- drivers/gpu/drm/drm_scatter.c | 9 +++++---- drivers/gpu/drm/drm_vm.c | 2 +- 16 files changed, 35 insertions(+), 32 deletions(-) diff --git a/drivers/gpu/drm/drm_bridge.c b/drivers/gpu/drm/drm_bridge.c index 1545c50fd1c8..20a8cde70640 100644 --- a/drivers/gpu/drm/drm_bridge.c +++ b/drivers/gpu/drm/drm_bridge.c @@ -312,11 +312,11 @@ int drm_bridge_attach(struct drm_encoder *encoder, st= ruct drm_bridge *bridge, list_del(&bridge->chain_node); =20 #ifdef CONFIG_OF - DRM_ERROR("failed to attach bridge %pOF to encoder %s: %d\n", - bridge->of_node, encoder->name, ret); + drm_err(encoder->dev, "failed to attach bridge %pOF to encoder %s: %d\n", + bridge->of_node, encoder->name, ret); #else - DRM_ERROR("failed to attach bridge to encoder %s: %d\n", - encoder->name, ret); + drm_err(encoder->dev, "failed to attach bridge to encoder %s: %d\n", + encoder->name, ret); #endif =20 return ret; diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c index fcca21e8efac..98aaf3379a3b 100644 --- a/drivers/gpu/drm/drm_bufs.c +++ b/drivers/gpu/drm/drm_bufs.c @@ -1474,15 +1474,15 @@ int drm_legacy_freebufs(struct drm_device *dev, voi= d *data, if (copy_from_user(&idx, &request->list[i], sizeof(idx))) return -EFAULT; if (idx < 0 || idx >=3D dma->buf_count) { - DRM_ERROR("Index %d (of %d max)\n", - idx, dma->buf_count - 1); + drm_err(dev, "Index %d (of %d max)\n", + idx, dma->buf_count - 1); return -EINVAL; } idx =3D array_index_nospec(idx, dma->buf_count); buf =3D dma->buflist[idx]; if (buf->file_priv !=3D file_priv) { - DRM_ERROR("Process %d freeing buffer not owned\n", - task_pid_nr(current)); + drm_err(dev, "Process %d freeing buffer not owned\n", + task_pid_nr(current)); return -EINVAL; } drm_legacy_free_buffer(dev, buf); diff --git a/drivers/gpu/drm/drm_client_modeset.c b/drivers/gpu/drm/drm_cli= ent_modeset.c index 2b76d4828c5f..c4517dea924e 100644 --- a/drivers/gpu/drm/drm_client_modeset.c +++ b/drivers/gpu/drm/drm_client_modeset.c @@ -812,7 +812,7 @@ int drm_client_modeset_probe(struct drm_client_dev *cli= ent, unsigned int width, offsets =3D kcalloc(connector_count, sizeof(*offsets), GFP_KERNEL); enabled =3D kcalloc(connector_count, sizeof(bool), GFP_KERNEL); if (!crtcs || !modes || !enabled || !offsets) { - DRM_ERROR("Memory allocation failed\n"); + drm_err(client->dev, "Memory allocation failed\n"); ret =3D -ENOMEM; goto out; } @@ -836,7 +836,7 @@ int drm_client_modeset_probe(struct drm_client_dev *cli= ent, unsigned int width, offsets, enabled, width, height) && !drm_client_target_preferred(connectors, connector_count, modes, offsets, enabled, width, height)) - DRM_ERROR("Unable to find initial modes\n"); + drm_err(client->dev, "Unable to find initial modes\n"); =20 DRM_DEBUG_KMS("picking CRTCs for %dx%d config\n", width, height); diff --git a/drivers/gpu/drm/drm_context.c b/drivers/gpu/drm/drm_context.c index c6e6a3e7219a..f6d68fad8311 100644 --- a/drivers/gpu/drm/drm_context.c +++ b/drivers/gpu/drm/drm_context.c @@ -276,7 +276,7 @@ int drm_legacy_setsareactx(struct drm_device *dev, void= *data, static int drm_context_switch(struct drm_device * dev, int old, int new) { if (test_and_set_bit(0, &dev->context_flag)) { - DRM_ERROR("Reentering -- FIXME\n"); + drm_err(dev, "Reentering -- FIXME\n"); return -EBUSY; } =20 @@ -307,7 +307,7 @@ static int drm_context_switch_complete(struct drm_devic= e *dev, dev->last_context =3D new; /* PRE/POST: This is the _only_ writer. */ =20 if (!_DRM_LOCK_IS_HELD(file_priv->master->lock.hw_lock->lock)) { - DRM_ERROR("Lock isn't held after context switch\n"); + drm_err(dev, "Lock isn't held after context switch\n"); } =20 /* If a context switch is ever initiated diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_h= elper.c index a209659a996c..ab41dc180c58 100644 --- a/drivers/gpu/drm/drm_crtc_helper.c +++ b/drivers/gpu/drm/drm_crtc_helper.c @@ -768,8 +768,8 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set, if (!drm_crtc_helper_set_mode(set->crtc, set->mode, set->x, set->y, save_set.fb)) { - DRM_ERROR("failed to set mode on [CRTC:%d:%s]\n", - set->crtc->base.id, set->crtc->name); + drm_err(dev, "failed to set mode on [CRTC:%d:%s]\n", + set->crtc->base.id, set->crtc->name); set->crtc->primary->fb =3D save_set.fb; ret =3D -EINVAL; goto fail; @@ -996,7 +996,7 @@ void drm_helper_resume_force_mode(struct drm_device *de= v) =20 /* Restoring the old config should never fail! */ if (ret =3D=3D false) - DRM_ERROR("failed to set mode on crtc %p\n", crtc); + drm_err(dev, "failed to set mode on crtc %p\n", crtc); =20 /* Turn off outputs that were already powered off */ if (drm_helper_choose_crtc_dpms(crtc)) { diff --git a/drivers/gpu/drm/drm_debugfs_crc.c b/drivers/gpu/drm/drm_debugf= s_crc.c index bbc3bc4ba844..a59ef3f0e4a1 100644 --- a/drivers/gpu/drm/drm_debugfs_crc.c +++ b/drivers/gpu/drm/drm_debugfs_crc.c @@ -416,7 +416,8 @@ int drm_crtc_add_crc_entry(struct drm_crtc *crtc, bool = has_frame, spin_unlock_irqrestore(&crc->lock, flags); =20 if (!was_overflow) - DRM_ERROR("Overflow of CRC buffer, userspace reads too slow.\n"); + drm_err(crtc->dev, + "Overflow of CRC buffer, userspace reads too slow.\n"); =20 return -ENOBUFS; } diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c index bc98e4bcf2c1..1295ecd98f12 100644 --- a/drivers/gpu/drm/drm_drv.c +++ b/drivers/gpu/drm/drm_drv.c @@ -177,7 +177,7 @@ static int drm_minor_register(struct drm_device *dev, u= nsigned int type) } else { ret =3D drm_debugfs_init(minor, minor->index, drm_debugfs_root); if (ret) { - DRM_ERROR("DRM: Failed to initialize /sys/kernel/debug/dri.\n"); + drm_err(dev, "DRM: Failed to initialize /sys/kernel/debug/dri.\n"); goto err_debugfs; } } @@ -629,7 +629,7 @@ static int drm_dev_init(struct drm_device *dev, if (drm_core_check_feature(dev, DRIVER_COMPUTE_ACCEL) && (drm_core_check_feature(dev, DRIVER_RENDER) || drm_core_check_feature(dev, DRIVER_MODESET))) { - DRM_ERROR("DRM driver can't be both a compute acceleration and graphics = driver\n"); + drm_err(dev, "DRM driver can't be both a compute acceleration and graphi= cs driver\n"); return -EINVAL; } =20 @@ -652,7 +652,7 @@ static int drm_dev_init(struct drm_device *dev, inode =3D drm_fs_inode_new(); if (IS_ERR(inode)) { ret =3D PTR_ERR(inode); - DRM_ERROR("Cannot allocate anonymous inode: %d\n", ret); + drm_err(dev, "Cannot allocate anonymous inode: %d\n", ret); goto err; } =20 @@ -683,7 +683,7 @@ static int drm_dev_init(struct drm_device *dev, if (drm_core_check_feature(dev, DRIVER_GEM)) { ret =3D drm_gem_init(dev); if (ret) { - DRM_ERROR("Cannot initialize graphics execution manager (GEM)\n"); + drm_err(dev, "Cannot initialize graphics execution manager (GEM)\n"); goto err; } } diff --git a/drivers/gpu/drm/drm_framebuffer.c b/drivers/gpu/drm/drm_frameb= uffer.c index 2dd97473ca10..5aea791f4341 100644 --- a/drivers/gpu/drm/drm_framebuffer.c +++ b/drivers/gpu/drm/drm_framebuffer.c @@ -1070,7 +1070,8 @@ static void legacy_remove_fb(struct drm_framebuffer *= fb) =20 /* should turn off the crtc */ if (drm_crtc_force_disable(crtc)) - DRM_ERROR("failed to reset crtc %p when fb was deleted\n", crtc); + drm_err(dev, "failed to reset crtc %p when fb was deleted\n", + crtc); } } =20 diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c index b8db675e7fb5..3c99610afc0a 100644 --- a/drivers/gpu/drm/drm_gem.c +++ b/drivers/gpu/drm/drm_gem.c @@ -101,7 +101,7 @@ drm_gem_init(struct drm_device *dev) vma_offset_manager =3D drmm_kzalloc(dev, sizeof(*vma_offset_manager), GFP_KERNEL); if (!vma_offset_manager) { - DRM_ERROR("out of memory\n"); + drm_err(dev, "out of memory\n"); return -ENOMEM; } =20 diff --git a/drivers/gpu/drm/drm_gem_dma_helper.c b/drivers/gpu/drm/drm_gem= _dma_helper.c index 1e658c448366..1ba551b0ab97 100644 --- a/drivers/gpu/drm/drm_gem_dma_helper.c +++ b/drivers/gpu/drm/drm_gem_dma_helper.c @@ -583,7 +583,7 @@ drm_gem_dma_prime_import_sg_table_vmap(struct drm_devic= e *dev, =20 ret =3D dma_buf_vmap_unlocked(attach->dmabuf, &map); if (ret) { - DRM_ERROR("Failed to vmap PRIME buffer\n"); + drm_err(dev, "Failed to vmap PRIME buffer\n"); return ERR_PTR(ret); } =20 diff --git a/drivers/gpu/drm/drm_mipi_dbi.c b/drivers/gpu/drm/drm_mipi_dbi.c index a6ac56580876..24af507bb687 100644 --- a/drivers/gpu/drm/drm_mipi_dbi.c +++ b/drivers/gpu/drm/drm_mipi_dbi.c @@ -527,7 +527,7 @@ int mipi_dbi_dev_init_with_formats(struct mipi_dbi_dev = *dbidev, drm_mode_copy(&dbidev->mode, mode); ret =3D mipi_dbi_rotate_mode(&dbidev->mode, rotation); if (ret) { - DRM_ERROR("Illegal rotation value %u\n", rotation); + drm_err(drm, "Illegal rotation value %u\n", rotation); return -EINVAL; } =20 diff --git a/drivers/gpu/drm/drm_mode_config.c b/drivers/gpu/drm/drm_mode_c= onfig.c index 688c8afe0bf1..5dab605520b1 100644 --- a/drivers/gpu/drm/drm_mode_config.c +++ b/drivers/gpu/drm/drm_mode_config.c @@ -505,7 +505,7 @@ void drm_mode_config_cleanup(struct drm_device *dev) if (WARN_ON(!list_empty(&dev->mode_config.connector_list))) { drm_connector_list_iter_begin(dev, &conn_iter); drm_for_each_connector_iter(connector, &conn_iter) - DRM_ERROR("connector %s leaked!\n", connector->name); + drm_err(dev, "connector %s leaked!\n", connector->name); drm_connector_list_iter_end(&conn_iter); } =20 diff --git a/drivers/gpu/drm/drm_modeset_helper.c b/drivers/gpu/drm/drm_mod= eset_helper.c index f858dfedf2cf..e26b0285dde6 100644 --- a/drivers/gpu/drm/drm_modeset_helper.c +++ b/drivers/gpu/drm/drm_modeset_helper.c @@ -235,7 +235,7 @@ int drm_mode_config_helper_resume(struct drm_device *de= v) =20 ret =3D drm_atomic_helper_resume(dev, dev->mode_config.suspend_state); if (ret) - DRM_ERROR("Failed to resume (%d)\n", ret); + drm_err(dev, "Failed to resume (%d)\n", ret); dev->mode_config.suspend_state =3D NULL; =20 drm_fb_helper_set_suspend_unlocked(dev->fb_helper, 0); diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c index 33357629a7f5..a650f06e4cea 100644 --- a/drivers/gpu/drm/drm_plane.c +++ b/drivers/gpu/drm/drm_plane.c @@ -606,7 +606,7 @@ void drm_plane_force_disable(struct drm_plane *plane) plane->old_fb =3D plane->fb; ret =3D plane->funcs->disable_plane(plane, NULL); if (ret) { - DRM_ERROR("failed to disable plane with busy fb\n"); + drm_err(plane->dev, "failed to disable plane with busy fb\n"); plane->old_fb =3D NULL; return; } diff --git a/drivers/gpu/drm/drm_scatter.c b/drivers/gpu/drm/drm_scatter.c index f4e6184d1877..5b0b2140d535 100644 --- a/drivers/gpu/drm/drm_scatter.c +++ b/drivers/gpu/drm/drm_scatter.c @@ -170,9 +170,10 @@ int drm_legacy_sg_alloc(struct drm_device *dev, void *= data, j++, tmp++) { if (*tmp !=3D 0xcafebabe && error =3D=3D 0) { error =3D 1; - DRM_ERROR("Scatter allocation error, " - "pagelist does not match " - "virtual mapping\n"); + drm_err(dev, + "Scatter allocation error, " + "pagelist does not match " + "virtual mapping\n"); } } tmp =3D page_address(entry->pagelist[i]); @@ -183,7 +184,7 @@ int drm_legacy_sg_alloc(struct drm_device *dev, void *d= ata, } } if (error =3D=3D 0) - DRM_ERROR("Scatter allocation matches pagelist\n"); + drm_err(dev, "Scatter allocation matches pagelist\n"); } #endif =20 diff --git a/drivers/gpu/drm/drm_vm.c b/drivers/gpu/drm/drm_vm.c index f024dc93939e..cdb956af2079 100644 --- a/drivers/gpu/drm/drm_vm.c +++ b/drivers/gpu/drm/drm_vm.c @@ -547,7 +547,7 @@ static int drm_mmap_locked(struct file *filp, struct vm= _area_struct *vma) return drm_mmap_dma(filp, vma); =20 if (drm_ht_find_item(&dev->map_hash, vma->vm_pgoff, &hash)) { - DRM_ERROR("Could not find map\n"); + drm_err(dev, "Could not find map\n"); return -EINVAL; } =20 --=20 2.35.1 From nobody Wed Sep 17 06:31:35 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 D641EC4332F for ; Thu, 22 Dec 2022 15:41:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230197AbiLVPlb (ORCPT ); Thu, 22 Dec 2022 10:41:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47876 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230220AbiLVPl2 (ORCPT ); Thu, 22 Dec 2022 10:41:28 -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 3AF7911C19 for ; Thu, 22 Dec 2022 07:41:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671723650; cv=none; d=zohomail.in; s=zohoarc; b=VqvptbOUabuM1XNJN3E+8gBnGn7sCqG26D1Ws2ZYAfywGWAPwLDrNnVwC5/6dZBXcSfROHLfCyqJkV8Evm5qgSN5C/WRWCORKAF0fW+VbZs4p+WAF4X5/WQE6qLoWlCVZggVDXpD4OopQGPfpRuaXw9KzlwxPQne2RNsgO2ERCM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.in; s=zohoarc; t=1671723650; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=32++P+q6Vmnok5SXRBgj9sElDpHPxwJUSBDXcv+gGuA=; b=TY3CzIcESJuLY6p128Ubg8sToU5g3bI99MQtg/PL3+AqBIuRkN0cjQMT6RbmQabtvl3Mnj7snqi9Z+yYs9omkvYt9iFCYncyLwFV1DPy81tQF+3C18KpzBY5zm8mjMaWq7wt0H/TwINKPIIzfp4bm6w7W5DjoG1pXckSKBiQRL4= 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=1671723650; 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=32++P+q6Vmnok5SXRBgj9sElDpHPxwJUSBDXcv+gGuA=; b=YJosYX+N3UI6pQO1AtjuwCz/NAevzV6UWbox/NlRJuB+DSxG44hHsXDy768ZGxIf Dt3X8DR+v9Vpt8uLpR9wp7nzpDEham7e/2fAIgVzoI/IfVAtgvzFq+csarRH7r8F/ah K3dTJZr1cD+6Q3nzeSSNcY6JPw8FEehHVouMSwcs= Received: from kampyooter.. (110.226.31.37 [110.226.31.37]) by mx.zoho.in with SMTPS id 1671723648363134.27341012227134; Thu, 22 Dec 2022 21:10:48 +0530 (IST) From: Siddh Raman Pant To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Simon Ser Cc: dri-devel , linux-kernel Message-ID: Subject: [PATCH v2 3/9] drm/print: Fix support for NULL as first argument of drm_dbg_* Date: Thu, 22 Dec 2022 21:10:37 +0530 X-Mailer: git-send-email 2.35.1 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" Comments say macros DRM_DEBUG_* are deprecated in favor of drm_dbg_*(NULL, ...), but they have broken support for it, as the macro will result in `(NULL) ? (NULL)->dev : NULL`. Thus, fix them by separating logic to get dev ptr in a new function, which will return the dev ptr if arg is not NULL. Use it in drm_dbg_*, and also in __DRM_DEFINE_DBG_RATELIMITED, where a similar (but correct) NULL check was in place. Signed-off-by: Siddh Raman Pant --- include/drm/drm_print.h | 42 ++++++++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 13 deletions(-) diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h index a44fb7ef257f..6d2d5c522e25 100644 --- a/include/drm/drm_print.h +++ b/include/drm/drm_print.h @@ -34,6 +34,7 @@ #include =20 #include +#include =20 /* Do *not* use outside of drm_print.[ch]! */ extern unsigned long __drm_debug; @@ -451,6 +452,22 @@ void __drm_dev_dbg(struct _ddebug *desc, const struct = device *dev, * Prefer drm_device based logging over device or prink based logging. */ =20 +/** + * __drm_get_dev_ptr - Helper function to get device type pointer even if = NULL + * is passed. Primarily for use in print macros, since they + * need to handle NULL as the first argument passed. + * @drm: The *drm_device pointer, or NULL. + * + * RETURNS: + * The *device pointer, or NULL. + */ +static inline struct device *__drm_get_dev_ptr(const struct drm_device *dr= m) +{ + if (drm) + return drm->dev; + return NULL; +} + /* Helper for struct drm_device based logging. */ #define __drm_printk(drm, level, type, fmt, ...) \ dev_##level##type((drm)->dev, "[drm] " fmt, ##__VA_ARGS__) @@ -487,25 +504,25 @@ void __drm_dev_dbg(struct _ddebug *desc, const struct= device *dev, =20 =20 #define drm_dbg_core(drm, fmt, ...) \ - drm_dev_dbg((drm) ? (drm)->dev : NULL, DRM_UT_CORE, fmt, ##__VA_ARGS__) -#define drm_dbg_driver(drm, fmt, ...) \ - drm_dev_dbg((drm) ? (drm)->dev : NULL, DRM_UT_DRIVER, fmt, ##__VA_ARGS__) + drm_dev_dbg(__drm_get_dev_ptr(drm), DRM_UT_CORE, fmt, ##__VA_ARGS__) +#define drm_dbg_driver(drm, fmt, ...) \ + drm_dev_dbg(__drm_get_dev_ptr(drm), DRM_UT_DRIVER, fmt, ##__VA_ARGS__) #define drm_dbg_kms(drm, fmt, ...) \ - drm_dev_dbg((drm) ? (drm)->dev : NULL, DRM_UT_KMS, fmt, ##__VA_ARGS__) + drm_dev_dbg(__drm_get_dev_ptr(drm), DRM_UT_KMS, fmt, ##__VA_ARGS__) #define drm_dbg_prime(drm, fmt, ...) \ - drm_dev_dbg((drm) ? (drm)->dev : NULL, DRM_UT_PRIME, fmt, ##__VA_ARGS__) + drm_dev_dbg(__drm_get_dev_ptr(drm), DRM_UT_PRIME, fmt, ##__VA_ARGS__) #define drm_dbg_atomic(drm, fmt, ...) \ - drm_dev_dbg((drm) ? (drm)->dev : NULL, DRM_UT_ATOMIC, fmt, ##__VA_ARGS__) + drm_dev_dbg(__drm_get_dev_ptr(drm), DRM_UT_ATOMIC, fmt, ##__VA_ARGS__) #define drm_dbg_vbl(drm, fmt, ...) \ - drm_dev_dbg((drm) ? (drm)->dev : NULL, DRM_UT_VBL, fmt, ##__VA_ARGS__) + drm_dev_dbg(__drm_get_dev_ptr(drm), DRM_UT_VBL, fmt, ##__VA_ARGS__) #define drm_dbg_state(drm, fmt, ...) \ - drm_dev_dbg((drm) ? (drm)->dev : NULL, DRM_UT_STATE, fmt, ##__VA_ARGS__) + drm_dev_dbg(__drm_get_dev_ptr(drm), DRM_UT_STATE, fmt, ##__VA_ARGS__) #define drm_dbg_lease(drm, fmt, ...) \ - drm_dev_dbg((drm) ? (drm)->dev : NULL, DRM_UT_LEASE, fmt, ##__VA_ARGS__) + drm_dev_dbg(__drm_get_dev_ptr(drm), DRM_UT_LEASE, fmt, ##__VA_ARGS__) #define drm_dbg_dp(drm, fmt, ...) \ - drm_dev_dbg((drm) ? (drm)->dev : NULL, DRM_UT_DP, fmt, ##__VA_ARGS__) + drm_dev_dbg(__drm_get_dev_ptr(drm), DRM_UT_DP, fmt, ##__VA_ARGS__) #define drm_dbg_drmres(drm, fmt, ...) \ - drm_dev_dbg((drm) ? (drm)->dev : NULL, DRM_UT_DRMRES, fmt, ##__VA_ARGS__) + drm_dev_dbg(__drm_get_dev_ptr(drm), DRM_UT_DRMRES, fmt, ##__VA_ARGS__) =20 #define drm_dbg(drm, fmt, ...) drm_dbg_driver(drm, fmt, ##__VA_ARGS__) =20 @@ -596,10 +613,9 @@ void __drm_err(const char *format, ...); #define __DRM_DEFINE_DBG_RATELIMITED(category, drm, fmt, ...) \ ({ \ static DEFINE_RATELIMIT_STATE(rs_, DEFAULT_RATELIMIT_INTERVAL, DEFAULT_RA= TELIMIT_BURST);\ - const struct drm_device *drm_ =3D (drm); \ \ if (drm_debug_enabled(DRM_UT_ ## category) && __ratelimit(&rs_)) \ - drm_dev_printk(drm_ ? drm_->dev : NULL, KERN_DEBUG, fmt, ## __VA_ARGS__)= ; \ + drm_dev_printk(__drm_get_dev_ptr(drm), KERN_DEBUG, fmt, ## __VA_ARGS__);= \ }) =20 #define drm_dbg_kms_ratelimited(drm, fmt, ...) \ --=20 2.35.1 From nobody Wed Sep 17 06:31:35 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 B236EC4332F for ; Thu, 22 Dec 2022 15:41:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231132AbiLVPly (ORCPT ); Thu, 22 Dec 2022 10:41:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48034 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230183AbiLVPlb (ORCPT ); Thu, 22 Dec 2022 10:41:31 -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 03B7A1A3BB for ; Thu, 22 Dec 2022 07:41:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671723649; cv=none; d=zohomail.in; s=zohoarc; b=TKTWJfZiuUHA21b7WQXL5Ods3vsR/KLEyeTIvh+Z3zb3/U7QJgWgzdY34643JR44Zrsu8F8Q/RXY4yi1HXARf6qC+lFFykFNXjLDaMYhMZUTxT5PM97JyZ7lhSs3LFcJFhZn9HXPrmrEBp5muQrA3ErBKvFJoFi/ZzmLtzTPQIY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.in; s=zohoarc; t=1671723649; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=a5Px7CsVTIGORocMQQuan6bgXoizKd9d5R341BlN+ko=; b=VsLpyUmZYBeohQUTRHTF25KLkQHyHGP3efMr/jtM9BeKBWfbUZzaXCrbUehiPsrsG07I5XhZ8o4ymdYo1p0dSd6eMOE4tTKZRx6Xwh+pg7aqg4RrzsrOnEYav53GoueSGE+79vrvf1UDfg/rD19nb11YSgRBVmuUZyeExznEbkM= 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=1671723649; 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=a5Px7CsVTIGORocMQQuan6bgXoizKd9d5R341BlN+ko=; b=kj8CHjNRqvyRQxihQs1N0xTsdXs3Am8Hy8j8zs7ffYrnkAk2slAPwg+ZpUQ5AWy8 /U1RtFvy+aS1PzVdb+0puUT9WbSx9f7iijNj4vPHahJt1IXXC8a6cUmK6T5I+ZxDajF HgaXwGwJm41/D51NgkfUx5gbyUoMIqTGPyspOBUE= Received: from kampyooter.. (110.226.31.37 [110.226.31.37]) by mx.zoho.in with SMTPS id 1671723648768835.3729319070094; Thu, 22 Dec 2022 21:10:48 +0530 (IST) From: Siddh Raman Pant To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Simon Ser Cc: dri-devel , linux-kernel Message-ID: <497f99a71fd71ba49c482f0af883939498a16d95.1671723195.git.code@siddh.me> Subject: [PATCH v2 4/9] drm: Remove usage of deprecated DRM_DEBUG Date: Thu, 22 Dec 2022 21:10:38 +0530 X-Mailer: git-send-email 2.35.1 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 is deprecated in favor of drm_dbg_core(). Signed-off-by: Siddh Raman Pant --- drivers/gpu/drm/drm_agpsupport.c | 4 +- drivers/gpu/drm/drm_bufs.c | 114 +++++++++++++++--------------- drivers/gpu/drm/drm_context.c | 14 ++-- drivers/gpu/drm/drm_dma.c | 10 +-- drivers/gpu/drm/drm_drv.c | 10 +-- drivers/gpu/drm/drm_file.c | 18 ++--- drivers/gpu/drm/drm_gem.c | 5 +- drivers/gpu/drm/drm_hashtab.c | 6 +- drivers/gpu/drm/drm_ioc32.c | 13 ++-- drivers/gpu/drm/drm_ioctl.c | 24 +++---- drivers/gpu/drm/drm_irq.c | 4 +- drivers/gpu/drm/drm_lease.c | 2 +- drivers/gpu/drm/drm_legacy_misc.c | 4 +- drivers/gpu/drm/drm_lock.c | 20 +++--- drivers/gpu/drm/drm_mode_object.c | 6 +- drivers/gpu/drm/drm_pci.c | 12 ++-- drivers/gpu/drm/drm_plane.c | 12 ++-- drivers/gpu/drm/drm_scatter.c | 10 +-- drivers/gpu/drm/drm_syncobj.c | 2 +- drivers/gpu/drm/drm_sysfs.c | 14 ++-- drivers/gpu/drm/drm_vm.c | 43 ++++++----- 21 files changed, 178 insertions(+), 169 deletions(-) diff --git a/drivers/gpu/drm/drm_agpsupport.c b/drivers/gpu/drm/drm_agpsupp= ort.c index a4ad6fd13abc..d27686d6e82d 100644 --- a/drivers/gpu/drm/drm_agpsupport.c +++ b/drivers/gpu/drm/drm_agpsupport.c @@ -315,8 +315,8 @@ int drm_legacy_agp_bind(struct drm_device *dev, struct = drm_agp_binding *request) if (retcode) return retcode; entry->bound =3D dev->agp->base + (page << PAGE_SHIFT); - DRM_DEBUG("base =3D 0x%lx entry->bound =3D 0x%lx\n", - dev->agp->base, entry->bound); + drm_dbg_core(dev, "base =3D 0x%lx entry->bound =3D 0x%lx\n", + dev->agp->base, entry->bound); return 0; } EXPORT_SYMBOL(drm_legacy_agp_bind); diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c index 98aaf3379a3b..feedd7c6f0d5 100644 --- a/drivers/gpu/drm/drm_bufs.c +++ b/drivers/gpu/drm/drm_bufs.c @@ -171,8 +171,8 @@ static int drm_addmap_core(struct drm_device *dev, reso= urce_size_t offset, kfree(map); return -EINVAL; } - DRM_DEBUG("offset =3D 0x%08llx, size =3D 0x%08lx, type =3D %d\n", - (unsigned long long)map->offset, map->size, map->type); + drm_dbg_core(dev, "offset =3D 0x%08llx, size =3D 0x%08lx, type =3D %d\n", + (unsigned long long)map->offset, map->size, map->type); =20 /* page-align _DRM_SHM maps. They are allocated here so there is no secur= ity * hole created by that and it works around various broken drivers that u= se @@ -205,10 +205,10 @@ static int drm_addmap_core(struct drm_device *dev, re= source_size_t offset, list =3D drm_find_matching_map(dev, map); if (list !=3D NULL) { if (list->map->size !=3D map->size) { - DRM_DEBUG("Matching maps of type %d with " - "mismatched sizes, (%ld vs %ld)\n", - map->type, map->size, - list->map->size); + drm_dbg_core(dev, "Matching maps of type %d with " + "mismatched sizes, (%ld vs %ld)\n", + map->type, map->size, + list->map->size); list->map->size =3D map->size; } =20 @@ -239,9 +239,9 @@ static int drm_addmap_core(struct drm_device *dev, reso= urce_size_t offset, list =3D drm_find_matching_map(dev, map); if (list !=3D NULL) { if (list->map->size !=3D map->size) { - DRM_DEBUG("Matching maps of type %d with " - "mismatched sizes, (%ld vs %ld)\n", - map->type, map->size, list->map->size); + drm_dbg_core(dev, "Matching maps of type %d with " + "mismatched sizes, (%ld vs %ld)\n", + map->type, map->size, list->map->size); list->map->size =3D map->size; } =20 @@ -250,8 +250,8 @@ static int drm_addmap_core(struct drm_device *dev, reso= urce_size_t offset, return 0; } map->handle =3D vmalloc_user(map->size); - DRM_DEBUG("%lu %d %p\n", - map->size, order_base_2(map->size), map->handle); + drm_dbg_core(dev, "%lu %d %p\n", + map->size, order_base_2(map->size), map->handle); if (!map->handle) { kfree(map); return -ENOMEM; @@ -308,8 +308,8 @@ static int drm_addmap_core(struct drm_device *dev, reso= urce_size_t offset, kfree(map); return -EPERM; } - DRM_DEBUG("AGP offset =3D 0x%08llx, size =3D 0x%08lx\n", - (unsigned long long)map->offset, map->size); + drm_dbg_core(dev, "AGP offset =3D 0x%08llx, size =3D 0x%08lx\n", + (unsigned long long)map->offset, map->size); =20 break; } @@ -749,13 +749,13 @@ int drm_legacy_addbufs_agp(struct drm_device *dev, byte_count =3D 0; agp_offset =3D dev->agp->base + request->agp_start; =20 - DRM_DEBUG("count: %d\n", count); - DRM_DEBUG("order: %d\n", order); - DRM_DEBUG("size: %d\n", size); - DRM_DEBUG("agp_offset: %lx\n", agp_offset); - DRM_DEBUG("alignment: %d\n", alignment); - DRM_DEBUG("page_order: %d\n", page_order); - DRM_DEBUG("total: %d\n", total); + drm_dbg_core(dev, "count: %d\n", count); + drm_dbg_core(dev, "order: %d\n", order); + drm_dbg_core(dev, "size: %d\n", size); + drm_dbg_core(dev, "agp_offset: %lx\n", agp_offset); + drm_dbg_core(dev, "alignment: %d\n", alignment); + drm_dbg_core(dev, "page_order: %d\n", page_order); + drm_dbg_core(dev, "total: %d\n", total); =20 if (order < DRM_MIN_ORDER || order > DRM_MAX_ORDER) return -EINVAL; @@ -770,7 +770,7 @@ int drm_legacy_addbufs_agp(struct drm_device *dev, } } if (!list_empty(&dev->agp->memory) && !valid) { - DRM_DEBUG("zone invalid\n"); + drm_dbg_core(dev, "zone invalid\n"); return -EINVAL; } spin_lock(&dev->buf_lock); @@ -833,14 +833,15 @@ int drm_legacy_addbufs_agp(struct drm_device *dev, return -ENOMEM; } =20 - DRM_DEBUG("buffer %d @ %p\n", entry->buf_count, buf->address); + drm_dbg_core(dev, "buffer %d @ %p\n", entry->buf_count, + buf->address); =20 offset +=3D alignment; entry->buf_count++; byte_count +=3D PAGE_SIZE << page_order; } =20 - DRM_DEBUG("byte_count: %d\n", byte_count); + drm_dbg_core(dev, "byte_count: %d\n", byte_count); =20 temp_buflist =3D krealloc(dma->buflist, (dma->buf_count + entry->buf_count) * @@ -863,8 +864,8 @@ int drm_legacy_addbufs_agp(struct drm_device *dev, dma->page_count +=3D byte_count >> PAGE_SHIFT; dma->byte_count +=3D byte_count; =20 - DRM_DEBUG("dma->buf_count : %d\n", dma->buf_count); - DRM_DEBUG("entry->buf_count : %d\n", entry->buf_count); + drm_dbg_core(dev, "dma->buf_count : %d\n", dma->buf_count); + drm_dbg_core(dev, "entry->buf_count : %d\n", entry->buf_count); =20 mutex_unlock(&dev->struct_mutex); =20 @@ -912,8 +913,8 @@ int drm_legacy_addbufs_pci(struct drm_device *dev, order =3D order_base_2(request->size); size =3D 1 << order; =20 - DRM_DEBUG("count=3D%d, size=3D%d (%d), order=3D%d\n", - request->count, request->size, size, order); + drm_dbg_core(dev, "count=3D%d, size=3D%d (%d), order=3D%d\n", + request->count, request->size, size, order); =20 if (order < DRM_MIN_ORDER || order > DRM_MAX_ORDER) return -EINVAL; @@ -975,8 +976,8 @@ int drm_legacy_addbufs_pci(struct drm_device *dev, } memcpy(temp_pagelist, dma->pagelist, dma->page_count * sizeof(*dma->pagelist)); - DRM_DEBUG("pagelist: %d entries\n", - dma->page_count + (count << page_order)); + drm_dbg_core(dev, "pagelist: %d entries\n", + dma->page_count + (count << page_order)); =20 entry->buf_size =3D size; entry->page_order =3D page_order; @@ -1015,9 +1016,9 @@ int drm_legacy_addbufs_pci(struct drm_device *dev, } entry->seglist[entry->seg_count++] =3D dmah; for (i =3D 0; i < (1 << page_order); i++) { - DRM_DEBUG("page %d @ 0x%08lx\n", - dma->page_count + page_count, - (unsigned long)dmah->vaddr + PAGE_SIZE * i); + drm_dbg_core(dev, "page %d @ 0x%08lx\n", + dma->page_count + page_count, + (unsigned long)dmah->vaddr + PAGE_SIZE * i); temp_pagelist[dma->page_count + page_count++] =3D (unsigned long)dmah->vaddr + PAGE_SIZE * i; } @@ -1051,8 +1052,8 @@ int drm_legacy_addbufs_pci(struct drm_device *dev, return -ENOMEM; } =20 - DRM_DEBUG("buffer %d @ %p\n", - entry->buf_count, buf->address); + drm_dbg_core(dev, "buffer %d @ %p\n", + entry->buf_count, buf->address); } byte_count +=3D PAGE_SIZE << page_order; } @@ -1140,13 +1141,13 @@ static int drm_legacy_addbufs_sg(struct drm_device = *dev, byte_count =3D 0; agp_offset =3D request->agp_start; =20 - DRM_DEBUG("count: %d\n", count); - DRM_DEBUG("order: %d\n", order); - DRM_DEBUG("size: %d\n", size); - DRM_DEBUG("agp_offset: %lu\n", agp_offset); - DRM_DEBUG("alignment: %d\n", alignment); - DRM_DEBUG("page_order: %d\n", page_order); - DRM_DEBUG("total: %d\n", total); + drm_dbg_core(dev, "count: %d\n", count); + drm_dbg_core(dev, "order: %d\n", order); + drm_dbg_core(dev, "size: %d\n", size); + drm_dbg_core(dev, "agp_offset: %lu\n", agp_offset); + drm_dbg_core(dev, "alignment: %d\n", alignment); + drm_dbg_core(dev, "page_order: %d\n", page_order); + drm_dbg_core(dev, "total: %d\n", total); =20 if (order < DRM_MIN_ORDER || order > DRM_MAX_ORDER) return -EINVAL; @@ -1212,14 +1213,15 @@ static int drm_legacy_addbufs_sg(struct drm_device = *dev, return -ENOMEM; } =20 - DRM_DEBUG("buffer %d @ %p\n", entry->buf_count, buf->address); + drm_dbg_core(dev, "buffer %d @ %p\n", entry->buf_count, + buf->address); =20 offset +=3D alignment; entry->buf_count++; byte_count +=3D PAGE_SIZE << page_order; } =20 - DRM_DEBUG("byte_count: %d\n", byte_count); + drm_dbg_core(dev, "byte_count: %d\n", byte_count); =20 temp_buflist =3D krealloc(dma->buflist, (dma->buf_count + entry->buf_count) * @@ -1242,8 +1244,8 @@ static int drm_legacy_addbufs_sg(struct drm_device *d= ev, dma->page_count +=3D byte_count >> PAGE_SHIFT; dma->byte_count +=3D byte_count; =20 - DRM_DEBUG("dma->buf_count : %d\n", dma->buf_count); - DRM_DEBUG("entry->buf_count : %d\n", entry->buf_count); + drm_dbg_core(dev, "dma->buf_count : %d\n", dma->buf_count); + drm_dbg_core(dev, "entry->buf_count : %d\n", entry->buf_count); =20 mutex_unlock(&dev->struct_mutex); =20 @@ -1344,7 +1346,7 @@ int __drm_legacy_infobufs(struct drm_device *dev, ++count; } =20 - DRM_DEBUG("count =3D %d\n", count); + drm_dbg_core(dev, "count =3D %d\n", count); =20 if (*p >=3D count) { for (i =3D 0, count =3D 0; i < DRM_MAX_ORDER + 1; i++) { @@ -1353,12 +1355,12 @@ int __drm_legacy_infobufs(struct drm_device *dev, if (from->buf_count) { if (f(data, count, from) < 0) return -EFAULT; - DRM_DEBUG("%d %d %d %d %d\n", - i, - dma->bufs[i].buf_count, - dma->bufs[i].buf_size, - dma->bufs[i].low_mark, - dma->bufs[i].high_mark); + drm_dbg_core(dev, "%d %d %d %d %d\n", + i, + dma->bufs[i].buf_count, + dma->bufs[i].buf_size, + dma->bufs[i].low_mark, + dma->bufs[i].high_mark); ++count; } } @@ -1421,8 +1423,8 @@ int drm_legacy_markbufs(struct drm_device *dev, void = *data, if (!dma) return -EINVAL; =20 - DRM_DEBUG("%d, %d, %d\n", - request->size, request->low_mark, request->high_mark); + drm_dbg_core(dev, "%d, %d, %d\n", + request->size, request->low_mark, request->high_mark); order =3D order_base_2(request->size); if (order < DRM_MIN_ORDER || order > DRM_MAX_ORDER) return -EINVAL; @@ -1469,7 +1471,7 @@ int drm_legacy_freebufs(struct drm_device *dev, void = *data, if (!dma) return -EINVAL; =20 - DRM_DEBUG("%d\n", request->count); + drm_dbg_core(dev, "%d\n", request->count); for (i =3D 0; i < request->count; i++) { if (copy_from_user(&idx, &request->list[i], sizeof(idx))) return -EFAULT; @@ -1569,7 +1571,7 @@ int __drm_legacy_mapbufs(struct drm_device *dev, void= *data, int *p, } done: *p =3D dma->buf_count; - DRM_DEBUG("%d buffers, retcode =3D %d\n", *p, retcode); + drm_dbg_core(dev, "%d buffers, retcode =3D %d\n", *p, retcode); =20 return retcode; } diff --git a/drivers/gpu/drm/drm_context.c b/drivers/gpu/drm/drm_context.c index f6d68fad8311..c52764e98d26 100644 --- a/drivers/gpu/drm/drm_context.c +++ b/drivers/gpu/drm/drm_context.c @@ -280,7 +280,7 @@ static int drm_context_switch(struct drm_device * dev, = int old, int new) return -EBUSY; } =20 - DRM_DEBUG("Context switch from %d to %d\n", old, new); + drm_dbg_core(dev, "Context switch from %d to %d\n", old, new); =20 if (new =3D=3D dev->last_context) { clear_bit(0, &dev->context_flag); @@ -379,9 +379,9 @@ int drm_legacy_addctx(struct drm_device *dev, void *dat= a, /* Skip kernel's context and get a new one. */ tmp_handle =3D drm_legacy_ctxbitmap_next(dev); } - DRM_DEBUG("%d\n", tmp_handle); + drm_dbg_core(dev, "%d\n", tmp_handle); if (tmp_handle < 0) { - DRM_DEBUG("Not enough free contexts.\n"); + drm_dbg_core(dev, "Not enough free contexts.\n"); /* Should this return -EBUSY instead? */ return tmp_handle; } @@ -390,7 +390,7 @@ int drm_legacy_addctx(struct drm_device *dev, void *dat= a, =20 ctx_entry =3D kmalloc(sizeof(*ctx_entry), GFP_KERNEL); if (!ctx_entry) { - DRM_DEBUG("out of memory\n"); + drm_dbg_core(dev, "out of memory\n"); return -ENOMEM; } =20 @@ -449,7 +449,7 @@ int drm_legacy_switchctx(struct drm_device *dev, void *= data, !drm_core_check_feature(dev, DRIVER_LEGACY)) return -EOPNOTSUPP; =20 - DRM_DEBUG("%d\n", ctx->handle); + drm_dbg_core(dev, "%d\n", ctx->handle); return drm_context_switch(dev, dev->last_context, ctx->handle); } =20 @@ -473,7 +473,7 @@ int drm_legacy_newctx(struct drm_device *dev, void *dat= a, !drm_core_check_feature(dev, DRIVER_LEGACY)) return -EOPNOTSUPP; =20 - DRM_DEBUG("%d\n", ctx->handle); + drm_dbg_core(dev, "%d\n", ctx->handle); drm_context_switch_complete(dev, file_priv, ctx->handle); =20 return 0; @@ -499,7 +499,7 @@ int drm_legacy_rmctx(struct drm_device *dev, void *data, !drm_core_check_feature(dev, DRIVER_LEGACY)) return -EOPNOTSUPP; =20 - DRM_DEBUG("%d\n", ctx->handle); + drm_dbg_core(dev, "%d\n", ctx->handle); if (ctx->handle !=3D DRM_KERNEL_CONTEXT) { if (dev->driver->context_dtor) dev->driver->context_dtor(dev, ctx->handle); diff --git a/drivers/gpu/drm/drm_dma.c b/drivers/gpu/drm/drm_dma.c index eb6b741a6f99..dac137072c33 100644 --- a/drivers/gpu/drm/drm_dma.c +++ b/drivers/gpu/drm/drm_dma.c @@ -94,11 +94,11 @@ void drm_legacy_dma_takedown(struct drm_device *dev) /* Clear dma buffers */ for (i =3D 0; i <=3D DRM_MAX_ORDER; i++) { if (dma->bufs[i].seg_count) { - DRM_DEBUG("order %d: buf_count =3D %d," - " seg_count =3D %d\n", - i, - dma->bufs[i].buf_count, - dma->bufs[i].seg_count); + drm_dbg_core(dev, "order %d: buf_count =3D %d," + " seg_count =3D %d\n", + i, + dma->bufs[i].buf_count, + dma->bufs[i].seg_count); for (j =3D 0; j < dma->bufs[i].seg_count; j++) { if (dma->bufs[i].seglist[j]) { dmah =3D dma->bufs[i].seglist[j]; diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c index 1295ecd98f12..6c97531ce7a3 100644 --- a/drivers/gpu/drm/drm_drv.c +++ b/drivers/gpu/drm/drm_drv.c @@ -166,7 +166,7 @@ static int drm_minor_register(struct drm_device *dev, u= nsigned int type) unsigned long flags; int ret; =20 - DRM_DEBUG("\n"); + drm_dbg_core(dev, "\n"); =20 minor =3D *drm_minor_get_slot(dev, type); if (!minor) @@ -195,7 +195,7 @@ static int drm_minor_register(struct drm_device *dev, u= nsigned int type) spin_unlock_irqrestore(&drm_minor_lock, flags); } =20 - DRM_DEBUG("new minor registered %d\n", minor->index); + drm_dbg_core(dev, "new minor registered %d\n", minor->index); return 0; =20 err_debugfs: @@ -422,7 +422,7 @@ void drm_minor_release(struct drm_minor *minor) */ void drm_put_dev(struct drm_device *dev) { - DRM_DEBUG("\n"); + drm_dbg_core(dev, "\n"); =20 if (!dev) { DRM_ERROR("cleanup called no dev\n"); @@ -1043,7 +1043,7 @@ static int drm_stub_open(struct inode *inode, struct = file *filp) struct drm_minor *minor; int err; =20 - DRM_DEBUG("\n"); + drm_dbg_core(NULL, "\n"); =20 minor =3D drm_minor_acquire(iminor(inode)); if (IS_ERR(minor)) @@ -1112,7 +1112,7 @@ static int __init drm_core_init(void) =20 drm_core_init_complete =3D true; =20 - DRM_DEBUG("Initialized\n"); + drm_dbg_core(NULL, "Initialized\n"); return 0; =20 error: diff --git a/drivers/gpu/drm/drm_file.c b/drivers/gpu/drm/drm_file.c index 64b4a3a87fbb..04f0042accec 100644 --- a/drivers/gpu/drm/drm_file.c +++ b/drivers/gpu/drm/drm_file.c @@ -245,10 +245,10 @@ void drm_file_free(struct drm_file *file) =20 dev =3D file->minor->dev; =20 - DRM_DEBUG("comm=3D\"%s\", pid=3D%d, dev=3D0x%lx, open_count=3D%d\n", - current->comm, task_pid_nr(current), - (long)old_encode_dev(file->minor->kdev->devt), - atomic_read(&dev->open_count)); + drm_dbg_core(dev, "comm=3D\"%s\", pid=3D%d, dev=3D0x%lx, open_count=3D%d\= n", + current->comm, task_pid_nr(current), + (long)old_encode_dev(file->minor->kdev->devt), + atomic_read(&dev->open_count)); =20 #ifdef CONFIG_DRM_LEGACY if (drm_core_check_feature(dev, DRIVER_LEGACY) && @@ -340,8 +340,8 @@ int drm_open_helper(struct file *filp, struct drm_minor= *minor) dev->switch_power_state !=3D DRM_SWITCH_POWER_DYNAMIC_OFF) return -EINVAL; =20 - DRM_DEBUG("comm=3D\"%s\", pid=3D%d, minor=3D%d\n", current->comm, - task_pid_nr(current), minor->index); + drm_dbg_core(dev, "comm=3D\"%s\", pid=3D%d, minor=3D%d\n", current->comm, + task_pid_nr(current), minor->index); =20 priv =3D drm_file_alloc(minor); if (IS_ERR(priv)) @@ -450,11 +450,11 @@ EXPORT_SYMBOL(drm_open); =20 void drm_lastclose(struct drm_device * dev) { - DRM_DEBUG("\n"); + drm_dbg_core(dev, "\n"); =20 if (dev->driver->lastclose) dev->driver->lastclose(dev); - DRM_DEBUG("driver lastclose completed\n"); + drm_dbg_core(dev, "driver lastclose completed\n"); =20 if (drm_core_check_feature(dev, DRIVER_LEGACY)) drm_legacy_dev_reinit(dev); @@ -485,7 +485,7 @@ int drm_release(struct inode *inode, struct file *filp) if (drm_dev_needs_global_mutex(dev)) mutex_lock(&drm_global_mutex); =20 - DRM_DEBUG("open_count =3D %d\n", atomic_read(&dev->open_count)); + drm_dbg_core(dev, "open_count =3D %d\n", atomic_read(&dev->open_count)); =20 drm_close_helper(filp); =20 diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c index 3c99610afc0a..6adc509b6a07 100644 --- a/drivers/gpu/drm/drm_gem.c +++ b/drivers/gpu/drm/drm_gem.c @@ -698,7 +698,7 @@ int drm_gem_objects_lookup(struct drm_file *filp, void = __user *bo_handles, =20 if (copy_from_user(handles, bo_handles, count * sizeof(u32))) { ret =3D -EFAULT; - DRM_DEBUG("Failed to copy in GEM handles\n"); + drm_dbg_core(filp->minor->dev, "Failed to copy in GEM handles\n"); goto out; } =20 @@ -753,7 +753,8 @@ long drm_gem_dma_resv_wait(struct drm_file *filep, u32 = handle, =20 obj =3D drm_gem_object_lookup(filep, handle); if (!obj) { - DRM_DEBUG("Failed to look up GEM BO %d\n", handle); + drm_dbg_core(filep->minor->dev, + "Failed to look up GEM BO %d\n", handle); return -EINVAL; } =20 diff --git a/drivers/gpu/drm/drm_hashtab.c b/drivers/gpu/drm/drm_hashtab.c index 60afa1865559..80d663d93037 100644 --- a/drivers/gpu/drm/drm_hashtab.c +++ b/drivers/gpu/drm/drm_hashtab.c @@ -67,10 +67,12 @@ void drm_ht_verbose_list(struct drm_open_hash *ht, unsi= gned long key) int count =3D 0; =20 hashed_key =3D hash_long(key, ht->order); - DRM_DEBUG("Key is 0x%08lx, Hashed key is 0x%08x\n", key, hashed_key); + drm_dbg_core(NULL, "Key is 0x%08lx, Hashed key is 0x%08x\n", + key, hashed_key); h_list =3D &ht->table[hashed_key]; hlist_for_each_entry(entry, h_list, head) - DRM_DEBUG("count %d, key: 0x%08lx\n", count++, entry->key); + drm_dbg_core(NULL, "count %d, key: 0x%08lx\n", + count++, entry->key); } =20 static struct hlist_node *drm_ht_find_key(struct drm_open_hash *ht, diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c index 5d82891c3222..115abcccd2f1 100644 --- a/drivers/gpu/drm/drm_ioc32.c +++ b/drivers/gpu/drm/drm_ioc32.c @@ -986,14 +986,15 @@ long drm_compat_ioctl(struct file *filp, unsigned int= cmd, unsigned long arg) if (!fn) return drm_ioctl(filp, cmd, arg); =20 - DRM_DEBUG("comm=3D\"%s\", pid=3D%d, dev=3D0x%lx, auth=3D%d, %s\n", - current->comm, task_pid_nr(current), - (long)old_encode_dev(file_priv->minor->kdev->devt), - file_priv->authenticated, - drm_compat_ioctls[nr].name); + drm_dbg_core(file_priv->minor->dev, + "comm=3D\"%s\", pid=3D%d, dev=3D0x%lx, auth=3D%d, %s\n", + current->comm, task_pid_nr(current), + (long)old_encode_dev(file_priv->minor->kdev->devt), + file_priv->authenticated, + drm_compat_ioctls[nr].name); ret =3D (*fn)(filp, cmd, arg); if (ret) - DRM_DEBUG("ret =3D %d\n", ret); + drm_dbg_core(file_priv->minor->dev, "ret =3D %d\n", ret); return ret; } EXPORT_SYMBOL(drm_compat_ioctl); diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c index ca2a6e6101dc..192c4803c3e0 100644 --- a/drivers/gpu/drm/drm_ioctl.c +++ b/drivers/gpu/drm/drm_ioctl.c @@ -440,7 +440,7 @@ static int drm_setversion(struct drm_device *dev, void = *data, struct drm_file *f int drm_noop(struct drm_device *dev, void *data, struct drm_file *file_priv) { - DRM_DEBUG("\n"); + drm_dbg_core(dev, "\n"); return 0; } EXPORT_SYMBOL(drm_noop); @@ -856,16 +856,16 @@ long drm_ioctl(struct file *filp, out_size =3D 0; ksize =3D max(max(in_size, out_size), drv_size); =20 - DRM_DEBUG("comm=3D\"%s\" pid=3D%d, dev=3D0x%lx, auth=3D%d, %s\n", - current->comm, task_pid_nr(current), - (long)old_encode_dev(file_priv->minor->kdev->devt), - file_priv->authenticated, ioctl->name); + drm_dbg_core(dev, "comm=3D\"%s\" pid=3D%d, dev=3D0x%lx, auth=3D%d, %s\n", + current->comm, task_pid_nr(current), + (long)old_encode_dev(file_priv->minor->kdev->devt), + file_priv->authenticated, ioctl->name); =20 /* Do not trust userspace, use our own definition */ func =3D ioctl->func; =20 if (unlikely(!func)) { - DRM_DEBUG("no function\n"); + drm_dbg_core(dev, "no function\n"); retcode =3D -EINVAL; goto err_i1; } @@ -894,16 +894,16 @@ long drm_ioctl(struct file *filp, =20 err_i1: if (!ioctl) - DRM_DEBUG("invalid ioctl: comm=3D\"%s\", pid=3D%d, dev=3D0x%lx, auth=3D%= d, cmd=3D0x%02x, nr=3D0x%02x\n", - current->comm, task_pid_nr(current), - (long)old_encode_dev(file_priv->minor->kdev->devt), - file_priv->authenticated, cmd, nr); + drm_dbg_core(dev, "invalid ioctl: comm=3D\"%s\", pid=3D%d, dev=3D0x%lx, = auth=3D%d, cmd=3D0x%02x, nr=3D0x%02x\n", + current->comm, task_pid_nr(current), + (long)old_encode_dev(file_priv->minor->kdev->devt), + file_priv->authenticated, cmd, nr); =20 if (kdata !=3D stack_kdata) kfree(kdata); if (retcode) - DRM_DEBUG("comm=3D\"%s\", pid=3D%d, ret=3D%d\n", current->comm, - task_pid_nr(current), retcode); + drm_dbg_core(dev, "comm=3D\"%s\", pid=3D%d, ret=3D%d\n", current->comm, + task_pid_nr(current), retcode); return retcode; } EXPORT_SYMBOL(drm_ioctl); diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c index d327638e15ee..e70d6975310c 100644 --- a/drivers/gpu/drm/drm_irq.c +++ b/drivers/gpu/drm/drm_irq.c @@ -78,7 +78,7 @@ static int drm_legacy_irq_install(struct drm_device *dev,= int irq) return -EBUSY; dev->irq_enabled =3D true; =20 - DRM_DEBUG("irq=3D%d\n", irq); + drm_dbg_core(dev, "irq=3D%d\n", irq); =20 /* Before installing handler */ if (dev->driver->irq_preinstall) @@ -146,7 +146,7 @@ int drm_legacy_irq_uninstall(struct drm_device *dev) if (!irq_enabled) return -EINVAL; =20 - DRM_DEBUG("irq=3D%d\n", dev->irq); + drm_dbg_core(dev, "irq=3D%d\n", dev->irq); =20 if (drm_core_check_feature(dev, DRIVER_LEGACY)) vga_client_unregister(to_pci_dev(dev->dev)); diff --git a/drivers/gpu/drm/drm_lease.c b/drivers/gpu/drm/drm_lease.c index d72c2fac0ff1..a4b50fdbaaf7 100644 --- a/drivers/gpu/drm/drm_lease.c +++ b/drivers/gpu/drm/drm_lease.c @@ -673,7 +673,7 @@ int drm_mode_get_lease_ioctl(struct drm_device *dev, count++; } =20 - DRM_DEBUG("lease holds %d objects\n", count); + drm_dbg_core(dev, "lease holds %d objects\n", count); if (ret =3D=3D 0) arg->count_objects =3D count; =20 diff --git a/drivers/gpu/drm/drm_legacy_misc.c b/drivers/gpu/drm/drm_legacy= _misc.c index d4c5434062d7..ad0eef292cb0 100644 --- a/drivers/gpu/drm/drm_legacy_misc.c +++ b/drivers/gpu/drm/drm_legacy_misc.c @@ -70,7 +70,7 @@ int drm_legacy_setup(struct drm_device * dev) return ret; =20 =20 - DRM_DEBUG("\n"); + drm_dbg_core(dev, "\n"); return 0; } =20 @@ -95,7 +95,7 @@ void drm_legacy_dev_reinit(struct drm_device *dev) dev->last_context =3D 0; dev->if_version =3D 0; =20 - DRM_DEBUG("lastclose completed\n"); + drm_dbg_core(dev, "lastclose completed\n"); } =20 void drm_master_legacy_init(struct drm_master *master) diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c index 1efbd5389d89..a38b3681dbfc 100644 --- a/drivers/gpu/drm/drm_lock.c +++ b/drivers/gpu/drm/drm_lock.c @@ -180,10 +180,10 @@ int drm_legacy_lock(struct drm_device *dev, void *dat= a, return -EINVAL; } =20 - DRM_DEBUG("%d (pid %d) requests lock (0x%08x), flags =3D 0x%08x\n", - lock->context, task_pid_nr(current), - master->lock.hw_lock ? master->lock.hw_lock->lock : -1, - lock->flags); + drm_dbg_core(dev, "%d (pid %d) requests lock (0x%08x), flags =3D 0x%08x\n= ", + lock->context, task_pid_nr(current), + master->lock.hw_lock ? master->lock.hw_lock->lock : -1, + lock->flags); =20 add_wait_queue(&master->lock.lock_queue, &entry); spin_lock_bh(&master->lock.spinlock); @@ -219,8 +219,8 @@ int drm_legacy_lock(struct drm_device *dev, void *data, __set_current_state(TASK_RUNNING); remove_wait_queue(&master->lock.lock_queue, &entry); =20 - DRM_DEBUG("%d %s\n", lock->context, - ret ? "interrupted" : "has lock"); + drm_dbg_core(dev, "%d %s\n", lock->context, + ret ? "interrupted" : "has lock"); if (ret) return ret; =20 /* don't set the block all signals on the master process for now=20 @@ -234,8 +234,8 @@ int drm_legacy_lock(struct drm_device *dev, void *data, if (dev->driver->dma_quiescent && (lock->flags & _DRM_LOCK_QUIESCENT)) { if (dev->driver->dma_quiescent(dev)) { - DRM_DEBUG("%d waiting for DMA quiescent\n", - lock->context); + drm_dbg_core(dev, "%d waiting for DMA quiescent\n", + lock->context); return -EBUSY; } } @@ -345,8 +345,8 @@ void drm_legacy_lock_release(struct drm_device *dev, st= ruct file *filp) return; =20 if (drm_legacy_i_have_hw_lock(dev, file_priv)) { - DRM_DEBUG("File %p released, freeing lock for context %d\n", - filp, _DRM_LOCKING_CONTEXT(file_priv->master->lock.hw_lock->lock)); + drm_dbg_core(dev, "File %p released, freeing lock for context %d\n", + filp, _DRM_LOCKING_CONTEXT(file_priv->master->lock.hw_lock->lock)); drm_legacy_lock_free(&file_priv->master->lock, _DRM_LOCKING_CONTEXT(file_priv->master->lock.hw_lock->lock)); } diff --git a/drivers/gpu/drm/drm_mode_object.c b/drivers/gpu/drm/drm_mode_o= bject.c index ba1608effc0f..6e5a970043fc 100644 --- a/drivers/gpu/drm/drm_mode_object.c +++ b/drivers/gpu/drm/drm_mode_object.c @@ -192,7 +192,8 @@ EXPORT_SYMBOL(drm_mode_object_find); void drm_mode_object_put(struct drm_mode_object *obj) { if (obj->free_cb) { - DRM_DEBUG("OBJ ID: %d (%d)\n", obj->id, kref_read(&obj->refcount)); + drm_dbg_core(NULL, "OBJ ID: %d (%d)\n", obj->id, + kref_read(&obj->refcount)); kref_put(&obj->refcount, obj->free_cb); } } @@ -209,7 +210,8 @@ EXPORT_SYMBOL(drm_mode_object_put); void drm_mode_object_get(struct drm_mode_object *obj) { if (obj->free_cb) { - DRM_DEBUG("OBJ ID: %d (%d)\n", obj->id, kref_read(&obj->refcount)); + drm_dbg_core(NULL, "OBJ ID: %d (%d)\n", obj->id, + kref_read(&obj->refcount)); kref_get(&obj->refcount); } } diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c index 39d35fc3a43b..87fe9454d62e 100644 --- a/drivers/gpu/drm/drm_pci.c +++ b/drivers/gpu/drm/drm_pci.c @@ -85,8 +85,8 @@ static int drm_legacy_pci_irq_by_busid(struct drm_device = *dev, struct drm_irq_bu =20 p->irq =3D pdev->irq; =20 - DRM_DEBUG("%d:%d:%d =3D> IRQ %d\n", p->busnum, p->devnum, p->funcnum, - p->irq); + drm_dbg_core(dev, "%d:%d:%d =3D> IRQ %d\n", + p->busnum, p->devnum, p->funcnum, p->irq); return 0; } =20 @@ -151,12 +151,12 @@ static int drm_legacy_get_pci_dev(struct pci_dev *pde= v, struct drm_device *dev; int ret; =20 - DRM_DEBUG("\n"); - dev =3D drm_dev_alloc(driver, &pdev->dev); if (IS_ERR(dev)) return PTR_ERR(dev); =20 + drm_dbg_core(dev, "\n"); + ret =3D pci_enable_device(pdev); if (ret) goto err_free; @@ -203,7 +203,7 @@ int drm_legacy_pci_init(const struct drm_driver *driver, const struct pci_device_id *pid; int i; =20 - DRM_DEBUG("\n"); + drm_dbg_core(NULL, "\n"); =20 if (WARN_ON(!(driver->driver_features & DRIVER_LEGACY))) return -EINVAL; @@ -247,7 +247,7 @@ void drm_legacy_pci_exit(const struct drm_driver *drive= r, { struct drm_device *dev, *tmp; =20 - DRM_DEBUG("\n"); + drm_dbg_core(NULL, "\n"); =20 if (!(driver->driver_features & DRIVER_LEGACY)) { WARN_ON(1); diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c index a650f06e4cea..5e3b82bf197a 100644 --- a/drivers/gpu/drm/drm_plane.c +++ b/drivers/gpu/drm/drm_plane.c @@ -1255,17 +1255,19 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev, switch (page_flip->flags & DRM_MODE_PAGE_FLIP_TARGET) { case DRM_MODE_PAGE_FLIP_TARGET_ABSOLUTE: if ((int)(target_vblank - current_vblank) > 1) { - DRM_DEBUG("Invalid absolute flip target %u, " - "must be <=3D %u\n", target_vblank, - current_vblank + 1); + drm_dbg_core(dev, + "Invalid absolute flip target %u, " + "must be <=3D %u\n", target_vblank, + current_vblank + 1); drm_crtc_vblank_put(crtc); return -EINVAL; } break; case DRM_MODE_PAGE_FLIP_TARGET_RELATIVE: if (target_vblank !=3D 0 && target_vblank !=3D 1) { - DRM_DEBUG("Invalid relative flip target %u, " - "must be 0 or 1\n", target_vblank); + drm_dbg_core(dev, + "Invalid relative flip target %u, " + "must be 0 or 1\n", target_vblank); drm_crtc_vblank_put(crtc); return -EINVAL; } diff --git a/drivers/gpu/drm/drm_scatter.c b/drivers/gpu/drm/drm_scatter.c index 5b0b2140d535..08b3eb586484 100644 --- a/drivers/gpu/drm/drm_scatter.c +++ b/drivers/gpu/drm/drm_scatter.c @@ -82,7 +82,7 @@ int drm_legacy_sg_alloc(struct drm_device *dev, void *dat= a, struct drm_sg_mem *entry; unsigned long pages, i, j; =20 - DRM_DEBUG("\n"); + drm_dbg_core(dev, "\n"); =20 if (!drm_core_check_feature(dev, DRIVER_LEGACY)) return -EOPNOTSUPP; @@ -101,7 +101,7 @@ int drm_legacy_sg_alloc(struct drm_device *dev, void *d= ata, return -ENOMEM; =20 pages =3D (request->size + PAGE_SIZE - 1) / PAGE_SIZE; - DRM_DEBUG("size=3D%ld pages=3D%ld\n", request->size, pages); + drm_dbg_core(dev, "size=3D%ld pages=3D%ld\n", request->size, pages); =20 entry->pages =3D pages; entry->pagelist =3D kcalloc(pages, sizeof(*entry->pagelist), GFP_KERNEL); @@ -132,8 +132,8 @@ int drm_legacy_sg_alloc(struct drm_device *dev, void *d= ata, =20 entry->handle =3D ScatterHandle((unsigned long)entry->virtual); =20 - DRM_DEBUG("handle =3D %08lx\n", entry->handle); - DRM_DEBUG("virtual =3D %p\n", entry->virtual); + drm_dbg_core(dev, "handle =3D %08lx\n", entry->handle); + drm_dbg_core(dev, "virtual =3D %p\n", entry->virtual); =20 for (i =3D (unsigned long)entry->virtual, j =3D 0; j < pages; i +=3D PAGE_SIZE, j++) { @@ -213,7 +213,7 @@ int drm_legacy_sg_free(struct drm_device *dev, void *da= ta, if (!entry || entry->handle !=3D request->handle) return -EINVAL; =20 - DRM_DEBUG("virtual =3D %p\n", entry->virtual); + drm_dbg_core(dev, "virtual =3D %p\n", entry->virtual); =20 drm_sg_cleanup(entry); =20 diff --git a/drivers/gpu/drm/drm_syncobj.c b/drivers/gpu/drm/drm_syncobj.c index 0c2be8360525..e84957a0f319 100644 --- a/drivers/gpu/drm/drm_syncobj.c +++ b/drivers/gpu/drm/drm_syncobj.c @@ -298,7 +298,7 @@ void drm_syncobj_add_point(struct drm_syncobj *syncobj, prev =3D drm_syncobj_fence_get(syncobj); /* You are adding an unorder point to timeline, which could cause payload= returned from query_ioctl is 0! */ if (prev && prev->seqno >=3D point) - DRM_DEBUG("You are adding an unorder point to timeline!\n"); + drm_dbg_core(NULL, "You are adding an unorder point to timeline!\n"); dma_fence_chain_init(chain, prev, fence, point); rcu_assign_pointer(syncobj->fence, &chain->base); =20 diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c index 183130355997..6b090d71d45a 100644 --- a/drivers/gpu/drm/drm_sysfs.c +++ b/drivers/gpu/drm/drm_sysfs.c @@ -342,8 +342,8 @@ int drm_sysfs_connector_add(struct drm_connector *conne= ctor) if (r) goto err_free; =20 - DRM_DEBUG("adding \"%s\" to sysfs\n", - connector->name); + drm_dbg_core(dev, "adding \"%s\" to sysfs\n", + connector->name); =20 r =3D device_add(kdev); if (r) { @@ -371,8 +371,8 @@ void drm_sysfs_connector_remove(struct drm_connector *c= onnector) if (connector->ddc) sysfs_remove_link(&connector->kdev->kobj, "ddc"); =20 - DRM_DEBUG("removing \"%s\" from sysfs\n", - connector->name); + drm_dbg_core(connector->dev, "removing \"%s\" from sysfs\n", + connector->name); =20 device_unregister(connector->kdev); connector->kdev =3D NULL; @@ -383,7 +383,7 @@ void drm_sysfs_lease_event(struct drm_device *dev) char *event_string =3D "LEASE=3D1"; char *envp[] =3D { event_string, NULL }; =20 - DRM_DEBUG("generating lease event\n"); + drm_dbg_core(dev, "generating lease event\n"); =20 kobject_uevent_env(&dev->primary->kdev->kobj, KOBJ_CHANGE, envp); } @@ -404,7 +404,7 @@ void drm_sysfs_hotplug_event(struct drm_device *dev) char *event_string =3D "HOTPLUG=3D1"; char *envp[] =3D { event_string, NULL }; =20 - DRM_DEBUG("generating hotplug event\n"); + drm_dbg_core(dev, "generating hotplug event\n"); =20 kobject_uevent_env(&dev->primary->kdev->kobj, KOBJ_CHANGE, envp); } @@ -460,7 +460,7 @@ void drm_sysfs_connector_status_event(struct drm_connec= tor *connector, snprintf(prop_id, ARRAY_SIZE(prop_id), "PROPERTY=3D%u", property->base.id); =20 - DRM_DEBUG("generating connector status event\n"); + drm_dbg_core(dev, "generating connector status event\n"); =20 kobject_uevent_env(&dev->primary->kdev->kobj, KOBJ_CHANGE, envp); } diff --git a/drivers/gpu/drm/drm_vm.c b/drivers/gpu/drm/drm_vm.c index cdb956af2079..6349807e8898 100644 --- a/drivers/gpu/drm/drm_vm.c +++ b/drivers/gpu/drm/drm_vm.c @@ -168,12 +168,11 @@ static vm_fault_t drm_vm_fault(struct vm_fault *vmf) get_page(page); vmf->page =3D page; =20 - DRM_DEBUG - ("baddr =3D 0x%llx page =3D 0x%p, offset =3D 0x%llx, count=3D%d\n", - (unsigned long long)baddr, - agpmem->memory->pages[offset], - (unsigned long long)offset, - page_count(page)); + drm_dbg_core(dev, "baddr =3D 0x%llx page =3D 0x%p, offset =3D 0x%llx, co= unt=3D%d\n", + (unsigned long long)baddr, + agpmem->memory->pages[offset], + (unsigned long long)offset, + page_count(page)); return 0; } vm_fault_error: @@ -215,7 +214,7 @@ static vm_fault_t drm_vm_shm_fault(struct vm_fault *vmf) get_page(page); vmf->page =3D page; =20 - DRM_DEBUG("shm_fault 0x%lx\n", offset); + drm_dbg_core(NULL, "shm_fault 0x%lx\n", offset); return 0; } =20 @@ -236,8 +235,8 @@ static void drm_vm_shm_close(struct vm_area_struct *vma) struct drm_map_list *r_list; int found_maps =3D 0; =20 - DRM_DEBUG("0x%08lx,0x%08lx\n", - vma->vm_start, vma->vm_end - vma->vm_start); + drm_dbg_core(dev, "0x%08lx,0x%08lx\n", + vma->vm_start, vma->vm_end - vma->vm_start); =20 map =3D vma->vm_private_data; =20 @@ -319,7 +318,7 @@ static vm_fault_t drm_vm_dma_fault(struct vm_fault *vmf) get_page(page); vmf->page =3D page; =20 - DRM_DEBUG("dma_fault 0x%lx (page %lu)\n", offset, page_nr); + drm_dbg_core(dev, "dma_fault 0x%lx (page %lu)\n", offset, page_nr); return 0; } =20 @@ -391,8 +390,8 @@ static void drm_vm_open_locked(struct drm_device *dev, { struct drm_vma_entry *vma_entry; =20 - DRM_DEBUG("0x%08lx,0x%08lx\n", - vma->vm_start, vma->vm_end - vma->vm_start); + drm_dbg_core(dev, "0x%08lx,0x%08lx\n", + vma->vm_start, vma->vm_end - vma->vm_start); =20 vma_entry =3D kmalloc(sizeof(*vma_entry), GFP_KERNEL); if (vma_entry) { @@ -417,8 +416,8 @@ static void drm_vm_close_locked(struct drm_device *dev, { struct drm_vma_entry *pt, *temp; =20 - DRM_DEBUG("0x%08lx,0x%08lx\n", - vma->vm_start, vma->vm_end - vma->vm_start); + drm_dbg_core(dev, "0x%08lx,0x%08lx\n", + vma->vm_start, vma->vm_end - vma->vm_start); =20 list_for_each_entry_safe(pt, temp, &dev->vmalist, head) { if (pt->vma =3D=3D vma) { @@ -466,8 +465,8 @@ static int drm_mmap_dma(struct file *filp, struct vm_ar= ea_struct *vma) =20 dev =3D priv->minor->dev; dma =3D dev->dma; - DRM_DEBUG("start =3D 0x%lx, end =3D 0x%lx, page offset =3D 0x%lx\n", - vma->vm_start, vma->vm_end, vma->vm_pgoff); + drm_dbg_core(dev, "start =3D 0x%lx, end =3D 0x%lx, page offset =3D 0x%lx\= n", + vma->vm_start, vma->vm_end, vma->vm_pgoff); =20 /* Length must match exact page count */ if (!dma || (length >> PAGE_SHIFT) !=3D dma->page_count) { @@ -528,8 +527,8 @@ static int drm_mmap_locked(struct file *filp, struct vm= _area_struct *vma) resource_size_t offset =3D 0; struct drm_hash_item *hash; =20 - DRM_DEBUG("start =3D 0x%lx, end =3D 0x%lx, page offset =3D 0x%lx\n", - vma->vm_start, vma->vm_end, vma->vm_pgoff); + drm_dbg_core(dev, "start =3D 0x%lx, end =3D 0x%lx, page offset =3D 0x%lx\= n", + vma->vm_start, vma->vm_end, vma->vm_pgoff); =20 if (!priv->authenticated) return -EACCES; @@ -600,10 +599,10 @@ static int drm_mmap_locked(struct file *filp, struct = vm_area_struct *vma) vma->vm_end - vma->vm_start, vma->vm_page_prot)) return -EAGAIN; - DRM_DEBUG(" Type =3D %d; start =3D 0x%lx, end =3D 0x%lx," - " offset =3D 0x%llx\n", - map->type, - vma->vm_start, vma->vm_end, (unsigned long long)(map->offset + offset= )); + drm_dbg_core(dev, + " Type =3D %d; start =3D 0x%lx, end =3D 0x%lx, offset =3D 0x%llx= \n", + map->type, vma->vm_start, vma->vm_end, + (unsigned long long)(map->offset + offset)); =20 vma->vm_ops =3D &drm_vm_ops; break; --=20 2.35.1 From nobody Wed Sep 17 06:31:35 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 D0B46C4167B for ; Thu, 22 Dec 2022 15:43:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235393AbiLVPne (ORCPT ); Thu, 22 Dec 2022 10:43:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49488 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230260AbiLVPnU (ORCPT ); Thu, 22 Dec 2022 10:43:20 -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 3DC3311A2B for ; Thu, 22 Dec 2022 07:43:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671723650; cv=none; d=zohomail.in; s=zohoarc; b=L0Mso4H09NMTWbLQuKSRtIani7ShsA8ryfjPJ15BYRvVvFW+RBMvaXw4l2W9TqlxC3w7w0osDyfd48eTlML9bxuGgYU6xwvJLZBnRAI5WIsSvdRP6LFyJzdQU+hh4GvrJx3GtCJadDxCTN0m05Z0gghuAdmDP3i9aa4BmLVONfE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.in; s=zohoarc; t=1671723650; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=oY3981IrmoUdN5yimQiKjEoeQi+zVtf1CbGlFX5KcoU=; b=K8YooLkXh6yy9WucGwhCLlnsd6N/ZukhILV+btogp2aXlRCseHJWNkt3nRKQRYqnQXaAppK94Y2MYqsMgVzpD+8WKpozFxJcKc3z+ck1SqUE5eECGeJ+2JGplmK+rQzLj4b3dcNZ5GZUGw1mbUmkyAOmJCtq5mWDMabCycWGvbM= 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=1671723650; 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=oY3981IrmoUdN5yimQiKjEoeQi+zVtf1CbGlFX5KcoU=; b=O7aohhhWZcumu7PqKH1DWhrpFwKBjboMKMn4O47hxC0MKC9DR1e9thkqONI/sY26 dIIcDpRL8KukzThb/R1adyUp7N1/XLtSbMWrbCRS3mn6kv7J8kf/myow9HfVFzc5AaM c0VtSkLgD+G9pDVf25Wg8sJHJJhrsuUx2F6v8w00= Received: from kampyooter.. (110.226.31.37 [110.226.31.37]) by mx.zoho.in with SMTPS id 1671723649149737.4887777903457; Thu, 22 Dec 2022 21:10:49 +0530 (IST) From: Siddh Raman Pant To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Simon Ser Cc: dri-devel , linux-kernel Message-ID: <5366b23e1e6761a303381fe1cccda2e41549113a.1671723195.git.code@siddh.me> Subject: [PATCH v2 5/9] drm: Remove usage of deprecated DRM_DEBUG_DRIVER Date: Thu, 22 Dec 2022 21:10:39 +0530 X-Mailer: git-send-email 2.35.1 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_DRIVER is deprecated. Thus, use newer drm_dbg_driver(). Also fix the deprecation comment in drm_print.h which mentions drm_dbg() instead of drm_dbg_driver(). Signed-off-by: Siddh Raman Pant --- drivers/gpu/drm/drm_mipi_dbi.c | 10 +++++----- include/drm/drm_print.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/drm_mipi_dbi.c b/drivers/gpu/drm/drm_mipi_dbi.c index 24af507bb687..6ad399f6ab03 100644 --- a/drivers/gpu/drm/drm_mipi_dbi.c +++ b/drivers/gpu/drm/drm_mipi_dbi.c @@ -69,11 +69,11 @@ #define MIPI_DBI_DEBUG_COMMAND(cmd, data, len) \ ({ \ if (!len) \ - DRM_DEBUG_DRIVER("cmd=3D%02x\n", cmd); \ + drm_dbg_driver(NULL, "cmd=3D%02x\n", cmd); \ else if (len <=3D 32) \ - DRM_DEBUG_DRIVER("cmd=3D%02x, par=3D%*ph\n", cmd, (int)len, data);\ + drm_dbg_driver(NULL, "cmd=3D%02x, par=3D%*ph\n", cmd, (int)len, data);\ else \ - DRM_DEBUG_DRIVER("cmd=3D%02x, len=3D%zu\n", cmd, len); \ + drm_dbg_driver(NULL, "cmd=3D%02x, len=3D%zu\n", cmd, len); \ }) =20 static const u8 mipi_dbi_dcs_read_commands[] =3D { @@ -632,7 +632,7 @@ bool mipi_dbi_display_is_on(struct mipi_dbi *dbi) DCS_POWER_MODE_DISPLAY_NORMAL_MODE | DCS_POWER_MODE_SLEEP_MODE)) return false; =20 - DRM_DEBUG_DRIVER("Display is ON\n"); + drm_dbg_driver(NULL, "Display is ON\n"); =20 return true; } @@ -1168,7 +1168,7 @@ int mipi_dbi_spi_init(struct spi_device *spi, struct = mipi_dbi *dbi, =20 mutex_init(&dbi->cmdlock); =20 - DRM_DEBUG_DRIVER("SPI speed: %uMHz\n", spi->max_speed_hz / 1000000); + drm_dbg_driver(NULL, "SPI speed: %uMHz\n", spi->max_speed_hz / 1000000); =20 return 0; } diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h index 6d2d5c522e25..3f81f4edbe1d 100644 --- a/include/drm/drm_print.h +++ b/include/drm/drm_print.h @@ -582,7 +582,7 @@ void __drm_err(const char *format, ...); #define DRM_DEBUG(fmt, ...) \ __drm_dbg(DRM_UT_CORE, fmt, ##__VA_ARGS__) =20 -/* NOTE: this is deprecated in favor of drm_dbg(NULL, ...). */ +/* NOTE: this is deprecated in favor of drm_dbg_driver(NULL, ...). */ #define DRM_DEBUG_DRIVER(fmt, ...) \ __drm_dbg(DRM_UT_DRIVER, fmt, ##__VA_ARGS__) =20 --=20 2.35.1 From nobody Wed Sep 17 06:31:35 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 4FA36C001B2 for ; Thu, 22 Dec 2022 15:42:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235290AbiLVPl7 (ORCPT ); Thu, 22 Dec 2022 10:41:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48048 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230204AbiLVPlc (ORCPT ); Thu, 22 Dec 2022 10:41:32 -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 E162C101CB for ; Thu, 22 Dec 2022 07:41:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671723651; cv=none; d=zohomail.in; s=zohoarc; b=HoKArGi8ce7hrRu3a1mVfYt7kKCpgv+tULtmwzu+ntoW5G/UbjAmL2+JbQ/+pm5qhR65amrrx4wNTLVfCXwBX7ZjKukm3QzY+ASxieqVjXtiRVZsTMvubWZDgOLT33karhuAyvwSID49xuIONIdcmcvx5aI4bSNrHV85/a4idBI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.in; s=zohoarc; t=1671723651; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=s2YR6+sc3vpmlKXIrDgxAbWMiDEYikBHSbBE9mIKiVY=; b=BHsvYQg+Fm6flpMMh9vyJ0TRnTVyCisZXy2fYY2pqKruXjA2ORITN5kaF+Wzsc10dhCMUdrj3CrmegR5qKT8pDq81g3hXNkpaL+gIwq+owBuQJ90ZmLVOW1fA+t1fuOp1Dz/7JWrOAkNZxghgjGQGAo8Kz3FGIBoV7VIxveIFbc= 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=1671723651; 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=s2YR6+sc3vpmlKXIrDgxAbWMiDEYikBHSbBE9mIKiVY=; b=XHs+12i/xqCdxKlb/eorLFqqf4lAIQxJjBjjYCGeoZTvyweXb6h/ZWDrogWLWebE 9Bq3o5j2w6D4lRj/KSZp0JSroFG+SChUzGa9aENsT6E+j9CmCZDxcWaMRQF1BlT3TsW L0lc+ZLBa1YjGKUGCTvCEy9av3wi7OnAiDalwn2I= Received: from kampyooter.. (110.226.31.37 [110.226.31.37]) by mx.zoho.in with SMTPS id 1671723649759610.789155107985; Thu, 22 Dec 2022 21:10:49 +0530 (IST) From: Siddh Raman Pant To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Simon Ser Cc: dri-devel , linux-kernel Message-ID: <13a8b0d71b2b7529b9d5bd52cd3583db269b6fd8.1671723195.git.code@siddh.me> Subject: [PATCH v2 6/9] drm: Remove usage of deprecated DRM_DEBUG_KMS Date: Thu, 22 Dec 2022 21:10:40 +0530 X-Mailer: git-send-email 2.35.1 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 c4517dea924e..7c1e8352ff71 100644 --- a/drivers/gpu/drm/drm_client_modeset.c +++ b/drivers/gpu/drm/drm_client_modeset.c @@ -246,8 +246,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]; } @@ -307,7 +308,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 @@ -332,7 +333,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"); @@ -356,8 +357,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) @@ -368,7 +370,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 @@ -425,14 +428,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 */ @@ -454,16 +459,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 @@ -623,15 +629,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; } @@ -641,8 +649,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; @@ -659,28 +668,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); @@ -699,8 +712,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; } /* @@ -709,18 +723,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); @@ -736,15 +752,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; } @@ -781,7 +797,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; @@ -823,7 +839,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, @@ -838,8 +854,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); @@ -857,8 +873,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 34c26b2a974e..3294f2e41e7a 100644 --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c @@ -178,13 +178,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) @@ -244,9 +245,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 ab41dc180c58..9478d16fc7b0 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 38ea8203df45..e8c2d73b29e6 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 3841aba17abd..ee16ebf88eea 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -1987,7 +1987,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. */ @@ -2173,8 +2173,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); @@ -5629,7 +5630,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; } @@ -5674,7 +5675,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; } @@ -5801,7 +5802,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 @@ -5812,8 +5813,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 b602cd72a120..f0b6b69f4baf 100644 --- a/drivers/gpu/drm/drm_gem_shmem_helper.c +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c @@ -173,7 +173,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); } @@ -326,7 +326,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 a4b50fdbaaf7..c442d5e766d1 100644 --- a/drivers/gpu/drm/drm_lease.c +++ b/drivers/gpu/drm/drm_lease.c @@ -400,7 +400,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 6ad399f6ab03..64a976675fde 100644 --- a/drivers/gpu/drm/drm_mipi_dbi.c +++ b/drivers/gpu/drm/drm_mipi_dbi.c @@ -282,7 +282,8 @@ static void mipi_dbi_fb_dirty(struct drm_framebuffer *f= b, struct drm_rect *rect) =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) { @@ -418,7 +419,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); @@ -551,7 +552,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 3c8034a8c27b..112429eb3709 100644 --- a/drivers/gpu/drm/drm_modes.c +++ b/drivers/gpu/drm/drm_modes.c @@ -52,11 +52,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 @@ -1336,9 +1336,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 5e3b82bf197a..ad623a085362 100644 --- a/drivers/gpu/drm/drm_plane.c +++ b/drivers/gpu/drm/drm_plane.c @@ -270,7 +270,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; } @@ -297,7 +297,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; @@ -781,7 +781,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 @@ -789,8 +789,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 @@ -799,8 +800,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 @@ -977,24 +978,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; } } @@ -1043,7 +1043,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 @@ -1114,7 +1114,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 @@ -1335,7 +1335,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 bcd9611dabfd..5aca64370cb5 100644 --- a/drivers/gpu/drm/drm_probe_helper.c +++ b/drivers/gpu/drm/drm_probe_helper.c @@ -498,8 +498,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); @@ -542,11 +542,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 @@ -567,8 +568,8 @@ int drm_helper_probe_single_connector_modes(struct drm_= connector *connector, dev->mode_config.poll_running =3D drm_kms_helper_poll; =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; @@ -626,8 +627,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); @@ -758,14 +759,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.35.1 From nobody Wed Sep 17 06:31:35 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 E6022C4332F for ; Thu, 22 Dec 2022 15:41:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235003AbiLVPll (ORCPT ); Thu, 22 Dec 2022 10:41:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47880 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230246AbiLVPl2 (ORCPT ); Thu, 22 Dec 2022 10:41:28 -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 802A517414 for ; Thu, 22 Dec 2022 07:41:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671723651; cv=none; d=zohomail.in; s=zohoarc; b=afDaLve54pgeuDsZug2F8oCsQta7Wcv/5Y4ujwHaC/v0nQ7WIlQdfijwb02kpBqiqoa+ihvjblsIwNCfnVVPazg5AHw6VNiG37Sv5S5U9nJ+mCRKhxDHREw1SxdMfEyfg+UmvxuBYSkWfbEtiCnfpxIXiIR0KiaRl5Hld1Rsado= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.in; s=zohoarc; t=1671723651; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=1MCKPJOG9ImRBJLySDbjsiaY3Ui5PpMZ+NWkNcMBJcc=; b=ea6szritPlwEEyRxR7EFBEshraVatCEARiM/If5Xdw8nNiZUqHoHUYOSuUoELC748cKiZVrWz8MIv52snHgbjFx265trnAma+xL5zwFoxTb9G+pGeNEbyFNY/xslBJkqMgl4Gz4eSzcGH/2adYG7rCeL9CVQZ8s8TStGxeMApkg= 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=1671723651; 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=1MCKPJOG9ImRBJLySDbjsiaY3Ui5PpMZ+NWkNcMBJcc=; b=D5M8EEyXnty59BC5u06qtwDD41GRAVI5Gka9YYEHZwyDnBiixX28hBt9EFqwvdfc fsO/J151DpIq96ya2IdSUX7+SHv8WhQnQZR79Ka3tRAIZArgugewGwAjEWgs99oN9KN 8Th7ZcE5DW72H4Qx9EhMIQQNIhOM5t266ZqTj45w= Received: from kampyooter.. (110.226.31.37 [110.226.31.37]) by mx.zoho.in with SMTPS id 1671723650135402.59306702069614; Thu, 22 Dec 2022 21:10:50 +0530 (IST) From: Siddh Raman Pant To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Simon Ser Cc: dri-devel , linux-kernel Message-ID: Subject: [PATCH v2 7/9] drm: Remove usage of deprecated DRM_DEBUG_PRIME Date: Thu, 22 Dec 2022 21:10:41 +0530 X-Mailer: git-send-email 2.35.1 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_PRIME is deprecated in favor of drm_dbg_prime(). Signed-off-by: Siddh Raman Pant Reviewed-by: Simon Ser --- drivers/gpu/drm/drm_gem_dma_helper.c | 4 ++-- drivers/gpu/drm/drm_gem_shmem_helper.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/drm_gem_dma_helper.c b/drivers/gpu/drm/drm_gem= _dma_helper.c index 1ba551b0ab97..0f903cc8914a 100644 --- a/drivers/gpu/drm/drm_gem_dma_helper.c +++ b/drivers/gpu/drm/drm_gem_dma_helper.c @@ -477,8 +477,8 @@ drm_gem_dma_prime_import_sg_table(struct drm_device *de= v, dma_obj->dma_addr =3D sg_dma_address(sgt->sgl); dma_obj->sgt =3D sgt; =20 - DRM_DEBUG_PRIME("dma_addr =3D %pad, size =3D %zu\n", &dma_obj->dma_addr, - attach->dmabuf->size); + drm_dbg_prime(dev, "dma_addr =3D %pad, size =3D %zu\n", &dma_obj->dma_add= r, + attach->dmabuf->size); =20 return &dma_obj->base; } diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_g= em_shmem_helper.c index f0b6b69f4baf..1b9a6b357d8a 100644 --- a/drivers/gpu/drm/drm_gem_shmem_helper.c +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c @@ -764,7 +764,7 @@ drm_gem_shmem_prime_import_sg_table(struct drm_device *= dev, =20 shmem->sgt =3D sgt; =20 - DRM_DEBUG_PRIME("size =3D %zu\n", size); + drm_dbg_prime(dev, "size =3D %zu\n", size); =20 return &shmem->base; } --=20 2.35.1 From nobody Wed Sep 17 06:31:35 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 AA388C4332F for ; Thu, 22 Dec 2022 15:41:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230433AbiLVPli (ORCPT ); Thu, 22 Dec 2022 10:41:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47940 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229525AbiLVPl2 (ORCPT ); Thu, 22 Dec 2022 10:41:28 -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 D2E121A82A for ; Thu, 22 Dec 2022 07:41:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671723651; cv=none; d=zohomail.in; s=zohoarc; b=Jqc0VQquB+j/zoLYAQH9Bx3xekdzsxmrYlcQwoDHDi7zlpxZIHxuIoo61kvRXM+GD8pz9VuANzJ4pO+RH26K0QwFIspawTa2DV9sYfdbG0n7e4OzXkAY7W/+vPp5ECOR8pWfCtIcZRKe8ynQUC6Cw8SfPGnvWMySGrJu3gbSUOY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.in; s=zohoarc; t=1671723651; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=jOS7lFqPyYp4aF6uyo+Mu87tNYK2Fubh9HQ2gBzQ9pY=; b=dYu0F1rb0hwU/HMv7vvPxKe3VACmJwvUaoRfSBueVni/13B9C3nlb5KuSgK4gGq2IzlAzEj7KKQDejBFEqcvQ9orVkHfwZ40jwc/lUBG6aldblKUKIHY/rRvei+NtifpGNMQTXr7VUvrNPVblViYegcJCrZTxp6aX1gyuGLFlLc= 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=1671723651; 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=jOS7lFqPyYp4aF6uyo+Mu87tNYK2Fubh9HQ2gBzQ9pY=; b=ZwaW4OiBc8H0sdC6pEw/EDve8LxAnsN78Dhmm2TraAW9sb5BnMEVMEBROldnTfDd nf/Gahc3ZqjACQXVgPafDwqoNwUruYKpziEyl26ScP8QCeIVEyM85siXvwPhRMHIEox VLAZJHS04wzyBuCdON7Hq/F4EF+aUaNmI3VvdikY= Received: from kampyooter.. (110.226.31.37 [110.226.31.37]) by mx.zoho.in with SMTPS id 167172365051070.15665484717306; Thu, 22 Dec 2022 21:10:50 +0530 (IST) From: Siddh Raman Pant To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Simon Ser Cc: dri-devel , linux-kernel Message-ID: <58ca4a915c1ff714198316365afbb7fb2da1bf8b.1671723195.git.code@siddh.me> Subject: [PATCH v2 8/9] drm/drm_blend: Remove usage of deprecated DRM_DEBUG_ATOMIC Date: Thu, 22 Dec 2022 21:10:42 +0530 X-Mailer: git-send-email 2.35.1 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_ATOMIC is deprecated in favor of drm_dbg_atomic(). Signed-off-by: Siddh Raman Pant Reviewed-by: Simon Ser --- drivers/gpu/drm/drm_blend.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/drm_blend.c b/drivers/gpu/drm/drm_blend.c index b4c8cab7158c..6e74de833466 100644 --- a/drivers/gpu/drm/drm_blend.c +++ b/drivers/gpu/drm/drm_blend.c @@ -450,8 +450,8 @@ static int drm_atomic_helper_crtc_normalize_zpos(struct= drm_crtc *crtc, int i, n =3D 0; int ret =3D 0; =20 - DRM_DEBUG_ATOMIC("[CRTC:%d:%s] calculating normalized zpos values\n", - crtc->base.id, crtc->name); + drm_dbg_atomic(dev, "[CRTC:%d:%s] calculating normalized zpos values\n", + crtc->base.id, crtc->name); =20 states =3D kmalloc_array(total_planes, sizeof(*states), GFP_KERNEL); if (!states) @@ -469,9 +469,8 @@ static int drm_atomic_helper_crtc_normalize_zpos(struct= drm_crtc *crtc, goto done; } states[n++] =3D plane_state; - DRM_DEBUG_ATOMIC("[PLANE:%d:%s] processing zpos value %d\n", - plane->base.id, plane->name, - plane_state->zpos); + drm_dbg_atomic(dev, "[PLANE:%d:%s] processing zpos value %d\n", + plane->base.id, plane->name, plane_state->zpos); } =20 sort(states, n, sizeof(*states), drm_atomic_state_zpos_cmp, NULL); @@ -480,8 +479,8 @@ static int drm_atomic_helper_crtc_normalize_zpos(struct= drm_crtc *crtc, plane =3D states[i]->plane; =20 states[i]->normalized_zpos =3D i; - DRM_DEBUG_ATOMIC("[PLANE:%d:%s] normalized zpos value %d\n", - plane->base.id, plane->name, i); + drm_dbg_atomic(dev, "[PLANE:%d:%s] normalized zpos value %d\n", + plane->base.id, plane->name, i); } crtc_state->zpos_changed =3D true; =20 --=20 2.35.1 From nobody Wed Sep 17 06:31:35 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 2EB7BC4332F for ; Thu, 22 Dec 2022 15:41:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235263AbiLVPlo (ORCPT ); Thu, 22 Dec 2022 10:41:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48032 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230137AbiLVPla (ORCPT ); Thu, 22 Dec 2022 10:41:30 -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 29E8711453 for ; Thu, 22 Dec 2022 07:41:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671723652; cv=none; d=zohomail.in; s=zohoarc; b=TFaGR2XcNqR08I95QmCsDEI+2RsYKIgUe8iT6mzW8JNR6+uVtI48g68h4QH95JCPpDOfhrXbUBayvQ2nuOO+HRJ3FsEQdqvfU297dFjf++du/OEJcWHS+UfGHHX9Rs5Cut4d79hCq/QUJKQRt53qzFfgKQ4zF7B1ZiCKRJwyOew= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.in; s=zohoarc; t=1671723652; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=iZz7X6e3jG+2rIkRvN509bNCkZ80pmjJN8lTLn7L8aw=; b=IU64PLwoXT1GLArrrfI0nDsCJJd+fEhM88nAhLdhj83RD/9bCpHh4VvaFeUJZ9LFiIXcd04gIFBUD86x/QIlIqTweknJhwwB07xkr2y6TO+1DXR9zPZgeMUIAwE1Dd//2755bq0kceU+w6LxpsZ1YrtxmyWE8IyGwKiTdTChAxY= 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=1671723652; 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=iZz7X6e3jG+2rIkRvN509bNCkZ80pmjJN8lTLn7L8aw=; b=e9kMocEBUsI03h4fI+PbQDjGMe3qoBDMTuaC1CQIOo1hokiTDCaiCEuiC8qjhE5h AT9Kw75SRIODili26mNQa1Dis8fsTQeYaSdxHG+QaB3v0kGqlqheLMyNKx2HYySY8Ic IPFLjRKynn968e/K+7d7BKGLqW97pLBZ/V2fGJaE= Received: from kampyooter.. (110.226.31.37 [110.226.31.37]) by mx.zoho.in with SMTPS id 16717236509871003.0139285664518; Thu, 22 Dec 2022 21:10:50 +0530 (IST) From: Siddh Raman Pant To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Simon Ser Cc: dri-devel , linux-kernel Message-ID: <1a9995a54f7309b4d120582b36ebb7950d5ddeba.1671723195.git.code@siddh.me> Subject: [PATCH v2 9/9] drm/drm_lease: Remove usage of deprecated DRM_DEBUG_LEASE Date: Thu, 22 Dec 2022 21:10:43 +0530 X-Mailer: git-send-email 2.35.1 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_LEASE is deprecated in favor of drm_dbg_lease(). Signed-off-by: Siddh Raman Pant Reviewed-by: Simon Ser --- drivers/gpu/drm/drm_lease.c | 64 ++++++++++++++++++++----------------- 1 file changed, 34 insertions(+), 30 deletions(-) diff --git a/drivers/gpu/drm/drm_lease.c b/drivers/gpu/drm/drm_lease.c index c442d5e766d1..08b4f29f8b61 100644 --- a/drivers/gpu/drm/drm_lease.c +++ b/drivers/gpu/drm/drm_lease.c @@ -213,11 +213,11 @@ static struct drm_master *drm_lease_create(struct drm= _master *lessor, struct idr int id; void *entry; =20 - DRM_DEBUG_LEASE("lessor %d\n", lessor->lessee_id); + drm_dbg_lease(dev, "lessor %d\n", lessor->lessee_id); =20 lessee =3D drm_master_create(lessor->dev); if (!lessee) { - DRM_DEBUG_LEASE("drm_master_create failed\n"); + drm_dbg_lease(dev, "drm_master_create failed\n"); return ERR_PTR(-ENOMEM); } =20 @@ -231,7 +231,7 @@ static struct drm_master *drm_lease_create(struct drm_m= aster *lessor, struct idr error =3D -EBUSY; =20 if (error !=3D 0) { - DRM_DEBUG_LEASE("object %d failed %d\n", object, error); + drm_dbg_lease(dev, "object %d failed %d\n", object, error); goto out_lessee; } } @@ -249,7 +249,8 @@ static struct drm_master *drm_lease_create(struct drm_m= aster *lessor, struct idr =20 /* Move the leases over */ lessee->leases =3D *leases; - DRM_DEBUG_LEASE("new lessee %d %p, lessor %d %p\n", lessee->lessee_id, le= ssee, lessor->lessee_id, lessor); + drm_dbg_lease(dev, "new lessee %d %p, lessor %d %p\n", + lessee->lessee_id, lessee, lessor->lessee_id, lessor); =20 mutex_unlock(&dev->mode_config.idr_mutex); return lessee; @@ -268,7 +269,7 @@ void drm_lease_destroy(struct drm_master *master) =20 mutex_lock(&dev->mode_config.idr_mutex); =20 - DRM_DEBUG_LEASE("drm_lease_destroy %d\n", master->lessee_id); + drm_dbg_lease(dev, "drm_lease_destroy %d\n", master->lessee_id); =20 /* This master is referenced by all lessees, hence it cannot be destroyed * until all of them have been @@ -277,7 +278,8 @@ void drm_lease_destroy(struct drm_master *master) =20 /* Remove this master from the lessee idr in the owner */ if (master->lessee_id !=3D 0) { - DRM_DEBUG_LEASE("remove master %d from device list of lessees\n", master= ->lessee_id); + drm_dbg_lease(dev, "remove master %d from device list of lessees\n", + master->lessee_id); idr_remove(&(drm_lease_owner(master)->lessee_idr), master->lessee_id); } =20 @@ -292,7 +294,7 @@ void drm_lease_destroy(struct drm_master *master) drm_master_put(&master->lessor); } =20 - DRM_DEBUG_LEASE("drm_lease_destroy done %d\n", master->lessee_id); + drm_dbg_lease(dev, "drm_lease_destroy done %d\n", master->lessee_id); } =20 static void _drm_lease_revoke(struct drm_master *top) @@ -308,7 +310,8 @@ static void _drm_lease_revoke(struct drm_master *top) * the tree is fully connected, we can do this without recursing */ for (;;) { - DRM_DEBUG_LEASE("revoke leases for %p %d\n", master, master->lessee_id); + drm_dbg_lease(master->dev, "revoke leases for %p %d\n", + master, master->lessee_id); =20 /* Evacuate the lease */ idr_for_each_entry(&master->leases, entry, object) @@ -408,7 +411,7 @@ static int fill_object_idr(struct drm_device *dev, =20 ret =3D validate_lease(dev, object_count, objects, universal_planes); if (ret) { - DRM_DEBUG_LEASE("lease validation failed\n"); + drm_dbg_lease(dev, "lease validation failed\n"); goto out_free_objects; } =20 @@ -418,7 +421,7 @@ static int fill_object_idr(struct drm_device *dev, struct drm_mode_object *obj =3D objects[o]; u32 object_id =3D objects[o]->id; =20 - DRM_DEBUG_LEASE("Adding object %d to lease\n", object_id); + drm_dbg_lease(dev, "Adding object %d to lease\n", object_id); =20 /* * We're using an IDR to hold the set of leased @@ -430,8 +433,8 @@ static int fill_object_idr(struct drm_device *dev, */ ret =3D idr_alloc(leases, &drm_lease_idr_object , object_id, object_id += 1, GFP_KERNEL); if (ret < 0) { - DRM_DEBUG_LEASE("Object %d cannot be inserted into leases (%d)\n", - object_id, ret); + drm_dbg_lease(dev, "Object %d cannot be inserted into leases (%d)\n", + object_id, ret); goto out_free_objects; } if (obj->type =3D=3D DRM_MODE_OBJECT_CRTC && !universal_planes) { @@ -439,15 +442,15 @@ static int fill_object_idr(struct drm_device *dev, =20 ret =3D idr_alloc(leases, &drm_lease_idr_object, crtc->primary->base.id= , crtc->primary->base.id + 1, GFP_KERNEL); if (ret < 0) { - DRM_DEBUG_LEASE("Object primary plane %d cannot be inserted into lease= s (%d)\n", - object_id, ret); + drm_dbg_lease(dev, "Object primary plane %d cannot be inserted into le= ases (%d)\n", + object_id, ret); goto out_free_objects; } if (crtc->cursor) { ret =3D idr_alloc(leases, &drm_lease_idr_object, crtc->cursor->base.id= , crtc->cursor->base.id + 1, GFP_KERNEL); if (ret < 0) { - DRM_DEBUG_LEASE("Object cursor plane %d cannot be inserted into lease= s (%d)\n", - object_id, ret); + drm_dbg_lease(dev, "Object cursor plane %d cannot be inserted into le= ases (%d)\n", + object_id, ret); goto out_free_objects; } } @@ -490,14 +493,14 @@ int drm_mode_create_lease_ioctl(struct drm_device *de= v, return -EOPNOTSUPP; =20 if (cl->flags && (cl->flags & ~(O_CLOEXEC | O_NONBLOCK))) { - DRM_DEBUG_LEASE("invalid flags\n"); + drm_dbg_lease(dev, "invalid flags\n"); return -EINVAL; } =20 lessor =3D drm_file_get_master(lessor_priv); /* Do not allow sub-leases */ if (lessor->lessor) { - DRM_DEBUG_LEASE("recursive leasing not allowed\n"); + drm_dbg_lease(dev, "recursive leasing not allowed\n"); ret =3D -EINVAL; goto out_lessor; } @@ -520,7 +523,7 @@ int drm_mode_create_lease_ioctl(struct drm_device *dev, object_count, object_ids); kfree(object_ids); if (ret) { - DRM_DEBUG_LEASE("lease object lookup failed: %i\n", ret); + drm_dbg_lease(dev, "lease object lookup failed: %i\n", ret); idr_destroy(&leases); goto out_lessor; } @@ -534,7 +537,7 @@ int drm_mode_create_lease_ioctl(struct drm_device *dev, goto out_lessor; } =20 - DRM_DEBUG_LEASE("Creating lease\n"); + drm_dbg_lease(dev, "Creating lease\n"); /* lessee will take the ownership of leases */ lessee =3D drm_lease_create(lessor, &leases); =20 @@ -545,7 +548,7 @@ int drm_mode_create_lease_ioctl(struct drm_device *dev, } =20 /* Clone the lessor file to create a new file for us */ - DRM_DEBUG_LEASE("Allocating lease file\n"); + drm_dbg_lease(dev, "Allocating lease file\n"); lessee_file =3D file_clone_open(lessor_file); if (IS_ERR(lessee_file)) { ret =3D PTR_ERR(lessee_file); @@ -560,7 +563,7 @@ int drm_mode_create_lease_ioctl(struct drm_device *dev, lessee_priv->authenticated =3D 1; =20 /* Pass fd back to userspace */ - DRM_DEBUG_LEASE("Returning fd %d id %d\n", fd, lessee->lessee_id); + drm_dbg_lease(dev, "Returning fd %d id %d\n", fd, lessee->lessee_id); cl->fd =3D fd; cl->lessee_id =3D lessee->lessee_id; =20 @@ -568,7 +571,7 @@ int drm_mode_create_lease_ioctl(struct drm_device *dev, fd_install(fd, lessee_file); =20 drm_master_put(&lessor); - DRM_DEBUG_LEASE("drm_mode_create_lease_ioctl succeeded\n"); + drm_dbg_lease(dev, "drm_mode_create_lease_ioctl succeeded\n"); return 0; =20 out_lessee: @@ -579,7 +582,7 @@ int drm_mode_create_lease_ioctl(struct drm_device *dev, =20 out_lessor: drm_master_put(&lessor); - DRM_DEBUG_LEASE("drm_mode_create_lease_ioctl failed: %d\n", ret); + drm_dbg_lease(dev, "drm_mode_create_lease_ioctl failed: %d\n", ret); return ret; } =20 @@ -601,7 +604,7 @@ int drm_mode_list_lessees_ioctl(struct drm_device *dev, return -EOPNOTSUPP; =20 lessor =3D drm_file_get_master(lessor_priv); - DRM_DEBUG_LEASE("List lessees for %d\n", lessor->lessee_id); + drm_dbg_lease(dev, "List lessees for %d\n", lessor->lessee_id); =20 mutex_lock(&dev->mode_config.idr_mutex); =20 @@ -610,7 +613,8 @@ int drm_mode_list_lessees_ioctl(struct drm_device *dev, /* Only list un-revoked leases */ if (!idr_is_empty(&lessee->leases)) { if (count_lessees > count) { - DRM_DEBUG_LEASE("Add lessee %d\n", lessee->lessee_id); + drm_dbg_lease(dev, "Add lessee %d\n", + lessee->lessee_id); ret =3D put_user(lessee->lessee_id, lessee_ids + count); if (ret) break; @@ -619,7 +623,7 @@ int drm_mode_list_lessees_ioctl(struct drm_device *dev, } } =20 - DRM_DEBUG_LEASE("Lessor leases to %d\n", count); + drm_dbg_lease(dev, "Lessor leases to %d\n", count); if (ret =3D=3D 0) arg->count_lessees =3D count; =20 @@ -651,7 +655,7 @@ int drm_mode_get_lease_ioctl(struct drm_device *dev, return -EOPNOTSUPP; =20 lessee =3D drm_file_get_master(lessee_priv); - DRM_DEBUG_LEASE("get lease for %d\n", lessee->lessee_id); + drm_dbg_lease(dev, "get lease for %d\n", lessee->lessee_id); =20 mutex_lock(&dev->mode_config.idr_mutex); =20 @@ -665,7 +669,7 @@ int drm_mode_get_lease_ioctl(struct drm_device *dev, count =3D 0; idr_for_each_entry(object_idr, entry, object) { if (count_objects > count) { - DRM_DEBUG_LEASE("adding object %d\n", object); + drm_dbg_lease(dev, "adding object %d\n", object); ret =3D put_user(object, object_ids + count); if (ret) break; @@ -696,7 +700,7 @@ int drm_mode_revoke_lease_ioctl(struct drm_device *dev, struct drm_master *lessee; int ret =3D 0; =20 - DRM_DEBUG_LEASE("revoke lease for %d\n", arg->lessee_id); + drm_dbg_lease(dev, "revoke lease for %d\n", arg->lessee_id); =20 /* Can't lease without MODESET */ if (!drm_core_check_feature(dev, DRIVER_MODESET)) --=20 2.35.1