From mboxrd@z Thu Jan 1 00:00:00 1970 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 27ECF38A9BF for ; Tue, 13 Jan 2026 15:10:09 +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=1768317014; cv=none; b=dHV59YZE5PXn/R5IXeKNJkBXOTb35zw+Wjkd6nfc5lsjuRl8xUZE4KBih7Qc8awqLlWTeQeXJvxU+GEFHA02EOaV6LoQ7nBtFU/MWxULH93mnHaVUr4lQbh8ZOFFIV0PHA1q8cZ0QvjyzrxV8XY5dDhw0GNQBT1ILkDnCwEj55M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768317014; c=relaxed/simple; bh=3Qt3PPBW0EOqivH7PZKc5Rp9J4QVVjOldfrh4WBzw4U=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=s5lifJxr8HrvPrZCGv+/c/CKGMm6Wzc4lB8uOHfbvHbtvGBNnDZaGRH90or2AekJO04VKcfBromEPjz2cbDkFh6UO6+DnwEwbO2ONLP8jecQCqLTd5UaMWQ6E2ykqr5gXXRkcBpX+EOy7jIfJSj77HiK3QTVrh3eAhZJC0Tnmmk= 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=APMuYhk6; 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="APMuYhk6" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1768317008; bh=3Qt3PPBW0EOqivH7PZKc5Rp9J4QVVjOldfrh4WBzw4U=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=APMuYhk6HiXkfK0tgcarBgKZ/Exw2pisufwnpt8i+3dJCVUESaxTZcGQPQLqfEdjT 6Zze6kL3ZBBqCdB3frKCF3Ohd4trq8s7l6qgNQPv3Z88QuI3snH4zVkz1CGqnz66u0 GvGubIOqvDO3Lcfe5I5GpUj44k/iKg0RmfSeIp4r4+yA5NWHD+e0lOGI+/HUKeYYdZ PMFxTKPPEYuJ/G/HytMam0EX5hFIG6CBgqN/9nCFzWpoiOW3LNEY/QK4H5OrO4YaAc bYw+rLPiO3HQhDawE+VScw5laGg2zfJpqnNqNvhZ5bCllMg444nMqBc7Ru6g5/Kn+4 xhVATSp5KSdfw== Received: from [192.168.1.90] (unknown [82.79.138.145]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: cristicc) by bali.collaboradmins.com (Postfix) with ESMTPSA id 63DB617E0443; Tue, 13 Jan 2026 16:10:07 +0100 (CET) Message-ID: <38f9e21c-ac64-45cd-a425-4036ad2ef32b@collabora.com> Date: Tue, 13 Jan 2026 17:10:06 +0200 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2 3/4] drm/bridge: dw-hdmi-qp: Add high TMDS clock ratio and scrambling support To: Maxime Ripard Cc: Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Maarten Lankhorst , Thomas Zimmermann , David Airlie , Simona Vetter , Sandy Huang , =?UTF-8?Q?Heiko_St=C3=BCbner?= , Andy Yan , kernel@collabora.com, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, Diederik de Haas , Maud Spierings References: <20260113-dw-hdmi-qp-scramb-v2-0-ae7b2c58d24d@collabora.com> <20260113-dw-hdmi-qp-scramb-v2-3-ae7b2c58d24d@collabora.com> <20260113-unselfish-russet-chicken-80d3c3@houat> Content-Language: en-US From: Cristian Ciocaltea In-Reply-To: <20260113-unselfish-russet-chicken-80d3c3@houat> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Hi Maxime, On 1/13/26 5:00 PM, Maxime Ripard wrote: > On Tue, Jan 13, 2026 at 12:26:20AM +0200, Cristian Ciocaltea wrote: >> @@ -902,13 +981,74 @@ static void dw_hdmi_qp_bridge_atomic_disable(struct drm_bridge *bridge, >> >> hdmi->tmds_char_rate = 0; >> >> + dw_hdmi_qp_disable_scramb(hdmi); >> + >> + hdmi->curr_conn = NULL; >> hdmi->phy.ops->disable(hdmi, hdmi->phy.data); >> } >> >> -static enum drm_connector_status >> -dw_hdmi_qp_bridge_detect(struct drm_bridge *bridge, struct drm_connector *connector) >> +static int dw_hdmi_qp_reset_link(struct dw_hdmi_qp *hdmi, >> + struct drm_connector *conn, >> + struct drm_modeset_acquire_ctx *ctx) >> +{ >> + struct drm_crtc *crtc; >> + u8 config; >> + int ret; >> + >> + if (!conn->state) >> + return 0; >> + >> + crtc = conn->state->crtc; >> + if (!crtc) >> + return 0; >> + >> +retry: >> + ret = drm_modeset_lock(&crtc->mutex, ctx); >> + if (ret) >> + goto check_err; >> + >> + if (!crtc->state->active) >> + return 0; >> + >> + if (conn->state->commit && >> + !try_wait_for_completion(&conn->state->commit->hw_done)) >> + return 0; >> + >> + ret = drm_scdc_readb(hdmi->bridge.ddc, SCDC_TMDS_CONFIG, &config); >> + if (ret < 0) { >> + dev_err(hdmi->dev, "Failed to read TMDS config: %d\n", ret); >> + return 0; >> + } >> + >> + if (!!(config & SCDC_SCRAMBLING_ENABLE) == hdmi->scramb_enabled) >> + return 0; >> + >> + dev_dbg(hdmi->dev, "%s resetting crtc\n", __func__); >> + >> + drm_atomic_helper_connector_hdmi_hotplug(conn, connector_status_connected); >> + >> + /* >> + * Conform to HDMI 2.0 spec by ensuring scrambled data is not sent >> + * before configuring the sink scrambling, as well as suspending any >> + * TMDS transmission while changing the TMDS clock rate in the sink. >> + */ >> + ret = drm_atomic_helper_reset_crtc(crtc, ctx); >> + >> +check_err: >> + if (ret == -EDEADLK) { >> + drm_modeset_backoff(ctx); >> + goto retry; >> + } >> + >> + return ret; >> +} >> + >> +static int dw_hdmi_qp_bridge_detect(struct drm_bridge *bridge, >> + struct drm_connector *connector, >> + struct drm_modeset_acquire_ctx *ctx) >> { >> struct dw_hdmi_qp *hdmi = bridge->driver_private; >> + enum drm_connector_status status; >> const struct drm_edid *drm_edid; >> >> if (hdmi->no_hpd) { >> @@ -919,7 +1059,15 @@ dw_hdmi_qp_bridge_detect(struct drm_bridge *bridge, struct drm_connector *connec >> return connector_status_disconnected; >> } >> >> - return hdmi->phy.ops->read_hpd(hdmi, hdmi->phy.data); >> + status = hdmi->phy.ops->read_hpd(hdmi, hdmi->phy.data); >> + >> + dev_dbg(hdmi->dev, "%s status=%d scramb=%d\n", __func__, >> + status, hdmi->scramb_enabled); >> + >> + if (status == connector_status_connected && hdmi->scramb_enabled) >> + dw_hdmi_qp_reset_link(hdmi, connector, ctx); >> + >> + return status; >> } > > We have drm_bridge_helper_reset_crtc() now, any reason you didn't use it? Ups, I missed it somehow.. Thanks, Cristian