From nobody Sat Apr 4 01:49:14 2026 Received: from mail-ua1-f44.google.com (mail-ua1-f44.google.com [209.85.222.44]) (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 4CBD73BB48 for ; Sat, 21 Mar 2026 01:57:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774058249; cv=none; b=YvuUWoA7itjCQdgp9Rvp0r4Zm/kGRC/9nWVA+Y6B7iQ/6u1SwT3UPfEGxYKfgV/KSqSSfnds4zWdJJwWi/SvvJzGXaRwMWdP1wv9p80rCVIRk1kHA0UXzqGIiEoTpkgyDVPqW/wU7s/JcOeCabjDscdKnoVASMZ/6eddPJD4DXo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774058249; c=relaxed/simple; bh=9tv+4YgRcbNFb6Fbs4slqa6g4c96EQfC6oL9VoQ5EUY=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=Dmkz32w2jYwKcDPcWKdutY4KTFSXO/4sy2hLJ25FhRvzdX3qe53+Qpyn8kSEAAIPgsDB25LQVmHUFUJjngHK2NMcZY7BxrHBacHEHrAvjuDcfczOtRWrlwu08DsydWIYwj4fEZwqDnz632gXBarvpP+84MYMTutaBA1ZIV7qL58= 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=bU2BAOl3; arc=none smtp.client-ip=209.85.222.44 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="bU2BAOl3" Received: by mail-ua1-f44.google.com with SMTP id a1e0cc1a2514c-950cd03fb5eso647383241.0 for ; Fri, 20 Mar 2026 18:57:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1774058247; x=1774663047; 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=NOjbfVu2iFXxJILdCEl8FiFsVKUYJeRJ3TBc4EnNsEs=; b=bU2BAOl3f6nyTbG13Tfl4HMNWxgYS4YDbADUk/XQVEdW9m6Hyjcun58pbhARn9c36k c+YJiUpj7moEIxX9hE8kOTotz7feYPHWmeC3CAhuCQF8YWecrq2a+PJ5IZ25vVpjHALS W5yn0FBFR5847L/34XbQneg/mxCzdNo2XvXXVbR/8AJFNE7/mRYoiI2+g5+qaE0d2Xm1 YhZ+1Md6rB9pMrw3w03OVV0nEPIOi6szw0A9K8Ir8fMfXjCa23WKoc+RUiVo4cgcRBCT BNCXc1d1GTDEHCXMyluuA3gVkTeAWNARMnI26S21dz2HMF+riGTj0nCH00aQEmLyKua4 cU+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774058247; x=1774663047; 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=NOjbfVu2iFXxJILdCEl8FiFsVKUYJeRJ3TBc4EnNsEs=; b=laZrvIKu6UZqRQj4rVbVC5d911d+qKsT18qkM3yVaVVxnHKlhFBHOyAkUgoeF7r3C+ a8tdSW5yDLuDeDxnUd8ch39PaQ9+RsawFL8+z0kekioGpMZkSo4wfBwCYNFb/SHjWs8M Dp1nLAIvV53n6tIQDIgsyhquwDzRSAlg/mYpjFLHKHlSvrGGpq55qo1DZeo9CV1dgP7o juSKNvtSqDOVOJpsyYYgda9+27/Cqz7oWzzTzMd4/iSRM+BnmgU4JTA9tzxAWLJsGU2X uwQQxYjMGurULSicNcLUQKdwvxYHfhbP5ulsr9560el4Gs6MVFwbBySuxN52Abo9n/y2 ytAQ== X-Forwarded-Encrypted: i=1; AJvYcCVmjUeZ8c0PJ8p0GSiKk4WLGwbvHOnDFn2I3qERE3KmJs1ZZgB/akC7focr0kcgHat1IlkWfcWzKe3GiTY=@vger.kernel.org X-Gm-Message-State: AOJu0YyDpXVLHRwRqiish4k/WBtS1oFOj3Wrj4I1fqGGTRT0bcQ8fjyw 0vO1f6UVDv6Vqg4e56tK6aiRD7BSMS/mSunCm9LMjsg0tocdjEs/Z7e5 X-Gm-Gg: ATEYQzzA+fi5Heksn78CPk67CgDa3VMOKkSfy8ykqAXzpn4xw0zVRcfbn3+NDc5olem jyURFujjldeJggzF0dudJKMjIQTv+cB85pn/WwnOMqkGJk8VYc3lD0xF/sGFUrF5rcGkxholdAB 5BFNmQsAQmXlPTL1qNrhOX5k0M7YYxV6ECDDlDHI/R18wNzoHGftVa/BSjtPT+zuLjFBN2onYt/ qLVpg7gmoJZ2EPPEVdb7MJN+EteyjbC6L0GuZx6IV8o5e7/5z6P0k4v+TNU6cmzbmWaIQ6lP0R7 nefnjwJOaW86xAo1XuSvy6vLnbsDPfVGqSgjI5Y9Zb3cGL3jueSA8OPOKo79X99lNOuhZb8vgt5 mdU7zblPFIMHKJrVdL0IZHeu5DpiFoNl2B00BTx1LrsFZZcXbrYo5CP1W+BDv64CS1jfbng++vG FZMbQWztkbMZKteNXE2Qx1L9idcd2yhB0= X-Received: by 2002:a05:6102:2ac1:b0:5ff:b403:a36a with SMTP id ada2fe7eead31-602aeb08fb4mr2284953137.16.1774058247111; Fri, 20 Mar 2026 18:57:27 -0700 (PDT) Received: from gui-host.Dlink ([177.140.57.219]) by smtp.gmail.com with ESMTPSA id ada2fe7eead31-602afb00179sm1989296137.9.2026.03.20.18.57.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Mar 2026 18:57:25 -0700 (PDT) From: guilhermeivo To: harry.wentland@amd.com, sunpeng.li@amd.com, siqueira@igalia.com, alexander.deucher@amd.com, christian.koenig@amd.com, airlied@gmail.com, simona@ffwll.ch Cc: guilherme.bozi@usp.br, linux-kernel@vger.kernel.org, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, guilhermeivo Subject: [PATCH] drm/amd/display: Deduplicate DCN DDC register assignment Date: Fri, 20 Mar 2026 22:56:54 -0300 Message-ID: <20260321015654.105059-1-guilhermeivob@gmail.com> X-Mailer: git-send-email 2.47.3 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" Several DCN generations implement identical define_ddc_registers() functions to assign DDC register, shift and mask pointers based on GPIO ID. Introduce a shared inline helper, dcn_define_ddc_registers_common(), and convert all DCN implementations to use it. This reduces duplication and improves maintainability without changing behavior. No functional changes intended. Signed-off-by: guilhermeivo --- .../display/dc/gpio/dcn20/hw_factory_dcn20.c | 27 ++++--------- .../display/dc/gpio/dcn21/hw_factory_dcn21.c | 27 ++++--------- .../display/dc/gpio/dcn30/hw_factory_dcn30.c | 27 ++++--------- .../dc/gpio/dcn315/hw_factory_dcn315.c | 27 ++++--------- .../display/dc/gpio/dcn32/hw_factory_dcn32.c | 27 ++++--------- .../dc/gpio/dcn401/hw_factory_dcn401.c | 26 ++++--------- .../amd/display/dc/gpio/hw_factory_dcn_ddc.h | 39 +++++++++++++++++++ 7 files changed, 86 insertions(+), 114 deletions(-) create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/hw_factory_dcn_ddc.h diff --git a/drivers/gpu/drm/amd/display/dc/gpio/dcn20/hw_factory_dcn20.c b= /drivers/gpu/drm/amd/display/dc/gpio/dcn20/hw_factory_dcn20.c index e0bd0c722e00..905d14079b91 100644 --- a/drivers/gpu/drm/amd/display/dc/gpio/dcn20/hw_factory_dcn20.c +++ b/drivers/gpu/drm/amd/display/dc/gpio/dcn20/hw_factory_dcn20.c @@ -32,6 +32,8 @@ #include "../hw_hpd.h" #include "../hw_generic.h" =20 +#include "../hw_factory_dcn_ddc.h" + #include "hw_factory_dcn20.h" =20 =20 @@ -182,25 +184,12 @@ static void define_ddc_registers( struct hw_gpio_pin *pin, uint32_t en) { - struct hw_ddc *ddc =3D HW_DDC_FROM_BASE(pin); - - switch (pin->id) { - case GPIO_ID_DDC_DATA: - ddc->regs =3D &ddc_data_regs_dcn[en]; - ddc->base.regs =3D &ddc_data_regs_dcn[en].gpio; - break; - case GPIO_ID_DDC_CLOCK: - ddc->regs =3D &ddc_clk_regs_dcn[en]; - ddc->base.regs =3D &ddc_clk_regs_dcn[en].gpio; - break; - default: - ASSERT_CRITICAL(false); - return; - } - - ddc->shifts =3D &ddc_shift[en]; - ddc->masks =3D &ddc_mask[en]; - + dcn_define_ddc_registers_common( + pin, en, + ddc_data_regs_dcn, + ddc_clk_regs_dcn, + ddc_shift, + ddc_mask); } =20 static void define_hpd_registers(struct hw_gpio_pin *pin, uint32_t en) diff --git a/drivers/gpu/drm/amd/display/dc/gpio/dcn21/hw_factory_dcn21.c b= /drivers/gpu/drm/amd/display/dc/gpio/dcn21/hw_factory_dcn21.c index 2f57ee6deabc..f347b8c7e2b6 100644 --- a/drivers/gpu/drm/amd/display/dc/gpio/dcn21/hw_factory_dcn21.c +++ b/drivers/gpu/drm/amd/display/dc/gpio/dcn21/hw_factory_dcn21.c @@ -32,6 +32,8 @@ #include "../hw_hpd.h" #include "../hw_generic.h" =20 +#include "../hw_factory_dcn_ddc.h" + #include "hw_factory_dcn21.h" =20 #include "dcn/dcn_2_1_0_offset.h" @@ -170,25 +172,12 @@ static void define_ddc_registers( struct hw_gpio_pin *pin, uint32_t en) { - struct hw_ddc *ddc =3D HW_DDC_FROM_BASE(pin); - - switch (pin->id) { - case GPIO_ID_DDC_DATA: - ddc->regs =3D &ddc_data_regs_dcn[en]; - ddc->base.regs =3D &ddc_data_regs_dcn[en].gpio; - break; - case GPIO_ID_DDC_CLOCK: - ddc->regs =3D &ddc_clk_regs_dcn[en]; - ddc->base.regs =3D &ddc_clk_regs_dcn[en].gpio; - break; - default: - ASSERT_CRITICAL(false); - return; - } - - ddc->shifts =3D &ddc_shift[en]; - ddc->masks =3D &ddc_mask[en]; - + dcn_define_ddc_registers_common( + pin, en, + ddc_data_regs_dcn, + ddc_clk_regs_dcn, + ddc_shift, + ddc_mask); } =20 static void define_hpd_registers(struct hw_gpio_pin *pin, uint32_t en) diff --git a/drivers/gpu/drm/amd/display/dc/gpio/dcn30/hw_factory_dcn30.c b= /drivers/gpu/drm/amd/display/dc/gpio/dcn30/hw_factory_dcn30.c index 36a5736c58c9..25eef1ee10fe 100644 --- a/drivers/gpu/drm/amd/display/dc/gpio/dcn30/hw_factory_dcn30.c +++ b/drivers/gpu/drm/amd/display/dc/gpio/dcn30/hw_factory_dcn30.c @@ -32,6 +32,8 @@ #include "../hw_hpd.h" #include "../hw_generic.h" =20 +#include "../hw_factory_dcn_ddc.h" + #include "hw_factory_dcn30.h" =20 =20 @@ -199,25 +201,12 @@ static void define_ddc_registers( struct hw_gpio_pin *pin, uint32_t en) { - struct hw_ddc *ddc =3D HW_DDC_FROM_BASE(pin); - - switch (pin->id) { - case GPIO_ID_DDC_DATA: - ddc->regs =3D &ddc_data_regs_dcn[en]; - ddc->base.regs =3D &ddc_data_regs_dcn[en].gpio; - break; - case GPIO_ID_DDC_CLOCK: - ddc->regs =3D &ddc_clk_regs_dcn[en]; - ddc->base.regs =3D &ddc_clk_regs_dcn[en].gpio; - break; - default: - ASSERT_CRITICAL(false); - return; - } - - ddc->shifts =3D &ddc_shift[en]; - ddc->masks =3D &ddc_mask[en]; - + dcn_define_ddc_registers_common( + pin, en, + ddc_data_regs_dcn, + ddc_clk_regs_dcn, + ddc_shift, + ddc_mask); } =20 static void define_hpd_registers(struct hw_gpio_pin *pin, uint32_t en) diff --git a/drivers/gpu/drm/amd/display/dc/gpio/dcn315/hw_factory_dcn315.c= b/drivers/gpu/drm/amd/display/dc/gpio/dcn315/hw_factory_dcn315.c index 5feebb3b95ca..571a6f1b0cf9 100644 --- a/drivers/gpu/drm/amd/display/dc/gpio/dcn315/hw_factory_dcn315.c +++ b/drivers/gpu/drm/amd/display/dc/gpio/dcn315/hw_factory_dcn315.c @@ -32,6 +32,8 @@ #include "../hw_hpd.h" #include "../hw_generic.h" =20 +#include "../hw_factory_dcn_ddc.h" + #include "hw_factory_dcn315.h" =20 #include "dcn/dcn_3_1_5_offset.h" @@ -191,25 +193,12 @@ static void define_ddc_registers( struct hw_gpio_pin *pin, uint32_t en) { - struct hw_ddc *ddc =3D HW_DDC_FROM_BASE(pin); - - switch (pin->id) { - case GPIO_ID_DDC_DATA: - ddc->regs =3D &ddc_data_regs_dcn[en]; - ddc->base.regs =3D &ddc_data_regs_dcn[en].gpio; - break; - case GPIO_ID_DDC_CLOCK: - ddc->regs =3D &ddc_clk_regs_dcn[en]; - ddc->base.regs =3D &ddc_clk_regs_dcn[en].gpio; - break; - default: - ASSERT_CRITICAL(false); - return; - } - - ddc->shifts =3D &ddc_shift[en]; - ddc->masks =3D &ddc_mask[en]; - + dcn_define_ddc_registers_common( + pin, en, + ddc_data_regs_dcn, + ddc_clk_regs_dcn, + ddc_shift, + ddc_mask); } =20 static void define_hpd_registers(struct hw_gpio_pin *pin, uint32_t en) diff --git a/drivers/gpu/drm/amd/display/dc/gpio/dcn32/hw_factory_dcn32.c b= /drivers/gpu/drm/amd/display/dc/gpio/dcn32/hw_factory_dcn32.c index 985f10b39750..d6e97b246bae 100644 --- a/drivers/gpu/drm/amd/display/dc/gpio/dcn32/hw_factory_dcn32.c +++ b/drivers/gpu/drm/amd/display/dc/gpio/dcn32/hw_factory_dcn32.c @@ -32,6 +32,8 @@ #include "../hw_hpd.h" #include "../hw_generic.h" =20 +#include "../hw_factory_dcn_ddc.h" + #include "hw_factory_dcn32.h" =20 #include "dcn/dcn_3_2_0_offset.h" @@ -203,25 +205,12 @@ static void define_ddc_registers( struct hw_gpio_pin *pin, uint32_t en) { - struct hw_ddc *ddc =3D HW_DDC_FROM_BASE(pin); - - switch (pin->id) { - case GPIO_ID_DDC_DATA: - ddc->regs =3D &ddc_data_regs_dcn[en]; - ddc->base.regs =3D &ddc_data_regs_dcn[en].gpio; - break; - case GPIO_ID_DDC_CLOCK: - ddc->regs =3D &ddc_clk_regs_dcn[en]; - ddc->base.regs =3D &ddc_clk_regs_dcn[en].gpio; - break; - default: - ASSERT_CRITICAL(false); - return; - } - - ddc->shifts =3D &ddc_shift[en]; - ddc->masks =3D &ddc_mask[en]; - + dcn_define_ddc_registers_common( + pin, en, + ddc_data_regs_dcn, + ddc_clk_regs_dcn, + ddc_shift, + ddc_mask); } =20 static void define_hpd_registers(struct hw_gpio_pin *pin, uint32_t en) diff --git a/drivers/gpu/drm/amd/display/dc/gpio/dcn401/hw_factory_dcn401.c= b/drivers/gpu/drm/amd/display/dc/gpio/dcn401/hw_factory_dcn401.c index 928abca18a18..06a4d7a8a1ac 100644 --- a/drivers/gpu/drm/amd/display/dc/gpio/dcn401/hw_factory_dcn401.c +++ b/drivers/gpu/drm/amd/display/dc/gpio/dcn401/hw_factory_dcn401.c @@ -12,6 +12,7 @@ #include "../hw_hpd.h" #include "../hw_generic.h" =20 +#include "../hw_factory_dcn_ddc.h" =20 #include "dcn/dcn_4_1_0_offset.h" #include "dcn/dcn_4_1_0_sh_mask.h" @@ -195,25 +196,12 @@ static void define_ddc_registers( struct hw_gpio_pin *pin, uint32_t en) { - struct hw_ddc *ddc =3D HW_DDC_FROM_BASE(pin); - - switch (pin->id) { - case GPIO_ID_DDC_DATA: - ddc->regs =3D &ddc_data_regs_dcn[en]; - ddc->base.regs =3D &ddc_data_regs_dcn[en].gpio; - break; - case GPIO_ID_DDC_CLOCK: - ddc->regs =3D &ddc_clk_regs_dcn[en]; - ddc->base.regs =3D &ddc_clk_regs_dcn[en].gpio; - break; - default: - ASSERT_CRITICAL(false); - return; - } - - ddc->shifts =3D &ddc_shift[en]; - ddc->masks =3D &ddc_mask[en]; - + dcn_define_ddc_registers_common( + pin, en, + ddc_data_regs_dcn, + ddc_clk_regs_dcn, + ddc_shift, + ddc_mask); } =20 static void define_hpd_registers(struct hw_gpio_pin *pin, uint32_t en) diff --git a/drivers/gpu/drm/amd/display/dc/gpio/hw_factory_dcn_ddc.h b/dri= vers/gpu/drm/amd/display/dc/gpio/hw_factory_dcn_ddc.h new file mode 100644 index 000000000000..1f2bc7eea82e --- /dev/null +++ b/drivers/gpu/drm/amd/display/dc/gpio/hw_factory_dcn_ddc.h @@ -0,0 +1,39 @@ +/* SPDX-License-Identifier: MIT */ +/* + * Copyright 2024 Advanced Micro Devices, Inc. + */ + +#ifndef __DAL_HW_FACTORY_DCN_DDC_H__ +#define __DAL_HW_FACTORY_DCN_DDC_H__ + +static inline void dcn_define_ddc_registers_common( + struct hw_gpio_pin *pin, + uint32_t en, + const struct ddc_registers *data_regs, + const struct ddc_registers *clk_regs, + const struct ddc_shift *shift, + const struct ddc_mask *mask) +{ + struct hw_ddc *ddc =3D HW_DDC_FROM_BASE(pin); + + switch (pin->id) { + case GPIO_ID_DDC_DATA: + ddc->regs =3D &data_regs[en]; + ddc->base.regs =3D &data_regs[en].gpio; + break; + + case GPIO_ID_DDC_CLOCK: + ddc->regs =3D &clk_regs[en]; + ddc->base.regs =3D &clk_regs[en].gpio; + break; + + default: + ASSERT_CRITICAL(false); + return; + } + + ddc->shifts =3D &shift[en]; + ddc->masks =3D &mask[en]; +} + +#endif /* __DAL_HW_FACTORY_DCN_DDC_H__ */ --=20 2.47.3