From nobody Mon Feb 9 16:54:01 2026 Received: from mail-lf1-f41.google.com (mail-lf1-f41.google.com [209.85.167.41]) (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 146C6132111 for ; Sun, 26 Jan 2025 13:29:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737898157; cv=none; b=RFxG1l0sN9p+euU+Z2doMOMTaWBhp1DG+rxZ4BqT/q6qJJ6d6EjVoo1c0dSIphHQ5kj9Z2yApwDxQXPR7eU/uCb4v5r+r0VhT9fmtCOxWO0+gIecWqp7GXky4qZq7Z1nn+WI0hjf7e3RmQAKcM/IOt7b1tDucerOPqeOwVYHt5A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737898157; c=relaxed/simple; bh=exgmtXH0OIK6SdS9CCUitkYz/uNC3k7yD8vdgvaJocQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=YWGFzp4oheGDB4Ogk0c5kaSYzcw2YyIFh7q2o+X3a9k9X415aG8S+jl1DBkXXcz+8NNmo0NToH2jHpslg42vQ//8Tv5oD3H7GPb8gyr1+7W894I13Br2lcNgzW64DX4Fn0JC9uAu52ttqyry9mN7KSLEYUBYdOgc6evFehnR1Vg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=Iq6r2Ojg; arc=none smtp.client-ip=209.85.167.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="Iq6r2Ojg" Received: by mail-lf1-f41.google.com with SMTP id 2adb3069b0e04-53f22fd6832so3994834e87.1 for ; Sun, 26 Jan 2025 05:29:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1737898153; x=1738502953; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=d0vao2kszZEOdw8Rw0H4k+cRcCSPFR9JmZje0hGSkB0=; b=Iq6r2OjgRR/Rp/IAcIhU1/s8fJ6SKRStNzv31FNkNclVOsMoIOU1geYVYchwqfBG+z Zi7I2TQwkFY/rYbDjJsuzP8kJjo79Mcku1DbYCL7RF1BapMvPE0og4dEX7bQNWjPrwee 07+yKKDbWX4zcqNp6QyeIIS2lXSnxisYOL35UUFzNXZTLCXj/JU/aMiE9XHL+j7rXSts dJEQMvUFbHlx+mdMGfvG1P+LgSvG8zcckHIv0/ZpWUi9UbT9ilgYWEIj2d+r16XstsAD T7Mrm8l8UDFe9uJEMo/4YcC8FRwJKcrCLi0WDNU4WTd+Z7oxyjFlXuJCj7ecAv3srLrw k4UA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737898153; x=1738502953; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=d0vao2kszZEOdw8Rw0H4k+cRcCSPFR9JmZje0hGSkB0=; b=IUYyUU5TdyizPES/aU5h9Nhau6CEWNfbNKrWTMgMCfsgnEZDQiZ2VejZ+ryWvi0IrQ emthnZJxquQDHQbzDYwUtBHgzAmnjHBblnsHjIee0itfRv6Dvd5c2S2v05fLfTVmcg2G IjBsT2T8UsMG/LxOXiZUqwUmbieGUuQCRP/DmSNArvoDY978Ck0dFbrgGHfWTmdPg/4r 3rgEU+yGxUhVDRszIohyPpe9rXQ8zNFQFMhtcDQbqM4HFojzuQoVn21y0885bdziVDeE uP6oAqbinSINFBLlJrI1Q2SK0o9bP3eDr6DAhT2Qh8Iy+tXGKH/aPmsuKerAGWedf5NN eCyA== X-Forwarded-Encrypted: i=1; AJvYcCWMTv8dMm/00rgLOD+NeisQgQnU9Ha1w5oAEN8KU6Kgkiu7FCZ7wAsvnAv0m+xlIpGOYYaL413Z2CvkFWA=@vger.kernel.org X-Gm-Message-State: AOJu0YxYIwNrO/AxCTiQ4vKesiYHmvg6cdPzXzCpLWlVs5Z/SxIjuqhU +qYXrhGHlnBlQOv3xejFYf90qReVSayaezc3tuvvxG0NzF6ZhIIjCaMjLVTrkN4dY0b8svYBTip dMBg= X-Gm-Gg: ASbGncs1l+w0T7U2ZOZjMsDCsJY8HlVyb1B5NYakWFXHdL05cTVX60GwDrCYhrP6ov5 xXVDPLXf36i235hvYSoq70M9fceVztrVxeLGv7TZQ1xCrQjmH7bxwqDD+L+syafwRSVQYkML7Mr bKPYRZn76uSYYZ5vRlK6sheeABYSobaAd0LH+BAaNURk1zGadR17MBOlzIjgcCaoMJnATDQVmzu nBFqs0oP2hzK9d8OvGL6a/YGBlv0VD/ZrVOML5c/mb84qTWSwQh+MiKqCFkgi49L85f9wIw1+dt 85yREesp3d1+ X-Google-Smtp-Source: AGHT+IGHXX6eQwoZuNh8Wk+TR7mHmi2RdsLJwtN5r6hdBZJ8DQ89NZtSCk1G2dpZieRiC9k4AVWh8w== X-Received: by 2002:a05:6512:b94:b0:542:7217:361a with SMTP id 2adb3069b0e04-5439c22c3bemr11810436e87.10.1737898153055; Sun, 26 Jan 2025 05:29:13 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-543cbbd4cf8sm770488e87.201.2025.01.26.05.29.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Jan 2025 05:29:11 -0800 (PST) From: Dmitry Baryshkov Date: Sun, 26 Jan 2025 15:29:06 +0200 Subject: [PATCH v3 01/10] drm/connector: add CEC-related fields 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: <20250126-drm-hdmi-connector-cec-v3-1-5b5b2d4956da@linaro.org> References: <20250126-drm-hdmi-connector-cec-v3-0-5b5b2d4956da@linaro.org> In-Reply-To: <20250126-drm-hdmi-connector-cec-v3-0-5b5b2d4956da@linaro.org> To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Dave Stevenson , =?utf-8?q?Ma=C3=ADra_Canal?= , Raspberry Pi Kernel Maintenance , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=4115; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=exgmtXH0OIK6SdS9CCUitkYz/uNC3k7yD8vdgvaJocQ=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBnljijuKtQNpzaqioCpIWl2z6NyiaPvixrODXyD 1u4ZXv5VxuJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ5Y4owAKCRCLPIo+Aiko 1b5vCACKsF4hItIWVpOk1JfLTGh8G41DIxMQamsfYrT1qdtn3d5VVVXpzRZirdrQqwC7/McDgBm vEIbBpCSl9AtzlRcUWsH2DkwxT58Dd8qo4J1ETnwScI03fs/vh4G8raZXfnb6+BJxkHp0ZZuuDK 0FI18HdZHNyqSdhN+BjailOTRJg4JLTQzHkPa3hDj8xG+iplikXvS4YJJEqoATiVdpbyKNGLSXZ MQ7swXp9NNbTKEfCuKPZorEkxeo9UjHdKpbcxgj8qquImsFEttRlPEs2b4okP7hN+XVKxLO69mu Ptyx97RCkoafOZjhlHRb3f64euUQa4fn1VuV+30vT7sy+/hS X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A As a preparation to adding HDMI CEC helper code, add CEC-related fields to the struct drm_connector. Include both cec_adapter and cec_notifier, allowing drivers to select which one to use. The unregister callback is provided to let drivers unregister CEC-related data in a generic way without polluting drm_connector.c with dependencies on the CEC functions. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/drm_connector.c | 13 ++++++++++++ include/drm/drm_connector.h | 44 +++++++++++++++++++++++++++++++++++++= ++++ 2 files changed, 57 insertions(+) diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connecto= r.c index 1383fa9fff9bcf31488453e209a36c6fe97be2f1..fffb718b09eaaac200e6abc7524= bbfe98c4741f4 100644 --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c @@ -279,6 +279,7 @@ static int drm_connector_init_only(struct drm_device *d= ev, INIT_LIST_HEAD(&connector->probed_modes); INIT_LIST_HEAD(&connector->modes); mutex_init(&connector->mutex); + mutex_init(&connector->cec.mutex); mutex_init(&connector->eld_mutex); mutex_init(&connector->edid_override_mutex); mutex_init(&connector->hdmi.infoframes.lock); @@ -698,6 +699,16 @@ static void drm_mode_remove(struct drm_connector *conn= ector, drm_mode_destroy(connector->dev, mode); } =20 +static void drm_connector_cec_unregister(struct drm_connector *connector) +{ + mutex_lock(&connector->cec.mutex); + + if (connector->cec.funcs->unregister) + connector->cec.funcs->unregister(connector); + + mutex_unlock(&connector->cec.mutex); +} + /** * drm_connector_cleanup - cleans up an initialised connector * @connector: connector to cleanup @@ -718,6 +729,8 @@ void drm_connector_cleanup(struct drm_connector *connec= tor) =20 platform_device_unregister(connector->hdmi_audio.codec_pdev); =20 + drm_connector_cec_unregister(connector); + if (connector->privacy_screen) { drm_privacy_screen_put(connector->privacy_screen); connector->privacy_screen =3D NULL; diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h index f13d597370a30dc1b14c630ee00145256052ba56..6da840673b1209c84bbc396643c= 6033679a7ec74 100644 --- a/include/drm/drm_connector.h +++ b/include/drm/drm_connector.h @@ -46,6 +46,7 @@ struct drm_property_blob; struct drm_printer; struct drm_privacy_screen; struct drm_edid; +struct cec_adapter; struct edid; struct hdmi_codec_daifmt; struct hdmi_codec_params; @@ -1191,6 +1192,19 @@ struct drm_connector_hdmi_audio_funcs { bool enable, int direction); }; =20 +/** + * struct drm_connector_cec_funcs - drm_hdmi_connector control functions + */ +struct drm_connector_cec_funcs { + /** + * @adap_unregister: unregister CEC adapter / notifier. + * + * The callback to unregister CEC adapter or notifier, so that the core + * DRM layer doesn't depend on the CEC_CORE. + */ + void (*unregister)(struct drm_connector *connector); +}; + /** * struct drm_connector_hdmi_funcs - drm_hdmi_connector control functions */ @@ -1832,6 +1846,31 @@ struct drm_connector_hdmi { } infoframes; }; =20 +/** + * struct drm_connector_cec - DRM Connector CEC-related structure + */ +struct drm_connector_cec { + /** + * @mutex: protects all CEC-related fields + */ + struct mutex mutex; + + /** + * @adap: CEC adapter corresponding to the DRM connector. + */ + struct cec_adapter *adapter; + + /** + * @notifier: CEC notifier corresponding to the DRM connector. + */ + struct cec_notifier *notifier; + + /** + * @funcs: CEC Control Functions + */ + const struct drm_connector_cec_funcs *funcs; +}; + /** * struct drm_connector - central DRM connector control structure * @@ -2253,6 +2292,11 @@ struct drm_connector { * @hdmi_audio: HDMI codec properties and non-DRM state. */ struct drm_connector_hdmi_audio hdmi_audio; + + /** + * @cec: CEC-related data. + */ + struct drm_connector_cec cec; }; =20 #define obj_to_connector(x) container_of(x, struct drm_connector, base) --=20 2.39.5 From nobody Mon Feb 9 16:54:01 2026 Received: from mail-lf1-f53.google.com (mail-lf1-f53.google.com [209.85.167.53]) (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 886AC25A65D for ; Sun, 26 Jan 2025 13:29:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737898160; cv=none; b=TnU/DqHRxqFjS0vDpn+GK1TlyuR9n8tn0A3QtMlN/AyAhxfkZEgTnW1TisEebwYrJ/yTiVkvI3bj95aE3vd8W++s6XE0bZWcvSgr3T3Qd/2MVbZbd+VR1TbIeJqhV9iez80LBvvAT/BU805SEU9tcdcVxQ+c/ALofO4Nvb8YwqY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737898160; c=relaxed/simple; bh=OcWcKf/InZviT08C0ZhI5Jo5qPbyiNWwLd10i7D2BeE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=oCAOdUXNxIBNl37aKotagcNwXw+ujKRN+oWCU8e67xNxlOkbw2m/fuLN7E8QE77+r8Qx8OOMsDOVaNqttgv6+LqxzJLPYcE2fanMimrf5AtQ6Dr5VubB1lV/A2dZFYIj29PLk2QNLfgBqMKIhc/8bYlFt0GW++nM7otW91c5cj4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=GeVUzN2p; arc=none smtp.client-ip=209.85.167.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="GeVUzN2p" Received: by mail-lf1-f53.google.com with SMTP id 2adb3069b0e04-53f22fd6832so3994858e87.1 for ; Sun, 26 Jan 2025 05:29:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1737898155; x=1738502955; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=mtOuCADvqxiQ8qskiTg6RnzWChalNaUWo6+lKfRYGWM=; b=GeVUzN2p5nbvJhym/s0zZpGkaZ7vi3Xz/iyPrs1JclH/btDl1hoAjcluH2Iuua+wS1 dJGQo95JMNoBDO/lZ/Uc/n8CPB7/FKIrhs2iVRqBnLhrbKvd+FSgZMT0MgJEO4JGk59b DwnSwrWbR+yzdDej6i8v2C1zwjTInZ5xYkRTCNI4aUfXHvMjPUPfiLOSOAjrDQKJjQnr RJ9b9r5O2BkFbkj61cYgLshy9qK/rB4BhrngOaPjw0xdODeSZcBvwNBRn2OUXOEznq5k xSXWEwckGPAY8dCVikjbQ/xD9wYQiO7Vcx27RQlV9iEfAY38dMO6gbFk1ztxadYo8N4n 8V/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737898155; x=1738502955; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mtOuCADvqxiQ8qskiTg6RnzWChalNaUWo6+lKfRYGWM=; b=Lai4UjvgFP2ZnuKCvx1KJ+gA5MWl9jqqY0XebdZb/LL6oQhJF8jZ3+17EECaOIUQz2 5DlaajRYOh7T5bJkIWGOH39a3YMBGebMq9wdZIuigxlc4iydL0XDMD+1i1dIzqGzxDwq dmJ/1epj/Bf0E9Edp9FrPjcW1PcBAzzZS4BAcQEwzLfe0Cv6bI/8K0KToT4yOLdM4l38 lkKulbokVOiOechg9jiuQ/ltwtRg5FA3d4eu4MNdGfsPwYVYmKkBHOaSO3EvknHsBLWp rruu/niPOGUnK1ysb6eXFrfXW2q4x2EP5A4uXSa1ColnFCxzJvxqyIfdm8RfHzm9XDcm cilw== X-Forwarded-Encrypted: i=1; AJvYcCU/tnx5zKCsif70hOOgj1+o2UhOmrPdJBuRhOKag7MLFVp/Ud6XxDdRgvCjpPLRkC7Nw6sb2UB6uIr1EKQ=@vger.kernel.org X-Gm-Message-State: AOJu0YzEDP2QhC+G6g5pannzqayftdhg4LUTNJIx1j8wZSKCvD2ZcAY1 rwtb3xRDwHkEh1+eGe54Jq+jdtgNc8ZsnM8IawbVHhedMr8ys8c8Dy9oSB9VT50= X-Gm-Gg: ASbGncsXjYasA/9MxUXINMutT+ViBmAD6Q4Lvfhdu2BLUC9Jem1tPn5QINnUgz3DjDD lPTAFOeg3J6RqVcT0wdpp/2z6RgTdWhtVpaJltAs3Ftii7rTWh36GRXcUwrxrogV43N9tAsR4ds Uj8cnkITD2v9Uu2jTHum3jelsp8CZYEESksrKAlKOdwQU8lSxJwM1pO7q99V5FG9JltrDPy19BD +rbrEpasKKwRznT5U2RMRNmd4+zHeEFWfH5WP+s0tzJ+KeGRUAITvc8LwCh5Q8/c1AY7iCFZY0u i4ONxSCkTlkv X-Google-Smtp-Source: AGHT+IFOVh39CoIeKAxiwxGLv30P4T5xgVBKdF914T+dQZYy4EUSVW/1GagTDS2LlI1AwCUC6vC8Yw== X-Received: by 2002:a19:5519:0:b0:540:1b2d:8ef3 with SMTP id 2adb3069b0e04-5439c28854fmr10983563e87.52.1737898155497; Sun, 26 Jan 2025 05:29:15 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-543cbbd4cf8sm770488e87.201.2025.01.26.05.29.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Jan 2025 05:29:14 -0800 (PST) From: Dmitry Baryshkov Date: Sun, 26 Jan 2025 15:29:07 +0200 Subject: [PATCH v3 02/10] drm/display: add CEC helpers code 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: <20250126-drm-hdmi-connector-cec-v3-2-5b5b2d4956da@linaro.org> References: <20250126-drm-hdmi-connector-cec-v3-0-5b5b2d4956da@linaro.org> In-Reply-To: <20250126-drm-hdmi-connector-cec-v3-0-5b5b2d4956da@linaro.org> To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Dave Stevenson , =?utf-8?q?Ma=C3=ADra_Canal?= , Raspberry Pi Kernel Maintenance , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=10695; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=OcWcKf/InZviT08C0ZhI5Jo5qPbyiNWwLd10i7D2BeE=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBnljijFPF1RqGbrj/r74mBNTqY1s66/05q/E0iq VnBUdiy+0GJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ5Y4owAKCRCLPIo+Aiko 1e4sB/wPzL9K3r1QUEY7NhESKMiCvc/+0HlGVb4HZXsMysrdeJTY9sY9SWpZpI1LxC+//yGvtJb H22w+cqi5ShIgmDqz0s06NOvBQOE/6dxX0x07ey7nEG7r9wLvHmKZhUQY4vHLdcttNSR+X9Qo0E 4BH8O9m5K2+lHQnAc0BBxcY46lC3KzDWbaEAimxKF7SFgNku478Jrik5qFkrfnXxrBdpewXCGMR Oi5sJvfxeNADyKSneN/0aJsOBssrXTyue6BhEqGPvI2T9nkvpL1HLSoEXny3NjGeXMURMf29vdV uEkkyyaa6IM11JTsp5nbU/GlFOPZqMF5fWVZWg2gQHswJ2zn X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A Add generic CEC helpers to be used by HDMI drivers. Both notifier and and adapter are supported for registration. Once registered, the driver can call common set of functions to update physical address, to invalidate it or to unregister CEC data. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/display/Kconfig | 5 + drivers/gpu/drm/display/Makefile | 2 + drivers/gpu/drm/display/drm_hdmi_cec_helper.c | 209 ++++++++++++++++++++++= ++++ include/drm/display/drm_hdmi_cec_helper.h | 61 ++++++++ 4 files changed, 277 insertions(+) diff --git a/drivers/gpu/drm/display/Kconfig b/drivers/gpu/drm/display/Kcon= fig index 8d22b7627d41f7bc015decf24ae02a05bc00f055..49da9b768acf3e5f84f2cefae4b= b042cfd57a50c 100644 --- a/drivers/gpu/drm/display/Kconfig +++ b/drivers/gpu/drm/display/Kconfig @@ -82,6 +82,11 @@ config DRM_DISPLAY_HDMI_AUDIO_HELPER DRM display helpers for HDMI Audio functionality (generic HDMI Codec implementation). =20 +config DRM_DISPLAY_HDMI_CEC_HELPER + bool + help + DRM display helpers for HDMI CEC implementation. + config DRM_DISPLAY_HDMI_HELPER bool help diff --git a/drivers/gpu/drm/display/Makefile b/drivers/gpu/drm/display/Mak= efile index b17879b957d5401721396e247fa346387cf6c48a..2cd078e2b81c1a9e6b336c4187b= 444bcb8a50e51 100644 --- a/drivers/gpu/drm/display/Makefile +++ b/drivers/gpu/drm/display/Makefile @@ -16,6 +16,8 @@ drm_display_helper-$(CONFIG_DRM_DISPLAY_DSC_HELPER) +=3D \ drm_display_helper-$(CONFIG_DRM_DISPLAY_HDCP_HELPER) +=3D drm_hdcp_helper.o drm_display_helper-$(CONFIG_DRM_DISPLAY_HDMI_AUDIO_HELPER) +=3D \ drm_hdmi_audio_helper.o +drm_display_helper-$(CONFIG_DRM_DISPLAY_HDMI_CEC_HELPER) +=3D \ + drm_hdmi_cec_helper.o drm_display_helper-$(CONFIG_DRM_DISPLAY_HDMI_HELPER) +=3D \ drm_hdmi_helper.o \ drm_scdc_helper.o diff --git a/drivers/gpu/drm/display/drm_hdmi_cec_helper.c b/drivers/gpu/dr= m/display/drm_hdmi_cec_helper.c new file mode 100644 index 0000000000000000000000000000000000000000..a6ed5f0fc3835b013a83308f528= 5ea0819c5702c --- /dev/null +++ b/drivers/gpu/drm/display/drm_hdmi_cec_helper.c @@ -0,0 +1,209 @@ +// SPDX-License-Identifier: MIT +/* + * Copyright (c) 2024 Linaro Ltd + */ + +#include +#include +#include + +#include + +#include +#include + +void drm_connector_hdmi_cec_unregister(struct drm_connector *connector) +{ + cec_unregister_adapter(connector->cec.adapter); + connector->cec.adapter =3D NULL; + + cec_notifier_conn_unregister(connector->cec.notifier); + connector->cec.notifier =3D NULL; + + connector->cec.funcs =3D NULL; +} +EXPORT_SYMBOL(drm_connector_hdmi_cec_unregister); + +static const struct drm_connector_cec_funcs drm_connector_hdmi_cec_funcs = =3D { + .unregister =3D drm_connector_hdmi_cec_unregister, +}; + +int drm_connector_hdmi_cec_notifier_register(struct drm_connector *connect= or, + const char *port_name, + struct device *dev) +{ + struct cec_connector_info conn_info; + struct cec_notifier *notifier; + int ret; + + mutex_lock(&connector->cec.mutex); + + if (connector->cec.funcs) { + ret =3D -EBUSY; + goto err_unlock; + } + + cec_fill_conn_info_from_drm(&conn_info, connector); + + notifier =3D cec_notifier_conn_register(dev, port_name, &conn_info); + if (!notifier) { + ret =3D -ENOMEM; + goto err_unlock; + } + + connector->cec.notifier =3D notifier; + connector->cec.funcs =3D &drm_connector_hdmi_cec_funcs; + + mutex_unlock(&connector->cec.mutex); + + return 0; + +err_unlock: + mutex_unlock(&connector->cec.mutex); + + return ret; +} +EXPORT_SYMBOL(drm_connector_hdmi_cec_notifier_register); + +#define to_hdmi_cec_adapter_ops(ops) \ + container_of(ops, struct drm_connector_hdmi_cec_adapter_ops, base) + +static int drm_connector_hdmi_cec_adap_enable(struct cec_adapter *adap, bo= ol enable) +{ + struct drm_connector *connector =3D cec_get_drvdata(adap); + struct drm_connector_hdmi_cec_adapter_ops *ops =3D + to_hdmi_cec_adapter_ops(connector->cec.funcs); + + return ops->enable(connector, enable); +} + +static int drm_connector_hdmi_cec_adap_log_addr(struct cec_adapter *adap, = u8 logical_addr) +{ + struct drm_connector *connector =3D cec_get_drvdata(adap); + struct drm_connector_hdmi_cec_adapter_ops *ops =3D + to_hdmi_cec_adapter_ops(connector->cec.funcs); + + return ops->log_addr(connector, logical_addr); +} + +static int drm_connector_hdmi_cec_adap_transmit(struct cec_adapter *adap, = u8 attempts, + u32 signal_free_time, struct cec_msg *msg) +{ + struct drm_connector *connector =3D cec_get_drvdata(adap); + struct drm_connector_hdmi_cec_adapter_ops *ops =3D + to_hdmi_cec_adapter_ops(connector->cec.funcs); + + return ops->transmit(connector, attempts, signal_free_time, msg); +} + +static const struct cec_adap_ops drm_connector_hdmi_cec_adap_ops =3D { + .adap_enable =3D drm_connector_hdmi_cec_adap_enable, + .adap_log_addr =3D drm_connector_hdmi_cec_adap_log_addr, + .adap_transmit =3D drm_connector_hdmi_cec_adap_transmit, +}; + +int drm_connector_hdmi_cec_register(struct drm_connector *connector, + const struct drm_connector_hdmi_cec_adapter_ops *ops, + const char *name, + u8 available_las, + struct device *dev) +{ + struct cec_connector_info conn_info; + struct cec_adapter *cec_adap; + int ret; + + if (!ops->base.unregister || + !ops->init || !ops->enable || !ops->log_addr || !ops->transmit) + return -EINVAL; + + mutex_lock(&connector->cec.mutex); + + if (connector->cec.funcs) { + ret =3D -EBUSY; + goto err_unlock; + } + + cec_adap =3D cec_allocate_adapter(&drm_connector_hdmi_cec_adap_ops, conne= ctor, name, + CEC_CAP_DEFAULTS | CEC_CAP_CONNECTOR_INFO, + available_las ? : CEC_MAX_LOG_ADDRS); + ret =3D PTR_ERR_OR_ZERO(cec_adap); + if (ret < 0) + goto err_unlock; + + cec_fill_conn_info_from_drm(&conn_info, connector); + cec_s_conn_info(cec_adap, &conn_info); + + connector->cec.adapter =3D cec_adap; + connector->cec.funcs =3D &ops->base; + + ret =3D ops->init(connector); + if (ret < 0) + goto err_delete_adapter; + + ret =3D cec_register_adapter(cec_adap, dev); + if (ret < 0) + goto err_delete_adapter; + + mutex_unlock(&connector->cec.mutex); + + return 0; + +err_delete_adapter: + cec_delete_adapter(cec_adap); + + connector->cec.adapter =3D NULL; + +err_unlock: + mutex_unlock(&connector->cec.mutex); + + return ret; +} +EXPORT_SYMBOL(drm_connector_hdmi_cec_register); + +void drm_connector_hdmi_cec_received_msg(struct drm_connector *connector, + struct cec_msg *msg) +{ + cec_received_msg(connector->cec.adapter, msg); +} +EXPORT_SYMBOL(drm_connector_hdmi_cec_received_msg); + +void drm_connector_hdmi_cec_transmit_attempt_done(struct drm_connector *co= nnector, + u8 status) +{ + cec_transmit_attempt_done(connector->cec.adapter, status); +} +EXPORT_SYMBOL(drm_connector_hdmi_cec_transmit_attempt_done); + +void drm_connector_hdmi_cec_transmit_done(struct drm_connector *connector, + u8 status, + u8 arb_lost_cnt, u8 nack_cnt, + u8 low_drive_cnt, u8 error_cnt) +{ + cec_transmit_done(connector->cec.adapter, status, + arb_lost_cnt, nack_cnt, low_drive_cnt, error_cnt); +} +EXPORT_SYMBOL(drm_connector_hdmi_cec_transmit_done); + +void drm_connector_hdmi_cec_phys_addr_invalidate(struct drm_connector *con= nector) +{ + mutex_lock(&connector->cec.mutex); + + cec_phys_addr_invalidate(connector->cec.adapter); + cec_notifier_phys_addr_invalidate(connector->cec.notifier); + + mutex_unlock(&connector->cec.mutex); +} +EXPORT_SYMBOL(drm_connector_hdmi_cec_phys_addr_invalidate); + +void drm_connector_hdmi_cec_phys_addr_set(struct drm_connector *connector) +{ + mutex_lock(&connector->cec.mutex); + + cec_s_phys_addr(connector->cec.adapter, + connector->display_info.source_physical_address, false); + cec_notifier_set_phys_addr(connector->cec.notifier, + connector->display_info.source_physical_address); + + mutex_unlock(&connector->cec.mutex); +} +EXPORT_SYMBOL(drm_connector_hdmi_cec_phys_addr_set); diff --git a/include/drm/display/drm_hdmi_cec_helper.h b/include/drm/displa= y/drm_hdmi_cec_helper.h new file mode 100644 index 0000000000000000000000000000000000000000..cd6274e4ee9b3e41a2d85289c4a= 420b854340e19 --- /dev/null +++ b/include/drm/display/drm_hdmi_cec_helper.h @@ -0,0 +1,61 @@ +/* SPDX-License-Identifier: MIT */ + +#ifndef DRM_DISPLAY_HDMI_CEC_HELPER +#define DRM_DISPLAY_HDMI_CEC_HELPER + +#include + +#include + +struct drm_connector; + +struct cec_msg; +struct device; + +struct drm_connector_hdmi_cec_adapter_ops { + struct drm_connector_cec_funcs base; + + int (*init)(struct drm_connector *connector); + void (*uninit)(struct drm_connector *connector); + + int (*enable)(struct drm_connector *connector, bool enable); + int (*log_addr)(struct drm_connector *connector, u8 logical_addr); + int (*transmit)(struct drm_connector *connector, u8 attempts, + u32 signal_free_time, struct cec_msg *msg); +}; + +int drm_connector_hdmi_cec_register(struct drm_connector *connector, + const struct drm_connector_hdmi_cec_adapter_ops *ops, + const char *name, + u8 available_las, + struct device *dev); + +int drm_connector_hdmi_cec_notifier_register(struct drm_connector *connect= or, + const char *port_name, + struct device *dev); + +void drm_connector_hdmi_cec_unregister(struct drm_connector *connector); + +void drm_connector_hdmi_cec_received_msg(struct drm_connector *connector, + struct cec_msg *msg); + +void drm_connector_hdmi_cec_transmit_done(struct drm_connector *connector, + u8 status, + u8 arb_lost_cnt, u8 nack_cnt, + u8 low_drive_cnt, u8 error_cnt); + +void drm_connector_hdmi_cec_transmit_attempt_done(struct drm_connector *co= nnector, + u8 status); +/* + * These functions are used by the state helper, so we end up linking to t= he + * same module. Define stubs to simplify the code. + */ +#ifdef CONFIG_DRM_DISPLAY_HDMI_CEC_HELPER +void drm_connector_hdmi_cec_phys_addr_invalidate(struct drm_connector *con= nector); +void drm_connector_hdmi_cec_phys_addr_set(struct drm_connector *connector); +#else +static inline void drm_connector_hdmi_cec_phys_addr_invalidate(struct drm_= connector *connector) {} +static inline void drm_connector_hdmi_cec_phys_addr_set(struct drm_connect= or *connector) {} +#endif + +#endif --=20 2.39.5 From nobody Mon Feb 9 16:54:01 2026 Received: from mail-lf1-f44.google.com (mail-lf1-f44.google.com [209.85.167.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 E85FEEEDE for ; Sun, 26 Jan 2025 13:29:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737898161; cv=none; b=B13d7kwQZr0UBn+zfCFCnXZp5tQxqSBCrzm4CtrEieS18tnqPA7ZvMlg/hmAynR7qT3txVOiVYxxo0GU4vT/EEtKwZbD3AexNAcenipnra+ntv/Vl4QlArEsYpUdpcMoZGiWmZldcZHyI5cJwlzyGj1vxF+tim4ZrlGRORmj2aA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737898161; c=relaxed/simple; bh=Klk620Is/1tbtYcXQ8FYuys+ryQfkRDd4Rrv8wsapQY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Y0eRbv6LuJXcOdgdt50tJq7UQ0493ReiyuqAG1nziFds+Zl7Kqd00j45HMnKf+xub/dh6jZ+YzY6yJv2uvOIKguP+nbw8WI6J/oXxkrpf2V+Bltx7RiU1QgemXTTyVE2DNlCCf8B5Z9LWBQKzne9vJWctkuatGA1mT77Ktnr8m8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=UDJAocKq; arc=none smtp.client-ip=209.85.167.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="UDJAocKq" Received: by mail-lf1-f44.google.com with SMTP id 2adb3069b0e04-5401bd6cdb4so3930471e87.2 for ; Sun, 26 Jan 2025 05:29:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1737898158; x=1738502958; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=SX9MYTSclFR0wg3r+1EUbn52IF2ijQOVXV2N75ELiLc=; b=UDJAocKqhSNyoZU46rkENvTepu/oJ61GT0Hy6+g155DuUZbzffzicp3OU2dxhrD5WM IY6Sgy70o2KlJllHupMYyXZW8q5S1+6WC3atQY/zSSz8v0dUAXIL95I6rYmLO8qswv3o Ln1wvI5nuS/4r8X4oP3Ui3lPfA2lQZMUoXONLTlaVWrSxv2VTrGSnSOZOYwaMbYtEAa8 2nAK3LxnT1yISNQtcM6wC3CHI2KtDxytDTSR0KpFItcUaLqASmZY/fhiQVsV4QNxGQFX gbKAIIx8Codpx7ZgOdkJ8XsmnY0OTP0u1AUz3g6HouYmoGkPw5flZgqF62dss6KTxWRw fSow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737898158; x=1738502958; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SX9MYTSclFR0wg3r+1EUbn52IF2ijQOVXV2N75ELiLc=; b=MTEsZjlkoLtFjqHijCQoxD1ogfHe/f2KR+6LfsaxZc5+mAjX2v9Kycq23+JcaZa/ER 5Z/z9fFPTI/uZ76Zfk+bviEqI4hiE+T//tRCirkXnwkmtRXe7mEfQsBEmzUZvAFbHcpf KvOCEWv8Sq36s7HholsKiTObK7benGxkSC+VOr9PdmFxiMiBHBR/geGprPFoNQ1YGbZd rv1p+W5gQN+XVdQvOc7QjHB6vS2G26vhNT7KQmi5nlxa50Br0+NXZz5uvuya7grteiS6 Sfqw5ngORowp0dOLadyXeFDe+9/8TX+L9r/O3+4kxzKljEObCrLObVnGZdvB6S4nmVR7 WORw== X-Forwarded-Encrypted: i=1; AJvYcCWBm4gMyBTVkPFIyhT8pWAbrZYpnVu0T2BvXtflielacRl8uw+/vcPtXwnED627MA2Rv0sD6KKEwqMlLzg=@vger.kernel.org X-Gm-Message-State: AOJu0YxuWpNpQ3hVm5JggeT5D2lSRqY5z66jya13YyMshFqBo+WyyQIi 4Y9vsJb9nkSz8NDZYLO+/Lq7uRDk7i9fBmzY74aRchQCksgjjqBwKXz3Lk9Tmws2YV7uzaNe0QU lCxE= X-Gm-Gg: ASbGncvuO9SyBUWKZ9WWyUADy8xcOHzMiAmOoYmcV9lD4odcP1qikKRpDod6DliVvCP k083Pey4nfBWdqXoPNe2Ypue1CiKRa5JF3WtC7jbbd0w3w6SDPTUKI3+wEpSFkr1DWK4xDTeW09 b99A2W80yzV7cL9Oln5K1uCmu3X5tVu2bf5WRfyVaaJjZXDxgEgPtgTLZB26XVTpfzlSeCsG2iL 7Om2SNGZMjqFqKqCSLkDVybljQhrqJpc4e2kAk7/LL/Rd2mF9JvkLzFBfHvBLdbakk6KPC01rFx J36epGRghCq9 X-Google-Smtp-Source: AGHT+IHfmHwDsIVDDU18s8k3+lcuyD5xVAkm66Onnq8gE2IJ4Oa+1KoJpdUO2EVL+jPU/OQ3U8votg== X-Received: by 2002:a05:6512:4007:b0:540:1fb5:3f9f with SMTP id 2adb3069b0e04-5439c28ae38mr13942554e87.47.1737898157961; Sun, 26 Jan 2025 05:29:17 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-543cbbd4cf8sm770488e87.201.2025.01.26.05.29.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Jan 2025 05:29:16 -0800 (PST) From: Dmitry Baryshkov Date: Sun, 26 Jan 2025 15:29:08 +0200 Subject: [PATCH v3 03/10] drm/display: hdmi-state-helper: handle CEC physical address 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: <20250126-drm-hdmi-connector-cec-v3-3-5b5b2d4956da@linaro.org> References: <20250126-drm-hdmi-connector-cec-v3-0-5b5b2d4956da@linaro.org> In-Reply-To: <20250126-drm-hdmi-connector-cec-v3-0-5b5b2d4956da@linaro.org> To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Dave Stevenson , =?utf-8?q?Ma=C3=ADra_Canal?= , Raspberry Pi Kernel Maintenance , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1811; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=Klk620Is/1tbtYcXQ8FYuys+ryQfkRDd4Rrv8wsapQY=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBnljijCZprOrZwWqHJxsZAFAM6dj6mDFy8rsaRO 6QKkE6uGU2JATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ5Y4owAKCRCLPIo+Aiko 1admB/sE+ydh5uJSpKj4Cz+Pt0QvIALY+Y3vS9INNJ8ZOQtD1hc8TlWDbv2L1wb8RDzKsKsaLC1 g1SFMu/bgEalhZEgCx2HqjH2mjCnWrvybPrdBPE3QJlqtuulkSkU5pM/ywF5qaEdkN81T2+Xjii 8fHRcZ6xzv1hXq+EIq/KLKdUMkpjST0jhvNI3ssFPG6supZqok1ENNlGa8UIL4e+oZyUk57dIKV l/A9ioRt0dpaCHCSs2+an1oV4zN4cdDhiFX7Moog/B+UA/832iFSywUG9w2Y07XJWYQv4riBQhT tfYvPQ2eQZPk3QYAzUt7W8b/RqMkkS9k0gckaO0tDFWbQ2W8 X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A Call HDMI CEC helpers in order to update physical address of the adapter. Signed-off-by: Dmitry Baryshkov Reviewed-by: Maxime Ripard --- drivers/gpu/drm/display/drm_hdmi_state_helper.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/display/drm_hdmi_state_helper.c b/drivers/gpu/= drm/display/drm_hdmi_state_helper.c index 2691e8b3e480131ac6e4e4b74b24947be55694bd..1e7ea9b387088d5f407b647a9a3= fead7a2929a30 100644 --- a/drivers/gpu/drm/display/drm_hdmi_state_helper.c +++ b/drivers/gpu/drm/display/drm_hdmi_state_helper.c @@ -6,6 +6,7 @@ #include =20 #include +#include #include #include =20 @@ -786,8 +787,11 @@ drm_atomic_helper_connector_hdmi_update(struct drm_con= nector *connector, const struct drm_edid *drm_edid; =20 if (status =3D=3D connector_status_disconnected) { - // TODO: also handle CEC and scramber, HDMI sink disconnected. + // TODO: also handle scramber, HDMI sink disconnected. drm_connector_hdmi_audio_plugged_notify(connector, false); + drm_edid_connector_update(connector, NULL); + drm_connector_hdmi_cec_phys_addr_invalidate(connector); + return; } =20 if (connector->hdmi.funcs->read_edid) @@ -800,8 +804,9 @@ drm_atomic_helper_connector_hdmi_update(struct drm_conn= ector *connector, drm_edid_free(drm_edid); =20 if (status =3D=3D connector_status_connected) { - // TODO: also handle CEC and scramber, HDMI sink is now connected. + // TODO: also handle scramber, HDMI sink is now connected. drm_connector_hdmi_audio_plugged_notify(connector, true); + drm_connector_hdmi_cec_phys_addr_set(connector); } } =20 --=20 2.39.5 From nobody Mon Feb 9 16:54:01 2026 Received: from mail-lf1-f46.google.com (mail-lf1-f46.google.com [209.85.167.46]) (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 ABDC31537C8 for ; Sun, 26 Jan 2025 13:29:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737898162; cv=none; b=baIkxp6vbiPLX0ycQfWR00W2RH9TsXQcyX2UPPV2qMqFer8R6FsEJShcevAa61SLUPmULWLOb0QGU8bxcx3l8fpnjrVTUQmMlylNslsm8nIuwJHZ6jHIOSX5Eqy+Rm5Bez0Z7hkOqOV9W4kWtEBvFYSto5nzMFnHjrZpFiO67Jw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737898162; c=relaxed/simple; bh=gLQhAOItk1SGD5tjqJAAptsrV//vN4Xt/at5DjS5YR4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=PZAWLXi8cfwEVtlUa09L6DVXjcrCyfioguthuDYbv9QUVr/oL4vSM5TnEklGDprwf6lMsDYFv+pig+wVxOAw8zQIz86Amy+KEWUg5DVgJUL850xfyfT7dFcUzWIRDvg534/WsDyas6t2W2sK00jDfqnWEWgvAuZE5uVGvz4+DX0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=wbuUmV92; arc=none smtp.client-ip=209.85.167.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="wbuUmV92" Received: by mail-lf1-f46.google.com with SMTP id 2adb3069b0e04-5439e331cceso4373321e87.1 for ; Sun, 26 Jan 2025 05:29:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1737898159; x=1738502959; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=QQncvRRAuoLjn6XHpoivkjOodkjhTrikHPuhN7/HYX0=; b=wbuUmV92vmFWst329p3tcgsNdEWt8Dr3d3urAAWcSCJbIe4vNd9MM7YASRPkbLt3Z+ YoyZIe6mXuTs8qiQQlsjX0NoADlwQpHMtg5gnpl3q9Dv5AD0+fzEloyiNIrnBs04T3o/ HUW+NGyhKy37P9MeRWjC+vHD53+BRgNm2UlZgzqDLTBEuanIUbvo784yV88yh7clvJsI AO+7Q9l1CBkdKbV+NyYQVGzZr9RwZXdg69mX9G/nDttZYwOz3tOwxfQvpuL3b6KEyDj7 G8onGlF16o6PqXzhiRvmOKnPfqgMuDHqCUivF1BKOK5bt9KFVY9NRcSjkoptImN+K93t 6oLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737898159; x=1738502959; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QQncvRRAuoLjn6XHpoivkjOodkjhTrikHPuhN7/HYX0=; b=RS2VUR1aooXtdpoqGQaNcbKz+NlLG/HihYet475hCo/WOsg3nmJDSt0B1lgFzjov0u TtK4VSdFY9LlOBgkNLFvRCnKxirskZP2ZPdWo326suFy+OeaMk5vVxxiumuB7Lm/SFwI CmYG5JudMe0z/JquX588MbQKJLvEVaBwRrN3dGmfeuOJU3cV/e95IX8MTJvzU2pUarJB oYW1M/2SLi/CdYvJ+t5bis+pVHmpY1oyHO1zBwDoQoZM8dEdRIA1ORCZzIHC7RxDYf/V clf836Gi280+XgtpAcX4RJEzJL922CERcfk7C7VqMPBELdIoLluk8/EfD8a4kJJc+rNu yQpA== X-Forwarded-Encrypted: i=1; AJvYcCWMDOlDoTdqA6JTA39QFkYM/6lFxa43p/0rAIu4OQiDa982VARgsfbyUbUigo6F2rHAvZYTCUDP8+2pX6Q=@vger.kernel.org X-Gm-Message-State: AOJu0Yx3t6CPIzl5LCvAb8jZE+G8tPMVkwZmqL/XJk2UCkw2eBS4HV46 +koAA6+GLE76vrGdxDJdh6JtOz/4OmiT1UssPPD/D4UvihXX3ExVsJ5Xz46q9Db7rnMqddniPTw PN18= X-Gm-Gg: ASbGncvBUWQmHoF8AaWWw6yr8gy553i+SDXn3NBhi51t2gumrVwYCXgZJQpJ8d6WP8R MxM0+w378GmtO20/ueG1aOc5UZPBJhb+dii8lB6mjhwEipqRTeYull3MIgli8jHZkhP3jzusCkc ZTR/FJQ2Xvz1s56u6ysumhXbolMHLCN6wvifTkc8hAlkKI//qHm76wY4/nJh2sWWjK4ha8vEg6+ 5DGezitR4hHVRL+M7S7h5DWJdOA5Hhx4WiL4VeWxv1E0ddVnnhamQtDDmPCuLJ5XX7ETHT1SB8D MsDxn3tyivWM X-Google-Smtp-Source: AGHT+IEt81Oa7UabYPV4+mRe4oWi7Klgy2H8e8ataKHVUzFtT6FX/ipVe56WsXXk5T+rYHlhBtnTKg== X-Received: by 2002:ac2:454b:0:b0:540:3561:8897 with SMTP id 2adb3069b0e04-5439c26751emr11564269e87.39.1737898158634; Sun, 26 Jan 2025 05:29:18 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-543cbbd4cf8sm770488e87.201.2025.01.26.05.29.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Jan 2025 05:29:18 -0800 (PST) From: Dmitry Baryshkov Date: Sun, 26 Jan 2025 15:29:09 +0200 Subject: [PATCH v3 04/10] drm/vc4: hdmi: switch to generic CEC helpers 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: <20250126-drm-hdmi-connector-cec-v3-4-5b5b2d4956da@linaro.org> References: <20250126-drm-hdmi-connector-cec-v3-0-5b5b2d4956da@linaro.org> In-Reply-To: <20250126-drm-hdmi-connector-cec-v3-0-5b5b2d4956da@linaro.org> To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Dave Stevenson , =?utf-8?q?Ma=C3=ADra_Canal?= , Raspberry Pi Kernel Maintenance , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=10666; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=gLQhAOItk1SGD5tjqJAAptsrV//vN4Xt/at5DjS5YR4=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBnljijVipVyTR9v9wCEdDGYSXHTVh6U54K2SFPO Xx6q2iAsXSJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ5Y4owAKCRCLPIo+Aiko 1UcdB/sGcuHMFOvCrZUOOtDcvik2ps9bkWvbfoLYkpL/wGQZkaJJ7NYpVoSIl0nx7ZquYnWCueu 9Fq2rYzwShauXCCYPm0Ht2ufBT6QR39xmBfXDpv1iOWqCHbF5mBEtGSwf72iIL0TGh8crUfNkxA r6y/+mSqNKyWYovclIHGFzJ488bofoL5HIlWuXGUuYCGYOhRcZ5zQXjjW1abK1x2otxIaM0UIz+ 2LKrKQNF/nE266QscT1NH8aFYhqpNxwkDTmY1tDC8ObkIpUkJyo+AewE9wxvFvac0gTAulKhOSU pUoedYj0dF1KxMyGks+JsPYp1msIFy0eMa0Hw5ufZbGAXR59 X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A Switch VC4 driver to using CEC helpers code, simplifying hotplug and registration / cleanup. The existing vc4_hdmi_cec_release() is kept for now. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/vc4/Kconfig | 1 + drivers/gpu/drm/vc4/vc4_hdmi.c | 138 ++++++++++++++++---------------------= ---- drivers/gpu/drm/vc4/vc4_hdmi.h | 1 - 3 files changed, 56 insertions(+), 84 deletions(-) diff --git a/drivers/gpu/drm/vc4/Kconfig b/drivers/gpu/drm/vc4/Kconfig index 123ab0ce178157c3b39466f87c7ac39c8470f329..bb8c40be325033632d3e94db87a= 16b03554ad3af 100644 --- a/drivers/gpu/drm/vc4/Kconfig +++ b/drivers/gpu/drm/vc4/Kconfig @@ -35,6 +35,7 @@ config DRM_VC4_HDMI_CEC bool "Broadcom VC4 HDMI CEC Support" depends on DRM_VC4 select CEC_CORE + select DRM_DISPLAY_HDMI_CEC_HELPER help Choose this option if you have a Broadcom VC4 GPU and want to use CEC. diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c index 47d9ada98430634cfd8c1e21c2a4d00d501bab7e..1108983c44858382cb9f09b6869= 56903645ebe0a 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -32,6 +32,7 @@ */ =20 #include +#include #include #include #include @@ -400,16 +401,8 @@ static void vc4_hdmi_handle_hotplug(struct vc4_hdmi *v= c4_hdmi, * the lock for now. */ =20 - if (status =3D=3D connector_status_disconnected) { - cec_phys_addr_invalidate(vc4_hdmi->cec_adap); - return; - } - drm_atomic_helper_connector_hdmi_hotplug(connector, status); =20 - cec_s_phys_addr(vc4_hdmi->cec_adap, - connector->display_info.source_physical_address, false); - if (status !=3D connector_status_connected) return; =20 @@ -2388,8 +2381,8 @@ static irqreturn_t vc4_cec_irq_handler_rx_thread(int = irq, void *priv) struct vc4_hdmi *vc4_hdmi =3D priv; =20 if (vc4_hdmi->cec_rx_msg.len) - cec_received_msg(vc4_hdmi->cec_adap, - &vc4_hdmi->cec_rx_msg); + drm_connector_hdmi_cec_received_msg(&vc4_hdmi->connector, + &vc4_hdmi->cec_rx_msg); =20 return IRQ_HANDLED; } @@ -2399,15 +2392,17 @@ static irqreturn_t vc4_cec_irq_handler_tx_thread(in= t irq, void *priv) struct vc4_hdmi *vc4_hdmi =3D priv; =20 if (vc4_hdmi->cec_tx_ok) { - cec_transmit_done(vc4_hdmi->cec_adap, CEC_TX_STATUS_OK, - 0, 0, 0, 0); + drm_connector_hdmi_cec_transmit_done(&vc4_hdmi->connector, + CEC_TX_STATUS_OK, + 0, 0, 0, 0); } else { /* * This CEC implementation makes 1 retry, so if we * get a NACK, then that means it made 2 attempts. */ - cec_transmit_done(vc4_hdmi->cec_adap, CEC_TX_STATUS_NACK, - 0, 2, 0, 0); + drm_connector_hdmi_cec_transmit_done(&vc4_hdmi->connector, + CEC_TX_STATUS_NACK, + 0, 2, 0, 0); } return IRQ_HANDLED; } @@ -2564,9 +2559,9 @@ static irqreturn_t vc4_cec_irq_handler(int irq, void = *priv) return ret; } =20 -static int vc4_hdmi_cec_enable(struct cec_adapter *adap) +static int vc4_hdmi_cec_enable(struct drm_connector *connector) { - struct vc4_hdmi *vc4_hdmi =3D cec_get_drvdata(adap); + struct vc4_hdmi *vc4_hdmi =3D connector_to_vc4_hdmi(connector); struct drm_device *drm =3D vc4_hdmi->connector.dev; /* clock period in microseconds */ const u32 usecs =3D 1000000 / CEC_CLOCK_FREQ; @@ -2631,9 +2626,9 @@ static int vc4_hdmi_cec_enable(struct cec_adapter *ad= ap) return 0; } =20 -static int vc4_hdmi_cec_disable(struct cec_adapter *adap) +static int vc4_hdmi_cec_disable(struct drm_connector *connector) { - struct vc4_hdmi *vc4_hdmi =3D cec_get_drvdata(adap); + struct vc4_hdmi *vc4_hdmi =3D connector_to_vc4_hdmi(connector); struct drm_device *drm =3D vc4_hdmi->connector.dev; unsigned long flags; int idx; @@ -2667,17 +2662,17 @@ static int vc4_hdmi_cec_disable(struct cec_adapter = *adap) return 0; } =20 -static int vc4_hdmi_cec_adap_enable(struct cec_adapter *adap, bool enable) +static int vc4_hdmi_cec_adap_enable(struct drm_connector *connector, bool = enable) { if (enable) - return vc4_hdmi_cec_enable(adap); + return vc4_hdmi_cec_enable(connector); else - return vc4_hdmi_cec_disable(adap); + return vc4_hdmi_cec_disable(connector); } =20 -static int vc4_hdmi_cec_adap_log_addr(struct cec_adapter *adap, u8 log_add= r) +static int vc4_hdmi_cec_adap_log_addr(struct drm_connector *connector, u8 = log_addr) { - struct vc4_hdmi *vc4_hdmi =3D cec_get_drvdata(adap); + struct vc4_hdmi *vc4_hdmi =3D connector_to_vc4_hdmi(connector); struct drm_device *drm =3D vc4_hdmi->connector.dev; unsigned long flags; int idx; @@ -2703,10 +2698,10 @@ static int vc4_hdmi_cec_adap_log_addr(struct cec_ad= apter *adap, u8 log_addr) return 0; } =20 -static int vc4_hdmi_cec_adap_transmit(struct cec_adapter *adap, u8 attempt= s, +static int vc4_hdmi_cec_adap_transmit(struct drm_connector *connector, u8 = attempts, u32 signal_free_time, struct cec_msg *msg) { - struct vc4_hdmi *vc4_hdmi =3D cec_get_drvdata(adap); + struct vc4_hdmi *vc4_hdmi =3D connector_to_vc4_hdmi(connector); struct drm_device *dev =3D vc4_hdmi->connector.dev; unsigned long flags; u32 val; @@ -2749,84 +2744,66 @@ static int vc4_hdmi_cec_adap_transmit(struct cec_ad= apter *adap, u8 attempts, return 0; } =20 -static const struct cec_adap_ops vc4_hdmi_cec_adap_ops =3D { - .adap_enable =3D vc4_hdmi_cec_adap_enable, - .adap_log_addr =3D vc4_hdmi_cec_adap_log_addr, - .adap_transmit =3D vc4_hdmi_cec_adap_transmit, -}; - -static void vc4_hdmi_cec_release(void *ptr) -{ - struct vc4_hdmi *vc4_hdmi =3D ptr; - - cec_unregister_adapter(vc4_hdmi->cec_adap); - vc4_hdmi->cec_adap =3D NULL; -} - -static int vc4_hdmi_cec_init(struct vc4_hdmi *vc4_hdmi) +static int vc4_hdmi_cec_init(struct drm_connector *connector) { - struct cec_connector_info conn_info; + struct vc4_hdmi *vc4_hdmi =3D connector_to_vc4_hdmi(connector); struct platform_device *pdev =3D vc4_hdmi->pdev; struct device *dev =3D &pdev->dev; int ret; =20 - if (!of_property_present(dev->of_node, "interrupts")) { - dev_warn(dev, "'interrupts' DT property is missing, no CEC\n"); - return 0; - } - - vc4_hdmi->cec_adap =3D cec_allocate_adapter(&vc4_hdmi_cec_adap_ops, - vc4_hdmi, - vc4_hdmi->variant->card_name, - CEC_CAP_DEFAULTS | - CEC_CAP_CONNECTOR_INFO, 1); - ret =3D PTR_ERR_OR_ZERO(vc4_hdmi->cec_adap); - if (ret < 0) - return ret; - - cec_fill_conn_info_from_drm(&conn_info, &vc4_hdmi->connector); - cec_s_conn_info(vc4_hdmi->cec_adap, &conn_info); - if (vc4_hdmi->variant->external_irq_controller) { ret =3D devm_request_threaded_irq(dev, platform_get_irq_byname(pdev, "ce= c-rx"), vc4_cec_irq_handler_rx_bare, vc4_cec_irq_handler_rx_thread, 0, "vc4 hdmi cec rx", vc4_hdmi); if (ret) - goto err_delete_cec_adap; + return ret; =20 ret =3D devm_request_threaded_irq(dev, platform_get_irq_byname(pdev, "ce= c-tx"), vc4_cec_irq_handler_tx_bare, vc4_cec_irq_handler_tx_thread, 0, "vc4 hdmi cec tx", vc4_hdmi); if (ret) - goto err_delete_cec_adap; + return ret; } else { ret =3D devm_request_threaded_irq(dev, platform_get_irq(pdev, 0), vc4_cec_irq_handler, vc4_cec_irq_handler_thread, 0, "vc4 hdmi cec", vc4_hdmi); if (ret) - goto err_delete_cec_adap; + return ret; } =20 - ret =3D cec_register_adapter(vc4_hdmi->cec_adap, &pdev->dev); - if (ret < 0) - goto err_delete_cec_adap; + return 0; +} + +static const struct drm_connector_hdmi_cec_adapter_ops vc4_hdmi_cec_adap_o= ps =3D { + .base.unregister =3D drm_connector_hdmi_cec_unregister, + .init =3D vc4_hdmi_cec_init, + .enable =3D vc4_hdmi_cec_adap_enable, + .log_addr =3D vc4_hdmi_cec_adap_log_addr, + .transmit =3D vc4_hdmi_cec_adap_transmit, +}; + +static int vc4_hdmi_cec_register(struct vc4_hdmi *vc4_hdmi) +{ + struct platform_device *pdev =3D vc4_hdmi->pdev; + struct device *dev =3D &pdev->dev; + + if (!of_property_present(dev->of_node, "interrupts")) { + dev_warn(dev, "'interrupts' DT property is missing, no CEC\n"); + return 0; + } =20 /* - * NOTE: Strictly speaking, we should probably use a DRM-managed - * registration there to avoid removing the CEC adapter by the - * time the DRM driver doesn't have any user anymore. + * NOTE: the CEC adapter will be unregistered from + * drm_connector_cleanup(), which is called from drm_dev_unplug() + * during device unbind. * * However, the CEC framework already cleans up the CEC adapter * only when the last user has closed its file descriptor, so we * don't need to handle it in DRM. * - * By the time the device-managed hook is executed, we will give - * up our reference to the CEC adapter and therefore don't - * really care when it's actually freed. - * * There's still a problematic sequence: if we unregister our * CEC adapter, but the userspace keeps a handle on the CEC * adapter but not the DRM device for some reason. In such a @@ -2837,19 +2814,14 @@ static int vc4_hdmi_cec_init(struct vc4_hdmi *vc4_h= dmi) * the CEC framework already handles this too, by calling * cec_is_registered() in cec_ioctl() and cec_poll(). */ - ret =3D devm_add_action_or_reset(dev, vc4_hdmi_cec_release, vc4_hdmi); - if (ret) - return ret; - - return 0; - -err_delete_cec_adap: - cec_delete_adapter(vc4_hdmi->cec_adap); - - return ret; + return drm_connector_hdmi_cec_register(&vc4_hdmi->connector, + &vc4_hdmi_cec_adap_ops, + vc4_hdmi->variant->card_name, + 1, + &pdev->dev); } #else -static int vc4_hdmi_cec_init(struct vc4_hdmi *vc4_hdmi) +static int vc4_hdmi_cec_register(struct vc4_hdmi *vc4_hdmi) { return 0; } @@ -3271,7 +3243,7 @@ static int vc4_hdmi_bind(struct device *dev, struct d= evice *master, void *data) if (ret) goto err_put_runtime_pm; =20 - ret =3D vc4_hdmi_cec_init(vc4_hdmi); + ret =3D vc4_hdmi_cec_register(vc4_hdmi); if (ret) goto err_put_runtime_pm; =20 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h index e3d989ca302b72533c374dfa3fd0d5bd7fe64a82..5acbe27fb57659d02f32ca571dd= 3ded4a1a0d9dc 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.h +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h @@ -146,7 +146,6 @@ struct vc4_hdmi { */ bool disable_wifi_frequencies; =20 - struct cec_adapter *cec_adap; struct cec_msg cec_rx_msg; bool cec_tx_ok; bool cec_irq_was_rx; --=20 2.39.5 From nobody Mon Feb 9 16:54:01 2026 Received: from mail-lf1-f53.google.com (mail-lf1-f53.google.com [209.85.167.53]) (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 1504015530B for ; Sun, 26 Jan 2025 13:29:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737898165; cv=none; b=kE/umv9PBK4U/iM43XbtxqoLBbHdDccvx5wOTAr5tka2Wf3JOMpcPRHsHBYk9xgdahWFIlCRIQNlj1W5YIDHsG/qoNZoWJzoRDxFKS4bfTn8VjtEskneORbHtNOMy8nAcdIDm83tcT7gEsAUZIPxwqYQ5oZD9swylWLNu51mNo8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737898165; c=relaxed/simple; bh=/jsOvxmo9hww94WNxXcKKcEbKigL+a1mybJ59QI/uaw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Ou9CJo3lrKDuhR5hEgymdxZviYeEqAuGjRWGn0rJc4UE5mfXkxbe6UTfo2IiJNR3fywpjy1gDzvEgHt+255tH5GHljPyjCwrJQS/2+3cUVObqRPiyflJrBa66BqOzQIlO4gTE2BKD+SOiNr2OEtnQR7pgl//AwbP7EG+SZpF4vs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=Y6LPzFAk; arc=none smtp.client-ip=209.85.167.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="Y6LPzFAk" Received: by mail-lf1-f53.google.com with SMTP id 2adb3069b0e04-5439b0dd4bfso2989657e87.0 for ; Sun, 26 Jan 2025 05:29:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1737898161; x=1738502961; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=WHkaqh97FX5NK3tiGexBaGATffLfTWz5HBGvpvU9JzI=; b=Y6LPzFAkPWXGoTR/OFY8sGaHXgBIhG/zg9gJPt+ZJfoKLTuFLBw2t0CWnQN7tLp4Sb elOihTBaug9AuCC7Rvx+qP3LlijUHiNWFaqgcbYnhoKKPMoHxebZ0lq0ldTA7ocC3hfW KrBsCst7c6rgQNx+Eq7GeAVdlnWV10qZYJTy/deimvLMWY3IAf9iQINbvGvJe+hm3i3+ UmAJh5jvwVzLR5b9tKZitoKTVH7liRhK/PznfH4jdJlpnvkXC7668kfVCVQOBSjdPNjs B3T4CUtI586xllmBlQn3dvskQqgn23arfcicS6xMipItmwqNw7pAb4qCPtSGdykehhh8 2vYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737898161; x=1738502961; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WHkaqh97FX5NK3tiGexBaGATffLfTWz5HBGvpvU9JzI=; b=KsexWMiXNbIxeSqDSx731KJ8+fo5iumV2T+D5IHzFDXZ0ylhCKwjX9pKdCGsnkth9G cjKCOXDGjLQodIsmdaoxq6C/MLQ7SYYOLaS20EanywX1PHQrZWSpSKp60ZDulvI7m1eK aSImPOxU6pfRCtZIKFEyyyn+fv/SUIbNXDnTMAe1aBCu50OblJC5lKYzkyFZtAsUacjz Jo7O46LwuVzDng2Afl6OSFypBVx/DjQKyHB4I/CKq+n50CPS0/kso1jVFrGGrckAnkB2 zS5iAtJOD2xbf5NfpfI39sj8GlRSldfuZA7EKHbpPahzAd/MxjVpjn2O10YYa2SOhmqs FkRw== X-Forwarded-Encrypted: i=1; AJvYcCV73g34NZMtP3xECmD3bwbzeQOIaD8b1eRfJo1qtriXIj7ais4Ub7PJKr5vHJyB3VJsymx8pd54BNiLAd4=@vger.kernel.org X-Gm-Message-State: AOJu0YwVQk6yu1B2n3TFcw+FMqAhy2FtAb6M/2YYi487O37y27k3rOC9 Mm3Apz5tMSs7pSaV/SAQ/HJqv8z0hf/kbikVi5xTybGzI2xdDCsuZokWvRVMhxI= X-Gm-Gg: ASbGncup/vpUyHWe69vF0LXqEpZWXwOXUGexYUs3cTUWoK5h7ZFLq0Pq/4jRq9nwxvn GBdR3SSigjD5aP8JI2L28BzeF7nIQ28ZkxVuq1AsnMii3wEJGQpI6gNwe4nKh6dpmp8/mCXA0/j r9TJmVbqJkGx7U3/NT+4AOOYkEo79ROw3ZYM9vzQN8HLjGYLoUN0d935NJntJ1KPpbGWSAitWrh ft5vh6ow1+z5+0NSjbfpLiTlP0cPdQY6XJr3epYdiDRkc05OijWHlbIfauAVVaS085tZ8CbcHy2 dDRU/crDuk0fp1GAML9XWHg= X-Google-Smtp-Source: AGHT+IEmnk0UB4SJeTDzm9WgvYSNKbhk5XBGUNzl4sq2v2jpKfa3K9WebNLlF40lsVrNumqRwggjMg== X-Received: by 2002:ac2:54b9:0:b0:53e:ca48:776e with SMTP id 2adb3069b0e04-5439c282d8fmr9525511e87.36.1737898161083; Sun, 26 Jan 2025 05:29:21 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-543cbbd4cf8sm770488e87.201.2025.01.26.05.29.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Jan 2025 05:29:19 -0800 (PST) From: Dmitry Baryshkov Date: Sun, 26 Jan 2025 15:29:10 +0200 Subject: [PATCH v3 05/10] drm/display: bridge-connector: hook in CEC notifier support 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: <20250126-drm-hdmi-connector-cec-v3-5-5b5b2d4956da@linaro.org> References: <20250126-drm-hdmi-connector-cec-v3-0-5b5b2d4956da@linaro.org> In-Reply-To: <20250126-drm-hdmi-connector-cec-v3-0-5b5b2d4956da@linaro.org> To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Dave Stevenson , =?utf-8?q?Ma=C3=ADra_Canal?= , Raspberry Pi Kernel Maintenance , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=4084; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=/jsOvxmo9hww94WNxXcKKcEbKigL+a1mybJ59QI/uaw=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBnljik10DbWjBxmbwXYxJDtHkvwc/vBACwPceo3 MGJ1DGhS9iJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ5Y4pAAKCRCLPIo+Aiko 1WbCCACSLcv6sQHDsQBgz28DGAgyP+HvXdXCf+ihbYLJzh1UBV2MgVhof0dsTHw/FLHvIiiQY4h MCVgx9bAxper6WX4WAfP5ym1uOIRDu/iBcWSqxJRgEb0hXWkKlnSbfJMD1Zl+djdFKpv4URB3tt EFCK2AtDdrysENkQep6Gjp7yuFOcsfine+21bXlc1paPI4jCj0tO/rKZbkQGyP/RZdgPNsh6oe8 6GCiZ+5WbejS+7jSk6KbJR4DFt23xmcvJX+uTSB6QwTnTHaqwrxy5ehZOjvQofoZ7RwY8W+ghAt HANvEDZzfzcJNEm0obk/Y+mUs/jEeg00wMUIkqiLk6Gs9ZbU X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A Allow HDMI DRM bridges to create CEC notifier. Physical address is handled automatically by drm_atomic_helper_connector_hdmi_hotplug() being called from .detect() path. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/bridge/lontium-lt9611.c | 2 +- drivers/gpu/drm/display/Kconfig | 1 + drivers/gpu/drm/display/drm_bridge_connector.c | 11 ++++++++++- include/drm/drm_bridge.h | 9 +++++++-- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/bridge/lontium-lt9611.c b/drivers/gpu/drm/brid= ge/lontium-lt9611.c index 0df2c68e45897f2f2eed10a56dd670582526180b..158a4966ac00657074b11e93dc9= bcab41c16db18 100644 --- a/drivers/gpu/drm/bridge/lontium-lt9611.c +++ b/drivers/gpu/drm/bridge/lontium-lt9611.c @@ -1252,7 +1252,7 @@ static int lt9611_probe(struct i2c_client *client) lt9611->bridge.type =3D DRM_MODE_CONNECTOR_HDMIA; lt9611->bridge.vendor =3D "Lontium"; lt9611->bridge.product =3D "LT9611"; - lt9611->bridge.hdmi_audio_dev =3D dev; + lt9611->bridge.hdmi_dev =3D dev; lt9611->bridge.hdmi_audio_max_i2s_playback_channels =3D 8; lt9611->bridge.hdmi_audio_dai_port =3D 2; =20 diff --git a/drivers/gpu/drm/display/Kconfig b/drivers/gpu/drm/display/Kcon= fig index 49da9b768acf3e5f84f2cefae4bb042cfd57a50c..d35d945a3811c30247a9f3e282a= 16c9eedd0d4e9 100644 --- a/drivers/gpu/drm/display/Kconfig +++ b/drivers/gpu/drm/display/Kconfig @@ -16,6 +16,7 @@ if DRM_DISPLAY_HELPER config DRM_BRIDGE_CONNECTOR bool select DRM_DISPLAY_HDMI_AUDIO_HELPER + select DRM_DISPLAY_HDMI_CEC_HELPER select DRM_DISPLAY_HDMI_STATE_HELPER help DRM connector implementation terminating DRM bridge chains. diff --git a/drivers/gpu/drm/display/drm_bridge_connector.c b/drivers/gpu/d= rm/display/drm_bridge_connector.c index 0397e62f9cbc93321caeae99982f5e3c66d308c5..9f234bc647d5c0880d4c42aea13= 0074b7fa54573 100644 --- a/drivers/gpu/drm/display/drm_bridge_connector.c +++ b/drivers/gpu/drm/display/drm_bridge_connector.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include =20 @@ -616,7 +617,7 @@ struct drm_connector *drm_bridge_connector_init(struct = drm_device *drm, return ERR_PTR(-EINVAL); =20 ret =3D drm_connector_hdmi_audio_init(connector, - bridge->hdmi_audio_dev, + bridge->hdmi_dev, &drm_bridge_connector_hdmi_audio_funcs, bridge->hdmi_audio_max_i2s_playback_channels, bridge->hdmi_audio_spdif_playback, @@ -624,6 +625,14 @@ struct drm_connector *drm_bridge_connector_init(struct= drm_device *drm, if (ret) return ERR_PTR(ret); } + + if (bridge->hdmi_cec_notifier) { + ret =3D drm_connector_hdmi_cec_notifier_register(connector, + NULL, + bridge->hdmi_dev); + if (ret) + return ERR_PTR(ret); + } } else { ret =3D drmm_connector_init(drm, connector, &drm_bridge_connector_funcs, diff --git a/include/drm/drm_bridge.h b/include/drm/drm_bridge.h index 4b84faf14e368310dd20aa964e8178ec80aa6fa7..1f1670e3c6aac39b8b891b0d5e7= e91254eb0d3a1 100644 --- a/include/drm/drm_bridge.h +++ b/include/drm/drm_bridge.h @@ -914,9 +914,9 @@ struct drm_bridge { unsigned int max_bpc; =20 /** - * @hdmi_audio_dev: device to be used as a parent for the HDMI Codec + * @hdmi_dev: device to be used as a parent for the HDMI Codec */ - struct device *hdmi_audio_dev; + struct device *hdmi_dev; =20 /** * @hdmi_audio_max_i2s_playback_channels: maximum number of playback @@ -933,6 +933,11 @@ struct drm_bridge { * @hdmi_audio_dai_port: sound DAI port, -1 if it is not enabled */ int hdmi_audio_dai_port; + + /** + * @hdmi_cec_notifier: use this bridge to register a CEC notifier + */ + bool hdmi_cec_notifier; }; =20 static inline struct drm_bridge * --=20 2.39.5 From nobody Mon Feb 9 16:54:01 2026 Received: from mail-lf1-f54.google.com (mail-lf1-f54.google.com [209.85.167.54]) (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 5622515747D for ; Sun, 26 Jan 2025 13:29:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737898167; cv=none; b=uJ8EAN6Z/Xyse/2bvDg8JNsv/aFqOvWg2S+LutpCsbnXEk/aUTQ5dT36qTmD//38ClISKxX55Fwe8ThXI2SQFVHOvN0oJe7eeZi/v2tRFYSMofaErMAKSkWztoMZoDI8xOjV5aKFEy0BQun77+NqrZJdBsUWrEjax6dKIud+ne0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737898167; c=relaxed/simple; bh=Bh587iD2fc71HoCxezk2yuAVtboO7fHMro855SCGYPU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Nxd8iLDdD31r7xii//jsZEdJ08r1kVFOwtom5mJkD2XDU/Q2MJ2rGOP4PlCggeRbFj57D45yW19Q+wgqs9zx35fknYLQAz/VhHdzDxp+E3qNrnEqLglSBs2SKByjd0HQ0sQB/0tWa4cApGgB7Z0D7JgYFwUm3Mo3lSKAPRht6ko= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=KYmBAA7G; arc=none smtp.client-ip=209.85.167.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="KYmBAA7G" Received: by mail-lf1-f54.google.com with SMTP id 2adb3069b0e04-543cc81ddebso2105063e87.1 for ; Sun, 26 Jan 2025 05:29:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1737898163; x=1738502963; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=efhfp+4qW1iSmQeuDMr+e/8ImYQLWTnZeSHC6Pg4yQI=; b=KYmBAA7GEK7zn5pjeon9RuG0BxyIh7FC6rd4871SQ6r7K2W8SLeASXWN/1UvpoxvY8 fJit9nDY+J5YZQ9Zmjj3d+4nFNtSiV7WaToEFn+PbsbhvDDxBQhjU1OUws/CNk0PQhCC 839vun+b/kQ6J2+YnT5w7M9FjopPdWfW4lXMWIVYcZz0mPcAn+pgwa2ueQkm1w9uuAfI 1K29eKE6TLx2YGUkNplmg0BW8pDWwyQbYAl+z0pC4XwrzACsB4mRBTYZLsIbm/o2RlwG CQZbjaOGpKNCGPc+Gl/w1I/OHjjHVmc/lGYn9rf46YA5pKG+l52nkDzGT+4dcIHX72h6 v9LQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737898163; x=1738502963; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=efhfp+4qW1iSmQeuDMr+e/8ImYQLWTnZeSHC6Pg4yQI=; b=l2iOLunkFLmCawHHoMpHw7VbRkdzN5cZUFNt4yD6f4HamHS28/qJ02qpAElTtyyHDN TELl3y/uQpDF4CiM+KOCuvlTHoJY0xUNR1FNE1XrJQXgE5ZNjeGLDsCnL21R0/PiEBYF 8FFxneETKM3sG0kM4gKNzO0H5QJ+jh9e1xbpufuiz7R3Bmiy9Vl3Lb1DyW0IlD87iagi 60sYhK5LfiRNFKUiVnvJ6XGsux2HRNRBJlC+Q8Zeq1P3uY8qQOxuFve+D8ZIdSrDxAPi airR7vJfoAZkO4Ru1VP+ptSvwiZnIVQKW6q5a+9pHijeMTd+3c+uW52F5X2QNZPCLPdp J/zQ== X-Forwarded-Encrypted: i=1; AJvYcCVGkT13ffQ+oNfTj2VFuk6hZ//DUbZSQSVP6Xha4HwRB6faCnf03ffOv/bDxulsV2/LX2AW3OkPLd10LXE=@vger.kernel.org X-Gm-Message-State: AOJu0Yy4Xlfp3qrBjmvW/hfYdGF+FEPVrDmzBUxiw/W9c1/wXPQJqRI4 0iTvEqfQvRP0ODTCZtlHAN6XhbX42GhKOJtGT0YbnSUOIV6GnLX372isEg+4iGc= X-Gm-Gg: ASbGncv5LtTb3X49MHq4HvwA+imrG/mcBEl4nIyadOFecdofFKJ/hxS4Pva8l8r0KIT 8jgVW3t2oUPnMC5wp+X9D7E9fiB8vBYGxinraiiBfUpLREC2JdL5W7u1/iqsM5ElUtGD7xQZwIg 4yDDmtnVY5C//idpWm/T1qnovpAQuGq3wdFfLWK9L071TKzYG8J9WgNxkbSLmnJ21FqHXKCe23V jeyZon3Tnz1/QkiGsxnGTxQOWiE8HuU3E6WgSeGAmneVqlEgmbNrGrLBGISiako7eG7cxHz776f riHQItOZB70o X-Google-Smtp-Source: AGHT+IGRFVavtCP2oHUG3cWkJln79H03XgQNclX1sBSU4i0U6FM+nxYetEFqwINGPmVUjLm2/ld5oQ== X-Received: by 2002:ac2:5497:0:b0:542:2a20:e699 with SMTP id 2adb3069b0e04-5439c21f31fmr9969294e87.9.1737898163506; Sun, 26 Jan 2025 05:29:23 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-543cbbd4cf8sm770488e87.201.2025.01.26.05.29.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Jan 2025 05:29:22 -0800 (PST) From: Dmitry Baryshkov Date: Sun, 26 Jan 2025 15:29:11 +0200 Subject: [PATCH v3 06/10] drm/bridge: move private data to the end of the struct 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: <20250126-drm-hdmi-connector-cec-v3-6-5b5b2d4956da@linaro.org> References: <20250126-drm-hdmi-connector-cec-v3-0-5b5b2d4956da@linaro.org> In-Reply-To: <20250126-drm-hdmi-connector-cec-v3-0-5b5b2d4956da@linaro.org> To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Dave Stevenson , =?utf-8?q?Ma=C3=ADra_Canal?= , Raspberry Pi Kernel Maintenance , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1860; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=Bh587iD2fc71HoCxezk2yuAVtboO7fHMro855SCGYPU=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBnljikKPA9DA3frChDr5cC8Ud5cvJdTqCYznd+J 5AmlRoZ5Z2JATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ5Y4pAAKCRCLPIo+Aiko 1Sz/CACtnEd7Pc0822JrjUoq6+RwZyPotsnDptSEdfECF9jiRDPxncN19071vyguqmutGjgtUOH LeW+kdl82VIQJGyxkPUb49s3ZPRUHA5/Aqe1Wlr8xHagTq1K1iyCsi02KTMCk4fYBbe/E+OOnkK 1gPLYH/iOBu1vJd4PwvYVh4JNJeynmCet1a1Op1MuAwoUhNO31GgepazWzuRizxbjFxkuFXyqJW mGsaN2v2w2Rl/AlFopd6JnAjS6DuqRAkrJV6DFA3ea4xA7FS5XYl9XKIBisAUi+Px6p9FskRNNQ igUckx2Qk0mELpvZ7VkFw5x2inT9H89HhjT3/vuH3IsEUjUO X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A WHen adding HDMI fields I didn't notice the private: declaration for HPD fields. Move private fields to the end of the struct drm_bride to have clear distinction between private and public fields. Signed-off-by: Dmitry Baryshkov Reviewed-by: Maxime Ripard --- include/drm/drm_bridge.h | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/include/drm/drm_bridge.h b/include/drm/drm_bridge.h index 1f1670e3c6aac39b8b891b0d5e7e91254eb0d3a1..348778f233b06265a6ae577762c= 6558e69cdb396 100644 --- a/include/drm/drm_bridge.h +++ b/include/drm/drm_bridge.h @@ -872,21 +872,6 @@ struct drm_bridge { * @ddc: Associated I2C adapter for DDC access, if any. */ struct i2c_adapter *ddc; - /** private: */ - /** - * @hpd_mutex: Protects the @hpd_cb and @hpd_data fields. - */ - struct mutex hpd_mutex; - /** - * @hpd_cb: Hot plug detection callback, registered with - * drm_bridge_hpd_enable(). - */ - void (*hpd_cb)(void *data, enum drm_connector_status status); - /** - * @hpd_data: Private data passed to the Hot plug detection callback - * @hpd_cb. - */ - void *hpd_data; =20 /** * @vendor: Vendor of the product to be used for the SPD InfoFrame @@ -938,6 +923,22 @@ struct drm_bridge { * @hdmi_cec_notifier: use this bridge to register a CEC notifier */ bool hdmi_cec_notifier; + + /** private: */ + /** + * @hpd_mutex: Protects the @hpd_cb and @hpd_data fields. + */ + struct mutex hpd_mutex; + /** + * @hpd_cb: Hot plug detection callback, registered with + * drm_bridge_hpd_enable(). + */ + void (*hpd_cb)(void *data, enum drm_connector_status status); + /** + * @hpd_data: Private data passed to the Hot plug detection callback + * @hpd_cb. + */ + void *hpd_data; }; =20 static inline struct drm_bridge * --=20 2.39.5 From nobody Mon Feb 9 16:54:01 2026 Received: from mail-lf1-f45.google.com (mail-lf1-f45.google.com [209.85.167.45]) (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 CB90115E5B8 for ; Sun, 26 Jan 2025 13:29:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737898169; cv=none; b=skVgE6LG0xaFI+f64y4OPqBP7vMKzm+zS6mFAcDOCSGd0uclzVEDpqkdgAEdri1dEfnjfDHMYjSZl9jCD/0iXDgQixzxAfGWnps8n7dwWdA58TtpCDc5Nf9t/0jDnzl7qeKp+qEV2ACqT5w4cob33E50uVnQwFRHUyy0MjPIRgA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737898169; c=relaxed/simple; bh=8KmVPM6GAMlsBDAHnGMu9T0kXZRp9qdL3hAnikOOhow=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=sr+gtK0SrK/locQm8E6m9RvWlPcyznCRoKkB+rVVyzuuWLFvJ/hfE3TX8Z3CRtTmuy0zAFGyXViQ+oStzb23B5qD6soEHAtQy8GEW3QXlWHVuEouM3ShQBSD4VyMb1Bd28rVg+PFHk1zbAOdbvRzWxE5ssVPdIIOyfa8ERuLLAo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=nTp8SO+j; arc=none smtp.client-ip=209.85.167.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="nTp8SO+j" Received: by mail-lf1-f45.google.com with SMTP id 2adb3069b0e04-5401bd6cdb7so3780018e87.2 for ; Sun, 26 Jan 2025 05:29:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1737898166; x=1738502966; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=eaHMvUQVVEqao58qO6A/gTtUiQNtzJSNB/5ccpaHYJU=; b=nTp8SO+j6F5GCHxtVBnNdCsguAh7yOFBYKL3ZaEgj2o6JawQF3Ahlgin3BPvQZX/Nw GnCa6MlczRxnNGN2KM9YMwsL6aFKgsbguRrab/UFZSX4Iv87oImmJnHxI0otRvct7P0s SLpugW4HKqyVOEpaeK/bhD8s6eH2XwJfllJMYGsezCt3MuZp7fGvcy+tdhXEApTD7VVi Pi4+MTVRvUKK4qlQatY8s/hmikrZ0SVW+95RbN6iekKeF0TbaZSmPmjrGjxaVe1f9FWA wSUBJIH4GEdUOpAYS8I+qwIQbbZlXlnEXqhyDELyB87nBXXus1oIOeCndrni2y6ykTK0 onOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737898166; x=1738502966; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=eaHMvUQVVEqao58qO6A/gTtUiQNtzJSNB/5ccpaHYJU=; b=PlXoBJyE37fQzLqLr2B/GkotsFOH+WXfxnB7koruE0kPp0htC4BpoZ5s+0h59UExhx u0yTYyDFQoYH3WMAyeslOI3MUDgbRbSyBXPw30Q/jKacnah8YtgoHQMq/vLc+41mDotk qo07c+7gMn07lfDn7CY6K/8rahr97NnO36sg43EK+zSKlCBaq6ywqu6q2od+iq3Bttto W7Od7H8y7jKQ3Nx+II8il986q2So4CPeLGpErMYwJntwqGYOc+YQnXgn5eA8rwIOaQag EYMXP+QGFhzlb+vrKQ9ImOJfIAumtW5tA3fbj1elNDvERq83FECyliuUGOac00iWV03A 3n7w== X-Forwarded-Encrypted: i=1; AJvYcCU+0X0s0GLe6lZ7bpwRDebweMAdgdj1HYvGhRrlbS2z6cdp/yv3/S7t9fpBbkF3DwFuDOys0VXRlU8qvZM=@vger.kernel.org X-Gm-Message-State: AOJu0YwRBlfCTSs6Iuz+Cvs5NXv3YdcExHM/e+SrkGJgPfqNibtiZa79 8wCLvXw+ZLAvelIBBxYQHDNnJvVUd1sKooUj9YUzaJFF0fvDAVz1r8ihCD2yNlY= X-Gm-Gg: ASbGnctwvBqIA/1uB93aZN0PslVjMbeAKNxBrtfD0RRbJ1CMghzk8B2sDnRHeFP2Cup F95cykQZ3XM5LjJ7Tr/zDqOPdCPaKUY4UbVKiB759UspWoWZ2es+meufgpwko8xQBsIXeLl9+PW ztM2WzQnWzQq0ubzwgTOJj9piGhZ5vIFH2V8syGl78kE45RRdas/Gypq15PFsRlYYKnPxvBitGH EwdklD8FzBlWbGnmdMHdutfr9lz/ZQp+uc+GgJC4gQSBxgXfNiPdSj5PriAHX82tOO/UK0WvIV6 h0zZY/XD5IC/ X-Google-Smtp-Source: AGHT+IEKdtN0/flyrp4R1BEmnLgqwRjLmXPNVu/6Q4EzCFgKVRbVHrqTCJ1zpGOk1ZBWJIEDf3PA0g== X-Received: by 2002:a19:700a:0:b0:540:1d37:e6c with SMTP id 2adb3069b0e04-5439c245c87mr11786754e87.30.1737898165904; Sun, 26 Jan 2025 05:29:25 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-543cbbd4cf8sm770488e87.201.2025.01.26.05.29.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Jan 2025 05:29:24 -0800 (PST) From: Dmitry Baryshkov Date: Sun, 26 Jan 2025 15:29:12 +0200 Subject: [PATCH v3 07/10] drm/display: hdmi-cec-helper: add bridge-related functions 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: <20250126-drm-hdmi-connector-cec-v3-7-5b5b2d4956da@linaro.org> References: <20250126-drm-hdmi-connector-cec-v3-0-5b5b2d4956da@linaro.org> In-Reply-To: <20250126-drm-hdmi-connector-cec-v3-0-5b5b2d4956da@linaro.org> To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Dave Stevenson , =?utf-8?q?Ma=C3=ADra_Canal?= , Raspberry Pi Kernel Maintenance , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=5348; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=8KmVPM6GAMlsBDAHnGMu9T0kXZRp9qdL3hAnikOOhow=; b=owGbwMvMwMXYbdNlx6SpcZXxtFoSQ/o0iyXp3JapNftqjZ/+0Od0bX1j83S5rsCiq32Se5fbS m8TNY3qZDRmYWDkYpAVU2TxKWiZGrMpOezDjqn1MINYmUCmMHBxCsBEPvuz/48t323tfcjmgnzI TMntPVkS/+7+Flj1QLRfXF/EgWue1IftodlftTht/58vaTHa9r1f84z52ndfuopzZSOzD0s32N6 ZohP25uhLN6mn2/b01dcJ/WCQWHHnbqnJJEW7td/mcZfN35DHWvzn5y9xtpLuPa6Hs9P8Cg/cU7 y9LeUAa0BOUaUe5x+Wx5UJgsI/HR6+Nb0y4eskh6R75ZHG73U958vHfdTKDDiQdLi7MTu1JJjf7 JfjvLky31mXW9bPf9klXGHQc1nq1MUtn352sV1584I1gkGL0ct1cruLS05Iq/aC2nippgYLzzvb 9k5kllCfFV59k4tDT66xsuC8zqmOWyf7L+yxmnDYd+F7AA== X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A Let drm_bridge drivers handle CEC adapters in a generic way. Add a set of helper functions to be called by DRM bridge drivers to report CEC message-related events. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/display/drm_hdmi_cec_helper.c | 38 +++++++++++++++++++++++= ++++ drivers/gpu/drm/drm_bridge.c | 15 +++++++++++ include/drm/display/drm_hdmi_cec_helper.h | 8 ++++++ include/drm/drm_bridge.h | 11 ++++++++ 4 files changed, 72 insertions(+) diff --git a/drivers/gpu/drm/display/drm_hdmi_cec_helper.c b/drivers/gpu/dr= m/display/drm_hdmi_cec_helper.c index a6ed5f0fc3835b013a83308f5285ea0819c5702c..8cb3bd35febd55211f7088b9f47= dfc6a00c06109 100644 --- a/drivers/gpu/drm/display/drm_hdmi_cec_helper.c +++ b/drivers/gpu/drm/display/drm_hdmi_cec_helper.c @@ -207,3 +207,41 @@ void drm_connector_hdmi_cec_phys_addr_set(struct drm_c= onnector *connector) mutex_unlock(&connector->cec.mutex); } EXPORT_SYMBOL(drm_connector_hdmi_cec_phys_addr_set); + +void drm_bridge_cec_transmit_done(struct drm_bridge *bridge, u8 status, + u8 arb_lost_cnt, u8 nack_cnt, + u8 low_drive_cnt, u8 error_cnt) +{ + mutex_lock(&bridge->cec_mutex); + + if (bridge->cec_data) + drm_connector_hdmi_cec_transmit_done(bridge->cec_data, + status, arb_lost_cnt, + nack_cnt, low_drive_cnt, error_cnt); + + mutex_unlock(&bridge->cec_mutex); +} +EXPORT_SYMBOL_GPL(drm_bridge_cec_transmit_done); + +void drm_bridge_cec_transmit_attempt_done(struct drm_bridge *bridge, u8 st= atus) +{ + mutex_lock(&bridge->cec_mutex); + + if (bridge->cec_data) + drm_connector_hdmi_cec_transmit_attempt_done(bridge->cec_data, status); + + mutex_unlock(&bridge->cec_mutex); +} +EXPORT_SYMBOL_GPL(drm_bridge_cec_transmit_attempt_done); + +void drm_bridge_cec_received_msg(struct drm_bridge *bridge, + struct cec_msg *msg) +{ + mutex_lock(&bridge->cec_mutex); + + if (bridge->cec_data) + drm_connector_hdmi_cec_received_msg(bridge->cec_data, msg); + + mutex_unlock(&bridge->cec_mutex); +} +EXPORT_SYMBOL_GPL(drm_bridge_cec_received_msg); diff --git a/drivers/gpu/drm/drm_bridge.c b/drivers/gpu/drm/drm_bridge.c index c6af46dd02bfa9e15b59e4c460debdd7fd84be44..7ee791aa8f962fb13467464cebb= 8f53ab06991f0 100644 --- a/drivers/gpu/drm/drm_bridge.c +++ b/drivers/gpu/drm/drm_bridge.c @@ -206,6 +206,7 @@ static LIST_HEAD(bridge_list); void drm_bridge_add(struct drm_bridge *bridge) { mutex_init(&bridge->hpd_mutex); + mutex_init(&bridge->cec_mutex); =20 mutex_lock(&bridge_lock); list_add_tail(&bridge->list, &bridge_list); @@ -248,6 +249,7 @@ void drm_bridge_remove(struct drm_bridge *bridge) mutex_unlock(&bridge_lock); =20 mutex_destroy(&bridge->hpd_mutex); + mutex_destroy(&bridge->cec_mutex); } EXPORT_SYMBOL(drm_bridge_remove); =20 @@ -1302,6 +1304,19 @@ void drm_bridge_hpd_notify(struct drm_bridge *bridge, } EXPORT_SYMBOL_GPL(drm_bridge_hpd_notify); =20 +void drm_bridge_cec_data_set(struct drm_bridge *bridge, void *cec_data) +{ + if (!(bridge->ops & DRM_BRIDGE_OP_HDMI)) + return; + + mutex_lock(&bridge->cec_mutex); + + bridge->cec_data =3D cec_data; + + mutex_unlock(&bridge->cec_mutex); +} +EXPORT_SYMBOL_GPL(drm_bridge_cec_data_set); + #ifdef CONFIG_OF /** * of_drm_find_bridge - find the bridge corresponding to the device node in diff --git a/include/drm/display/drm_hdmi_cec_helper.h b/include/drm/displa= y/drm_hdmi_cec_helper.h index cd6274e4ee9b3e41a2d85289c4a420b854340e19..4d435192cba5a16255c7856c896= 86024521f51d2 100644 --- a/include/drm/display/drm_hdmi_cec_helper.h +++ b/include/drm/display/drm_hdmi_cec_helper.h @@ -7,6 +7,7 @@ =20 #include =20 +struct drm_bridge; struct drm_connector; =20 struct cec_msg; @@ -58,4 +59,11 @@ static inline void drm_connector_hdmi_cec_phys_addr_inva= lidate(struct drm_connec static inline void drm_connector_hdmi_cec_phys_addr_set(struct drm_connect= or *connector) {} #endif =20 +void drm_bridge_cec_transmit_done(struct drm_bridge *bridge, u8 status, + u8 arb_lost_cnt, u8 nack_cnt, + u8 low_drive_cnt, u8 error_cnt); +void drm_bridge_cec_transmit_attempt_done(struct drm_bridge *bridge, u8 st= atus); +void drm_bridge_cec_received_msg(struct drm_bridge *bridge, + struct cec_msg *msg); + #endif diff --git a/include/drm/drm_bridge.h b/include/drm/drm_bridge.h index 348778f233b06265a6ae577762c6558e69cdb396..df1d72c7e176c75585283684acc= 2ef2ffb2f8bff 100644 --- a/include/drm/drm_bridge.h +++ b/include/drm/drm_bridge.h @@ -939,6 +939,15 @@ struct drm_bridge { * @hpd_cb. */ void *hpd_data; + + /** + * @cec_mutex: Protects the @cec_data field. + */ + struct mutex cec_mutex; + /** + * @cec_data: Private data to be used by the CEC callbacks. + */ + void *cec_data; }; =20 static inline struct drm_bridge * @@ -1062,6 +1071,8 @@ void drm_bridge_hpd_disable(struct drm_bridge *bridge= ); void drm_bridge_hpd_notify(struct drm_bridge *bridge, enum drm_connector_status status); =20 +void drm_bridge_cec_data_set(struct drm_bridge *bridge, void *cec_data); + #ifdef CONFIG_DRM_PANEL_BRIDGE bool drm_bridge_is_panel(const struct drm_bridge *bridge); struct drm_bridge *drm_panel_bridge_add(struct drm_panel *panel); --=20 2.39.5 From nobody Mon Feb 9 16:54:01 2026 Received: from mail-lf1-f47.google.com (mail-lf1-f47.google.com [209.85.167.47]) (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 438F314830C for ; Sun, 26 Jan 2025 13:29:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737898172; cv=none; b=L87Y761W4beCBC+gMCMyfyee326JxXmcrl5wsUYEcoLgc4oYA5uoSqByHEetVAnvHtmBmldSoaEZFfShBaudx/mhPar4Wu+N5kI5cUPHgMyts9yGs7Woc4SvRac2kHbxn/N5dEqoYBvMjZQ/LWExr8vzLaIDrnbeT5yPnEevX5A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737898172; c=relaxed/simple; bh=vbGZOMc+V4BW3oRtVXZ0aC7nodmuYNbj76HULcIcwv0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=BO9TgTFogJsHIBxnDPr8AiEeTe6ZT3bV9PrOCLolw8P8hAa34tM2WxELjn+m407E8MrVmfhZnAYKLEVgp2wDC/k6Q2CP01+rmcUXBv2ENXU/QebuDPKowarXw1CGFPbdxhUxNFoJpswjF3DZk+se/3XI1shWpRWn+uPsd34+tzg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=D3oC2Yig; arc=none smtp.client-ip=209.85.167.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="D3oC2Yig" Received: by mail-lf1-f47.google.com with SMTP id 2adb3069b0e04-53e389d8dc7so3999176e87.0 for ; Sun, 26 Jan 2025 05:29:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1737898168; x=1738502968; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=RLHm3bhxZ2eEkV8ibPSP711qjdIHEc+NFBEKYoktv98=; b=D3oC2YigNJVs5SXe4K/Kr3Mw9feR4PD9AMcpUxZMZxjb/DlhO3voDtmfvnKnaSwrXY 0HHBB7yBU6k4gmCDYWdEvNNKnuCeNAKtb5ZcI4yBBXmY6WdBZ7khCFn4Y9mnTJmJ+t+y iJUqRlkglG7pd4iGI9ueWxGqceeKFe6sfBPHjINjxperbY1moPX2bkNGa5udBoyHsVGl YMddP303xYaUYakEzxP9FRw8XQe7Ui7zxExw/yGk0WrSXWQmgAefgEmANhfsdgFTFwK4 mecVHqAklMQcbReltzVqm5YoXY3elCONi3TqoxmBjtEnYrum+xi6r7XMp3LZwR8nL/Bc cwXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737898168; x=1738502968; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RLHm3bhxZ2eEkV8ibPSP711qjdIHEc+NFBEKYoktv98=; b=booXJs1dHdgJHe2fd1PTLlCHmayo+b71XYJDid+nO8PhOIkx6vonJgcLOn3xS2PZyb dEw6+GaGCQD87XG3i+EE06KAjjzF5EP2mi/ZW8kl8qk1URqMN85mOnE1vSuQnjTSrk9C eGo4nEkfEeLn6Hg5zSt6sB+iRBt2syroSIbN9n5C48C3iCKWlAd4o5pwLGX1jyBMSb+2 eDdCMBq1I2Cv0mqxLqmV6AYGVL/KAU8k0encTpuiwLJj5UXCEmsStx76K2DncPIb9dhL IiuUmd/Db+GlJSzdwquFMDopDNbpYw5idX44m2wGeuwr9QF3dS3hE+nT1XFJSaHbSLnl wpUw== X-Forwarded-Encrypted: i=1; AJvYcCWNa/aNPSb6xwC+3vEirivs58FxClL6AdwYmILQ1NyCb3Fe85aMe/PhBKM67m0nOpQqxJZbKaAkeGCsTMc=@vger.kernel.org X-Gm-Message-State: AOJu0YzQTyeHpy7WdcIR0bThexYRJMo89xfoGG1l02/Y0soeh0G/2LtO W7z3bVvN/Zm2P8+ooBrLUJE6yf1A1zi96bKkAzWGj92CD4jCg/8Lgi0Yqc9MeDY= X-Gm-Gg: ASbGnctvP3jrZqaIVOg2Vj7gBsVT4Dl61XrZIBvIPEZiYk6opIqymabd2HeF2QBJtUk 6HRelH7wg99MIJWuyfjg3x+O/u7VYmf0ae3VzkfFkFQhBD5pasS52FS2FlgeXpuUsprxYnD+ukp T95DUtjupBwp+JXsNmJStlip7wQC4wgKaBfZrMaKR8txgEnm7OzjKt4TOMcbjqZYJ+kfD05uLQi 3W07B8VGJQ56t3+b17mdV9M+xQkRZ9WfQ2yD7fIGK6YSu357E2zkT1oYHbyiz4vloswfRGX+yyN 4e+/mNFx//Rx X-Google-Smtp-Source: AGHT+IEq+gayuNxKbei7gfDdJiacLK5NTTkfna34HaecSR3ynySMD5P2FUlG4fPT43/RYl0gY9/XnA== X-Received: by 2002:ac2:48a1:0:b0:540:1d6c:f1af with SMTP id 2adb3069b0e04-5439c27d0d8mr11014963e87.44.1737898168295; Sun, 26 Jan 2025 05:29:28 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-543cbbd4cf8sm770488e87.201.2025.01.26.05.29.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Jan 2025 05:29:27 -0800 (PST) From: Dmitry Baryshkov Date: Sun, 26 Jan 2025 15:29:13 +0200 Subject: [PATCH v3 08/10] drm/display: bridge-connector: handle CEC adapters 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: <20250126-drm-hdmi-connector-cec-v3-8-5b5b2d4956da@linaro.org> References: <20250126-drm-hdmi-connector-cec-v3-0-5b5b2d4956da@linaro.org> In-Reply-To: <20250126-drm-hdmi-connector-cec-v3-0-5b5b2d4956da@linaro.org> To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Dave Stevenson , =?utf-8?q?Ma=C3=ADra_Canal?= , Raspberry Pi Kernel Maintenance , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=5547; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=vbGZOMc+V4BW3oRtVXZ0aC7nodmuYNbj76HULcIcwv0=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBnljikFORT3AoWnSm+wWOCdVJyIUd/NbTQO2aml pdyeBru1YiJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ5Y4pAAKCRCLPIo+Aiko 1WFAB/4zCkOWf2w7pf0OllVEjSqoX7oLw9NNsfABGKIRInVOn/ZGroFB2x3X3teG3rtDOwIGcVO VSmGo/hyyCawXffM/sPE29F6FSTaJcEwdcZpXOS54CFSe1oKDux8fItMg+mPxRzAL5b38mW8WPF +htGXBnF7ImG7BTLKAAuwdciMzP91k802mY2NUDzSgTBpWv7ap40xzeqGsoFtPun4GPr3Q50Nwn EFT4+L276w2dg65NgyZ5wXnPNnPM83K6X9BT7N1oCbzBvqsqulNrGWFdRZ+mPkhqE29A+9rba4w Wb10muZwgGRit99VGbQvRD1eaYjKmsOfIQowQbwlSxFNhHyh X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A Implement necessary glue code to let DRM bridge drivers to implement CEC adapters support. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/display/drm_bridge_connector.c | 93 ++++++++++++++++++++++= ++++ include/drm/drm_bridge.h | 21 ++++++ 2 files changed, 114 insertions(+) diff --git a/drivers/gpu/drm/display/drm_bridge_connector.c b/drivers/gpu/d= rm/display/drm_bridge_connector.c index 9f234bc647d5c0880d4c42aea130074b7fa54573..5b77fd59d79abddd419e611a786= 8b001857ccb37 100644 --- a/drivers/gpu/drm/display/drm_bridge_connector.c +++ b/drivers/gpu/drm/display/drm_bridge_connector.c @@ -9,6 +9,8 @@ #include #include =20 +#include + #include #include #include @@ -497,6 +499,82 @@ static const struct drm_connector_hdmi_audio_funcs drm= _bridge_connector_hdmi_aud .mute_stream =3D drm_bridge_connector_audio_mute_stream, }; =20 +static int drm_bridge_connector_hdmi_cec_enable(struct drm_connector *conn= ector, bool enable) +{ + struct drm_bridge_connector *bridge_connector =3D + to_drm_bridge_connector(connector); + struct drm_bridge *bridge; + + bridge =3D bridge_connector->bridge_hdmi; + + return bridge->funcs->hdmi_cec_enable(bridge, enable); +} + +static int drm_bridge_connector_hdmi_cec_log_addr(struct drm_connector *co= nnector, u8 logical_addr) +{ + struct drm_bridge_connector *bridge_connector =3D + to_drm_bridge_connector(connector); + struct drm_bridge *bridge; + + bridge =3D bridge_connector->bridge_hdmi; + + return bridge->funcs->hdmi_cec_log_addr(bridge, logical_addr); +} + +static int drm_bridge_connector_hdmi_cec_transmit(struct drm_connector *co= nnector, + u8 attempts, + u32 signal_free_time, + struct cec_msg *msg) +{ + struct drm_bridge_connector *bridge_connector =3D + to_drm_bridge_connector(connector); + struct drm_bridge *bridge; + + bridge =3D bridge_connector->bridge_hdmi; + + return bridge->funcs->hdmi_cec_transmit(bridge, attempts, + signal_free_time, + msg); +} + +static int drm_bridge_connector_hdmi_cec_init(struct drm_connector *connec= tor) +{ + struct drm_bridge_connector *bridge_connector =3D + to_drm_bridge_connector(connector); + struct drm_bridge *bridge; + + bridge =3D bridge_connector->bridge_hdmi; + + drm_bridge_cec_data_set(bridge, connector); + + if (!bridge->funcs->hdmi_cec_init) + return 0; + + return bridge->funcs->hdmi_cec_init(connector, bridge); +} + +static void drm_bridge_connector_hdmi_cec_unregister(struct drm_connector = *connector) +{ + struct drm_bridge_connector *bridge_connector =3D + to_drm_bridge_connector(connector); + struct drm_bridge *bridge; + + bridge =3D bridge_connector->bridge_hdmi; + + drm_bridge_cec_data_set(bridge, NULL); + + drm_connector_hdmi_cec_unregister(connector); +} + +static const struct drm_connector_hdmi_cec_adapter_ops drm_bridge_connecto= r_hdmi_cec_ops =3D { + .base.unregister =3D drm_bridge_connector_hdmi_cec_unregister, + .init =3D drm_bridge_connector_hdmi_cec_init, + .enable =3D drm_bridge_connector_hdmi_cec_enable, + .log_addr =3D drm_bridge_connector_hdmi_cec_log_addr, + .transmit =3D drm_bridge_connector_hdmi_cec_transmit, +}; + + /* -----------------------------------------------------------------------= ------ * Bridge Connector Initialisation */ @@ -633,6 +711,21 @@ struct drm_connector *drm_bridge_connector_init(struct= drm_device *drm, if (ret) return ERR_PTR(ret); } + + if (bridge->hdmi_cec_adapter_name) { + if (!bridge->funcs->hdmi_cec_enable || + !bridge->funcs->hdmi_cec_log_addr || + !bridge->funcs->hdmi_cec_transmit) + return ERR_PTR(-EINVAL); + + ret =3D drm_connector_hdmi_cec_register(connector, + &drm_bridge_connector_hdmi_cec_ops, + bridge->hdmi_cec_adapter_name, + bridge->hdmi_cec_available_las, + bridge->hdmi_dev); + if (ret) + return ERR_PTR(ret); + } } else { ret =3D drmm_connector_init(drm, connector, &drm_bridge_connector_funcs, diff --git a/include/drm/drm_bridge.h b/include/drm/drm_bridge.h index df1d72c7e176c75585283684acc2ef2ffb2f8bff..b55e80a57758e8b652eac0cd01c= b245a04e221f5 100644 --- a/include/drm/drm_bridge.h +++ b/include/drm/drm_bridge.h @@ -32,6 +32,7 @@ #include #include =20 +struct cec_msg; struct device_node; =20 struct drm_bridge; @@ -729,6 +730,16 @@ struct drm_bridge_funcs { struct drm_bridge *bridge, bool enable, int direction); =20 + int (*hdmi_cec_init)(struct drm_connector *connector, + struct drm_bridge *bridge); + + int (*hdmi_cec_enable)(struct drm_bridge *bridge, bool enable); + + int (*hdmi_cec_log_addr)(struct drm_bridge *bridge, u8 logical_addr); + + int (*hdmi_cec_transmit)(struct drm_bridge *bridge, u8 attempts, + u32 signal_free_time, struct cec_msg *msg); + /** * @debugfs_init: * @@ -924,6 +935,16 @@ struct drm_bridge { */ bool hdmi_cec_notifier; =20 + /** + * @hdmi_cec_adapter_name: the name of the adapter to register + */ + const char *hdmi_cec_adapter_name; + + /** + * @hdmi_cec_available_las: number of logical addresses, CEC_MAX_LOG_ADDR= S if unset + */ + u8 hdmi_cec_available_las; + /** private: */ /** * @hpd_mutex: Protects the @hpd_cb and @hpd_data fields. --=20 2.39.5 From nobody Mon Feb 9 16:54:01 2026 Received: from mail-lf1-f50.google.com (mail-lf1-f50.google.com [209.85.167.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 AFE331684B0 for ; Sun, 26 Jan 2025 13:29:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737898174; cv=none; b=ktlxKHbrSO6qtxNL5qNzYcE0NNYVzYkhUCS15hdnrlF6wi+eyiwnwAgSI5xaAKdArtrEhqriUDR9LoadAbWlQaxUqwmqIu34P8LJvFnPKJWUs4LuNW6XlSBkJeSjitW6JQFGjzIdQjpEmQk9N/QxQkc0dPV9nUt0b7D8pz5B05I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737898174; c=relaxed/simple; bh=ASn3UQankdxlfhrL+CKAzYynXIH1IlHKS9zOuAB5WR4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=QaBg/cjN+MB/miticKBlUmvHuAECKoiv/hi4NzKJDI+p1Yf5QsgPbK9gZbEOOLHRreqT3OZM7PyTJLu180PAN9UIu+zHrBGKbXdrJwPE8wm+o2add2rPI07TdvzDf96jUQTlPWMdLnFUvaKqcfotMICaHe2hNv7HudvyJd9kssg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=d69uPBRg; arc=none smtp.client-ip=209.85.167.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="d69uPBRg" Received: by mail-lf1-f50.google.com with SMTP id 2adb3069b0e04-53f22fd6887so4021158e87.2 for ; Sun, 26 Jan 2025 05:29:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1737898171; x=1738502971; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=HGhjmb+uqSqvkEmufcjl2V40+leLLjqR5nwVjQpnnDA=; b=d69uPBRgYX96f7tcDI0jd/CXiykmoWXP2RvxnhtvXrE70mWYz2p++aztXN8Eza2HQz sePv/VZvd6oEWhDjB4ZG12wABMbzvQjmQ+yNAClELNk6uZBRCE2JPw8NkdzDQcfrB1q1 Xxp9AicADt2S8BP/4C5pyfIh1nRVztt7jWxljtrYeIWTdww3loNiAJMzjWb6P/zYkQfp yn6nKwqCUpcKj9IS+mzZkbkireEy4fEFXXCGhGg+9DBEPHN8KqLQWocKgxDHqstKrmmk uHNnI8wYd0aw7/69koIDh9gSULl2sviu+9texIeNRk94bnDkC2Q4ii2yzqgngwq9eUcZ w7mA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737898171; x=1738502971; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HGhjmb+uqSqvkEmufcjl2V40+leLLjqR5nwVjQpnnDA=; b=Htx1qB+pigOzUO837v+mn/3AfqIG9NOJd47wMnwPAJw2XgfvGUI6hl6XndRFKtVdpn nbOhnu4fNhSt/17NObZh1N1PBdSPQaGxUOJDnKdcdFozR4bEgYfvzp93FuMiosFkgVg3 zYjA9VfYz6SAmvMdPnI6/Pfp9sdHN9JK0d6RPULiMsnVG2HYQg2d1ZrbKpt2JHDvTMXP mvt3uv2qYVAoCfpqOMqdvoInC4HL4UTCyE1u3H4NXL8ndH8rZj6gDXPQ7zIKYtdIVtIn MP0NyPqtLdOyS+jE7PAVwgQpL+QkMxMNp62tz5Iyi5X2nMtgv+ZtNTb3lLarxsZrHpm7 290A== X-Forwarded-Encrypted: i=1; AJvYcCXSrCWJVdEoXCJTCIHo8kLb+tfY3mdv4E1q41VIg9FX9+ULs2cWD5wR9UpuoSPJQCVp+gMGtRWWeNPNG64=@vger.kernel.org X-Gm-Message-State: AOJu0Yxl78EQOs3/we+23Sh7aFFlwwkfxK5kgKPURHVxY9lX8TPF8WpR 821EQzc0ZWhuwgctoIePr8Pnw6FLZOb+En2+r1RQlePau4PVWgGdDNq6uRWbfVM= X-Gm-Gg: ASbGncvRbCtceY+IL9hZAcMq6a6bttU0bu5tY7q8NwMGddI8rfKJVVhsrJY7U+p2Idw ItjMNvcIWLhaQfT9o+E04/mB11VP8j3SjP6oDjaYFgW02X0Y2C9roOMKkI4HvUQn4tBjQov+Mos 16gUnnTaEy/+On4O50/2PhLGUZh145XuBxOOh3sw9KVr9X5r5f4g+hXfoHmD0dVQcOnyV+HEreE DOBwC0zVw3ZLPaWBQ880AJmvbYp3zHIj2ubgN1y+hXSq9mOPeamjyULDoWgG7akwQH3RXzN9RrY bd0Vlr3wFMap X-Google-Smtp-Source: AGHT+IHJn1KiUo3Vc8J9Cci15tlfKfpOBbrYT330xqlvaSxCSdV7Lx8S0XyWdDjQ64i5ZLK2+EFYeA== X-Received: by 2002:ac2:4acb:0:b0:540:1a0c:9ba6 with SMTP id 2adb3069b0e04-5439c282d2bmr11295775e87.34.1737898170829; Sun, 26 Jan 2025 05:29:30 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-543cbbd4cf8sm770488e87.201.2025.01.26.05.29.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Jan 2025 05:29:29 -0800 (PST) From: Dmitry Baryshkov Date: Sun, 26 Jan 2025 15:29:14 +0200 Subject: [PATCH v3 09/10] drm/bridge: allow limiting I2S formats 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: <20250126-drm-hdmi-connector-cec-v3-9-5b5b2d4956da@linaro.org> References: <20250126-drm-hdmi-connector-cec-v3-0-5b5b2d4956da@linaro.org> In-Reply-To: <20250126-drm-hdmi-connector-cec-v3-0-5b5b2d4956da@linaro.org> To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Dave Stevenson , =?utf-8?q?Ma=C3=ADra_Canal?= , Raspberry Pi Kernel Maintenance , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=4008; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=ASn3UQankdxlfhrL+CKAzYynXIH1IlHKS9zOuAB5WR4=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBnljikF9+yC/fA8RClEtPsWuyQ2DiNmGNb9dUCZ 5Oabv7pqZWJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ5Y4pAAKCRCLPIo+Aiko 1VmfB/kBgNMdpi9bIEMgrEFVMB8ztoZ8lIr4Gr1w3U6+wvRyn1IGyjrdxU7hic0WIa6W5ATt07L YX9N+KyCJkk+gBGOa1OrdACF0HaBEc55fQKAAP+csUYpdWlSYhAPUbB09dWvj14KDGk7nHpE8us f5sswFr6LaGY5DF6gF04u99ezewv/RMrxp3IQ1DSY4XQm5OUCTwOzyhSiP1khQqS8FGSrKSPKRT R89SG0VBNPBye3Drx4FpWUA0kO6Mr5mMUUSTvKZcedv/kuvo4yw2ijzaz8W2noDUb5KaLd0k7Gt GkKKXD09UBVJeB65hDQ2cHrMEKLoDrWR7h0wbzSyqtAjsAc5 X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A By default HDMI codec registers all formats supported on the I2S bus. Allow bridges (and connectors) to limit the list of the PCM formats supported by the HDMI codec. Signed-off-by: Dmitry Baryshkov Reviewed-by: Maxime Ripard --- drivers/gpu/drm/display/drm_bridge_connector.c | 1 + drivers/gpu/drm/display/drm_hdmi_audio_helper.c | 2 ++ drivers/gpu/drm/vc4/vc4_hdmi.c | 2 +- include/drm/display/drm_hdmi_audio_helper.h | 1 + include/drm/drm_bridge.h | 5 +++++ 5 files changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/display/drm_bridge_connector.c b/drivers/gpu/d= rm/display/drm_bridge_connector.c index 5b77fd59d79abddd419e611a7868b001857ccb37..28055bc2e7069d738bbe76b16c3= bbde06f2d6e4e 100644 --- a/drivers/gpu/drm/display/drm_bridge_connector.c +++ b/drivers/gpu/drm/display/drm_bridge_connector.c @@ -698,6 +698,7 @@ struct drm_connector *drm_bridge_connector_init(struct = drm_device *drm, bridge->hdmi_dev, &drm_bridge_connector_hdmi_audio_funcs, bridge->hdmi_audio_max_i2s_playback_channels, + bridge->hdmi_audio_i2s_formats, bridge->hdmi_audio_spdif_playback, bridge->hdmi_audio_dai_port); if (ret) diff --git a/drivers/gpu/drm/display/drm_hdmi_audio_helper.c b/drivers/gpu/= drm/display/drm_hdmi_audio_helper.c index 05afc9f0bdd6b6f00d74223a9d8875e6d16aea5f..589b0bd6c21366b83bd4d1131e8= 9c71644ebc401 100644 --- a/drivers/gpu/drm/display/drm_hdmi_audio_helper.c +++ b/drivers/gpu/drm/display/drm_hdmi_audio_helper.c @@ -154,6 +154,7 @@ int drm_connector_hdmi_audio_init(struct drm_connector = *connector, struct device *hdmi_codec_dev, const struct drm_connector_hdmi_audio_funcs *funcs, unsigned int max_i2s_playback_channels, + u64 i2s_formats, bool spdif_playback, int dai_port) { @@ -161,6 +162,7 @@ int drm_connector_hdmi_audio_init(struct drm_connector = *connector, .ops =3D &drm_connector_hdmi_audio_ops, .max_i2s_channels =3D max_i2s_playback_channels, .i2s =3D !!max_i2s_playback_channels, + .i2s_formats =3D i2s_formats, .spdif =3D spdif_playback, .no_i2s_capture =3D true, .no_spdif_capture =3D true, diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c index 1108983c44858382cb9f09b686956903645ebe0a..fcaba4a64a33b2267b22960772c= 2977b4109c67f 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -582,7 +582,7 @@ static int vc4_hdmi_connector_init(struct drm_device *d= ev, =20 ret =3D drm_connector_hdmi_audio_init(connector, dev->dev, &vc4_hdmi_audio_funcs, - 8, false, -1); + 8, 0, false, -1); if (ret) return ret; =20 diff --git a/include/drm/display/drm_hdmi_audio_helper.h b/include/drm/disp= lay/drm_hdmi_audio_helper.h index c9a6faef4109f20ba79b610a9d5e8d5980efe2d1..44d910bdc72dd2fdbbe7ada65b6= 7080d4a41e88b 100644 --- a/include/drm/display/drm_hdmi_audio_helper.h +++ b/include/drm/display/drm_hdmi_audio_helper.h @@ -14,6 +14,7 @@ int drm_connector_hdmi_audio_init(struct drm_connector *c= onnector, struct device *hdmi_codec_dev, const struct drm_connector_hdmi_audio_funcs *funcs, unsigned int max_i2s_playback_channels, + u64 i2s_formats, bool spdif_playback, int sound_dai_port); void drm_connector_hdmi_audio_plugged_notify(struct drm_connector *connect= or, diff --git a/include/drm/drm_bridge.h b/include/drm/drm_bridge.h index b55e80a57758e8b652eac0cd01cb245a04e221f5..d16af5fe90cb48f6671e798d9de= e61a359c9233f 100644 --- a/include/drm/drm_bridge.h +++ b/include/drm/drm_bridge.h @@ -920,6 +920,11 @@ struct drm_bridge { */ int hdmi_audio_max_i2s_playback_channels; =20 + /** + * @hdmi_audio_i2s_formats: supported I2S formats, optional + */ + u64 hdmi_audio_i2s_formats; + /** * @hdmi_audio_spdif_playback: set if HDMI codec has S/PDIF playback port */ --=20 2.39.5 From nobody Mon Feb 9 16:54:01 2026 Received: from mail-lf1-f54.google.com (mail-lf1-f54.google.com [209.85.167.54]) (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 83FAE186E54 for ; Sun, 26 Jan 2025 13:29:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737898178; cv=none; b=J2nBx2IiBJMJzrfwWxHbyX6jLiWVE5zZ+fNslmgM4THBvps8xR/z4IBUA7lLuaLwZf+h6+PTn3LeCzyjfpnATQ3PKNrEUPcfDLn8YFeeyY8N9vRTd1oDES3RluAyE/he4KUfEig7ZgPCdLYA0emTNcb/hgdx3XA5l2OGjBmjtqc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737898178; c=relaxed/simple; bh=WfKEFt+y9BLwjBavCAnhuJy6D0rNZn7wGESDQ2N5T7Q=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Pdnwku3fovO/ANZ9c+Nbr21vl3S+A/TkhC4hmww6M3/o6U9t4TVv29lVUJ4KOulmy+AKFolZU6PCtY9/NN4CgcJpBOW4hPYRibNPw9RvCQ4IKElmrpu+2PFiN6vzrZzpjroIqV5MfBfkvR+HkRD6CdWcYHxXRaeWFTPcOZUt+5k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=egUZ6RAR; arc=none smtp.client-ip=209.85.167.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="egUZ6RAR" Received: by mail-lf1-f54.google.com with SMTP id 2adb3069b0e04-5439e331cceso4373471e87.1 for ; Sun, 26 Jan 2025 05:29:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1737898173; x=1738502973; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=7BnUhkTsqj7xxtVU54ylIUnvBxtMyQnngNgaXDvt7J0=; b=egUZ6RAR9j9FR+oUTQPJesK0cXXFxq32ex+Y7BOyEa21k7u/6mjatFyGY8jZXEZXaJ 4hqvs9RwoOGaKs59lgRwquFerUvjlTbcK7uShQJTN42kpGhFiQG44oZTJz7jFPe+bFZl H6CH/DNIrz5n5f+0Xo/gx0/Oz0eGr5Y5ywg49WI4wMr9W9rNijItpmVui5IV1oTL1gi9 73Ez50IDu+a4e6csRX7hXt5DjM5H4xXK3jvylAt/0z+1VVUltQ1efgDqq8V8I+mh+CXG cQNqdfe68VlbTIMxWUU0xAAouu6qr549+cuIVMQv3cicxIFTB3Td4rWb0toOFHsoX7eL +SHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737898173; x=1738502973; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7BnUhkTsqj7xxtVU54ylIUnvBxtMyQnngNgaXDvt7J0=; b=O3FttttBdE8QV4z8ZoYEZQ1GHcV7jZ6x4YoK/SeNVeVRb4oQAuUsUs+K9wiPYAkFwC E23M3LPD6H/yVejJ/HIT4w+Sn3Y7HNw6w7hM0ItXAfN0M85SHoYWyJ8vH7Wj1CyQrYzk 6CI/TKxshpf5hLWFUb/elfEhNuSSwGusnICoo/i8ndc1x5LFyEt/Pnd9TUGpBsAim4QG DGGcnePNInlNjvy7zYH74vJOIToAoGiWrLAe1QdK9d/FuvlcH/TvtNLUTJu1pUKpjTR6 6yKCjrzWJs7eYAdiVU6EDQu3wUiBUtnxDiIwfkfYnQZlZvuUKW2ZZqeZjr8JVEyWPc1q nAEA== X-Forwarded-Encrypted: i=1; AJvYcCX1OHZx24QCnb0w+sofg28wElkOcTaOcG7W75e3KX2Ag0idS0kIki2GzcwyffQNnrHmKT6IVlpX+gJrIoE=@vger.kernel.org X-Gm-Message-State: AOJu0YyuBq09J2Z5XS4frZ/76XmuAanICXsiwFLBZb0CT/SM/sxPWNnh 9pMaUXxeuiZhXDFIsG/wOlkfenpUqQiVKoZ1MMqpBklW2+aSsfi1AgHZC2X9d1Q= X-Gm-Gg: ASbGncswV4zrWPpdjMdEqfI2XhiuuniwVilTPbjiPTEAIYS22Zl2SULh7HKXR2hEUVm GXCxFwAiOy2z6yOVpINUJ4jwUemaTXV0FGpdJpsX+l8qFgxIJttcIojYbmCeFslJHLaPAa+tIPt G6wXq9VX1dyvVRXZ3YDWiKMT0AQ5eqgAXxWKltJFZrzhym0VsQlsKKBaAgTmugUR067JvtNX/JR pNbJROHJruEl50zQ4AB7FQn0gV5ekb/XZNLV9yF0MUEH6iGjjRqNFebWiAO/ZhL7viureveVEvi mHnuK1Mh0AV1 X-Google-Smtp-Source: AGHT+IGmckMhLLu5fkrUlW6EB1SPn7e1ejWpH3sgVN9EESeq5b/2oTSkTgICDLZE4SUi3oyFQj7cyg== X-Received: by 2002:a05:6512:1241:b0:541:1c49:523 with SMTP id 2adb3069b0e04-5439c27d0bamr13120933e87.48.1737898173369; Sun, 26 Jan 2025 05:29:33 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-543cbbd4cf8sm770488e87.201.2025.01.26.05.29.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Jan 2025 05:29:32 -0800 (PST) From: Dmitry Baryshkov Date: Sun, 26 Jan 2025 15:29:15 +0200 Subject: [PATCH v3 10/10] drm/bridge: adv7511: switch to the HDMI connector helpers 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: <20250126-drm-hdmi-connector-cec-v3-10-5b5b2d4956da@linaro.org> References: <20250126-drm-hdmi-connector-cec-v3-0-5b5b2d4956da@linaro.org> In-Reply-To: <20250126-drm-hdmi-connector-cec-v3-0-5b5b2d4956da@linaro.org> To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Dave Stevenson , =?utf-8?q?Ma=C3=ADra_Canal?= , Raspberry Pi Kernel Maintenance , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=34047; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=WfKEFt+y9BLwjBavCAnhuJy6D0rNZn7wGESDQ2N5T7Q=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBnljikG3kzU5uQ4uxdgUM5NbZNtqlhWbsZIXxCs WZI6bogOY2JATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ5Y4pAAKCRCLPIo+Aiko 1W4sB/0aLTwQP9hMugQvYJy5zQtHQq3yATQer4/ZtaPQHVwri9JKFjvbO8XlrkJ8ZOTzy3BQNDt +OVnonc1txHS0mhZHuR6pRIha/u/CacNfkTVR1F3H9oXouKZv1g689ZDswJyd/9dc2ds5tkJNbV tMbW9WxUjIM6ckQn+0gKWbdkYdBtnwRUotOe2XKt2xKq9kwuVR8wErO8hPTc5TyusWTKNJy1cFf +Vgde+er9mOw2EU86XZAN/XJEUScvGxSQaEI1i3OSMX0sKpMCU2TCHSh5pFlATfreA96fi7m0qb hvgJ6A4VKReGR/i54QI/sfEB1Yb71+ziwzqgt77HCnBc84tr X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A Rewrite the ADV7511 driver to use implementation provided by the DRM HDMI connector framework, including the Audio and CEC bits. Drop the in-bridge connector support and use drm_bridge_connector if the host requires the connector to be provided by the bridge. Note: currently only AVI InfoFrames are supported. Existing driver doesn't support programming any other InfoFrames directly and Audio InfoFrame seems to be programmed using individual bits and pieces rather than programming it directly. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/bridge/adv7511/Kconfig | 4 + drivers/gpu/drm/bridge/adv7511/adv7511.h | 51 ++-- drivers/gpu/drm/bridge/adv7511/adv7511_audio.c | 77 +----- drivers/gpu/drm/bridge/adv7511/adv7511_cec.c | 56 ++-- drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 342 +++++++++++----------= ---- drivers/gpu/drm/bridge/adv7511/adv7533.c | 4 - 6 files changed, 206 insertions(+), 328 deletions(-) diff --git a/drivers/gpu/drm/bridge/adv7511/Kconfig b/drivers/gpu/drm/bridg= e/adv7511/Kconfig index f46a5e26b5dd640670afa21802f9019d5c7439fb..31df5467fd6a035d546996dc6c8= b509eca0c64b1 100644 --- a/drivers/gpu/drm/bridge/adv7511/Kconfig +++ b/drivers/gpu/drm/bridge/adv7511/Kconfig @@ -5,6 +5,10 @@ config DRM_I2C_ADV7511 select DRM_KMS_HELPER select REGMAP_I2C select DRM_MIPI_DSI + select DRM_DISPLAY_HELPER + select DRM_BRIDGE_CONNECTOR + select DRM_DISPLAY_HDMI_STATE_HELPER + select DRM_DISPLAY_HDMI_CEC_HELPER help Support for the Analog Devices ADV7511(W)/13/33/35 HDMI encoders. =20 diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511.h b/drivers/gpu/drm/bri= dge/adv7511/adv7511.h index ec0b7f3d889c4eedeb1d80369fd2a160cd0e2968..530eb124b8969441939d8a1b7e9= c1268eb929672 100644 --- a/drivers/gpu/drm/bridge/adv7511/adv7511.h +++ b/drivers/gpu/drm/bridge/adv7511/adv7511.h @@ -313,16 +313,11 @@ enum adv7511_csc_scaling { * @csc_enable: Whether to enable color space conversion * @csc_scaling_factor: Color space conversion scaling factor * @csc_coefficents: Color space conversion coefficents - * @hdmi_mode: Whether to use HDMI or DVI output mode - * @avi_infoframe: HDMI infoframe */ struct adv7511_video_config { bool csc_enable; enum adv7511_csc_scaling csc_scaling_factor; const uint16_t *csc_coefficents; - - bool hdmi_mode; - struct hdmi_avi_infoframe avi_infoframe; }; =20 enum adv7511_type { @@ -337,6 +332,7 @@ struct adv7511_chip_info { enum adv7511_type type; unsigned int max_mode_clock_khz; unsigned int max_lane_freq_khz; + const char *name; const char * const *supply_names; unsigned int num_supplies; unsigned int reg_cec_offset; @@ -371,7 +367,6 @@ struct adv7511 { struct work_struct hpd_work; =20 struct drm_bridge bridge; - struct drm_connector connector; =20 bool embedded_sync; enum adv7511_sync_polarity vsync_polarity; @@ -389,9 +384,7 @@ struct adv7511 { bool use_timing_gen; =20 const struct adv7511_chip_info *info; - struct platform_device *audio_pdev; =20 - struct cec_adapter *cec_adap; u8 cec_addr[ADV7511_MAX_ADDRS]; u8 cec_valid_addrs; bool cec_enabled_adap; @@ -399,16 +392,24 @@ struct adv7511 { u32 cec_clk_freq; }; =20 +static inline struct adv7511 *bridge_to_adv7511(struct drm_bridge *bridge) +{ + return container_of(bridge, struct adv7511, bridge); +} + #ifdef CONFIG_DRM_I2C_ADV7511_CEC -int adv7511_cec_init(struct device *dev, struct adv7511 *adv7511); +int adv7511_cec_init(struct drm_connector *connector, + struct drm_bridge *bridge); +int adv7511_cec_enable(struct drm_bridge *bridge, bool enable); +int adv7511_cec_log_addr(struct drm_bridge *bridge, u8 addr); +int adv7511_cec_transmit(struct drm_bridge *bridge, u8 attempts, + u32 signal_free_time, struct cec_msg *msg); int adv7511_cec_irq_process(struct adv7511 *adv7511, unsigned int irq1); #else -static inline int adv7511_cec_init(struct device *dev, struct adv7511 *adv= 7511) -{ - regmap_write(adv7511->regmap, ADV7511_REG_CEC_CTRL, - ADV7511_CEC_CTRL_POWER_DOWN); - return 0; -} +#define adv7511_cec_init NULL +#define adv7511_cec_enable NULL +#define adv7511_cec_log_addr NULL +#define adv7511_cec_transmit NULL #endif =20 void adv7533_dsi_power_on(struct adv7511 *adv); @@ -421,16 +422,18 @@ int adv7533_attach_dsi(struct adv7511 *adv); int adv7533_parse_dt(struct device_node *np, struct adv7511 *adv); =20 #ifdef CONFIG_DRM_I2C_ADV7511_AUDIO -int adv7511_audio_init(struct device *dev, struct adv7511 *adv7511); -void adv7511_audio_exit(struct adv7511 *adv7511); +int adv7511_hdmi_audio_startup(struct drm_connector *connector, + struct drm_bridge *bridge); +void adv7511_hdmi_audio_shutdown(struct drm_connector *connector, + struct drm_bridge *bridge); +int adv7511_hdmi_audio_prepare(struct drm_connector *connector, + struct drm_bridge *bridge, + struct hdmi_codec_daifmt *fmt, + struct hdmi_codec_params *hparms); #else /*CONFIG_DRM_I2C_ADV7511_AUDIO */ -static inline int adv7511_audio_init(struct device *dev, struct adv7511 *a= dv7511) -{ - return 0; -} -static inline void adv7511_audio_exit(struct adv7511 *adv7511) -{ -} +#define adv7511_hdmi_audio_startup NULL +#define adv7511_hdmi_audio_shutdown NULL +#define adv7511_hdmi_audio_prepare NULL #endif /* CONFIG_DRM_I2C_ADV7511_AUDIO */ =20 #endif /* __DRM_I2C_ADV7511_H__ */ diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_audio.c b/drivers/gpu/d= rm/bridge/adv7511/adv7511_audio.c index 36a7b6f085f9a0fa2c60660df4f569b24b49c4be..9d0193075528186f47ae73a284c= 25376c41075a4 100644 --- a/drivers/gpu/drm/bridge/adv7511/adv7511_audio.c +++ b/drivers/gpu/drm/bridge/adv7511/adv7511_audio.c @@ -55,11 +55,12 @@ static int adv7511_update_cts_n(struct adv7511 *adv7511) return 0; } =20 -static int adv7511_hdmi_hw_params(struct device *dev, void *data, - struct hdmi_codec_daifmt *fmt, - struct hdmi_codec_params *hparms) +int adv7511_hdmi_audio_prepare(struct drm_connector *connector, + struct drm_bridge *bridge, + struct hdmi_codec_daifmt *fmt, + struct hdmi_codec_params *hparms) { - struct adv7511 *adv7511 =3D dev_get_drvdata(dev); + struct adv7511 *adv7511 =3D bridge_to_adv7511(bridge); unsigned int audio_source, i2s_format =3D 0; unsigned int invert_clock; unsigned int rate; @@ -158,9 +159,10 @@ static int adv7511_hdmi_hw_params(struct device *dev, = void *data, return 0; } =20 -static int audio_startup(struct device *dev, void *data) +int adv7511_hdmi_audio_startup(struct drm_connector *connector, + struct drm_bridge *bridge) { - struct adv7511 *adv7511 =3D dev_get_drvdata(dev); + struct adv7511 *adv7511 =3D bridge_to_adv7511(bridge); =20 regmap_update_bits(adv7511->regmap, ADV7511_REG_AUDIO_CONFIG, BIT(7), 0); @@ -194,69 +196,12 @@ static int audio_startup(struct device *dev, void *da= ta) return 0; } =20 -static void audio_shutdown(struct device *dev, void *data) +void adv7511_hdmi_audio_shutdown(struct drm_connector *connector, + struct drm_bridge *bridge) { - struct adv7511 *adv7511 =3D dev_get_drvdata(dev); + struct adv7511 *adv7511 =3D bridge_to_adv7511(bridge); =20 if (adv7511->audio_source =3D=3D ADV7511_AUDIO_SOURCE_SPDIF) regmap_update_bits(adv7511->regmap, ADV7511_REG_AUDIO_CONFIG, BIT(7), 0); } - -static int adv7511_hdmi_i2s_get_dai_id(struct snd_soc_component *component, - struct device_node *endpoint, - void *data) -{ - struct of_endpoint of_ep; - int ret; - - ret =3D of_graph_parse_endpoint(endpoint, &of_ep); - if (ret < 0) - return ret; - - /* - * HDMI sound should be located as reg =3D <2> - * Then, it is sound port 0 - */ - if (of_ep.port =3D=3D 2) - return 0; - - return -EINVAL; -} - -static const struct hdmi_codec_ops adv7511_codec_ops =3D { - .hw_params =3D adv7511_hdmi_hw_params, - .audio_shutdown =3D audio_shutdown, - .audio_startup =3D audio_startup, - .get_dai_id =3D adv7511_hdmi_i2s_get_dai_id, -}; - -static const struct hdmi_codec_pdata codec_data =3D { - .ops =3D &adv7511_codec_ops, - .i2s_formats =3D (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE | - SNDRV_PCM_FMTBIT_S24_3LE | SNDRV_PCM_FMTBIT_S24_LE | - SNDRV_PCM_FMTBIT_IEC958_SUBFRAME_LE), - .max_i2s_channels =3D 2, - .i2s =3D 1, - .no_i2s_capture =3D 1, - .spdif =3D 1, - .no_spdif_capture =3D 1, -}; - -int adv7511_audio_init(struct device *dev, struct adv7511 *adv7511) -{ - adv7511->audio_pdev =3D platform_device_register_data(dev, - HDMI_CODEC_DRV_NAME, - PLATFORM_DEVID_AUTO, - &codec_data, - sizeof(codec_data)); - return PTR_ERR_OR_ZERO(adv7511->audio_pdev); -} - -void adv7511_audio_exit(struct adv7511 *adv7511) -{ - if (adv7511->audio_pdev) { - platform_device_unregister(adv7511->audio_pdev); - adv7511->audio_pdev =3D NULL; - } -} diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_cec.c b/drivers/gpu/drm= /bridge/adv7511/adv7511_cec.c index 2e9c88a2b5ed44ef0cd417c553ea7873d00e4a14..bc96f46bbc4480d3439e821991d= ab81ae4950208 100644 --- a/drivers/gpu/drm/bridge/adv7511/adv7511_cec.c +++ b/drivers/gpu/drm/bridge/adv7511/adv7511_cec.c @@ -12,6 +12,8 @@ =20 #include =20 +#include + #include "adv7511.h" =20 static const u8 ADV7511_REG_CEC_RX_FRAME_HDR[] =3D { @@ -44,8 +46,8 @@ static void adv_cec_tx_raw_status(struct adv7511 *adv7511= , u8 tx_raw_status) return; =20 if (tx_raw_status & ADV7511_INT1_CEC_TX_ARBIT_LOST) { - cec_transmit_attempt_done(adv7511->cec_adap, - CEC_TX_STATUS_ARB_LOST); + drm_bridge_cec_transmit_attempt_done(&adv7511->bridge, + CEC_TX_STATUS_ARB_LOST); return; } if (tx_raw_status & ADV7511_INT1_CEC_TX_RETRY_TIMEOUT) { @@ -72,12 +74,13 @@ static void adv_cec_tx_raw_status(struct adv7511 *adv75= 11, u8 tx_raw_status) if (low_drive_cnt) status |=3D CEC_TX_STATUS_LOW_DRIVE; } - cec_transmit_done(adv7511->cec_adap, status, - 0, nack_cnt, low_drive_cnt, err_cnt); + drm_bridge_cec_transmit_done(&adv7511->bridge, status, + 0, nack_cnt, low_drive_cnt, + err_cnt); return; } if (tx_raw_status & ADV7511_INT1_CEC_TX_READY) { - cec_transmit_attempt_done(adv7511->cec_adap, CEC_TX_STATUS_OK); + drm_bridge_cec_transmit_attempt_done(&adv7511->bridge, CEC_TX_STATUS_OK); return; } } @@ -116,7 +119,7 @@ static void adv7511_cec_rx(struct adv7511 *adv7511, int= rx_buf) regmap_update_bits(adv7511->regmap_cec, ADV7511_REG_CEC_RX_BUFFERS + offset, BIT(rx_buf), 0); =20 - cec_received_msg(adv7511->cec_adap, &msg); + drm_bridge_cec_received_msg(&adv7511->bridge, &msg); } =20 int adv7511_cec_irq_process(struct adv7511 *adv7511, unsigned int irq1) @@ -179,9 +182,9 @@ int adv7511_cec_irq_process(struct adv7511 *adv7511, un= signed int irq1) return IRQ_HANDLED; } =20 -static int adv7511_cec_adap_enable(struct cec_adapter *adap, bool enable) +int adv7511_cec_enable(struct drm_bridge *bridge, bool enable) { - struct adv7511 *adv7511 =3D cec_get_drvdata(adap); + struct adv7511 *adv7511 =3D bridge_to_adv7511(bridge); unsigned int offset =3D adv7511->info->reg_cec_offset; =20 if (adv7511->i2c_cec =3D=3D NULL) @@ -225,9 +228,9 @@ static int adv7511_cec_adap_enable(struct cec_adapter *= adap, bool enable) return 0; } =20 -static int adv7511_cec_adap_log_addr(struct cec_adapter *adap, u8 addr) +int adv7511_cec_log_addr(struct drm_bridge *bridge, u8 addr) { - struct adv7511 *adv7511 =3D cec_get_drvdata(adap); + struct adv7511 *adv7511 =3D bridge_to_adv7511(bridge); unsigned int offset =3D adv7511->info->reg_cec_offset; unsigned int i, free_idx =3D ADV7511_MAX_ADDRS; =20 @@ -293,10 +296,10 @@ static int adv7511_cec_adap_log_addr(struct cec_adapt= er *adap, u8 addr) return 0; } =20 -static int adv7511_cec_adap_transmit(struct cec_adapter *adap, u8 attempts, - u32 signal_free_time, struct cec_msg *msg) +int adv7511_cec_transmit(struct drm_bridge *bridge, u8 attempts, + u32 signal_free_time, struct cec_msg *msg) { - struct adv7511 *adv7511 =3D cec_get_drvdata(adap); + struct adv7511 *adv7511 =3D bridge_to_adv7511(bridge); unsigned int offset =3D adv7511->info->reg_cec_offset; u8 len =3D msg->len; unsigned int i; @@ -328,12 +331,6 @@ static int adv7511_cec_adap_transmit(struct cec_adapte= r *adap, u8 attempts, return 0; } =20 -static const struct cec_adap_ops adv7511_cec_adap_ops =3D { - .adap_enable =3D adv7511_cec_adap_enable, - .adap_log_addr =3D adv7511_cec_adap_log_addr, - .adap_transmit =3D adv7511_cec_adap_transmit, -}; - static int adv7511_cec_parse_dt(struct device *dev, struct adv7511 *adv751= 1) { adv7511->cec_clk =3D devm_clk_get(dev, "cec"); @@ -348,21 +345,17 @@ static int adv7511_cec_parse_dt(struct device *dev, s= truct adv7511 *adv7511) return 0; } =20 -int adv7511_cec_init(struct device *dev, struct adv7511 *adv7511) +int adv7511_cec_init(struct drm_connector *connector, + struct drm_bridge *bridge) { + struct adv7511 *adv7511 =3D bridge_to_adv7511(bridge); + struct device *dev =3D &adv7511->i2c_main->dev; unsigned int offset =3D adv7511->info->reg_cec_offset; int ret =3D adv7511_cec_parse_dt(dev, adv7511); =20 if (ret) goto err_cec_parse_dt; =20 - adv7511->cec_adap =3D cec_allocate_adapter(&adv7511_cec_adap_ops, - adv7511, dev_name(dev), CEC_CAP_DEFAULTS, ADV7511_MAX_ADDRS); - if (IS_ERR(adv7511->cec_adap)) { - ret =3D PTR_ERR(adv7511->cec_adap); - goto err_cec_alloc; - } - regmap_write(adv7511->regmap, ADV7511_REG_CEC_CTRL, 0); /* cec soft reset */ regmap_write(adv7511->regmap_cec, @@ -378,17 +371,8 @@ int adv7511_cec_init(struct device *dev, struct adv751= 1 *adv7511) ADV7511_REG_CEC_CLK_DIV + offset, ((adv7511->cec_clk_freq / 750000) - 1) << 2); =20 - ret =3D cec_register_adapter(adv7511->cec_adap, dev); - if (ret) - goto err_cec_register; return 0; =20 -err_cec_register: - cec_delete_adapter(adv7511->cec_adap); - adv7511->cec_adap =3D NULL; -err_cec_alloc: - dev_info(dev, "Initializing CEC failed with error %d, disabling CEC\n", - ret); err_cec_parse_dt: regmap_write(adv7511->regmap, ADV7511_REG_CEC_CTRL, ADV7511_CEC_CTRL_POWER_DOWN); diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c b/drivers/gpu/drm= /bridge/adv7511/adv7511_drv.c index 1a76aea6a945ed4b23239edbf084681462fac1d9..60264bc903b58a72e8a2cd772ea= 07766c0ad12cf 100644 --- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c +++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c @@ -12,14 +12,17 @@ #include #include =20 -#include +#include =20 #include #include +#include #include #include #include #include +#include +#include =20 #include "adv7511.h" =20 @@ -203,62 +206,37 @@ static const uint16_t adv7511_csc_ycbcr_to_rgb[] =3D { =20 static void adv7511_set_config_csc(struct adv7511 *adv7511, struct drm_connector *connector, - bool rgb, bool hdmi_mode) + bool rgb) { struct adv7511_video_config config; bool output_format_422, output_format_ycbcr; unsigned int mode; - uint8_t infoframe[17]; - - config.hdmi_mode =3D hdmi_mode; - - hdmi_avi_infoframe_init(&config.avi_infoframe); - - config.avi_infoframe.scan_mode =3D HDMI_SCAN_MODE_UNDERSCAN; =20 if (rgb) { config.csc_enable =3D false; - config.avi_infoframe.colorspace =3D HDMI_COLORSPACE_RGB; + output_format_422 =3D false; + output_format_ycbcr =3D false; } else { config.csc_scaling_factor =3D ADV7511_CSC_SCALING_4; config.csc_coefficents =3D adv7511_csc_ycbcr_to_rgb; =20 if ((connector->display_info.color_formats & DRM_COLOR_FORMAT_YCBCR422) && - config.hdmi_mode) { + connector->display_info.is_hdmi) { config.csc_enable =3D false; - config.avi_infoframe.colorspace =3D - HDMI_COLORSPACE_YUV422; - } else { - config.csc_enable =3D true; - config.avi_infoframe.colorspace =3D HDMI_COLORSPACE_RGB; - } - } - - if (config.hdmi_mode) { - mode =3D ADV7511_HDMI_CFG_MODE_HDMI; - - switch (config.avi_infoframe.colorspace) { - case HDMI_COLORSPACE_YUV444: - output_format_422 =3D false; - output_format_ycbcr =3D true; - break; - case HDMI_COLORSPACE_YUV422: output_format_422 =3D true; output_format_ycbcr =3D true; - break; - default: + } else { + config.csc_enable =3D true; output_format_422 =3D false; output_format_ycbcr =3D false; - break; } - } else { - mode =3D ADV7511_HDMI_CFG_MODE_DVI; - output_format_422 =3D false; - output_format_ycbcr =3D false; } =20 - adv7511_packet_disable(adv7511, ADV7511_PACKET_ENABLE_AVI_INFOFRAME); + if (connector->display_info.is_hdmi) + mode =3D ADV7511_HDMI_CFG_MODE_HDMI; + else + mode =3D ADV7511_HDMI_CFG_MODE_DVI; =20 adv7511_set_colormap(adv7511, config.csc_enable, config.csc_coefficents, @@ -269,15 +247,6 @@ static void adv7511_set_config_csc(struct adv7511 *adv= 7511, =20 regmap_update_bits(adv7511->regmap, ADV7511_REG_HDCP_HDMI_CFG, ADV7511_HDMI_CFG_MODE_MASK, mode); - - hdmi_avi_infoframe_pack(&config.avi_infoframe, infoframe, - sizeof(infoframe)); - - /* The AVI infoframe id is not configurable */ - regmap_bulk_write(adv7511->regmap, ADV7511_REG_AVI_INFOFRAME_VERSION, - infoframe + 1, sizeof(infoframe) - 1); - - adv7511_packet_enable(adv7511, ADV7511_PACKET_ENABLE_AVI_INFOFRAME); } =20 static void adv7511_set_link_config(struct adv7511 *adv7511, @@ -446,22 +415,16 @@ static void adv7511_hpd_work(struct work_struct *work) * restore its state. */ if (status =3D=3D connector_status_connected && - adv7511->connector.status =3D=3D connector_status_disconnected && + adv7511->status =3D=3D connector_status_disconnected && adv7511->powered) { regcache_mark_dirty(adv7511->regmap); adv7511_power_on(adv7511); } =20 - if (adv7511->connector.status !=3D status) { - adv7511->connector.status =3D status; + if (adv7511->status !=3D status) { + adv7511->status =3D status; =20 - if (adv7511->connector.dev) { - if (status =3D=3D connector_status_disconnected) - cec_phys_addr_invalidate(adv7511->cec_adap); - drm_kms_helper_hotplug_event(adv7511->connector.dev); - } else { - drm_bridge_hpd_notify(&adv7511->bridge, status); - } + drm_bridge_hpd_notify(&adv7511->bridge, status); } } =20 @@ -636,45 +599,11 @@ static const struct drm_edid *adv7511_edid_read(struc= t adv7511 *adv7511, if (!adv7511->powered) __adv7511_power_off(adv7511); =20 - if (drm_edid) { - /* - * FIXME: The CEC physical address should be set using - * cec_s_phys_addr(adap, - * connector->display_info.source_physical_address, false) from - * a path that has read the EDID and called - * drm_edid_connector_update(). - */ - const struct edid *edid =3D drm_edid_raw(drm_edid); - - adv7511_set_config_csc(adv7511, connector, adv7511->rgb, - drm_detect_hdmi_monitor(edid)); - - cec_s_phys_addr_from_edid(adv7511->cec_adap, edid); - } else { - cec_s_phys_addr_from_edid(adv7511->cec_adap, NULL); - } - return drm_edid; } =20 -static int adv7511_get_modes(struct adv7511 *adv7511, - struct drm_connector *connector) -{ - const struct drm_edid *drm_edid; - unsigned int count; - - drm_edid =3D adv7511_edid_read(adv7511, connector); - - drm_edid_connector_update(connector, drm_edid); - count =3D drm_edid_connector_add_modes(connector); - - drm_edid_free(drm_edid); - - return count; -} - static enum drm_connector_status -adv7511_detect(struct adv7511 *adv7511, struct drm_connector *connector) +adv7511_detect(struct adv7511 *adv7511) { enum drm_connector_status status; unsigned int val; @@ -699,8 +628,6 @@ adv7511_detect(struct adv7511 *adv7511, struct drm_conn= ector *connector) if (status =3D=3D connector_status_connected && hpd && adv7511->powered) { regcache_mark_dirty(adv7511->regmap); adv7511_power_on(adv7511); - if (connector) - adv7511_get_modes(adv7511, connector); if (adv7511->status =3D=3D connector_status_connected) status =3D connector_status_disconnected; } else { @@ -719,17 +646,7 @@ adv7511_detect(struct adv7511 *adv7511, struct drm_con= nector *connector) return status; } =20 -static enum drm_mode_status adv7511_mode_valid(struct adv7511 *adv7511, - const struct drm_display_mode *mode) -{ - if (mode->clock > 165000) - return MODE_CLOCK_HIGH; - - return MODE_OK; -} - static void adv7511_mode_set(struct adv7511 *adv7511, - const struct drm_display_mode *mode, const struct drm_display_mode *adj_mode) { unsigned int low_refresh_rate; @@ -800,11 +717,11 @@ static void adv7511_mode_set(struct adv7511 *adv7511, vsync_polarity =3D 1; } =20 - if (drm_mode_vrefresh(mode) <=3D 24) + if (drm_mode_vrefresh(adj_mode) <=3D 24) low_refresh_rate =3D ADV7511_LOW_REFRESH_RATE_24HZ; - else if (drm_mode_vrefresh(mode) <=3D 25) + else if (drm_mode_vrefresh(adj_mode) <=3D 25) low_refresh_rate =3D ADV7511_LOW_REFRESH_RATE_25HZ; - else if (drm_mode_vrefresh(mode) <=3D 30) + else if (drm_mode_vrefresh(adj_mode) <=3D 30) low_refresh_rate =3D ADV7511_LOW_REFRESH_RATE_30HZ; else low_refresh_rate =3D ADV7511_LOW_REFRESH_RATE_NONE; @@ -826,77 +743,21 @@ static void adv7511_mode_set(struct adv7511 *adv7511, * supposed to give better results. */ =20 - adv7511->f_tmds =3D mode->clock; -} - -/* -----------------------------------------------------------------------= ------ - * DRM Connector Operations - */ - -static struct adv7511 *connector_to_adv7511(struct drm_connector *connecto= r) -{ - return container_of(connector, struct adv7511, connector); + adv7511->f_tmds =3D adj_mode->clock; } =20 -static int adv7511_connector_get_modes(struct drm_connector *connector) -{ - struct adv7511 *adv =3D connector_to_adv7511(connector); - - return adv7511_get_modes(adv, connector); -} - -static enum drm_mode_status -adv7511_connector_mode_valid(struct drm_connector *connector, - const struct drm_display_mode *mode) -{ - struct adv7511 *adv =3D connector_to_adv7511(connector); - - return adv7511_mode_valid(adv, mode); -} - -static struct drm_connector_helper_funcs adv7511_connector_helper_funcs = =3D { - .get_modes =3D adv7511_connector_get_modes, - .mode_valid =3D adv7511_connector_mode_valid, -}; - -static enum drm_connector_status -adv7511_connector_detect(struct drm_connector *connector, bool force) -{ - struct adv7511 *adv =3D connector_to_adv7511(connector); - - return adv7511_detect(adv, connector); -} - -static const struct drm_connector_funcs adv7511_connector_funcs =3D { - .fill_modes =3D drm_helper_probe_single_connector_modes, - .detect =3D adv7511_connector_detect, - .destroy =3D drm_connector_cleanup, - .reset =3D drm_atomic_helper_connector_reset, - .atomic_duplicate_state =3D drm_atomic_helper_connector_duplicate_state, - .atomic_destroy_state =3D drm_atomic_helper_connector_destroy_state, -}; - static int adv7511_connector_init(struct adv7511 *adv) { struct drm_bridge *bridge =3D &adv->bridge; - int ret; - - if (adv->i2c_main->irq) - adv->connector.polled =3D DRM_CONNECTOR_POLL_HPD; - else - adv->connector.polled =3D DRM_CONNECTOR_POLL_CONNECT | - DRM_CONNECTOR_POLL_DISCONNECT; + struct drm_connector *connector; =20 - ret =3D drm_connector_init(bridge->dev, &adv->connector, - &adv7511_connector_funcs, - DRM_MODE_CONNECTOR_HDMIA); - if (ret < 0) { + connector =3D drm_bridge_connector_init(bridge->dev, bridge->encoder); + if (IS_ERR(connector)) { DRM_ERROR("Failed to initialize connector with drm\n"); - return ret; + return PTR_ERR(connector); } - drm_connector_helper_add(&adv->connector, - &adv7511_connector_helper_funcs); - drm_connector_attach_encoder(&adv->connector, bridge->encoder); + + drm_connector_attach_encoder(connector, bridge->encoder); =20 return 0; } @@ -905,7 +766,7 @@ static int adv7511_connector_init(struct adv7511 *adv) * DRM Bridge Operations */ =20 -static struct adv7511 *bridge_to_adv7511(struct drm_bridge *bridge) +static const struct adv7511 *bridge_to_adv7511_const(const struct drm_brid= ge *bridge) { return container_of(bridge, struct adv7511, bridge); } @@ -913,9 +774,31 @@ static struct adv7511 *bridge_to_adv7511(struct drm_br= idge *bridge) static void adv7511_bridge_atomic_enable(struct drm_bridge *bridge, struct drm_bridge_state *bridge_state) { + struct drm_atomic_state *state =3D bridge_state->base.state; struct adv7511 *adv =3D bridge_to_adv7511(bridge); + struct drm_connector *connector; + struct drm_connector_state *conn_state; + struct drm_crtc_state *crtc_state; =20 adv7511_power_on(adv); + + connector =3D drm_atomic_get_new_connector_for_encoder(state, bridge->enc= oder); + if (WARN_ON(!connector)) + return; + + conn_state =3D drm_atomic_get_new_connector_state(state, connector); + if (WARN_ON(!conn_state)) + return; + + crtc_state =3D drm_atomic_get_new_crtc_state(state, conn_state->crtc); + if (WARN_ON(!crtc_state)) + return; + + adv7511_set_config_csc(adv, connector, adv->rgb); + + adv7511_mode_set(adv, &crtc_state->adjusted_mode); + + drm_atomic_helper_connector_hdmi_update_infoframes(connector, state); } =20 static void adv7511_bridge_atomic_disable(struct drm_bridge *bridge, @@ -926,13 +809,17 @@ static void adv7511_bridge_atomic_disable(struct drm_= bridge *bridge, adv7511_power_off(adv); } =20 -static void adv7511_bridge_mode_set(struct drm_bridge *bridge, - const struct drm_display_mode *mode, - const struct drm_display_mode *adj_mode) +static enum drm_mode_status +adv7511_bridge_hdmi_tmds_char_rate_valid(const struct drm_bridge *bridge, + const struct drm_display_mode *mode, + unsigned long long tmds_rate) { - struct adv7511 *adv =3D bridge_to_adv7511(bridge); + const struct adv7511 *adv =3D bridge_to_adv7511_const(bridge); =20 - adv7511_mode_set(adv, mode, adj_mode); + if (mode->clock > 1000ULL * adv->info->max_mode_clock_khz) + return MODE_CLOCK_HIGH; + + return MODE_OK; } =20 static enum drm_mode_status adv7511_bridge_mode_valid(struct drm_bridge *b= ridge, @@ -941,10 +828,10 @@ static enum drm_mode_status adv7511_bridge_mode_valid= (struct drm_bridge *bridge, { struct adv7511 *adv =3D bridge_to_adv7511(bridge); =20 - if (adv->info->has_dsi) - return adv7533_mode_valid(adv, mode); - else - return adv7511_mode_valid(adv, mode); + if (!adv->info->has_dsi) + return MODE_OK; + + return adv7533_mode_valid(adv, mode); } =20 static int adv7511_bridge_attach(struct drm_bridge *bridge, @@ -977,7 +864,7 @@ static enum drm_connector_status adv7511_bridge_detect(= struct drm_bridge *bridge { struct adv7511 *adv =3D bridge_to_adv7511(bridge); =20 - return adv7511_detect(adv, NULL); + return adv7511_detect(adv); } =20 static const struct drm_edid *adv7511_bridge_edid_read(struct drm_bridge *= bridge, @@ -988,28 +875,71 @@ static const struct drm_edid *adv7511_bridge_edid_rea= d(struct drm_bridge *bridge return adv7511_edid_read(adv, connector); } =20 -static void adv7511_bridge_hpd_notify(struct drm_bridge *bridge, - enum drm_connector_status status) +static int adv7511_bridge_hdmi_clear_infoframe(struct drm_bridge *bridge, + enum hdmi_infoframe_type type) { - struct adv7511 *adv =3D bridge_to_adv7511(bridge); + struct adv7511 *adv7511 =3D bridge_to_adv7511(bridge); + + switch (type) { + case HDMI_INFOFRAME_TYPE_AVI: + adv7511_packet_disable(adv7511, ADV7511_PACKET_ENABLE_AVI_INFOFRAME); + break; + default: + drm_dbg_driver(adv7511->bridge.dev, "Unsupported HDMI InfoFrame %x\n", t= ype); + break; + } + + return 0; +} + +static int adv7511_bridge_hdmi_write_infoframe(struct drm_bridge *bridge, + enum hdmi_infoframe_type type, + const u8 *buffer, size_t len) +{ + struct adv7511 *adv7511 =3D bridge_to_adv7511(bridge); + + adv7511_bridge_hdmi_clear_infoframe(bridge, type); + + switch (type) { + case HDMI_INFOFRAME_TYPE_AVI: + /* The AVI infoframe id is not configurable */ + regmap_bulk_write(adv7511->regmap, ADV7511_REG_AVI_INFOFRAME_VERSION, + buffer + 1, len - 1); =20 - if (status =3D=3D connector_status_disconnected) - cec_phys_addr_invalidate(adv->cec_adap); + adv7511_packet_enable(adv7511, ADV7511_PACKET_ENABLE_AVI_INFOFRAME); + break; + default: + drm_dbg_driver(adv7511->bridge.dev, "Unsupported HDMI InfoFrame %x\n", t= ype); + break; + } + + return 0; } =20 static const struct drm_bridge_funcs adv7511_bridge_funcs =3D { - .mode_set =3D adv7511_bridge_mode_set, .mode_valid =3D adv7511_bridge_mode_valid, .attach =3D adv7511_bridge_attach, .detect =3D adv7511_bridge_detect, .edid_read =3D adv7511_bridge_edid_read, - .hpd_notify =3D adv7511_bridge_hpd_notify, =20 .atomic_enable =3D adv7511_bridge_atomic_enable, .atomic_disable =3D adv7511_bridge_atomic_disable, .atomic_duplicate_state =3D drm_atomic_helper_bridge_duplicate_state, .atomic_destroy_state =3D drm_atomic_helper_bridge_destroy_state, .atomic_reset =3D drm_atomic_helper_bridge_reset, + + .hdmi_tmds_char_rate_valid =3D adv7511_bridge_hdmi_tmds_char_rate_valid, + .hdmi_clear_infoframe =3D adv7511_bridge_hdmi_clear_infoframe, + .hdmi_write_infoframe =3D adv7511_bridge_hdmi_write_infoframe, + + .hdmi_audio_startup =3D adv7511_hdmi_audio_startup, + .hdmi_audio_prepare =3D adv7511_hdmi_audio_prepare, + .hdmi_audio_shutdown =3D adv7511_hdmi_audio_shutdown, + + .hdmi_cec_init =3D adv7511_cec_init, + .hdmi_cec_enable =3D adv7511_cec_enable, + .hdmi_cec_log_addr =3D adv7511_cec_log_addr, + .hdmi_cec_transmit =3D adv7511_cec_transmit, }; =20 /* -----------------------------------------------------------------------= ------ @@ -1320,22 +1250,40 @@ static int adv7511_probe(struct i2c_client *i2c) if (adv7511->info->link_config) adv7511_set_link_config(adv7511, &link_config); =20 - ret =3D adv7511_cec_init(dev, adv7511); - if (ret) - goto err_unregister_cec; + regmap_write(adv7511->regmap, ADV7511_REG_CEC_CTRL, + ADV7511_CEC_CTRL_POWER_DOWN); =20 adv7511->bridge.funcs =3D &adv7511_bridge_funcs; - adv7511->bridge.ops =3D DRM_BRIDGE_OP_DETECT | DRM_BRIDGE_OP_EDID; + adv7511->bridge.ops =3D DRM_BRIDGE_OP_DETECT | DRM_BRIDGE_OP_EDID | + DRM_BRIDGE_OP_HDMI; if (adv7511->i2c_main->irq) adv7511->bridge.ops |=3D DRM_BRIDGE_OP_HPD; =20 + adv7511->bridge.vendor =3D "Analog"; + adv7511->bridge.product =3D adv7511->info->name; + adv7511->bridge.hdmi_dev =3D dev; + +#ifdef CONFIG_DRM_I2C_ADV7511_AUDIO + adv7511->bridge.hdmi_audio_max_i2s_playback_channels =3D 2; + adv7511->bridge.hdmi_audio_i2s_formats =3D (SNDRV_PCM_FMTBIT_S16_LE | + SNDRV_PCM_FMTBIT_S20_3LE | + SNDRV_PCM_FMTBIT_S24_3LE | + SNDRV_PCM_FMTBIT_S24_LE | + SNDRV_PCM_FMTBIT_IEC958_SUBFRAME_LE), + adv7511->bridge.hdmi_audio_spdif_playback =3D 1; + adv7511->bridge.hdmi_audio_dai_port =3D 2; +#endif + +#ifdef CONFIG_DRM_I2C_ADV7511_CEC + adv7511->bridge.hdmi_cec_adapter_name =3D dev_name(dev); + adv7511->bridge.hdmi_cec_available_las =3D ADV7511_MAX_ADDRS; +#endif + adv7511->bridge.of_node =3D dev->of_node; adv7511->bridge.type =3D DRM_MODE_CONNECTOR_HDMIA; =20 drm_bridge_add(&adv7511->bridge); =20 - adv7511_audio_init(dev, adv7511); - if (i2c->irq) { init_waitqueue_head(&adv7511->wq); =20 @@ -1357,10 +1305,7 @@ static int adv7511_probe(struct i2c_client *i2c) return 0; =20 err_unregister_audio: - adv7511_audio_exit(adv7511); drm_bridge_remove(&adv7511->bridge); -err_unregister_cec: - cec_unregister_adapter(adv7511->cec_adap); i2c_unregister_device(adv7511->i2c_cec); clk_disable_unprepare(adv7511->cec_clk); err_i2c_unregister_packet: @@ -1381,9 +1326,6 @@ static void adv7511_remove(struct i2c_client *i2c) =20 drm_bridge_remove(&adv7511->bridge); =20 - adv7511_audio_exit(adv7511); - - cec_unregister_adapter(adv7511->cec_adap); i2c_unregister_device(adv7511->i2c_cec); clk_disable_unprepare(adv7511->cec_clk); =20 @@ -1393,6 +1335,8 @@ static void adv7511_remove(struct i2c_client *i2c) =20 static const struct adv7511_chip_info adv7511_chip_info =3D { .type =3D ADV7511, + .name =3D "ADV7511", + .max_mode_clock_khz =3D 165000, .supply_names =3D adv7511_supply_names, .num_supplies =3D ARRAY_SIZE(adv7511_supply_names), .link_config =3D true, @@ -1400,6 +1344,7 @@ static const struct adv7511_chip_info adv7511_chip_in= fo =3D { =20 static const struct adv7511_chip_info adv7533_chip_info =3D { .type =3D ADV7533, + .name =3D "ADV7533", .max_mode_clock_khz =3D 80000, .max_lane_freq_khz =3D 800000, .supply_names =3D adv7533_supply_names, @@ -1410,6 +1355,7 @@ static const struct adv7511_chip_info adv7533_chip_in= fo =3D { =20 static const struct adv7511_chip_info adv7535_chip_info =3D { .type =3D ADV7535, + .name =3D "ADV7535", .max_mode_clock_khz =3D 148500, .max_lane_freq_khz =3D 891000, .supply_names =3D adv7533_supply_names, diff --git a/drivers/gpu/drm/bridge/adv7511/adv7533.c b/drivers/gpu/drm/bri= dge/adv7511/adv7533.c index 4481489aaf5ebf164313c86cbf3447d2d7914ab9..3ed0fa56bb97c53c2d578c24260= 3e195a574dc14 100644 --- a/drivers/gpu/drm/bridge/adv7511/adv7533.c +++ b/drivers/gpu/drm/bridge/adv7511/adv7533.c @@ -106,10 +106,6 @@ enum drm_mode_status adv7533_mode_valid(struct adv7511= *adv, struct mipi_dsi_device *dsi =3D adv->dsi; u8 bpp =3D mipi_dsi_pixel_format_to_bpp(dsi->format); =20 - /* Check max clock for either 7533 or 7535 */ - if (mode->clock > adv->info->max_mode_clock_khz) - return MODE_CLOCK_HIGH; - /* Check max clock for each lane */ if (mode->clock * bpp > adv->info->max_lane_freq_khz * adv->num_dsi_lanes) return MODE_CLOCK_HIGH; --=20 2.39.5