From nobody Mon Feb 9 04:29:59 2026 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 1EFB51A7264 for ; Sun, 25 Jan 2026 00:23:20 +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=1769300601; cv=none; b=c7lyrPQMTmjiR+wQ9WASsRY9QCtf15qEuMuTmLRL/x0YP8jL+tARn63I0VU7roYXuEhmNVaIPlkcdewdotP1Hk/pqcfKOmRNip4Ee6nSS6reEZ7h7g4Np9yZX7d9VTnlMkXvUBQDc1+3AAI7H5euGOOuqz9h18okHhBHoh2Vd+U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769300601; c=relaxed/simple; bh=WRP+az7WCTaiRkLX5s8XWqF6Cs1gnW5lvSEMbCzU2Y8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=GG69A6fj+F4hciV6v2xfRw2QLKtZihBUucRkOosvsatTrrPo9vSVY1jRDw0aMAiW6nBc4seqL+7SvxRBPCjrmIAh/5ZiNSylUTe3BMI50MrWTak/56QBjltXA8w9L2u12TimxFatl/fne7j9cI5z65FPsn6fQA5apW952ay2IN0= 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=Q8jeGaEz; 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="Q8jeGaEz" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1769300593; bh=WRP+az7WCTaiRkLX5s8XWqF6Cs1gnW5lvSEMbCzU2Y8=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=Q8jeGaEzamf9G6yW/G6oh4mP4E/uzLgAQkCb3fI0Kb+dHKcbo9ryj0MuadXh3+b90 +ZkdSIIXGsR95owouxlfUdIb2E4imbaFvoY7w/167Zk/VRGkxLBbZa1ddNypLeKSWx zMsgFcwLe6YRvUonvyWfYwJYVRhOPYoqINPf7i4Q6mXB3fOX5TVXw9edBVBEFUX49A 137Odr8Le9+nkRCyfr0D1pGcEtgxFOwpUzJquLZwoiHtMxSqIBjQddT+Qio/n8HYTN lR11cDUq7EqsN3vh+KfJdbPu2OLwJoSJ8LlZvtCwF9q4xwQcLbGT4kSkEsQJUXSGqI DEavZ8Sm8ZMzQ== Received: from localhost (unknown [82.79.138.145]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: cristicc) by bali.collaboradmins.com (Postfix) with ESMTPSA id E22C317E1428; Sun, 25 Jan 2026 01:23:12 +0100 (CET) From: Cristian Ciocaltea Date: Sun, 25 Jan 2026 02:23:02 +0200 Subject: [PATCH 4/5] drm/bridge: dw-hdmi-qp: Rework DRM InfoFrame handler Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260125-dw-hdmi-qp-iframe-v1-4-e0f7649ecc4b@collabora.com> References: <20260125-dw-hdmi-qp-iframe-v1-0-e0f7649ecc4b@collabora.com> In-Reply-To: <20260125-dw-hdmi-qp-iframe-v1-0-e0f7649ecc4b@collabora.com> To: Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter Cc: kernel@collabora.com, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.14.3 Make use of the recently introduced dw_hdmi_qp_write_pkt() helper to simplify the writing of the Dynamic Range and Mastering (DRM) InfoFrame packet header and body registers. Moreover, since now having dedicated callbacks per InfoFrame type, move the implementation to dw_hdmi_qp_bridge_write_hdr_drm_infoframe() and drop dw_hdmi_qp_config_drm_infoframe(). While at it, also discard the unnecessary infoframe size verification, as well as the redundant disabling of the packet transmission (already done by the explicit call to the clear callback). Signed-off-by: Cristian Ciocaltea --- drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c | 47 +++++++++---------------= ---- 1 file changed, 14 insertions(+), 33 deletions(-) diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c b/drivers/gpu/drm= /bridge/synopsys/dw-hdmi-qp.c index ff856f8bd53b..178d95a8ecbb 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c @@ -748,38 +748,6 @@ static struct i2c_adapter *dw_hdmi_qp_i2c_adapter(stru= ct dw_hdmi_qp *hdmi) return adap; } =20 -static int dw_hdmi_qp_config_drm_infoframe(struct dw_hdmi_qp *hdmi, - const u8 *buffer, size_t len) -{ - u32 val, i; - - if (len !=3D HDMI_INFOFRAME_SIZE(DRM)) { - dev_err(hdmi->dev, "failed to configure drm infoframe\n"); - return -EINVAL; - } - - dw_hdmi_qp_mod(hdmi, 0, PKTSCHED_DRMI_TX_EN, PKTSCHED_PKT_EN); - - val =3D buffer[1] << 8 | buffer[2] << 16; - dw_hdmi_qp_write(hdmi, val, PKT_DRMI_CONTENTS0); - - for (i =3D 0; i <=3D buffer[2]; i++) { - if (i % 4 =3D=3D 0) - val =3D buffer[3 + i]; - val |=3D buffer[3 + i] << ((i % 4) * 8); - - if ((i % 4 =3D=3D 3) || i =3D=3D buffer[2]) - dw_hdmi_qp_write(hdmi, val, - PKT_DRMI_CONTENTS1 + ((i / 4) * 4)); - } - - dw_hdmi_qp_mod(hdmi, 0, PKTSCHED_DRMI_FIELDRATE, PKTSCHED_PKT_CONFIG1); - dw_hdmi_qp_mod(hdmi, PKTSCHED_DRMI_TX_EN, PKTSCHED_DRMI_TX_EN, - PKTSCHED_PKT_EN); - - return 0; -} - /* * Static values documented in the TRM * Different values are only used for debug purposes @@ -1033,10 +1001,23 @@ static int dw_hdmi_qp_bridge_write_hdr_drm_infofram= e(struct drm_bridge *bridge, const u8 *buffer, size_t len) { struct dw_hdmi_qp *hdmi =3D bridge->driver_private; + size_t i; =20 dw_hdmi_qp_bridge_clear_hdr_drm_infoframe(bridge); =20 - return dw_hdmi_qp_config_drm_infoframe(hdmi, buffer, len); + /* DRM packet header */ + dw_hdmi_qp_write_pkt(hdmi, buffer, 1, 2, PKT_DRMI_CONTENTS0); + + /* DRM packet body */ + for (i =3D 0; i < len - 3; i +=3D 4) + dw_hdmi_qp_write_pkt(hdmi, buffer + 3, i, min(len - i - 3, 4), + PKT_DRMI_CONTENTS1 + i); + + dw_hdmi_qp_mod(hdmi, 0, PKTSCHED_DRMI_FIELDRATE, PKTSCHED_PKT_CONFIG1); + dw_hdmi_qp_mod(hdmi, PKTSCHED_DRMI_TX_EN, PKTSCHED_DRMI_TX_EN, + PKTSCHED_PKT_EN); + + return 0; } =20 static int dw_hdmi_qp_bridge_write_spd_infoframe(struct drm_bridge *bridge, --=20 2.52.0