From nobody Sun Feb 8 21:26:39 2026 Received: from mx.treblig.org (mx.treblig.org [46.235.229.95]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D745C212D66 for ; Mon, 3 Mar 2025 14:39:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=46.235.229.95 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741012772; cv=none; b=NzD4D3nGFQZcmW0ij3RVqnuh/JzbN/x//gdVKw5z6NAOPpOo0kcE25IsHJQs+gyXKMuFDi7hJcNBOkc/tKAW6YPzZgbXVuBQS3tT4uPxbf68TaZnCUepq8QJK2lwboP0eAJeMPsdyW8ILfflP4tsDCw/zqSMBql41iF8vu5MicI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741012772; c=relaxed/simple; bh=5mpCI9pZ8PWgc2rvH58GV05R+qnTGASobuPPyYIZp/M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=R2bIp9PpDNnde/aGkdw101xPXHsiJOYV5JWkv/CtVNrQA9wBWoiTm2mvf43Xree1Bofuambsxa4H5wdWt4uVSwPbpCuA3KxJuxpiPTJuoPvHsCs0Wn6u2cHQlXyH7DzpGLdw4FcY4mUZtVY+EsJr/h4e0U39qu110wF8aBA3cA4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=treblig.org; spf=pass smtp.mailfrom=treblig.org; dkim=pass (2048-bit key) header.d=treblig.org header.i=@treblig.org header.b=DXWP884M; arc=none smtp.client-ip=46.235.229.95 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=treblig.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=treblig.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=treblig.org header.i=@treblig.org header.b="DXWP884M" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=treblig.org ; s=bytemarkmx; h=MIME-Version:Message-ID:Date:Subject:From:Content-Type:From :Subject; bh=qbdK8IAgZW0guOrlqWaSI9e2yk+YFc7AzO9kJtOtkKA=; b=DXWP884ME7zSWaQT ibmvA8hYDJxaTuupNJ+p4U6szKySOsv8IY/tLkUC4NNAfnnlS4DUfv0kUo5/57G6BKSF9h27c+6Ba zALa8HLisBxxoUUCVHJiOr4Wn9q6kOBqXvVdYfL1vUXOjSk7cRPm8vHN08kc10v9trS5EK+O7H8pA VrquZOAwMigcKYPosfSojg1jOiEboldREKyzyg0kxRvFZh/boRUhmyxtjP5Iu8XyxLCqm1xhKShKh tMVZX66rSSjbu2I0tYbIiHFsmsknRGJPsWeuWpn3GHEyrkuh7+uqB2td31hxiQwnVrGRWVx31rUHZ KKV2UOusAKJJWobVEw==; Received: from localhost ([127.0.0.1] helo=dalek.home.treblig.org) by mx.treblig.org with esmtp (Exim 4.96) (envelope-from ) id 1tp6x3-0028PG-3C; Mon, 03 Mar 2025 14:39:26 +0000 From: linux@treblig.org To: alexander.deucher@amd.com, Felix.Kuehling@amd.com, christian.koenig@amd.com, harry.wentland@amd.com, sunpeng.li@amd.com, siqueira@igalia.com, austin.zheng@amd.com, jun.lei@amd.com, kenneth.feng@amd.com, linux-kernel@vger.kernel.org Cc: airlied@gmail.com, simona@ffwll.ch, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, "Dr. David Alan Gilbert" Subject: [PATCH 3/6] drm/amdgpu: Remove powerdown_uvd member Date: Mon, 3 Mar 2025 14:39:19 +0000 Message-ID: <20250303143922.36342-4-linux@treblig.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250303143922.36342-1-linux@treblig.org> References: <20250303143922.36342-1-linux@treblig.org> 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" From: "Dr. David Alan Gilbert" With phm_powerdown_uvd() gone in the previous patch, there's now no longer anything that reads the powerdown_uvd member of the pp_hwmgr_func. Remove it. There are a few assignments to it; a boring NULL which can just go, and two functions, but those functions are called explicitly anyway so the assignments to the member go. One of those (smu7_powerdown_uvd) wasn't static previously; make it static. Signed-off-by: Dr. David Alan Gilbert --- drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c | 1 - drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_clockpowergating.c | 2 +- drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_clockpowergating.h | 1 - drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 1 - drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c | 1 - drivers/gpu/drm/amd/pm/powerplay/inc/hwmgr.h | 1 - 6 files changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c b/drivers= /gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c index a8c732e07006..9a821563bc8e 100644 --- a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c +++ b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c @@ -1642,7 +1642,6 @@ static const struct pp_hwmgr_func smu10_hwmgr_funcs = =3D { .apply_state_adjust_rules =3D smu10_apply_state_adjust_rules, .force_dpm_level =3D smu10_dpm_force_dpm_level, .get_power_state_size =3D smu10_get_power_state_size, - .powerdown_uvd =3D NULL, .powergate_uvd =3D smu10_powergate_vcn, .powergate_vce =3D NULL, .get_mclk =3D smu10_dpm_get_mclk, diff --git a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_clockpowergating.c= b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_clockpowergating.c index f2bda3bcbbde..5e4c80f7b20a 100644 --- a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_clockpowergating.c +++ b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_clockpowergating.c @@ -55,7 +55,7 @@ static int smu7_update_vce_dpm(struct pp_hwmgr *hwmgr, bo= ol bgate) return smu7_enable_disable_vce_dpm(hwmgr, !bgate); } =20 -int smu7_powerdown_uvd(struct pp_hwmgr *hwmgr) +static int smu7_powerdown_uvd(struct pp_hwmgr *hwmgr) { if (phm_cf_want_uvd_power_gating(hwmgr)) return smum_send_msg_to_smc(hwmgr, diff --git a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_clockpowergating.h= b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_clockpowergating.h index fc8f8a6acc72..e56abbadc78b 100644 --- a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_clockpowergating.h +++ b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_clockpowergating.h @@ -28,7 +28,6 @@ =20 void smu7_powergate_vce(struct pp_hwmgr *hwmgr, bool bgate); void smu7_powergate_uvd(struct pp_hwmgr *hwmgr, bool bgate); -int smu7_powerdown_uvd(struct pp_hwmgr *hwmgr); int smu7_powergate_acp(struct pp_hwmgr *hwmgr, bool bgate); int smu7_disable_clock_power_gating(struct pp_hwmgr *hwmgr); int smu7_update_clock_gatings(struct pp_hwmgr *hwmgr, diff --git a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c b/drivers/= gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c index 632a25957477..8da882c51856 100644 --- a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c +++ b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c @@ -5754,7 +5754,6 @@ static const struct pp_hwmgr_func smu7_hwmgr_funcs = =3D { .patch_boot_state =3D smu7_dpm_patch_boot_state, .get_pp_table_entry =3D smu7_get_pp_table_entry, .get_num_of_pp_table_entries =3D smu7_get_number_of_powerplay_table_entri= es, - .powerdown_uvd =3D smu7_powerdown_uvd, .powergate_uvd =3D smu7_powergate_uvd, .powergate_vce =3D smu7_powergate_vce, .disable_clock_power_gating =3D smu7_disable_clock_power_gating, diff --git a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c b/drivers/= gpu/drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c index 7e1197420873..9d3b33446adc 100644 --- a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c +++ b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c @@ -2044,7 +2044,6 @@ static const struct pp_hwmgr_func smu8_hwmgr_funcs = =3D { .apply_state_adjust_rules =3D smu8_apply_state_adjust_rules, .force_dpm_level =3D smu8_dpm_force_dpm_level, .get_power_state_size =3D smu8_get_power_state_size, - .powerdown_uvd =3D smu8_dpm_powerdown_uvd, .powergate_uvd =3D smu8_dpm_powergate_uvd, .powergate_vce =3D smu8_dpm_powergate_vce, .powergate_acp =3D smu8_dpm_powergate_acp, diff --git a/drivers/gpu/drm/amd/pm/powerplay/inc/hwmgr.h b/drivers/gpu/drm= /amd/pm/powerplay/inc/hwmgr.h index 227bf0e84a13..c661185753b4 100644 --- a/drivers/gpu/drm/amd/pm/powerplay/inc/hwmgr.h +++ b/drivers/gpu/drm/amd/pm/powerplay/inc/hwmgr.h @@ -257,7 +257,6 @@ struct pp_hwmgr_func { int (*get_pp_table_entry)(struct pp_hwmgr *hwmgr, unsigned long, struct pp_power_state *); int (*get_num_of_pp_table_entries)(struct pp_hwmgr *hwmgr); - int (*powerdown_uvd)(struct pp_hwmgr *hwmgr); void (*powergate_vce)(struct pp_hwmgr *hwmgr, bool bgate); void (*powergate_uvd)(struct pp_hwmgr *hwmgr, bool bgate); void (*powergate_acp)(struct pp_hwmgr *hwmgr, bool bgate); --=20 2.48.1