From nobody Thu Dec 18 20:41:34 2025 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (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 348F02451E6; Mon, 13 Jan 2025 14:53:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736779988; cv=none; b=G/71S4yXI8f6TFJcY/OGTwzez7aD2Qb8BMlo8Vgwa6GNvo5XyyO90eMEPkVm3rMDT8Mu4WKb9MpsJAIL76mzQT0YU60S9aDa0GQKpBMJOa/z13Rg2fOIaiAOnQPUAs8lTjftAClq8HvR8fYnrJty+nMJ2R9z7e5fRK+2vsgSgQk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736779988; c=relaxed/simple; bh=bc1/5llvb/F+aOw3gHKRXfhgUMntRZTJgN0Q2TFxP5k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NtIkJt66NS9Oat6MZ3+3WzxJAS9etmN2Q7x6FgQB0Y5U9CSk2thXhXTOCzOtUBTTWAt2XF2CPU5IMWN8k4KLoNnsv/vu16CR70kRI6pkOAbepuV2HG68nr9mzFQ7yYw0zFl7NrgoF86zMJUKQapTZ+xrjmXhqSqeCJtRNuXC3w0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=Iicr/aSL; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="Iicr/aSL" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1736779985; bh=bc1/5llvb/F+aOw3gHKRXfhgUMntRZTJgN0Q2TFxP5k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Iicr/aSLCuSct1KklmIWQfixAuKUZLdNtHsk/F5qEuiEF+V1hIl3jZfkUf3lgcUHC +LGmWVq2MzWJnEWNzk+laziAP36paYBwNJxKWaZrlVAQ0gwiaX+e5mETyNp+dtc9dy dNl9ANn70ApuBngoMWb182FMZgoFI+aS7ZfS16v3K7dJUTSOwiowZw21ttpWwpdYSM bhFoabWhAy31gN40RtZsOiWb+lQw2p38ZpHLG7QjQNB2W6cWQ1xyYfcclMZYMYhvh/ iCzcw1iZGX5umaa1dEdXw/RM7oHNVbeGyN1T+cbpIwITR9ay3hyYzRY7kijftLpUOl 4XwjpJs6oe16A== Received: from IcarusMOD.eternityproject.eu (2-237-20-237.ip236.fastwebnet.it [2.237.20.237]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: kholk11) by bali.collaboradmins.com (Postfix) with ESMTPSA id 67F6F17E0FC9; Mon, 13 Jan 2025 15:53:04 +0100 (CET) From: AngeloGioacchino Del Regno To: chunkuang.hu@kernel.org Cc: p.zabel@pengutronix.de, airlied@gmail.com, simona@ffwll.ch, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, matthias.bgg@gmail.com, angelogioacchino.delregno@collabora.com, ck.hu@mediatek.com, jitao.shi@mediatek.com, jie.qiu@mediatek.com, junzhi.zhao@mediatek.com, dri-devel@lists.freedesktop.org, linux-mediatek@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kernel@collabora.com, dmitry.baryshkov@linaro.org, lewis.liao@mediatek.com, ives.chenjh@mediatek.com, tommyyl.chen@mediatek.com, jason-jh.lin@mediatek.com Subject: [PATCH v5 19/34] drm/mediatek: mtk_hdmi: Move vendor/product strings to drm_bridge Date: Mon, 13 Jan 2025 15:52:17 +0100 Message-ID: <20250113145232.227674-20-angelogioacchino.delregno@collabora.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20250113145232.227674-1-angelogioacchino.delregno@collabora.com> References: <20250113145232.227674-1-angelogioacchino.delregno@collabora.com> 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" Move the vendor and product strings to the appropriate entries of struct drm_bridge and use that in mtk_hdmi_setup_spd_infoframe instead of having the same as function parameters. While at it, also beautify the strings, setting them to read "MediaTek On-Chip HDMI". Reviewed-by: CK Hu Signed-off-by: AngeloGioacchino Del Regno --- drivers/gpu/drm/mediatek/mtk_hdmi.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek= /mtk_hdmi.c index 8a26cfc9fc61..65e9629b6b77 100644 --- a/drivers/gpu/drm/mediatek/mtk_hdmi.c +++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c @@ -952,15 +952,14 @@ static int mtk_hdmi_setup_avi_infoframe(struct mtk_hd= mi *hdmi, return 0; } =20 -static int mtk_hdmi_setup_spd_infoframe(struct mtk_hdmi *hdmi, - const char *vendor, - const char *product) +static int mtk_hdmi_setup_spd_infoframe(struct mtk_hdmi *hdmi) { + struct drm_bridge *bridge =3D &hdmi->bridge; struct hdmi_spd_infoframe frame; u8 buffer[HDMI_INFOFRAME_HEADER_SIZE + HDMI_SPD_INFOFRAME_SIZE]; ssize_t err; =20 - err =3D hdmi_spd_infoframe_init(&frame, vendor, product); + err =3D hdmi_spd_infoframe_init(&frame, bridge->vendor, bridge->product); if (err < 0) { dev_err(hdmi->dev, "Failed to initialize SPD infoframe: %zd\n", err); @@ -1328,7 +1327,7 @@ static void mtk_hdmi_send_infoframe(struct mtk_hdmi *= hdmi, { mtk_hdmi_setup_audio_infoframe(hdmi); mtk_hdmi_setup_avi_infoframe(hdmi, mode); - mtk_hdmi_setup_spd_infoframe(hdmi, "mediatek", "On-chip HDMI"); + mtk_hdmi_setup_spd_infoframe(hdmi); if (mode->flags & DRM_MODE_FLAG_3D_MASK) mtk_hdmi_setup_vendor_specific_infoframe(hdmi, mode); } @@ -1707,6 +1706,8 @@ static int mtk_hdmi_probe(struct platform_device *pde= v) hdmi->bridge.ops =3D DRM_BRIDGE_OP_DETECT | DRM_BRIDGE_OP_EDID | DRM_BRIDGE_OP_HPD; hdmi->bridge.type =3D DRM_MODE_CONNECTOR_HDMIA; + hdmi->bridge.vendor =3D "MediaTek"; + hdmi->bridge.product =3D "On-Chip HDMI"; drm_bridge_add(&hdmi->bridge); =20 ret =3D mtk_hdmi_clk_enable_audio(hdmi); --=20 2.47.0