From nobody Sun Apr 5 13:29:24 2026 Received: from mail-ej1-f50.google.com (mail-ej1-f50.google.com [209.85.218.50]) (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 496F1381C4 for ; Tue, 17 Feb 2026 22:36:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=209.85.218.50 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771367768; cv=pass; b=Vg5IRV3h8tzgPetuK++hULdMa9erVCqOHjje8u6ukn5cplMFMQIkAuQ4LP0OAm85Sjyyx9YNMuKU9MB22og6rFwWY4RSOgJ0JwgStJBMK1XzBuQo8NDslURM4UudrmzbPYpjSN/euMAV2z1e2dj3l7lvCVa+1DM8QxP6IQJnT6A= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771367768; c=relaxed/simple; bh=vtiTLvjplb/AKy1+uSISRxim1O6Ne7vWFpd53BG5iYA=; h=MIME-Version:From:Date:Message-ID:Subject:To:Cc:Content-Type; b=JB95lkQ/RKF3Q3oolJhjD6UKRjwDGDWcgQmMLNZkZ0v+EwlYNkMI44VVE7PFwRhs/+hihgJcj1ZKETVilDkOioZt71Asm1zjIwOCEzZKM2QLZZz6QwkAk/0JDtQmrt3Gf3iiS95sfSE6aAhOzufm9xfp6KEbPfUlu3RXXWEdpio= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=usp.br; spf=pass smtp.mailfrom=usp.br; dkim=pass (2048-bit key) header.d=usp.br header.i=@usp.br header.b=SJOLqYZ/; arc=pass smtp.client-ip=209.85.218.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=usp.br Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=usp.br Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=usp.br header.i=@usp.br header.b="SJOLqYZ/" Received: by mail-ej1-f50.google.com with SMTP id a640c23a62f3a-b8d7f22d405so521799366b.0 for ; Tue, 17 Feb 2026 14:36:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1771367762; cv=none; d=google.com; s=arc-20240605; b=iIk9CP4cIiTVvvyRpenKVZFXSvwoeeEiPGNkBlXU5n92BT00VvkOEjUlymsijFD24g wjS4EmbNMJhTbNzNljyvKskEQvNm5yj7XPhKTOfjQTfwzwXWEN/uv1C8S7ySRwuRPk1d YYId4C2mGfS/18/MZqBW/OtsXA1B9NhhAMLyCXGYVWOEgWqnOapEmHbibDxGMijVrHpK r6UCJusVOif5Qa6x8+ttaOiyqYHfJbDHBSn/s2vFrpGkxSa2wRFSN/wtHen1GJdbqeHE MGlG4AvnEEFwJ3sgoi/sJi3SgnVdY/LfTJjgtupY7y806ECbZh3RSFDe8/HOTV3k/9Ey +AFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=cc:to:subject:message-id:date:from:mime-version:dkim-signature; bh=s97S9QYC27wvlPQAhSqz0+mo94ezXIoGg3PTwcdlXc0=; fh=TB3llXW7qS8StnsuOX3IUa2RWbiMNCB2KiNLq68QTu0=; b=cCQoZRvxSJqocIc1jz3OQB/QyTJkS0kO2aUQOwnh5afKUz5YV1KIx75sfRV1tsLdpS ln4fGhUMRxjr8XgmXa3toAihZhZSWFnQzF+Ur0XR8vQ2ClFBV3bkZLfmwIuuWIp91RCb fuvlOMBzk5yPdj+isanlQ3MQbjtO4IRdckO33VOlifYUGxLs/wNYqqHKl8p5m8Ee6PQ/ 7/2adXlHfa7z0S+Ws6ST9dMb2P8IDFavLTRBQVc4B4ZrISPgpnBoB7GXWjwhzmZNMhYS ClUqN/4KkneOkf3quUE+239cwdlzJdAbB+XkBiF5DfAFAyuYEoxx2+kYewjXBnuXHWQn k86w==; darn=vger.kernel.org ARC-Authentication-Results: i=1; mx.google.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=usp.br; s=usp-google; t=1771367762; x=1771972562; darn=vger.kernel.org; h=cc:to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=s97S9QYC27wvlPQAhSqz0+mo94ezXIoGg3PTwcdlXc0=; b=SJOLqYZ/IIISLuacaN+R9p3SMSHYpaYsajKjT8NGdcxoIlrj3mUVTpNs+XpiPR4mQo nW6RzZMHlyNG1U/RcMZnUaU7Mw1mNCQTPI248+NJelLAHVxCcMxTq6HLpXO1wN0ASrHa Ryp7gIzwzFUCu4n/rrtg1hnGe7eCQgbIYOBQaEi0fotQbc3Uc1SnHgbu0ogqpk9O723j sLbjn8JH432iQNi4GQKT6O1yc/ggG46Th7B53KaOyTi1MaT+4jx27kgbxz/5jLO/5FK0 BdJ5g5ySTdM9c1/gYUmzpF+zuZOogJOQpRFI1QG/pRCcUWTHFxaxxKOAHh1Yn5L+Icht DvGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771367762; x=1771972562; h=cc:to:subject:message-id:date:from:mime-version:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=s97S9QYC27wvlPQAhSqz0+mo94ezXIoGg3PTwcdlXc0=; b=vCbEEqv/cEpWkEFx6/VgkTBk/i9XTrlw3ySUmu8jbNaz/c4Borui4cDkoJ3wEQ54Mw z4orN5AYRaK3C62jCnJcTcz+PYcA0PYpHvWibU7Nb0hiPUZDlwaAXeZs53vd7cpJms8F E6ZvlTxrD8skpHe4rDSrYWxeXjvxG4Vwxv4YMeFtMaCt6XaHMYY2pHZStSZ4sb/zLcnA QWw4BS34CcoyIA6dxGr8c5ZAerkRFdaWhYUqzXiDohRBpRbyUfKgfbbbP5tCWAoTg0DA LG6Me20IRIsoZ36YrsM7xzkESeBDTXpRGI6jpRhAT46/ln8+hMJNs7qls/ciGlIq/KLD V6qA== X-Forwarded-Encrypted: i=1; AJvYcCXOq2LGmyQ2RFt06AJUqlE3hihbFYtvHXOHFROgY2B9Yx+2/7lr2Gu562dz5GRyr+x4mjatbXvsA+AIkDQ=@vger.kernel.org X-Gm-Message-State: AOJu0YySDR7nkV2uPSK7yVVDkVy4RCvbVKrAZwyIArOo5yJw0wTnuubG QWaoULbB31SXVQ1UwbbWaR8bhPoZDQ/te8bNrVQQWDCxFZiiT6ono9WmRYms2yEieFNwL0ms5wd seRnPPLlb843Jnj0nM1xR1NOJ4CuNLZZbRak4ZLFQEw== X-Gm-Gg: AZuq6aJlum2WZCpXrMoJ5ccViq+lmf11AONnHixxxPdbIt9tBuIvXMKqW475/sIZgBF n/P8VyeV4SyZ1qmSU50NwbhAMIZrbzf8qVaqpfk5g6fr1XKXEOe0K/9kVKb6Tnx0UopBx30OPi0 1M59Ipz7e8tFd7TwDI85fFP7qj+/OXO02doUlrFS9Al9KxQ2kwbEOBKgDiL1XNlqltunIJ+LY3X ENQBJ6V7EK3SVp7V7XmwFmLEuRm41tmsQKrYAPU89kcllirp0wsjaUz4it+EgtNLJqJm0iRnGkl keplXmUA+MoF+/oc61LVRdOI9FRrfakzUSa/DWVxBIuTPMpQZa+P2uBPiMpylO76OicMwmfmNIZ ZKDR1f0vDtIYkgM6eZDgBKKA= X-Received: by 2002:a17:906:c10d:b0:b7a:2d:71af with SMTP id a640c23a62f3a-b8fb4462eb2mr863091166b.38.1771367762496; Tue, 17 Feb 2026 14:36:02 -0800 (PST) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Guilherme Ivo Bozi Date: Tue, 17 Feb 2026 19:35:51 -0300 X-Gm-Features: AaiRm50eWXdylCtKwCo4zH2z-fDALcCZF8JGW4FEyAH0tN9-aIjmLRR0XFK8Iww Message-ID: Subject: [PATCH] drm/amd/display: Deduplicate DCN DDC register assignment To: harry.wentland@amd.com, sunpeng.li@amd.com Cc: siqueira@igalia.com, alexander.deucher@amd.com, christian.koenig@amd.com, airlied@gmail.com, simona@ffwll.ch, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Guilherme Ivo Bozi Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From b61fa578ecb3800b4b0391c8d86f6d67c48a7cd9 Mon Sep 17 00:00:00 2001 From: Guilherme Bozi Date: Tue, 17 Feb 2026 17:49:26 -0300 Subject: [PATCH] drm/amd/display: Deduplicate DCN DDC register assignment 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: Guilherme Bozi --- .../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" +#include "../hw_factory_dcn_ddc.h" + #include "hw_factory_dcn20.h" @@ -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); } 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" +#include "../hw_factory_dcn_ddc.h" + #include "hw_factory_dcn21.h" #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); } 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" +#include "../hw_factory_dcn_ddc.h" + #include "hw_factory_dcn30.h" @@ -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); } 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" +#include "../hw_factory_dcn_ddc.h" + #include "hw_factory_dcn315.h" #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); } 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" +#include "../hw_factory_dcn_ddc.h" + #include "hw_factory_dcn32.h" #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); } 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" +#include "../hw_factory_dcn_ddc.h" #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); } 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/drivers/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