From nobody Sun Feb 8 20:35:10 2026 Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) (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 6255818E1F for ; Wed, 17 Dec 2025 17:01:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765990893; cv=none; b=TgW8zoPx8kPbsGZajtv079ThFKeoTFt+jafL+BD5b9Llo9t0VLdTiui6+0ny5oKapICqshurDWaWz/+DKU8cpGgy4mJ+k8IWhlbWzkYc43jOhUsziNkXU3Z3Kno3ol3vutQy6Dum2vvu/NeZgc5pZO2cufpwJ4glMSvkfFw2T+Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765990893; c=relaxed/simple; bh=n/LjWv5I1KJ58Bv5JOspzuJiZxNne9utmY8Iy4lo5eI=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=PZuGP7qsEXZdwCObQJBmjdnMLlBa/YXq6wdMW5uoLqt6hGlvg+UuZKL3TrNJ64z0UExC13sYHv3laImgGKK8oa5KbeFL0Dzlsfc9m61whpOXzwnCbNnHmUssuVezDw5U32hbsrwmuqgEL2QuPajEP3Dh9FEKTl4RhRGUYzB0bxQ= 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=FZjeem1V; arc=none smtp.client-ip=209.85.215.179 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="FZjeem1V" Received: by mail-pg1-f179.google.com with SMTP id 41be03b00d2f7-c06cb8004e8so5010456a12.0 for ; Wed, 17 Dec 2025 09:01:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1765990892; x=1766595692; 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=6FnQNORbcR1WLbdHKHjLa8M7Ar6HdGiq8Ari4GpdKG8=; b=FZjeem1VPLBGi+2CwNvlHjNHdtNCjM2BrnbUih+PPkZsuw7YhNCipBD4zqaiEvk+uZ w6gTCgAurYiZstDhKTThTMfDEp6aS2fItEaJhUULgczPd1AHL1RoXvLxyQBubt1KoKqX XZ9l8TVvkjaUrvL1BOt9bSWW0JjLhE677fwDx8hxJjaDhubJ7OibaPLbEJ9Bt6lILO9o Xbo2oLhrHjYFgVXhYYDtu5VYg9fNFyDhWg0iZoV9L8oksVgXRwTEGCkAITz9P22WM75r xbvtkK/rRM+URMOQbM0IL7gPidSPsrYbg1tl2ujAL+L2ER20TFxc1JDyRX+A/EcfeKki c9nA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765990892; x=1766595692; 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=6FnQNORbcR1WLbdHKHjLa8M7Ar6HdGiq8Ari4GpdKG8=; b=qmepQ8yG1aR+qrGb7A0NKRvjbtbu+qsoyJ0CmMfJwRYuXgGDYDKYaHSUjnKAoeUd6H ntx+r5GZaHVchWplLMBNWgEC0JrJrKbtYHP3DtfV3i/yi/S/Qll+b047YUQmNuTps54z 6XMSDTNt3v2XRbza7clvhpk4+WJpY3uYXHue44OcFIJzDjHGNoDtvhPjkK4DbkrfAMDl HwQL9cK0sPmJfpH7UhAITw7utOQM6b6QDl0a36hSUHwnUus3sWZK6mAQxucZq0C9s6pU Im/PNuok5z3TE1gxwAmbAmw3Ipa6AiUnxqNeX7eIRIg/ikFqDiki7OFQvFFfVuOFKusn eaLg== X-Forwarded-Encrypted: i=1; AJvYcCXQTY7K4AXdPMclbr3PkDYcLXLJHrCRad9eEq4wMy7sR6ivaP44HMKzWDOR/jXKoSXrmCoBsT9A1ylAGgc=@vger.kernel.org X-Gm-Message-State: AOJu0YyNANVfiRi3h2EoQTlTxGdJrdGNr3R7zSDEJmFhWCzy3YUdJiVS h+us0Um2AE3MYaJadRy7UDHakykeoiCpbhQZHGO+t8YDf9D6KLeaaBdT X-Gm-Gg: AY/fxX6GeW5jrP1K3e4BeJx19+/+44MPGhBqBFNaCGo2Kv7CgoOMPkONPh6bzN/YKK/ MmdJa0ax5goWasvBo8Q1AmfZ67SS1Sw0wJXVVe12oznksGBS0NdYFPhT881UkVLwiy6EayrPOvd YY6UY9NZB1T3nmBuBPOr5/ISu+u5hmAZIjKr2sWLhLZ9LMt4rxvd4YoHaHUIiqmiX4D/BGtE4N/ VvQ2ZTr/QC9MagD0xFrStqpUCYDXFtAvkG45tzimtzfWrwppJ9fRClc3mF4VpPXn5lkLmgmfab3 7rzzY/2l93HXyEY9URfl1XMjQbSqvDsD2PJQ5UaChFzzDms/nxpCoNVMUQWEnCckGXKdi9TVcK/ cFDwZ0t9zfoXp84tftp3L6pestTcRCI1uPg60RDSwLAWoE8Voo/+vbx4BRrTADy0IO1DKvuDu85 eR0mbQtsEaXAeqTfdb+eQnl1WGbGn9eD82 X-Google-Smtp-Source: AGHT+IHgy7dAE6tdAYJ5bkfbiGPj9Q9dIxu/KGDPFxDiWInDLoQjwzJpN2xyM4ZeC2WztgMAkRT3fg== X-Received: by 2002:a05:693c:40cc:b0:2a4:8aaf:d6b9 with SMTP id 5a478bee46e88-2ac2f899a5bmr13266243eec.13.1765990891160; Wed, 17 Dec 2025 09:01:31 -0800 (PST) Received: from titanite-d300.amd.com ([165.204.154.57]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2ae56eec6cdsm2354065eec.35.2025.12.17.09.01.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Dec 2025 09:01:30 -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 01:01:04 +0800 Message-ID: <20251217170104.2767939-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. 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..4401059ff907 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 @@ -238,22 +238,22 @@ static void unregister_all_irq_handlers(struct amdgpu= _device *adev) } =20 static bool -validate_irq_registration_params(struct dc_interrupt_params *int_params, +validate_irq_registration_params(struct drm_device *dev, struct dc_interru= pt_params *int_params, void (*ih)(void *)) { if (NULL =3D=3D int_params || NULL =3D=3D ih) { - DRM_ERROR("DM_IRQ: invalid input!\n"); + drm_err(dev, "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", + drm_err(dev, "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", + drm_err(dev, "DM_IRQ: invalid irq_source: %d!\n", int_params->irq_source); return false; } @@ -261,16 +261,18 @@ validate_irq_registration_params(struct dc_interrupt_= params *int_params, 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( + struct drm_device *dev, + 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"); + drm_err(dev, "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); + drm_err(dev, "DM_IRQ: invalid irq_source:%d!\n", irq_source); return false; } =20 @@ -310,12 +312,12 @@ void *amdgpu_dm_irq_register_interrupt(struct amdgpu_= device *adev, unsigned long irq_table_flags; enum dc_irq_source irq_source; =20 - if (false =3D=3D validate_irq_registration_params(int_params, ih)) + if (false =3D=3D validate_irq_registration_params(&adev->ddev, int_params= , ih)) 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->ddev, "DM_IRQ: failed to allocate irq handler!\n"); return DAL_INVALID_IRQ_HANDLER_IDX; } =20 @@ -375,7 +377,7 @@ void amdgpu_dm_irq_unregister_interrupt(struct amdgpu_d= evice *adev, struct dc_interrupt_params int_params; int i; =20 - if (false =3D=3D validate_irq_unregistration_params(irq_source, ih)) + if (false =3D=3D validate_irq_unregistration_params(&adev->ddev, irq_sour= ce, ih)) return; =20 memset(&int_params, 0, sizeof(int_params)); @@ -396,7 +398,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(&adev->ddev, "DM_IRQ: failed to find irq handler:%p for irq_source:%d!\n", ih, irq_source); } @@ -596,7 +598,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->ddev, "DM_IRQ: failed to allocate irq handler!\n"); return; } =20 @@ -611,11 +613,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->ddev, "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->ddev, "Failed to queue work for handling interrupt " "from display for IRQ source %d\n", irq_source); } @@ -720,7 +722,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->ddev, "%s: crtc is NULL at id :%d\n", func, crtc_id); --=20 2.43.0