From nobody Sun Feb 8 13:45:31 2026 Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) (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 2C2B01C3BFC for ; Thu, 18 Dec 2025 10:07:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766052437; cv=none; b=jkczUGJ6JYux5FZ2eCdhyF5mcP9qz17qyZvpazHg2pS3+ycLFEr+wX8B0D8k8DJzsQMNcVne1WdjD0VxuRtth5ot5QgVv2q6rSO4o5gvpIDNlmeLbP6Wkyl8BEfvNq4odXB9ClmqYe9rw5xVqJLLOuxn3R2JNaoxeSeOkf6ZLug= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766052437; c=relaxed/simple; bh=sqJB4/ZfGJqZ016lYoCUAnrcpOcfbVs9ZjEtvdsPsvA=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=L1XpDZ9ABQMBXBxqADcLZEn2tvlEwSgIP0LIVuGLevp8qsYuIq2HhvCaSSPcll3g5mW0vXZdfNTdCJq5+my1INfS3v64STq0orkpux3tG5g4mJpB4omgs7tiu4w+osCr9TGOHEHI9edQO0RDeXEpN7bRjJ9nQjDjovT6dCLxQzU= 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=XO7F17J+; arc=none smtp.client-ip=209.85.214.175 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="XO7F17J+" Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-2a0a95200e8so3926215ad.0 for ; Thu, 18 Dec 2025 02:07:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1766052435; x=1766657235; 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=kpRXf+CybyafgKkHmN7F6FAf7wCDCV9P2YSBozxEg1w=; b=XO7F17J+xnL7i8cKtN8Onn1FzNYjG4JRXt4qrDsJdp5e5FCQPgNXkwONkMlEownCTr nG2jVIkaSF6qe7MIVwcLRbSLPnxXPcp1uv+liTaNxNa2TmLHBX20ywQTDngKcJWO/eeD oqnJTFENDU4XlmHI4FADJ/iQnJiSOhQIK7iagN1N+nhThWRlim2354GlfBY1DoaBGAO1 UPcOqPrETKdC41SKXM7tsQF1qIUldBSUfHZ5JSUrrVfUjVOovLft5RsJFytyEwNc2MqX 4evB0Q53xB4yOCkkmJy8OIhhVQFgsM4vkOrsw2qrv1IhI5HN9jY65VvAA3y7V7T5hWxG 4LkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766052435; x=1766657235; 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=kpRXf+CybyafgKkHmN7F6FAf7wCDCV9P2YSBozxEg1w=; b=Of4/VU4EgeH4F0CU49QywAzvEPer9GKV+mkLcQESfkrOpbvY8dALiGmQ5GdlsMfu/1 E/P9aoTcp1iOimvdcwoJ2+EoG8GzpyJNtF7NctbWD+xcxkyANIS8e5CuJ86I7DB9no6U TAx5vYkY7rWCT3L0KT3/XrRnIz/u8Susg5RFDX2dw17++eoHDZs6BmBS/y0JJbv0XDdk LMaTMjy4O3wZGSZyEKVRLVjaDRejDyiGmPA3R0DV0EXxprjoehuJ54hKlnZNotzuyF1i DsHohv2b9LpXngbaNZG5iNkXqhYh2+tjrltU3xUd9qcfiLJz5JFPATrm7FXTSmLiAn2p 9TUA== X-Forwarded-Encrypted: i=1; AJvYcCX0t35mTQRtVMgf8bSXKCZ4ObpiDy2COPVUfkB7B9Zm2PN8fULL8r4FvovY0NzDK0wUbGyzaKy4w1b3tOY=@vger.kernel.org X-Gm-Message-State: AOJu0YyqmZGkkTPjo8J1VSqG5ItH5F5xzXf7zCAdE5H1J7a0M4Nu/Z2u 8wk6DjJC3+eJi2FAo8vrKx4dxD8xpxao2jAoJ5zH4zHsvT+EACN33Ipv X-Gm-Gg: AY/fxX7Ba1TNomwKW/pEV3mRZjK/MpSNn2zGMP1d64ixTyL3Yfj1xgt/KQGmaOMAdCj 1t1U4ZSFnXEVXw009PU5aG8B7IfMeVeOnRWB8NvfnOtEkLMec6AuqeGWn25+iuSXt0VBxpXsT45 3y8W7BZfITc0kH9m0wOcX0fzRonVgFirFEf2G8gjpSCo4QJ8237+z7UWdaXlXpMUOpSkAq6i3tu dDRQmRFgXBWTx63nu9eToZPjN7bwlPVWPjdR3MARxQ97457CWqq7WVQ3EL1WDpkz+2CQP3wThxf aerICxgne//38ksUqqMK0dc6Vu57rMZ/fCbiVbrySrrphsZPXGmsnSsM/sCVQ1PH7TrzxWT9U57 qtAixVBszhv2KS8SjaGwjWdSsJxjwrnUw6fu5naQl+EAV5fUkiE1fETGsId0jcRxs6RLOPoBTmK V1toFldr7G08EcUO7tJCr53lOWzDxc6G+VVz/cXDni86Y= X-Google-Smtp-Source: AGHT+IFz4Ugh0GME20ZYSCAsS5FdVOlyjab3uGMpWvUWX/4LmvR2z1wq9wJZY1s7sCcmSZ17Xl5o/w== X-Received: by 2002:a05:7022:458d:b0:11c:ec20:ea1f with SMTP id a92af1059eb24-11f34c57b69mr16886528c88.33.1766052435108; Thu, 18 Dec 2025 02:07:15 -0800 (PST) Received: from titanite-d300.amd.com ([165.204.154.57]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-12061fceec2sm5973650c88.13.2025.12.18.02.07.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Dec 2025 02:07:14 -0800 (PST) From: suryasaimadhu To: harry.wentland@amd.com, sunpeng.li@amd.com, alexander.deucher@amd.com, christian.koenig@amd.com, airlied@gmail.com, simona@ffwll.ch, amd-gfx@lists.freedesktop.org Cc: siqueira@igalia.com, mario.limonciello@amd.com, wayne.lin@amd.com, roman.li@amd.com, timur.kristof@gmail.com, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, suryasaimadhu Subject: [PATCH] drm/amdgpu/dm: Convert IRQ logging to drm_* helpers Date: Thu, 18 Dec 2025 18:05:07 +0800 Message-ID: <20251218100507.1529908-1-suryasaimadhu369@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(), DRM_WARN(), and DRM_INFO() usage in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c with the corresponding drm_err(), drm_warn(), and drm_info() helpers. The drm_* logging helpers take a struct drm_device * as their first argument, allowing the DRM core to prefix log messages with the specific device name and instance. This is required to correctly differentiate log messages when multiple AMD GPUs are present. This aligns amdgpu_dm with the DRM TODO item to convert legacy DRM logging macros to the device-scoped drm_* helpers while keeping debug logging unchanged. v2: - Keep validation helpers DRM-agnostic - Move drm_* logging to AMDGPU DM callers - Use adev_to_drm() for drm_* logging v3: - Pass struct amdgpu_device to helpers instead of struct drm_device - Compact drm_* logging statements Signed-off-by: suryasaimadhu diff --git a/Makefile b/Makefile index 2f545ec1690f..e404e4767944 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,8 @@ # SPDX-License-Identifier: GPL-2.0 VERSION =3D 6 -PATCHLEVEL =3D 18 +PATCHLEVEL =3D 19 SUBLEVEL =3D 0 -EXTRAVERSION =3D +EXTRAVERSION =3D -rc1 NAME =3D Baby Opossum Posse =20 # *DOCUMENTATION* diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c b/driver= s/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c index 0a2a3f233a0e..82ea217e8195 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c @@ -242,35 +242,29 @@ validate_irq_registration_params(struct dc_interrupt_= params *int_params, void (*ih)(void *)) { if (NULL =3D=3D int_params || NULL =3D=3D ih) { - DRM_ERROR("DM_IRQ: invalid input!\n"); return false; } =20 if (int_params->int_context >=3D INTERRUPT_CONTEXT_NUMBER) { - DRM_ERROR("DM_IRQ: invalid context: %d!\n", - int_params->int_context); return false; } =20 if (!DAL_VALID_IRQ_SRC_NUM(int_params->irq_source)) { - DRM_ERROR("DM_IRQ: invalid irq_source: %d!\n", - int_params->irq_source); return false; } =20 return true; } =20 -static bool validate_irq_unregistration_params(enum dc_irq_source irq_sour= ce, - irq_handler_idx handler_idx) +static bool validate_irq_unregistration_params( + enum dc_irq_source irq_source, + irq_handler_idx handler_idx) { if (handler_idx =3D=3D DAL_INVALID_IRQ_HANDLER_IDX) { - DRM_ERROR("DM_IRQ: invalid handler_idx=3D=3DNULL!\n"); return false; } =20 if (!DAL_VALID_IRQ_SRC_NUM(irq_source)) { - DRM_ERROR("DM_IRQ: invalid irq_source:%d!\n", irq_source); return false; } =20 @@ -311,11 +305,12 @@ void *amdgpu_dm_irq_register_interrupt(struct amdgpu_= device *adev, enum dc_irq_source irq_source; =20 if (false =3D=3D validate_irq_registration_params(int_params, ih)) + drm_err(adev_to_drm(adev), "DM_IRQ: invalid registration parameters\n"); return DAL_INVALID_IRQ_HANDLER_IDX; =20 handler_data =3D kzalloc(sizeof(*handler_data), GFP_KERNEL); if (!handler_data) { - DRM_ERROR("DM_IRQ: failed to allocate irq handler!\n"); + drm_err(adev_to_drm(adev), "DM_IRQ: failed to allocate irq handler!\n"); return DAL_INVALID_IRQ_HANDLER_IDX; } =20 @@ -376,6 +371,7 @@ void amdgpu_dm_irq_unregister_interrupt(struct amdgpu_d= evice *adev, int i; =20 if (false =3D=3D validate_irq_unregistration_params(irq_source, ih)) + drm_err(adev_to_drm(adev), "DM_IRQ: invalid unregistration parameters\n"= ); return; =20 memset(&int_params, 0, sizeof(int_params)); @@ -396,8 +392,8 @@ void amdgpu_dm_irq_unregister_interrupt(struct amdgpu_d= evice *adev, /* If we got here, it means we searched all irq contexts * for this irq source, but the handler was not found. */ - DRM_ERROR( - "DM_IRQ: failed to find irq handler:%p for irq_source:%d!\n", + drm_err(adev_to_drm(adev), + "DM_IRQ: failed to find irq handler:%p for irq_source:%d\n", ih, irq_source); } } @@ -596,7 +592,7 @@ static void amdgpu_dm_irq_schedule_work(struct amdgpu_d= evice *adev, /*allocate a new amdgpu_dm_irq_handler_data*/ handler_data_add =3D kzalloc(sizeof(*handler_data), GFP_ATOMIC); if (!handler_data_add) { - DRM_ERROR("DM_IRQ: failed to allocate irq handler!\n"); + drm_err(adev_to_drm(adev), "DM_IRQ: failed to allocate irq handler!\n"); return; } =20 @@ -611,11 +607,11 @@ static void amdgpu_dm_irq_schedule_work(struct amdgpu= _device *adev, INIT_WORK(&handler_data_add->work, dm_irq_work_func); =20 if (queue_work(system_highpri_wq, &handler_data_add->work)) - DRM_DEBUG("Queued work for handling interrupt from " + drm_dbg(adev_to_drm(adev), "Queued work for handling interrupt from " "display for IRQ source %d\n", irq_source); else - DRM_ERROR("Failed to queue work for handling interrupt " + drm_err(adev_to_drm(adev), "Failed to queue work for handling interrupt= " "from display for IRQ source %d\n", irq_source); } @@ -720,10 +716,9 @@ static inline int dm_irq_state(struct amdgpu_device *a= dev, struct amdgpu_crtc *acrtc =3D adev->mode_info.crtcs[crtc_id]; =20 if (!acrtc) { - DRM_ERROR( + drm_err(adev_to_drm(adev), "%s: crtc is NULL at id :%d\n", - func, - crtc_id); + func, crtc_id); return 0; } =20 --=20 2.43.0