From nobody Sun Feb 8 05:28:36 2026 Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) (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 9C40E318156 for ; Fri, 19 Dec 2025 11:35:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766144160; cv=none; b=kgMio3v4MIEuPV+QRLOSZAk9uxGmYrQP1otwiP39MWsYH3GXd9seKRtKpW124zz6BgKO+XhzlIgqvbEkhIidAgVJ32XnekkXmhCzk1dWT0eJWadfV1emCaEKGozSL2J08MadZFfXCbjX9mGE4iIWIsumtsXmzdyKYkZoVgwGUS4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766144160; c=relaxed/simple; bh=L4MgOJYnxnFjhWbPqQyoIfVD+I7J7hYI5AcV6EsIED0=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=ItJse+G8OdBT6WsoUvctgvhf/XUPaHDGwFJJ0zJscrlAkArbm2XKkklcSd9XUmRfmS41aT0sPhLoTbdlcOOxsfFYlo0v5MbKAdttzekBrrVEWLE7CaqbHbGX/3K1Nndurb1adUN5trCmEMjDRa5cMHIRoWhsyYczWV3pDlpEMNg= 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=F6inKJ4m; arc=none smtp.client-ip=209.85.216.43 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="F6inKJ4m" Received: by mail-pj1-f43.google.com with SMTP id 98e67ed59e1d1-34ca40c1213so1403330a91.0 for ; Fri, 19 Dec 2025 03:35:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1766144156; x=1766748956; 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=JA5intEY20oPKSii3rLvk45WSR+ZyHeegPBmceUZplA=; b=F6inKJ4mwG/je3TBUts9LvHufkoZ1x/ELzzVRqStnrLjPdE3ix/39KR2kyYVS2TKRx AubMGFPg82EEPoPtaCpSaReY2P3hkKl4+R8qyyVOPlyXxR7kaQM6B8M53VLNz8/gQTDh AdN3mZphBqdS1iyTFI1VmV+W8qA6CH5ztySOztf2dOOjcoLf8rkNVsLywMLn0vNOKdbx 1uYCay+8mFnEczX4v3coZZY2wmIWPcrmPjCNU6plI7CWW8EDgYeEHThQ2j5D0xhXzkM5 AMdl0KCs7WKR/wkjagJWC6xSjbFcsnZA70/vKYGp/5x2lKyPO+pRviM7uWrUiuIKt3O5 aNRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766144156; x=1766748956; 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=JA5intEY20oPKSii3rLvk45WSR+ZyHeegPBmceUZplA=; b=nkezqWOBy91U3LIn8+IijamO8M4M2CBEMEf6yq8hdz8LEedsGo1baSVcLJLdCi3OmG fPtS7W72Ej3lfxtGkykR23wqOLP97Zc8NPlzLY0OP06Dh0XRlASvl1vMyIPk5JhxY8cS 8Pr7FVWfxcQ56F2j7f2Pw/ApigweejGLveUrdMdL0Nk1qvqUUYCwhPaFyYEi0DkYFiCC jmi7s64El1ijh3tgAqdFdlVBqOiLppo0OgjKinxDA+fPZcDzifzTBvb+5MZBzu2lc5SB xEeWP1dVGw37KR3XZ/X+oUG8HfvYCdImYREp4zW80P9Frj63PGXdJ+x/Xt0aymADbr1o XaYw== X-Forwarded-Encrypted: i=1; AJvYcCXXq27KO1q97zA7lJIhHCvBTrdT54DMV22dHJZM4RcjGNvW/3ccj+w/mgtr9SI6uxI3V92l7pbrESqRTA0=@vger.kernel.org X-Gm-Message-State: AOJu0YyI7tBXScRqb60n7nxmOSLZ1ANV/CnClLF2KETEiK37RjgLBWPk 3iPX7C2WlM0LXqXfpScGPsfp1gwz611cywaRb1BXupr8PYyE9wguGgLm X-Gm-Gg: AY/fxX7V6sP8pYHKNN99SpPXMXMYDC4tFlcKRVtl4AEJjsY3wz+R+Ww1HiYRSQorDCF AsIwD/RXGEP4VhDFbRhEHh3EqnvcC2rch4h1A8RIjHCIWY0WOvT1bob0Qpqx2Ezjvx5rUcUBI5r rT7DG5T1g6X6scTTj6XwsuTorF9EId1f73/MjJ+NzCpqTPtFy+NF9hJJ0DOajLc6rjGJYtrJa55 ib52gFQpxZ1U+aPHmMgEPSxTdhHJW3rzZ5JlSQyldFlNCHc9F3oVlXdx0E4XJSzmsBoOt/wgrMV eVxYj7T2/qVDUQ+R5/HnYb6LrWYPuKx7I6F8wkwTtjQskOlVxuMyHKIGU5Fuw4L0aeptpYkmppM fZnk8iIQn37gEXyDTgup2k5lyRe4XpMAYw2kQT6SErFn6+DWbzIGIUJK0DQghFk8mOdAZY7ewRs NoVWAyPOU83i7IwWOG95ihDgUx0OAV8W2+7bnFVdE5McdKiFyr9Kv3VkMueuqYVQ== X-Google-Smtp-Source: AGHT+IFtCut35HMjFifxg7L5t/Pbn005/ktmA3HlwcWvREH16NYGHRExGDLh7PckZyKPgPc9irSTjw== X-Received: by 2002:a05:7022:2586:b0:11b:9386:a3cf with SMTP id a92af1059eb24-12172312215mr2945203c88.48.1766144155767; Fri, 19 Dec 2025 03:35:55 -0800 (PST) Received: from titanite-d300.amd.com ([165.204.154.57]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-1217254c734sm6857661c88.13.2025.12.19.03.35.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Dec 2025 03:35:55 -0800 (PST) From: Mukesh Ogare To: alexander.deucher@amd.com, christian.koenig@amd.com, airlied@gmail.com, simona@ffwll.ch, amd-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Mukesh Ogare Subject: [PATCH] drm/radeon: convert VCE logging to drm_* helpers Date: Fri, 19 Dec 2025 19:35:41 +0800 Message-ID: <20251219113541.1264030-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 legacy DRM_ERROR() and DRM_INFO() logging in the VCE code with drm_err() and drm_info() helpers that take a struct drm_device. Using drm_* logging provides proper device context in dmesg, which is important for systems with multiple DRM devices, and aligns the radeon driver with current DRM logging practices. No functional change intended. Signed-off-by: Mukesh Ogare 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/radeon/radeon_vce.c b/drivers/gpu/drm/radeon/r= adeon_vce.c index bdbc1bbe8a9b..a203992cb932 100644 --- a/drivers/gpu/drm/radeon/radeon_vce.c +++ b/drivers/gpu/drm/radeon/radeon_vce.c @@ -121,7 +121,7 @@ int radeon_vce_init(struct radeon_device *rdev) if (sscanf(c, "%2u]", &rdev->vce.fb_version) !=3D 1) return -EINVAL; =20 - DRM_INFO("Found VCE firmware/feedback version %d.%d.%d / %d!\n", + drm_err(&rdev->ddev, "Found VCE firmware/feedback version %d.%d.%d / %d!\= n", start, mid, end, rdev->vce.fb_version); =20 rdev->vce.fw_version =3D (start << 24) | (mid << 16) | (end << 8); @@ -325,7 +325,7 @@ void radeon_vce_free_handles(struct radeon_device *rdev= , struct drm_file *filp) r =3D radeon_vce_get_destroy_msg(rdev, TN_RING_TYPE_VCE1_INDEX, handle, NULL); if (r) - DRM_ERROR("Error destroying VCE handle (%d)!\n", r); + drm_err(&rdev->ddev, "Error destroying VCE handle (%d)!\n", r); =20 rdev->vce.filp[i] =3D NULL; atomic_set(&rdev->vce.handles[i], 0); @@ -352,7 +352,7 @@ int radeon_vce_get_create_msg(struct radeon_device *rde= v, int ring, =20 r =3D radeon_ib_get(rdev, ring, &ib, NULL, ib_size_dw * 4); if (r) { - DRM_ERROR("radeon: failed to get ib (%d).\n", r); + drm_err(&rdev->ddev, "radeon: failed to get ib (%d).\n", r); return r; } =20 @@ -388,7 +388,7 @@ int radeon_vce_get_create_msg(struct radeon_device *rde= v, int ring, =20 r =3D radeon_ib_schedule(rdev, &ib, NULL, false); if (r) - DRM_ERROR("radeon: failed to schedule ib (%d).\n", r); + drm_err(&rdev->ddev, "radeon: failed to schedule ib (%d).\n", r); =20 =20 if (fence) @@ -419,7 +419,7 @@ int radeon_vce_get_destroy_msg(struct radeon_device *rd= ev, int ring, =20 r =3D radeon_ib_get(rdev, ring, &ib, NULL, ib_size_dw * 4); if (r) { - DRM_ERROR("radeon: failed to get ib (%d).\n", r); + drm_err(&rdev->ddev, "radeon: failed to get ib (%d).\n", r); return r; } =20 @@ -445,7 +445,7 @@ int radeon_vce_get_destroy_msg(struct radeon_device *rd= ev, int ring, =20 r =3D radeon_ib_schedule(rdev, &ib, NULL, false); if (r) { - DRM_ERROR("radeon: failed to schedule ib (%d).\n", r); + drm_err(&rdev->ddev, "radeon: failed to schedule ib (%d).\n", r); } =20 if (fence) @@ -479,7 +479,7 @@ int radeon_vce_cs_reloc(struct radeon_cs_parser *p, int= lo, int hi, idx =3D radeon_get_ib_value(p, hi); =20 if (idx >=3D relocs_chunk->length_dw) { - DRM_ERROR("Relocs at %d after relocations chunk end %d !\n", + drm_err(&p->rdev->ddev, "Relocs at %d after relocations chunk end %d !\n= ", idx, relocs_chunk->length_dw); return -EINVAL; } @@ -493,11 +493,11 @@ int radeon_vce_cs_reloc(struct radeon_cs_parser *p, i= nt lo, int hi, p->ib.ptr[hi] =3D start >> 32; =20 if (end <=3D start) { - DRM_ERROR("invalid reloc offset %llX!\n", offset); + drm_err(&p->rdev->ddev, "invalid reloc offset %llX!\n", offset); return -EINVAL; } if ((end - start) < size) { - DRM_ERROR("buffer to small (%d / %d)!\n", + drm_err(&p->rdev->ddev, "buffer to small (%d / %d)!\n", (unsigned)(end - start), size); return -EINVAL; } @@ -526,7 +526,7 @@ static int radeon_vce_validate_handle(struct radeon_cs_= parser *p, for (i =3D 0; i < RADEON_MAX_VCE_HANDLES; ++i) { if (atomic_read(&p->rdev->vce.handles[i]) =3D=3D handle) { if (p->rdev->vce.filp[i] !=3D p->filp) { - DRM_ERROR("VCE handle collision detected!\n"); + drm_err(&p->rdev->ddev, "VCE handle collision detected!\n"); return -EINVAL; } return i; @@ -543,7 +543,7 @@ static int radeon_vce_validate_handle(struct radeon_cs_= parser *p, } } =20 - DRM_ERROR("No more free VCE handles!\n"); + drm_err(&p->rdev->ddev, "No more free VCE handles!\n"); return -EINVAL; } =20 @@ -566,13 +566,13 @@ int radeon_vce_cs_parse(struct radeon_cs_parser *p) uint32_t cmd =3D radeon_get_ib_value(p, p->idx + 1); =20 if ((len < 8) || (len & 3)) { - DRM_ERROR("invalid VCE command length (%d)!\n", len); + drm_err(&p->rdev->ddev, "invalid VCE command length (%d)!\n", len); r =3D -EINVAL; goto out; } =20 if (destroyed) { - DRM_ERROR("No other command allowed after destroy!\n"); + drm_err(&p->rdev->ddev, "No other command allowed after destroy!\n"); r =3D -EINVAL; goto out; } @@ -593,7 +593,7 @@ int radeon_vce_cs_parse(struct radeon_cs_parser *p) case 0x01000001: // create created =3D true; if (!allocated) { - DRM_ERROR("Handle already in use!\n"); + drm_err(&p->rdev->ddev, "Handle already in use!\n"); r =3D -EINVAL; goto out; } @@ -650,13 +650,13 @@ int radeon_vce_cs_parse(struct radeon_cs_parser *p) break; =20 default: - DRM_ERROR("invalid VCE command (0x%x)!\n", cmd); + drm_err(&p->rdev->ddev, "invalid VCE command (0x%x)!\n", cmd); r =3D -EINVAL; goto out; } =20 if (session_idx =3D=3D -1) { - DRM_ERROR("no session command at start of IB\n"); + drm_err(&p->rdev->ddev, "no session command at start of IB\n"); r =3D -EINVAL; goto out; } @@ -665,7 +665,7 @@ int radeon_vce_cs_parse(struct radeon_cs_parser *p) } =20 if (allocated && !created) { - DRM_ERROR("New session without create command!\n"); + drm_err(&p->rdev->ddev, "New session without create command!\n"); r =3D -ENOENT; } =20 @@ -760,7 +760,7 @@ int radeon_vce_ring_test(struct radeon_device *rdev, st= ruct radeon_ring *ring) =20 r =3D radeon_ring_lock(rdev, ring, 16); if (r) { - DRM_ERROR("radeon: vce failed to lock ring %d (%d).\n", + drm_err(&rdev->ddev, "radeon: vce failed to lock ring %d (%d).\n", ring->idx, r); return r; } @@ -774,10 +774,10 @@ int radeon_vce_ring_test(struct radeon_device *rdev, = struct radeon_ring *ring) } =20 if (i < rdev->usec_timeout) { - DRM_INFO("ring test on %d succeeded in %d usecs\n", + drm_info(&rdev->ddev, "ring test on %d succeeded in %d usecs\n", ring->idx, i); } else { - DRM_ERROR("radeon: ring %d test failed\n", + drm_err(&rdev->ddev, "radeon: ring %d test failed\n", ring->idx); r =3D -ETIMEDOUT; } @@ -799,25 +799,25 @@ int radeon_vce_ib_test(struct radeon_device *rdev, st= ruct radeon_ring *ring) =20 r =3D radeon_vce_get_create_msg(rdev, ring->idx, 1, NULL); if (r) { - DRM_ERROR("radeon: failed to get create msg (%d).\n", r); + drm_err(&rdev->ddev, "radeon: failed to get create msg (%d).\n", r); goto error; } =20 r =3D radeon_vce_get_destroy_msg(rdev, ring->idx, 1, &fence); if (r) { - DRM_ERROR("radeon: failed to get destroy ib (%d).\n", r); + drm_err(&rdev->ddev, "radeon: failed to get destroy ib (%d).\n", r); goto error; } =20 r =3D radeon_fence_wait_timeout(fence, false, usecs_to_jiffies( RADEON_USEC_IB_TEST_TIMEOUT)); if (r < 0) { - DRM_ERROR("radeon: fence wait failed (%d).\n", r); + drm_err(&rdev->ddev, "radeon: fence wait failed (%d).\n", r); } else if (r =3D=3D 0) { - DRM_ERROR("radeon: fence wait timed out.\n"); + drm_err(&rdev->ddev, "radeon: fence wait timed out.\n"); r =3D -ETIMEDOUT; } else { - DRM_INFO("ib test on ring %d succeeded\n", ring->idx); + drm_info(&rdev->ddev, "ib test on ring %d succeeded\n", ring->idx); r =3D 0; } error: --=20 2.43.0