From nobody Sun Feb 8 01:51:58 2026 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) (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 5066030E858 for ; Tue, 16 Dec 2025 06:43:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765867386; cv=none; b=o/Uy9QOxlEPu3it7xAb2GRI3E0CPC4f++zcs/WbMc4+BTrQfhiivLggW6QBcROrsfCZEAOB1nBZvYsfj35oKS7AFB6R1r+FdtYClEAEKCzc0FXGX7yDeQUishU8ZW+iREwaWnDsUSBnuW4iXFpj5N57Uvjo5Axs4S3BgbArRaLM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765867386; c=relaxed/simple; bh=qrkkzlRKjRLEJEVlkkT0SSIn38IySLvLxN12XRTxNKs=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=FsqYC05RBsKB2/2I8F9cQKKKZc5wV0AxoPk7Nt8S83NSOs5IFBx8Cp9mzfNMgyKm+tXI1KvFcKNcBWE5TyUZM557X2fgIj5UDVPAh/J5hfBbN8EwdrANni+fgKgoSjUN4z96nrCbhXXnVQo2x+MYW6wQMv/D9x4dOpa76c52ukk= 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=mkLV8la5; arc=none smtp.client-ip=209.85.214.176 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="mkLV8la5" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-2a110548cdeso17878695ad.0 for ; Mon, 15 Dec 2025 22:43:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1765867377; x=1766472177; 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=v2bmsoq/n0F14/KwlXRT7hb4jXoFQiO9q+m2/WPCVIU=; b=mkLV8la5qzHGAhN9BQGUXAloXDTqd8rvAE73AaPqkvOpvIYtX/XwJeyM/gmQ9Zawk/ EKOMQKw3G9Q+YZOwdJlM6xe614GFXsVFBxmcjSN2DDGfVMgtJbLUC3UJEIMi2cp+Grii tncpUg8q9VGDhQpkslLTqI+newEb+fqB0chSmsLsYsqq5ezJRxgKtNHs+LMm2s1I+90B 9fF8F5RvdjdwCD4KErU91qZKKFcLCEuxbZlGeC68jWdwQwV+AYCwy8poKq6UECSFLjkQ 3rWObrcRMi/BmhAFxZV0lHjHDsEjjzos1AHxoWUt4TX5weP4ceoJJpNytOKX45f117Lu WBFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765867377; x=1766472177; 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=v2bmsoq/n0F14/KwlXRT7hb4jXoFQiO9q+m2/WPCVIU=; b=YiZHDyLECiyoFTVV5uHtxgmBTciA1Idarze62pFXkc0NLsrnspyKBcCJX3le4qGN3A BTLheHi32WNxjFDAmyoptACEiQ3kGPNMQneXGjfS9ANmsza+OcXpD8s5pgWoZQf7qdOp sT0rC15hMmzr510rP2856cqrxdOAyu5BjfmrpA2bgWN0NUTIZkA0MuNWT5QbU6g1ueX7 TBgPNkKsNd19YJwEQ5OOaBDlgGB04i9VZxdWUC2EshkBfKRaXOsSPXe58CtenwWX9acA qaXJxfYHDdpVVinDiOB6FvkDwuf9+stOlzS6flBhXqK4Ju5ReZG65MG26B75OYdtIGTP frBQ== X-Forwarded-Encrypted: i=1; AJvYcCWbB3HhEPd4OULtxHfgo+u51CODuLCxGbbUhZjiDbpkqFNG/egci79dvSoLEoGrmlxHyJGu+BJlUfDhw/0=@vger.kernel.org X-Gm-Message-State: AOJu0YxvvXZ9iBH2AjgBV6FlS8pL/J6+BBdlQXRCqLrrtt2M7+NGIs+X 5QDzLubM+Q4kl/LrXT9HVSKS6iA9oeGhPcFJNqGEAYEM9UEnvJ/nAuFd X-Gm-Gg: AY/fxX687V16wVaL6W1G008nGBoL86JinluCudgSvu/86+pxqhbytwdnD030vDoLyBl FA+tBUCyGsNYV3tgKiT7DNe9RDJidRWo3bykFgraMEj8nxWFD1/Cnetk0JtcSAFH9Nlk9nstxMH o2hcm91nKPa9hfiuQFFoUygy297aTC80UbN/eTte6iSfpTlKKWWMKy4aTA0xGVUtjV3kVQ19FRX KD26XPEtdNcnt9DGgKjtIrMVUPZRbI9Q/gGzRb/P9BJmjJ5IncanjYMg1JJfX5oXLuUTt1F+YoO ve7mQMB/0UOs1tZc8o77PU7yegBAmEaHcAzatdrdfnZmqcLaXbiKMNOTO53/WfiHZdPkpzr2sZu kzvI94EeW5200CeGkYzDz5cnz50VmMNBCpK7u01VcidfvDwqqm1ILRS4njAGtt9fK9faVSN5PaY 1Wm6uTcWXHx1GLZOCYfp53Z3sUc2D1l9v6fIGQguz64Zm1pGBYAUZYtSmfQG4I+us= X-Google-Smtp-Source: AGHT+IFar+tL4JPaarEM2ARLO+T20e2mStsXQVCj82DlL5Ir+c5vZWMVWSjH5RC2TFXXUxM6LFEwEg== X-Received: by 2002:a17:902:cecc:b0:2a1:3895:e0d8 with SMTP id d9443c01a7336-2a13895e17dmr14512435ad.60.1765867376883; Mon, 15 Dec 2025 22:42:56 -0800 (PST) Received: from rahul-mintos.ban-spse ([165.204.156.251]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a0ced60fddsm64218355ad.77.2025.12.15.22.42.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Dec 2025 22:42:56 -0800 (PST) From: Mukesh Ogare To: alexander.deucher@amd.com, christian.koenig@amd.com, airlied@gmail.com, simona@ffwll.ch Cc: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, mukeshogare871@gmail.com Subject: [PATCH] drm/radeon: Convert logging in radeon_display.c to drm_* helpers Date: Tue, 16 Dec 2025 12:12:24 +0530 Message-ID: <20251216064224.537759-1-mukeshogare871@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_ERROR() and DRM_INFO() calls in drivers/gpu/drm/radeon/radeon_display.c with the corresponding drm_err() and drm_info() helpers. The drm_*() logging functions 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 radeon with the DRM TODO item: "Convert logging to drm_* functions with drm_device parameter". Signed-off-by: Mukesh Ogare diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/rade= on/radeon_display.c index 35fb99bcd9a7..bc28117e01b4 100644 Acked-by: Christian K=C3=B6nig --- a/drivers/gpu/drm/radeon/radeon_display.c +++ b/drivers/gpu/drm/radeon/radeon_display.c @@ -41,6 +41,7 @@ #include #include #include +#include =20 #include "atom.h" #include "radeon.h" @@ -273,7 +274,7 @@ static void radeon_unpin_work_func(struct work_struct *= __work) radeon_bo_unpin(work->old_rbo); radeon_bo_unreserve(work->old_rbo); } else - DRM_ERROR("failed to reserve buffer after flip\n"); + drm_err(&work->rdev->ddev, "failed to reserve buffer after flip\n"); =20 drm_gem_object_put(&work->old_rbo->tbo.base); kfree(work); @@ -434,7 +435,7 @@ static void radeon_flip_work_func(struct work_struct *_= _work) r =3D dma_fence_wait(work->fence, false); =20 if (r) - DRM_ERROR("failed to wait on page flip fence (%d)!\n", r); + drm_err(dev, "failed to wait on page flip fence (%d)!\n", r); =20 /* We continue with the page flip even if we failed to wait on * the fence, otherwise the DRM core and userspace will be @@ -521,7 +522,7 @@ static int radeon_crtc_page_flip_target(struct drm_crtc= *crtc, =20 r =3D radeon_bo_reserve(new_rbo, false); if (unlikely(r !=3D 0)) { - DRM_ERROR("failed to reserve new rbo buffer before flip\n"); + drm_err(dev, "failed to reserve new rbo buffer before flip\n"); goto cleanup; } /* Only 27 bit offset for legacy CRTC */ @@ -530,14 +531,14 @@ static int radeon_crtc_page_flip_target(struct drm_cr= tc *crtc, if (unlikely(r !=3D 0)) { radeon_bo_unreserve(new_rbo); r =3D -EINVAL; - DRM_ERROR("failed to pin new rbo buffer before flip\n"); + drm_err(dev, "failed to pin new rbo buffer before flip\n"); goto cleanup; } r =3D dma_resv_get_singleton(new_rbo->tbo.base.resv, DMA_RESV_USAGE_WRITE, &work->fence); if (r) { radeon_bo_unreserve(new_rbo); - DRM_ERROR("failed to get new rbo buffer fences\n"); + drm_err(dev, "failed to get new rbo buffer fences\n"); goto cleanup; } radeon_bo_get_tiling_flags(new_rbo, &tiling_flags, NULL); @@ -604,7 +605,7 @@ static int radeon_crtc_page_flip_target(struct drm_crtc= *crtc, =20 pflip_cleanup: if (unlikely(radeon_bo_reserve(new_rbo, false) !=3D 0)) { - DRM_ERROR("failed to reserve new rbo in error path\n"); + drm_err(dev, "failed to reserve new rbo in error path\n"); goto cleanup; } radeon_bo_unpin(new_rbo); @@ -772,15 +773,15 @@ static void radeon_print_display_setup(struct drm_dev= ice *dev) uint32_t devices; int i =3D 0; =20 - DRM_INFO("Radeon Display Connectors\n"); + drm_info(dev, "Radeon Display Connectors\n"); list_for_each_entry(connector, &dev->mode_config.connector_list, head) { radeon_connector =3D to_radeon_connector(connector); - DRM_INFO("Connector %d:\n", i); - DRM_INFO(" %s\n", connector->name); + drm_info(dev, "Connector %d:\n", i); + drm_info(dev, " %s\n", connector->name); if (radeon_connector->hpd.hpd !=3D RADEON_HPD_NONE) - DRM_INFO(" %s\n", hpd_names[radeon_connector->hpd.hpd]); + drm_info(dev, " %s\n", hpd_names[radeon_connector->hpd.hpd]); if (radeon_connector->ddc_bus) { - DRM_INFO(" DDC: 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x\n", + drm_info(dev, " DDC: 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x\n", radeon_connector->ddc_bus->rec.mask_clk_reg, radeon_connector->ddc_bus->rec.mask_data_reg, radeon_connector->ddc_bus->rec.a_clk_reg, @@ -790,11 +791,11 @@ static void radeon_print_display_setup(struct drm_dev= ice *dev) radeon_connector->ddc_bus->rec.y_clk_reg, radeon_connector->ddc_bus->rec.y_data_reg); if (radeon_connector->router.ddc_valid) - DRM_INFO(" DDC Router 0x%x/0x%x\n", + drm_info(dev, " DDC Router 0x%x/0x%x\n", radeon_connector->router.ddc_mux_control_pin, radeon_connector->router.ddc_mux_state); if (radeon_connector->router.cd_valid) - DRM_INFO(" Clock/Data Router 0x%x/0x%x\n", + drm_info(dev, " Clock/Data Router 0x%x/0x%x\n", radeon_connector->router.cd_mux_control_pin, radeon_connector->router.cd_mux_state); } else { @@ -804,35 +805,46 @@ static void radeon_print_display_setup(struct drm_dev= ice *dev) connector->connector_type =3D=3D DRM_MODE_CONNECTOR_DVIA || connector->connector_type =3D=3D DRM_MODE_CONNECTOR_HDMIA || connector->connector_type =3D=3D DRM_MODE_CONNECTOR_HDMIB) - DRM_INFO(" DDC: no ddc bus - possible BIOS bug - please report to xor= g-driver-ati@lists.x.org\n"); + drm_info(dev, " DDC: no ddc bus - possible BIOS bug - please report t= o xorg-driver-ati@lists.x.org\n"); } - DRM_INFO(" Encoders:\n"); + drm_info(dev, " Encoders:\n"); list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) { radeon_encoder =3D to_radeon_encoder(encoder); devices =3D radeon_encoder->devices & radeon_connector->devices; if (devices) { if (devices & ATOM_DEVICE_CRT1_SUPPORT) - DRM_INFO(" CRT1: %s\n", encoder_names[radeon_encoder->encoder_id]); + drm_info(dev, " CRT1: %s\n", + encoder_names[radeon_encoder->encoder_id]); if (devices & ATOM_DEVICE_CRT2_SUPPORT) - DRM_INFO(" CRT2: %s\n", encoder_names[radeon_encoder->encoder_id]); + drm_info(dev, " CRT2: %s\n", + encoder_names[radeon_encoder->encoder_id]); if (devices & ATOM_DEVICE_LCD1_SUPPORT) - DRM_INFO(" LCD1: %s\n", encoder_names[radeon_encoder->encoder_id]); + drm_info(dev, " LCD1: %s\n", + encoder_names[radeon_encoder->encoder_id]); if (devices & ATOM_DEVICE_DFP1_SUPPORT) - DRM_INFO(" DFP1: %s\n", encoder_names[radeon_encoder->encoder_id]); + drm_info(dev, " DFP1: %s\n", + encoder_names[radeon_encoder->encoder_id]); if (devices & ATOM_DEVICE_DFP2_SUPPORT) - DRM_INFO(" DFP2: %s\n", encoder_names[radeon_encoder->encoder_id]); + drm_info(dev, " DFP2: %s\n", + encoder_names[radeon_encoder->encoder_id]); if (devices & ATOM_DEVICE_DFP3_SUPPORT) - DRM_INFO(" DFP3: %s\n", encoder_names[radeon_encoder->encoder_id]); + drm_info(dev, " DFP3: %s\n", + encoder_names[radeon_encoder->encoder_id]); if (devices & ATOM_DEVICE_DFP4_SUPPORT) - DRM_INFO(" DFP4: %s\n", encoder_names[radeon_encoder->encoder_id]); + drm_info(dev, " DFP4: %s\n", + encoder_names[radeon_encoder->encoder_id]); if (devices & ATOM_DEVICE_DFP5_SUPPORT) - DRM_INFO(" DFP5: %s\n", encoder_names[radeon_encoder->encoder_id]); + drm_info(dev, " DFP5: %s\n", + encoder_names[radeon_encoder->encoder_id]); if (devices & ATOM_DEVICE_DFP6_SUPPORT) - DRM_INFO(" DFP6: %s\n", encoder_names[radeon_encoder->encoder_id]); + drm_info(dev, " DFP6: %s\n", + encoder_names[radeon_encoder->encoder_id]); if (devices & ATOM_DEVICE_TV1_SUPPORT) - DRM_INFO(" TV1: %s\n", encoder_names[radeon_encoder->encoder_id]); + drm_info(dev, " TV1: %s\n", + encoder_names[radeon_encoder->encoder_id]); if (devices & ATOM_DEVICE_CV_SUPPORT) - DRM_INFO(" CV: %s\n", encoder_names[radeon_encoder->encoder_id]); + drm_info(dev, " CV: %s\n", + encoder_names[radeon_encoder->encoder_id]); } } i++; @@ -1747,7 +1759,7 @@ bool radeon_crtc_scaling_mode_fixup(struct drm_crtc *= crtc, * (ie all encoder can work with the same * scaling). */ - DRM_ERROR("Scaling not consistent across encoder.\n"); + drm_err(dev, "Scaling not consistent across encoder.\n"); return false; } } --=20 2.43.0