From nobody Sun Feb 8 04:23:13 2026 Received: from mail-dl1-f46.google.com (mail-dl1-f46.google.com [74.125.82.46]) (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 314F930B500 for ; Thu, 18 Dec 2025 06:35:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766039756; cv=none; b=C3dJcMYZUDRaTc1xmtIPXDtGsP+4yIlMuR9vc4m8TsVs8czu+9MofVtarBfeSvld3ofnvvE3C7XGqy657t9yzzaEwgIb3r6HqdL5sGFylsB4BSPru8vvl4rWQRz1nv27M86hClRtiPxNoJvvjb09SmmU/TVmkAdYe5PkXYwP9Fw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766039756; c=relaxed/simple; bh=jp5p0+eanYqgeVPgJmQo0MK4I4kwTiqK9i9rSlgmC/w=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=fT4OioRKIoVR+bEqJamMFY+h58CDwI5tS27qOiPLpek6e15LqNtLfsQjJjgHWHfNkqkXZFj3VRxEy5EVNml8hYBd9pRa6GweOD/nCFHUJjByLsbFIENUx8Vop9ARUFcmU3maT/di70CGB+ZboN8QifTdDbgfDEnhmUgsagPd7z8= 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=aD7IrBwv; arc=none smtp.client-ip=74.125.82.46 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="aD7IrBwv" Received: by mail-dl1-f46.google.com with SMTP id a92af1059eb24-11beb0a7bd6so1898665c88.1 for ; Wed, 17 Dec 2025 22:35:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1766039754; x=1766644554; 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=Thn9rn7gE9antg1NpSTp2xr5SDEVaOuwKGs07QhbG4A=; b=aD7IrBwvzDRvr37n2xjTWgQ9EeSGTU4WH06TQTp+jP9dVzw4nlqsQRONefN8fBL0lV WKZJJqenBPZSqvy40c/Qvsy4WDYaxTUhY5hh2zn3OlyK4LCSrUl7EtZ1d3Vji/quNHdj E+CBRZQ7bsUu13WnxZCqpzcu7vaSNW54NphHRgmYP1iPvOMV2CeCxJtBgtkjTXy40B1L 1WjPW7SgQ+XFdRXDEJZYfBU8b5msFhHomtOOWNwWBNH/H4rDRySYnzUR0WeDB72Yv9TR iogmPGvDMjcNY1AQO/W/DQvTfShvnmAiiuU5TZtdEyaoqZ4+cGYXZrkoVICN7/OUcOa9 MRJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766039754; x=1766644554; 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=Thn9rn7gE9antg1NpSTp2xr5SDEVaOuwKGs07QhbG4A=; b=i4HLzw7c8AMQ3hGoU7U6lkJ88oY9yqpbj63sz6nYp6TqzLaH8GzBFRYC6jEZVbcGTr lhsp8nl2Amp7Nx1GchyO6mVkT+Byzr1QLmqXRMFBJeZf7ayAsRYquKwUCKUWMe9MxBwF NA9K6BFj8WyqAwbOuHIenByaqtYoaORntvVIu0qj4d7quv8LuFKumuSIIL3rIP/HitEX uj5lShWXEQErUX6hPudVHGMdafzJnRGs5krl8Dt2g32iJZ+muxA0w/iQM+P1rB71SuuY 5XN61LYC8RcIWjWspgGG0gef3+zx+Rjhu9jta9oOXX+TX9F3OCCJKUwFFmwf7gVin0SJ XyNw== X-Forwarded-Encrypted: i=1; AJvYcCWlnSlG06bo8O10BVCzELjkEKjE7Qzl026wYVtGxLKMOtpBqtThJEIvri9SojJ2AU0jP9AHxiQqZMbC/7U=@vger.kernel.org X-Gm-Message-State: AOJu0Yyl9zJ3K55+Nzig1mNTrCiJyhUYFNCRo1bjrtayHnDX6JfKTdPs yWndJD3j9/Gx/nmlkL+oJksbuSrqtHtPvytyzX50orxVYi1nfRRVrSEI X-Gm-Gg: AY/fxX4z1I5J0+E1jv/80OV2oVfmhzZh1jga/yp7k0V+jQRdYW/WK/evyl+mlcOICZ8 ALV4c1iHNMfZnn+//dmijMKzNptZVn9ThOs5lfCMux1Xf2lC5J+Xr1k+F7PtiuFbGkSahbEeOrE ufC1rICWP5+Yetc8fvnP+o7mMIVixh+7G1dIyl5T/v2NntI4SQ3rQPPzy7WX/upFdQ76KvmU5O/ 9qiR0kqmoqRYxcdS5/c3i1A8PK79G0kz6/rN645xa/LbPlLmjQFJAMVxa2NSSoNgrwHm1AzgQOY YdZJFyK6e2LAQ6yVYvjv5VA0KlUJmINFsls0hXQ/wVJyMVZiLhJNREgw8zu/zgsa5ca4ME0lOUh EZKAtLEH900E055k8+4DZkJFm0c3D8gb82jQHr2q2UUjX2Ozy/PjzyV9b8wnq+gZkjp7s8M9Ibs eltKnSObV0sLSOSDCHr06PAb4ufQNPYRfS X-Google-Smtp-Source: AGHT+IHqT32jTbFGZMBVzT/uAPnbJ5NJrx5Wxvi4Ox8yJljxGA5EZFJPy5+Fl4TkIutq/eej3fKBPQ== X-Received: by 2002:a05:7022:7e08:b0:11e:3e9:3e8f with SMTP id a92af1059eb24-12061965882mr1586882c88.24.1766039753964; Wed, 17 Dec 2025 22:35:53 -0800 (PST) Received: from titanite-d300.amd.com ([165.204.154.57]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-12061fcef8esm5062055c88.14.2025.12.17.22.35.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Dec 2025 22:35:53 -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 14:35:12 +0800 Message-ID: <20251218063512.4572-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 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..60bf1b8d886a 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 @@ -305,17 +299,19 @@ void *amdgpu_dm_irq_register_interrupt(struct amdgpu_= device *adev, void (*ih)(void *), void *handler_args) { + struct drm_device *dev =3D adev_to_drm(adev); struct list_head *hnd_list; struct amdgpu_dm_irq_handler_data *handler_data; unsigned long irq_table_flags; enum dc_irq_source irq_source; =20 if (false =3D=3D validate_irq_registration_params(int_params, ih)) + drm_err(dev, "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(dev, "DM_IRQ: failed to allocate irq handler!\n"); return DAL_INVALID_IRQ_HANDLER_IDX; } =20 @@ -371,11 +367,13 @@ void amdgpu_dm_irq_unregister_interrupt(struct amdgpu= _device *adev, enum dc_irq_source irq_source, void *ih) { + struct drm_device *dev =3D adev_to_drm(adev); struct list_head *handler_list; struct dc_interrupt_params int_params; int i; =20 if (false =3D=3D validate_irq_unregistration_params(irq_source, ih)) + drm_err(dev, "DM_IRQ: invalid unregistration parameters\n"); return; =20 memset(&int_params, 0, sizeof(int_params)); @@ -396,7 +394,7 @@ 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( + drm_err(dev, "DM_IRQ: failed to find irq handler:%p for irq_source:%d!\n", ih, irq_source); } @@ -596,7 +594,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 +609,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,7 +718,7 @@ static inline int dm_irq_state(struct amdgpu_device *ad= ev, 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); --=20 2.43.0