From nobody Sun Feb 8 12:19:56 2026 Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 57E097082F for ; Wed, 24 Dec 2025 05:02:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766552570; cv=none; b=Xmne/yp37wzX1rOd9Vkpt4yZGTxILiN/IvA87ffyZLNgi1+EsqRFs/faE0SB/YWrPxx/FOfAr34sJ59AWq24Lia4ccdxIhGG7I4IuW6EwtYtEonRTy+EzpAF5L7jHX+SIDnYeQF4fVSh06vIVVZAsyeciDBylTtw+qQY1rNduDc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766552570; c=relaxed/simple; bh=uzMhTl5v8MljJgrMkKQUTVj3C24teLmCEuehkiNdlag=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=lhYg+mmG4usBm8sAsCfOfgcjvLtbbi6KjuxHUIetIKlC0foHZjtV4VMdaGI35yETCSAjKwmoTWGXhnS71uYbDCYshF1hWLxzPYFZlXd0MhC0JYWvdtqON87XEHhncHcTlxwiF5CrHjVoG4g4wa9KIF7AJGoImHvfxh7cykJL2To= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=hJ0QBEwI; arc=none smtp.client-ip=209.85.210.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="hJ0QBEwI" Received: by mail-pf1-f181.google.com with SMTP id d2e1a72fcca58-7b7828bf7bcso6449705b3a.2 for ; Tue, 23 Dec 2025 21:02:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1766552569; x=1767157369; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=b1ZnG8yLFOgNUkGkXDv15H0ovQZznReZopUu9qPxrhc=; b=hJ0QBEwIYyPifezoMAoGjv3+xJHh1nuH4WDh6P9l4KD8lWvktuNTI7Y81XBqwZUdfw DcTolcVFOe8u/aYzRpuA7oBIFv6d5iw6l5Mbx80duPZcyhTcNLscjyFVLCTX4efu6se3 JeloQsqOUJ7hu7xshDK4s1eE31gg9mb8Q/zAfcZXWljj1VxUWAefBeVrDlyJsk8/Z4wT O/0O3jXHq7Qo6Sb2TwchRZ++kyFAVEOVucaLefJhoegdNoRJcTTeNaz8NaWvBlRBrW41 dyl+OQvyULFsBl1kPGk2q8QwyUq4LGfNzkPaGn/vIUTcxO7VDiiInR3qNNxfG2Sb7w+l Tqxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766552569; x=1767157369; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=b1ZnG8yLFOgNUkGkXDv15H0ovQZznReZopUu9qPxrhc=; b=XX8l4XlA9sb38WprDa3qYIh0L2jd4p4s+JO9DGcxFxhHJT0Wapug63OrE3qoI0kqzq U8u9NZjBcHe39ZSlGCme/m1GDgo+lGq3IeuDs6rOeZBCu9IHQxJgMr7vJk286nqyfVf+ rQUqhH0EPp1mkh1Qt7BUcF77H+V/hqX5UBn4wvbHETE21mT3BXVtOpGFJKcyoESdb6bE 0w8QXF/J5prOo/hRMBh2/QKPqzNP2Zwk61obS8RQQix9d4kNSC490+6Beul0Zy0zM4kg qM2ECs5zbyfY+R9KB99iOaNKO5DsBI+M42KgP0E1KyZWtGmAIwyWqvu6CKmfoE+n6mit N6Fg== X-Forwarded-Encrypted: i=1; AJvYcCUvEcGLV+elGl+l6BQktstbCL7KZzFgQgNp6N5rqKkJFPbGFhSvJRJWZCNtAfSlDtGSCTU1R5z37azF8LY=@vger.kernel.org X-Gm-Message-State: AOJu0YyqXlq2laU9tBFF6uJy7JVqp4cdMpkH9/jpjWZ3fpGOvlBN6ftC ZWQ3koD9ZJoDE055hLyUtaijLccOJ4BvrBSv8iBKIBGgH2q05aptbvJaOiNdLcKB X-Gm-Gg: AY/fxX6pnAjBgcwuoH/sRqsoiXhBWgjY/nP7i0pCz9d9jtbm6qNDjhlDiT6BzcSvz21 lFIANNJ2Y3K/3AbcyF7ZjQqnU5WdQdJIPotGjaJbOgd8L4i+sYWK/X+8gxgFJLaK2b+bp1HZg2R JLdkoRuWvvGb6tC88IjN/Xe9dCC70pWtFoXI5AtVMUQx9rXJiA1h2p+G4lUzFa7QOISPlP4fZp+ 2eTNGYEdn5YLBgd+fUNVQsPRiyfQ+5dCroisEmtBGGK8/Wiv5cmuvLKY3m5G413eNfEcI5cPg/W 5Oj0XzeAKor/qc8xXjyxxdRe1QX3HmLI1OYnbwkVwCHDYTvOmq4mNSblV8lkTnf/wj2ZHedHnMM qsEoae9z3aiA4t5Q1P0JKEDTvHYO64QCiPd/IdBZb/0YIqyl4cPYW8MG61TLk9BqzvtVZhv+sLM zmhoCe8lzGdUynpW/lcHcUxoyWCmNqOm3tl+WEWl0= X-Google-Smtp-Source: AGHT+IG8qBs6UzP+fV1sTduEsAkrUxh2D/JucxeWhiAHN1H0Z1Eq7FBt5DNo6v5E8BQMbS4U5T814w== X-Received: by 2002:a05:6a00:278a:b0:79a:fd01:dfa9 with SMTP id d2e1a72fcca58-7ff64215308mr16709010b3a.6.1766552568538; Tue, 23 Dec 2025 21:02:48 -0800 (PST) Received: from rahul-mintos.ban-spse ([165.204.156.251]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7ff7e682870sm15349386b3a.57.2025.12.23.21.02.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Dec 2025 21:02:47 -0800 (PST) From: Abhishek Rajput To: Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , David Airlie , Simona Vetter Cc: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, abhiraj21put@gmail.com Subject: [PATCH] drm/radeon: Convert legacy DRM logging to drm_* helpers in radeon_device.c Date: Wed, 24 Dec 2025 10:32:30 +0530 Message-ID: <20251224050230.509813-1-abhiraj21put@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Replace DRM_INFO() and DRM_ERROR() calls in drivers/gpu/drm/radeon/radeon_device.c with the corresponding drm_info() and drm_err() helpers. The drm_*() logging helpers take a struct drm_device * argument, allowing the DRM core to prefix log messages with the correct device name and instance. This is required to correctly distinguish log messages on systems with multiple GPUs. This change aligns the radeon driver with the DRM TODO item: "Convert logging to drm_* functions with drm_device parameter". Signed-off-by: Abhishek Rajput diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeo= n/radeon_device.c index 60afaa8e56b4..e80c3ff6c16c 100644 --- a/drivers/gpu/drm/radeon/radeon_device.c +++ b/drivers/gpu/drm/radeon/radeon_device.c @@ -337,6 +337,8 @@ void radeon_scratch_free(struct radeon_device *rdev, ui= nt32_t reg) */ static int radeon_doorbell_init(struct radeon_device *rdev) { + struct drm_device *ddev =3D rdev_to_drm(rdev); + /* doorbell bar mapping */ rdev->doorbell.base =3D pci_resource_start(rdev->pdev, 2); rdev->doorbell.size =3D pci_resource_len(rdev->pdev, 2); @@ -349,8 +351,8 @@ static int radeon_doorbell_init(struct radeon_device *r= dev) if (rdev->doorbell.ptr =3D=3D NULL) { return -ENOMEM; } - DRM_INFO("doorbell mmio base: 0x%08X\n", (uint32_t)rdev->doorbell.base); - DRM_INFO("doorbell mmio size: %u\n", (unsigned)rdev->doorbell.size); + drm_info(ddev, "doorbell mmio base: 0x%08X\n", (uint32_t)rdev->doorbell.b= ase); + drm_info(ddev, "doorbell mmio size: %pa\n", &rdev->doorbell.size); =20 memset(&rdev->doorbell.used, 0, sizeof(rdev->doorbell.used)); =20 @@ -752,11 +754,13 @@ void radeon_update_bandwidth_info(struct radeon_devic= e *rdev) */ bool radeon_boot_test_post_card(struct radeon_device *rdev) { + struct drm_device *ddev =3D rdev_to_drm(rdev); + if (radeon_card_posted(rdev)) return true; =20 if (rdev->bios) { - DRM_INFO("GPU not posted. posting now...\n"); + drm_info(ddev, "GPU not posted. posting now...\n"); if (rdev->is_atom_bios) atom_asic_init(rdev->mode_info.atom_context); else @@ -975,6 +979,7 @@ int radeon_atombios_init(struct radeon_device *rdev) { struct card_info *atom_card_info =3D kzalloc(sizeof(struct card_info), GFP_KERNEL); + struct drm_device *ddev =3D rdev_to_drm(rdev); =20 if (!atom_card_info) return -ENOMEM; @@ -988,7 +993,7 @@ int radeon_atombios_init(struct radeon_device *rdev) atom_card_info->ioreg_read =3D cail_ioreg_read; atom_card_info->ioreg_write =3D cail_ioreg_write; } else { - DRM_ERROR("Unable to find PCI I/O BAR; using MMIO for ATOM IIO\n"); + drm_err(ddev, "Unable to find PCI I/O BAR; using MMIO for ATOM IIO\n"); atom_card_info->ioreg_read =3D cail_reg_read; atom_card_info->ioreg_write =3D cail_reg_write; } @@ -1297,7 +1302,7 @@ int radeon_device_init(struct radeon_device *rdev, } rdev->fence_context =3D dma_fence_context_alloc(RADEON_NUM_RINGS); =20 - DRM_INFO("initializing kernel modesetting (%s 0x%04X:0x%04X 0x%04X:0x%04X= 0x%02X).\n", + drm_info(ddev, "initializing kernel modesetting (%s 0x%04X:0x%04X 0x%04X:= 0x%04X 0x%02X).\n", radeon_family_name[rdev->family], pdev->vendor, pdev->device, pdev->subsystem_vendor, pdev->subsystem_device, pdev->revision); =20 @@ -1414,7 +1419,7 @@ int radeon_device_init(struct radeon_device *rdev, } } if (rdev->rio_mem =3D=3D NULL) - DRM_ERROR("Unable to find PCI I/O BAR\n"); + drm_err(ddev, "Unable to find PCI I/O BAR\n"); =20 if (rdev->flags & RADEON_IS_PX) radeon_device_handle_px_quirks(rdev); @@ -1454,7 +1459,7 @@ int radeon_device_init(struct radeon_device *rdev, =20 r =3D radeon_ib_ring_tests(rdev); if (r) - DRM_ERROR("ib ring test failed (%d).\n", r); + drm_err(ddev, "ib ring test failed (%d).\n", r); =20 /* * Turks/Thames GPU will freeze whole laptop if DPM is not restarted @@ -1475,19 +1480,19 @@ int radeon_device_init(struct radeon_device *rdev, if (rdev->accel_working) radeon_test_moves(rdev); else - DRM_INFO("radeon: acceleration disabled, skipping move tests\n"); + drm_info(ddev, "radeon: acceleration disabled, skipping move tests\n"); } if ((radeon_testing & 2)) { if (rdev->accel_working) radeon_test_syncing(rdev); else - DRM_INFO("radeon: acceleration disabled, skipping sync tests\n"); + drm_info(ddev, "radeon: acceleration disabled, skipping sync tests\n"); } if (radeon_benchmarking) { if (rdev->accel_working) radeon_benchmark(rdev, radeon_benchmarking); else - DRM_INFO("radeon: acceleration disabled, skipping benchmarks\n"); + drm_info(ddev, "radeon: acceleration disabled, skipping benchmarks\n"); } return 0; =20 @@ -1510,7 +1515,9 @@ int radeon_device_init(struct radeon_device *rdev, */ void radeon_device_fini(struct radeon_device *rdev) { - DRM_INFO("radeon: finishing device.\n"); + struct drm_device *ddev =3D rdev_to_drm(rdev); + + drm_info(ddev, "radeon: finishing device.\n"); rdev->shutdown =3D true; /* evict vram memory */ radeon_bo_evict_vram(rdev); @@ -1670,14 +1677,14 @@ int radeon_resume_kms(struct drm_device *dev, bool = resume, bool notify_clients) =20 r =3D radeon_ib_ring_tests(rdev); if (r) - DRM_ERROR("ib ring test failed (%d).\n", r); + drm_err(dev, "ib ring test failed (%d).\n", r); =20 if ((rdev->pm.pm_method =3D=3D PM_METHOD_DPM) && rdev->pm.dpm_enabled) { /* do dpm late init */ r =3D radeon_pm_late_init(rdev); if (r) { rdev->pm.dpm_enabled =3D false; - DRM_ERROR("radeon_pm_late_init failed, disabling dpm\n"); + drm_err(dev, "radeon_pm_late_init failed, disabling dpm\n"); } } else { /* resume old pm late */ @@ -1701,7 +1708,7 @@ int radeon_resume_kms(struct drm_device *dev, bool re= sume, bool notify_clients) 0 : 1 << 27, &radeon_crtc->cursor_addr); if (r !=3D 0) - DRM_ERROR("Failed to pin cursor BO (%d)\n", r); + drm_err(dev, "Failed to pin cursor BO (%d)\n", r); radeon_bo_unreserve(robj); } } @@ -1756,6 +1763,7 @@ int radeon_gpu_reset(struct radeon_device *rdev) { unsigned ring_sizes[RADEON_NUM_RINGS]; uint32_t *ring_data[RADEON_NUM_RINGS]; + struct drm_device *ddev =3D rdev_to_drm(rdev); =20 bool saved =3D false; =20 @@ -1807,7 +1815,7 @@ int radeon_gpu_reset(struct radeon_device *rdev) r =3D radeon_pm_late_init(rdev); if (r) { rdev->pm.dpm_enabled =3D false; - DRM_ERROR("radeon_pm_late_init failed, disabling dpm\n"); + drm_err(ddev, "radeon_pm_late_init failed, disabling dpm\n"); } } else { /* resume old pm late */ --=20 2.43.0