From nobody Sun Feb 8 14:57:25 2026 Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) (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 DE42E2F1FD5 for ; Thu, 18 Dec 2025 10:46:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766054769; cv=none; b=tV1pSZbLmMC+k0dhOwFXinTk7jcwSnRCh2+yQpbTYY/xNhcubw0w757nc+UbRJPI9TrQqdiex7+Je3zTswpDqJ06AJif4mAJnaSQPgyTQlhj/iAr0AzS5Uhe42mU/ytM4d1m7iiMz8E3vzO1lI8pLrADBC50GuHTlvWCuJ/7rws= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766054769; c=relaxed/simple; bh=/MQm1b4ZuWLRMYa1IqugP4uHIwkDDlAb7V5djAGEtWU=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=pADn+f4/MOlt4S9MQt6Pw0YPYSjPFwdjZKvfYyDYA8TgK+aX29KLWa63W8zomexL7vx4Sck+vzjL5lKzvh1sXmIZbuATBc3HtVRvwG6Zs0ZTiP04QTCQrH8ZIoPm5n020JiUqevsNIbp376WFD6M5n/1sGmDTR5bygpSkQF6CVg= 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=mxJuqx9m; arc=none smtp.client-ip=209.85.214.177 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="mxJuqx9m" Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-2a0d52768ccso6461865ad.1 for ; Thu, 18 Dec 2025 02:46:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1766054766; x=1766659566; 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=6IWwV37obkeTNwRLtikEMk+ZnED99GBbg/P6oJvfXDY=; b=mxJuqx9mAjqd3mhK7f7WEBEsHy8cSMXnfvkxIbiW80icYEoxQu4e0fpEtISuk8WqGI 6g7AvDtK9Mz+zbIy9wyjXycW4tnFnVfF20lzT9fktebAO6viomIIm48ozsZbae7JnPr4 /+YWy7p93lmwo198Swiv+M4oL9I4yqjIKgbOIUtlii1H1KrLWVlj8O9djSIw/OurgfrI eYX/WHFozrZ8A1ipXfztpN1grX3kTgmCoal/wFMhRxl9sKoTdCv2zH/7NjZ9Q1kcNQhB pyG//LxMh8tawFgdiZ2PKtU5XtwlZwZcITbnlZwe2OlHZNf1TaDPeASTmlOlnddZppBA /C1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766054766; x=1766659566; 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=6IWwV37obkeTNwRLtikEMk+ZnED99GBbg/P6oJvfXDY=; b=Xnx8YDGGUnnqbazkrie67sGXIrzOZKZNUZElCzNL0rT80JSldFvU7id8LQTtVEMLgj R29Po90RuUZQKqaClDLfqgEEWVcWvNnCeUs79EZwjV/paSj0DGeWYqqSM/23fJQ9UEcl BpPmTRTedmWk6zYfUMpcB9H4iVfSV7WBZakTBnnwVFhk9jDZiw/OIQ3z4AztWOPbM70Y PYatxgEJp427XQfsb5fCn1L1PmNOhVUHbJZq0Bx/cwL31T1NEZjx43Empx5IlxsIvcNm W2ES0AtU2MC9cS9hiobBHJLbIvYjcyo79Phfrl3cNYsvMsX7SlEEXvcleMMwR4gLTEdD GbpA== X-Forwarded-Encrypted: i=1; AJvYcCWHc8mCJ7mM32lyFnuR6LZYH10cfTnSUs4wC2InbhJuNEAGlXQv94noPowMMYd9ALqJ1wvaqUWV8WRqRl8=@vger.kernel.org X-Gm-Message-State: AOJu0YyDhzSGvAH8L+bQ3y14d62IJrHQkiTpUG4XnuwQpOeSN23hEaZd xoYS08SSInm5KlDPnJv2+Q1cRznD3QwHs6JSH+wGwDdzZtvgDORoG3Hc X-Gm-Gg: AY/fxX62zDy7HxxqklIKBN28c2hti29IinaxOPz4S0jpQHW7+4facOIfWdfzTVFwJyQ SXM6MMvyK9kUD086rhnhN9G4zZ8Tzav9GttZqaZhU5IxSx3d0rK7PBFIHoh55N19n3/DbXfQj3H rXnAhd180r/2XZjIHlxNS+5FNARlW2Q2oqPbyvhdpbdZGB5at4JV6GxPCVUpkSqROFRriZYfirM 6AsF2ABOWJ2XilYkoTHbjyVKn/W5Z5QAnVoIu2kqJwuBqgqNnH5iQPYhdANa/bY9DzNoz5ai57I KCMMkjoBzf+oQxHgkIXdxzRvVFUwdZjQjHZIgTAxEEln2a+uC94hg0inNwsENAInRBH70hf14sU //7+AhOl7VefpeTU7mJn7HOPQ7z7C77EzeuNMHwCl1X9A6WY5suFwN1nPAK2QqmtmObpQP/kL9q QWJiAmK0awTWziNKM99SQs824iheiDLyHq X-Google-Smtp-Source: AGHT+IGYqG4oHEa6FdY8jOkOX6Rg7hkcvaZznQh7jAqoK3JmX9MEirAXLKIqNrsxA/G8fgQU6xoWQg== X-Received: by 2002:a05:7022:7e84:b0:11f:2c69:32 with SMTP id a92af1059eb24-11f34bd9069mr14658428c88.7.1766054765669; Thu, 18 Dec 2025 02:46:05 -0800 (PST) Received: from titanite-d300.amd.com ([165.204.154.57]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-12061ef3383sm7410594c88.0.2025.12.18.02.46.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Dec 2025 02:46:05 -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 v4] drm/amdgpu/dm: Convert IRQ logging to drm_* helpers Date: Thu, 18 Dec 2025 18:45:33 +0800 Message-ID: <20251218104533.1551352-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 v4: - Drop newly added parameter validation logs 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..07d1d3b9d49a 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 @@ -315,7 +309,7 @@ void *amdgpu_dm_irq_register_interrupt(struct amdgpu_de= vice *adev, =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 @@ -396,8 +390,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 +590,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 +605,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 +714,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