From nobody Fri Dec 19 09:10:05 2025 Received: from mail-lj1-f173.google.com (mail-lj1-f173.google.com [209.85.208.173]) (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 B82F03A8D0 for ; Tue, 2 Jul 2024 09:48:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719913738; cv=none; b=A0wnvQM7uj8r0ZGxAPWmi59maGmusrLBhAeq4El0LzS806U6BU1ynumGozpeLXzzwB0Dy0vAsPUBxYvCGrZQd2ZPEGgrS7Q1N++3uu2tBIzujZFMOyOJV/HsrDrgG9tXENRqbX6U1rkTVLOreLasjShjBLu1dbl84kSL57GRylA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719913738; c=relaxed/simple; bh=ZHzhL2qDJx6VCsIqQPH6DPvSD0dOn8r7tcbnzboUaz4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=tXophBixtatRXgvhPILj7gL/6ClXcSasgQXnuHVBcC3/OmOmghlpe4LxQoXd+auJlWsB49uG93GczjjGWDg+gwWqlPj0n8s4UyLqh5+5AfJhKRlDGQAMu3Z0Hd3ascUFLe6ntKn9zzSFI0vS8bPXJdZnAYp/0OrrhTzUKgYZ11I= 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=ydDbUYVS; arc=none smtp.client-ip=209.85.208.173 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="ydDbUYVS" Received: by mail-lj1-f173.google.com with SMTP id 38308e7fff4ca-2ec5779b423so36402981fa.0 for ; Tue, 02 Jul 2024 02:48:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1719913735; x=1720518535; 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=grKYh+BySNj5dd16DxXRdwU80BL8FOK+kLgksXgznTg=; b=ydDbUYVS+lWjfItmvj/3zFXCS9WPXJ3tiAo9pf3DzeD+MBKRyAXtTg6CGdxItn7/WL bHm78QOpI37kaJfS8PVSc1SuoS7kaZ0t7ngYusnCWsq7Dto54a5L97bPdPoPU9Vt11Q/ zjykn0yqTrN5GQdJ6aVnhjJUubm0ffMD/LaaThqbuoFfHyg3n7un3sQliIsG71JNgtk9 iT9NqwNeQJ0W5EdkJYJQr/9BP8qLmpsIHrp9cTj+YuCWu3IGbRjERLLrm2fSjxXMWt1Z Jf+2TZpZvw95Nz5izz1n0GmSlvMm2iZoN0w4t31FcDyBUd700ynyZzj2QoEnJcPAPNFh Nkpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719913735; x=1720518535; 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=grKYh+BySNj5dd16DxXRdwU80BL8FOK+kLgksXgznTg=; b=A93HpBdDiePpxeSF/E4qFCNFKkSru3KcKlRW50nThbHuL7LuM3nqINeyjBMtpg+LKt VFUD4GqZ+FE5QRw99EjqIg/BHkOcF0/Emga3givljsesbwFnrWKem27UpE1TBLx11OtC JDJc5TRamYBBXa1JBhDkxOAWA+aHZgIbF/kf9CgEaar/kqIdtQfi7kFlm3M+AWwAFvdk fcXrjsFHbxZiVxj9F1i6AtWDCFljBTCZgVfEdcAg8w2rI9PS9/qOXAYxH8TmKU6Stp/j d0lRmG0+/pV1HeSb7tG/MWFTFkWEt+hoNytkemna1mq3pT+dOh/S1X33Bx5E+oa/959U 0dYw== X-Forwarded-Encrypted: i=1; AJvYcCWytlZ5AebRyTb7kU8+XlsJciSDkC6R0J7yE34J+ezR/NzXSzcmjFoHissx5jrPElQwr+thmYfGO1sPPdpbsXsPOgOytD99mBgAXNVG X-Gm-Message-State: AOJu0YzA89Xrk7hTSOQ0o3wwCn/N1T93cj+ceCSf7qObQyzZGaTKo79R 06RM7Vm7/HifM5lpIMs1Bwk+7QjdPx4HG4vi7J4G/pWXJHhbeJIAIDMwiIg/Taw= X-Google-Smtp-Source: AGHT+IEHYPqBRlSa4/s9XNTLhrSpJ2d7hL4YRvX3igF6c2N0POyPLUNHv3ogsHuGow9fTT7WHEO5lg== X-Received: by 2002:a2e:a9a8:0:b0:2ee:4c66:6828 with SMTP id 38308e7fff4ca-2ee5e4bb786mr66677251fa.24.1719913734882; Tue, 02 Jul 2024 02:48:54 -0700 (PDT) Received: from umbar.lan ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2ee5160e333sm16231161fa.5.2024.07.02.02.48.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jul 2024 02:48:54 -0700 (PDT) From: Dmitry Baryshkov Date: Tue, 02 Jul 2024 12:48:52 +0300 Subject: [PATCH v3 1/4] drm/drm_property: require DRM_MODE_PROP_IMMUTABLE for single-value props 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: <20240702-drm-bridge-connector-fix-hdmi-reset-v3-1-12b0e3124ca4@linaro.org> References: <20240702-drm-bridge-connector-fix-hdmi-reset-v3-0-12b0e3124ca4@linaro.org> In-Reply-To: <20240702-drm-bridge-connector-fix-hdmi-reset-v3-0-12b0e3124ca4@linaro.org> To: Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Dave Stevenson Cc: Rob Clark , Abhinav Kumar , Dmitry Baryshkov , dri-devel@lists.freedesktop.org, igt-dev@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1072; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=ZHzhL2qDJx6VCsIqQPH6DPvSD0dOn8r7tcbnzboUaz4=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBmg80EWZj1pah8UzMX2/G4UNqFRNqb0JlRO93Ms RRkSO6Hv/KJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZoPNBAAKCRCLPIo+Aiko 1Q1+CACxdDwVSgOIcrD5yaAYfHuWsZQlYwFDxYyvGJAOp18OWx0WYgryw6qDB4Kv6Am94YL8chA rzWgZDP7Fh4hmHGMQfPYqu5jd3h2jA45NJamjWWdXMWmVzFsrHBIlr/MqN4K+c1mcW8qAPM4Aut LQkdGUHQ936Kwhec384brroKfge+MO1h9dgB7wxbVvnPQapQTOibV0b3aISdjN8fkI/SBR5WEKE 61amWsXJ1hCW3zNZuGyFOepos7d/6vkL4gaCQ3svBPeNQPYHOxjH2EpaiW3Nmeh+x2C0+GhnVEV a/WFgjPVG7wSHgFk78J3uoewD+jjE5VNy14bP8PoznvUJzhS X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A Document that DRM_MODE_PROP_IMMUTABLE must be set for the properties that are immutable by definition - e.g. ranges with min =3D=3D max or enums with a single value. This matches the behaviour of the IGT tests, see kms_properties.c / validate_range_prop(), validate_enum_prop(), validate_bitmask_prop(). Signed-off-by: Dmitry Baryshkov --- include/drm/drm_property.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/drm/drm_property.h b/include/drm/drm_property.h index 082f29156b3e..7d0f793f50ca 100644 --- a/include/drm/drm_property.h +++ b/include/drm/drm_property.h @@ -162,6 +162,9 @@ struct drm_property { * userspace, e.g. the EDID, or the connector path property on DP * MST sinks. Kernel can update the value of an immutable property * by calling drm_object_property_set_value(). + * This flag should be set for all properties that have only a + * single value (e.g. min =3D=3D max or if enum has only a single + * value). */ uint32_t flags; =20 --=20 2.39.2 From nobody Fri Dec 19 09:10:05 2025 Received: from mail-lj1-f173.google.com (mail-lj1-f173.google.com [209.85.208.173]) (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 517D4153BFA for ; Tue, 2 Jul 2024 09:48:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719913739; cv=none; b=M2UnmnfCNey3vqY0U3F1Ewjq5X+CaChpvJ/KgTQTvwB7rqRdhoeo/ehMXXdtfmHKtmfQJjZCERccZuYRql62qbI678C4tDHCYLC+oieyzjLZdErqUZEqtwZgU+ttM+++zL3n4mgWf41uEe2yLdFVVueiW/2oGhA4PkG3q55QgfI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719913739; c=relaxed/simple; bh=Ogj1qgSBFy5LiaMGrph8HSRVcootU6FeEO747BTFj9E=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=swIs57pgR/yNNsX2XT01UN/jMrIseKpCia/ERZe5UYQo0h1GldJiUUzKUDHI7xlNhgG7aleyQwD97sPwU2LoxVTG0ASQJUJxNoEPyXLGeoaE/AQHCd4URPSDxYFDu6BWqZCedhOAA2YW/1Q6dF9OVcs0gYpDZoRgZ/vxHtclFls= 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=hv2nYLxc; arc=none smtp.client-ip=209.85.208.173 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="hv2nYLxc" Received: by mail-lj1-f173.google.com with SMTP id 38308e7fff4ca-2ebe785b234so40264611fa.1 for ; Tue, 02 Jul 2024 02:48:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1719913735; x=1720518535; 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=hbJUOmvW24quAtGM4HEWCKTnos6XbtfhPM+nK5+e2Tw=; b=hv2nYLxc4etcqSz4FN9ElxiAIDM91aZLvhLqCsNfvA5RlFBfJh5Na/62NdueDpe8pE 6iA1rzA/ByeHrjgIl++xyFttit+fop7JDVC3L294CRZu03ayAULwdlflOMcsPn9yT3/s 04NMm0cf3b4gOnl9iozX56KdCxdHqcnomTbmNLUIAV18Y15eQ+aQ+lgk+MiOBzvNgrdz hj5+pinDskDa5G1lG500SfrKF9CmZAIgN13yCmlndh58OgbnK8oYNNDIHO3VJekr7RpF kMZYQd9Org89UmazfVjAeYcsCu9tHCJzN1qHHlXyYfIxYwyxcPZzXp+E4BaqnCGmuif1 LuKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719913735; x=1720518535; 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=hbJUOmvW24quAtGM4HEWCKTnos6XbtfhPM+nK5+e2Tw=; b=nGHXa3w+e8V8S7JuBOuifjuoJoY2VF6RQ7HsaniaMoeQ3LlOqVRUG/QAin8SkrQYGW 6cqvXxrN8PpGUvBYtWosDsmSW/gS8mPU8y8TtQhER4bPUukfHRiqtHIip2/hSON7aJVU Pgjl6GztzQGg/BBBGcHPECvDvWEK3cnFtZO9dceNpzYvg/7AHEwLPDpX4KyP8fBVvwJM HKLM4jXm3gvvRUtAKsv06WYhX/GWMlUUGhjFvvEtVxkRgQ54TMAjHAMRiB8tAHxobXOA wV0o3rxp1AI+/+aHsrpizkE1CO549cpBTqj+bA1Qnn7kw97U9GCHvc76hCmIPPyDgDvP /qZw== X-Forwarded-Encrypted: i=1; AJvYcCXInEUmTjmR7Lru/iI5CT+W9lXCa46eJZZd4EWm1XyNSU5eSDSt2yZfwz2VSW3oeQM4cRQO3ltYhvndu1/3ezsUeenpVZ0eNK6TLBYd X-Gm-Message-State: AOJu0Yw3wsQ84ecUZL8WCqMcGeKVryeJuGloMAL2sD5e+bS1sFbCDKaZ NjQpgMfQDGOfd31ykam07as3tMaYAMLgogqpKJQFrnukzSrwSqjxqrRPEO0I2a4= X-Google-Smtp-Source: AGHT+IGfmdHB+8edC65CU37es9H6R49dvRUzRUlXwIzKM7NUfhJMiOkS6U7fLphVNhqcxMt5+DlouQ== X-Received: by 2002:a2e:b53a:0:b0:2ec:6cbe:5e4c with SMTP id 38308e7fff4ca-2ee5e4c38c3mr48178251fa.26.1719913735592; Tue, 02 Jul 2024 02:48:55 -0700 (PDT) Received: from umbar.lan ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2ee5160e333sm16231161fa.5.2024.07.02.02.48.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jul 2024 02:48:55 -0700 (PDT) From: Dmitry Baryshkov Date: Tue, 02 Jul 2024 12:48:53 +0300 Subject: [PATCH v3 2/4] drm/connector: automatically set immutable flag for max_bpc property 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: <20240702-drm-bridge-connector-fix-hdmi-reset-v3-2-12b0e3124ca4@linaro.org> References: <20240702-drm-bridge-connector-fix-hdmi-reset-v3-0-12b0e3124ca4@linaro.org> In-Reply-To: <20240702-drm-bridge-connector-fix-hdmi-reset-v3-0-12b0e3124ca4@linaro.org> To: Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Dave Stevenson Cc: Rob Clark , Abhinav Kumar , Dmitry Baryshkov , dri-devel@lists.freedesktop.org, igt-dev@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1164; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=Ogj1qgSBFy5LiaMGrph8HSRVcootU6FeEO747BTFj9E=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBmg80FIFlpwZSuAMcVaex64ulawWVazh4lwSquc qTrBGjVLnSJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZoPNBQAKCRCLPIo+Aiko 1ZPXB/9JSHXBoeLLdgKIA/GlpIadryusEgR3jFySCJuDELdNN4OuXdoem3dSd9kjIC+JcMsHNNF I0fK75E2EybrRE6uduTV2Z7e3+27bJvncgqo+vguR701/L5k7SQ10eqZ4FDg702uh9jSg635tsB 0sYf7ed+6tCdPoy7PrfIWzke9XSTRvyh6pcqDgJIX3f4cXnKnBJzk5QIrQPnghLIwS38Pw9PXW5 /F4+fMCjdCYjVO2i4L6ZfF5b9km3s/i6agBdI2/h6nOuaW+mh24ZOOPhQWhPu3olMMXl2W+3RSL t/HhQjnpdsmUS7Tbx2PKaDZWepo+M9RjijPg5dCK8NdkCJqE X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A With the introduction of the HDMI Connector framework the driver might end up creating the max_bpc property with min =3D max =3D 8. IGT insists that such properties carry the 'immutable' flag. Automatically set the flag if the driver asks for the max_bpc property with min =3D=3D max. Fixes: aadb3e16b8f3 ("drm/connector: hdmi: Add output BPC to the connector = state") Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/drm_connector.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connecto= r.c index ab6ab7ff7ea8..33847fd63628 100644 --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c @@ -2610,7 +2610,12 @@ int drm_connector_attach_max_bpc_property(struct drm= _connector *connector, =20 prop =3D connector->max_bpc_property; if (!prop) { - prop =3D drm_property_create_range(dev, 0, "max bpc", min, max); + u32 flags =3D 0; + + if (min =3D=3D max) + flags |=3D DRM_MODE_PROP_IMMUTABLE; + + prop =3D drm_property_create_range(dev, flags, "max bpc", min, max); if (!prop) return -ENOMEM; =20 --=20 2.39.2 From nobody Fri Dec 19 09:10:05 2025 Received: from mail-lj1-f175.google.com (mail-lj1-f175.google.com [209.85.208.175]) (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 3E067156C6B for ; Tue, 2 Jul 2024 09:48:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719913741; cv=none; b=dHJ5rWkANaSIDp/zz7fGx5o0cQIKCmAaW5U3KdEJ/UDNXfpu0KbhbJNV4dub37eo3hbJ4YyM0cs4/2JFHotI8qBgO0P9z/aKCdV2YI8yZK+L/AD1GiXseB0JWoV0J0a1/53xdDabXsc2L5jzaMBTiETBcHqEI7OThCJ9/5TTtgI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719913741; c=relaxed/simple; bh=XEu8F3MssoKDb+QQZWwR5R5Ax2lz2UkYvPYt1wioZ5M=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ULVcNIo258WaSSOou9JCLPd1mBTDmymPu8HH1aDJNufYSuM5gO3y/m8Ed1HIP/YPi0h5CDVBfqpeF5hOLMzU5zJpodSJuYBM8ugyjQFnlHhZuabP/ux3hI2h8MdkUivFk9R6X3SH5ZruKtNGd0HEmBADGtl2PZY5/oGkU6sCPG4= 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=KoSvspFn; arc=none smtp.client-ip=209.85.208.175 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="KoSvspFn" Received: by mail-lj1-f175.google.com with SMTP id 38308e7fff4ca-2eabd22d3f4so39110711fa.1 for ; Tue, 02 Jul 2024 02:48:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1719913737; x=1720518537; 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=zMfKgTFDHkwJCeUJvNPaxF1oMIhQ0c5OI5BCMTfEDCs=; b=KoSvspFnVw8DaJsEaLKC/7VThaq1lfPD343poYFDfa643AkCn3j1hS9FLdmT1SQKZr 8VttagdewuS/s6Bckt1/91m64X/9cw+GE2QJ6tJBd+LyjMyI4pJsxkAmrQL9t/rYyV7P KDv3EQ7v1mIB131bY85VZnmJHCXGGKXYCmmZUB9m3QkFxacjCnsbvQzTS1a0R7O6LNoa 1/FyBRw08P6wsn2A9WMu//F6cdMq5jwcmXmO9gYadCXcNgiTnqcVAzPnBCuZ90NsmUyt IV62ihEZhGy0MZYODgakmRlPLch8+1eMYmmd0TNW/NFVDVUVhxRUB2egU2hNYksfHx+r 6bAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719913737; x=1720518537; 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=zMfKgTFDHkwJCeUJvNPaxF1oMIhQ0c5OI5BCMTfEDCs=; b=C/6DFb9N+a7bW0tNzqWUC6zX8CwvlBbHJFJdyYv9BJb80OKD9HPyX7Q/j37QMPxn7p M5yhflFqMvpm2T9E+WH/SyZnNOHEJyHg64FXZDW818Z9Gqa//iOujAzgqEa0/JMws++o sRFG4lSt/6gDCbFw8MoQfKR7QU7fbFJLh06zuIvYbpxRz4M57WVhjk1Q6fBHMr/d6oqd cjw7A6ASJJQrZV4bR2OqThtRWb/2rS0nGL5JcEMO9mAFE7yMsVVorgTuw7VL0H37peqg HXfXmy04jGKdBPI/Tq/Yjn57UH7sOXmgqCpvQrdMEmYQHBoHjAUXIgZwosePvTjO51sq 9v7Q== X-Forwarded-Encrypted: i=1; AJvYcCUNzivSBjJB62qQsPYYev1iZd5lpXxQL05TxPTQ7JP5OS+L+ALtN7XVaRDnGa/Uf39lu4gdLxiRwuicpaMKUDuhEjY434kmaIwrwDzZ X-Gm-Message-State: AOJu0Yyty8iucpjC0Qao3XsKPzkhv0piW1QrfgUaZwuROcIRBsLmd72j +EcRz5joEuI311xTCza73cz7qgakhorVnv1jqk6mYokjDa5BzZpnMbGuWXGxmv4= X-Google-Smtp-Source: AGHT+IFdaqNk/YBQI79JMZgPPVDzQ8r2QaVueo1kugYWDyxFiIuMlN4vOElT1qOB4NowPdRrYtbqSQ== X-Received: by 2002:a2e:a702:0:b0:2ed:a091:f54c with SMTP id 38308e7fff4ca-2ee5e3ae50emr42630861fa.23.1719913736322; Tue, 02 Jul 2024 02:48:56 -0700 (PDT) Received: from umbar.lan ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2ee5160e333sm16231161fa.5.2024.07.02.02.48.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jul 2024 02:48:55 -0700 (PDT) From: Dmitry Baryshkov Date: Tue, 02 Jul 2024 12:48:54 +0300 Subject: [PATCH v3 3/4] drm/bridge-connector: move to DRM_DISPLAY_HELPER module 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: <20240702-drm-bridge-connector-fix-hdmi-reset-v3-3-12b0e3124ca4@linaro.org> References: <20240702-drm-bridge-connector-fix-hdmi-reset-v3-0-12b0e3124ca4@linaro.org> In-Reply-To: <20240702-drm-bridge-connector-fix-hdmi-reset-v3-0-12b0e3124ca4@linaro.org> To: Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Dave Stevenson Cc: Rob Clark , Abhinav Kumar , Dmitry Baryshkov , dri-devel@lists.freedesktop.org, igt-dev@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=11112; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=XEu8F3MssoKDb+QQZWwR5R5Ax2lz2UkYvPYt1wioZ5M=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBmg80F8ZWyWkyyc3QAemCdZTBWhJfq0V0Gs+fkf iMxBwUvTwWJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZoPNBQAKCRCLPIo+Aiko 1fR6B/0ZTaw/CY4NGnO6mbaRwCOlUXuVLCAKQSb4NnIy0rVV3JiDoP30xWsYPx9GneZianjjudG J988rMbqJ8qNRGZ2hLkpRUujNu2HTlp9PgTK5Ol2HzuXZTESZ79JpkvmsSXCHPeIYgwXK/psHTN s5G4KsSilB9lvqDhiRW8t3VpiPJPJSEb/BDt7LyMvPNh4RKgJ9MML1EkQc5Zn8VIC6PzkQgh0Sj XfjiGyO9ziGtJjG9EjbztUlGk3XxjrYxrF1mcINGFuKr6rSe7IbkEPUrpFz+exggCs0RoDRPqL+ 4y371LVTPvFETDH5aWWTPEltPanW70x4mG7fKrNNfKD0GPXg X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A drm_bridge_connector is a "leaf" driver, belonging to the display helper, rather than the "CRTC" drm_kms_helper module. Move the driver to the drm/display and add necessary Kconfig selection clauses. Suggested-by: Maxime Ripard Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/Makefile | 1 - drivers/gpu/drm/bridge/Kconfig | 1 + drivers/gpu/drm/display/Kconfig | 6 ++++++ drivers/gpu/drm/display/Makefile | 2 ++ drivers/gpu/drm/{ =3D> display}/drm_bridge_connector.c | 0 drivers/gpu/drm/imx/dcss/Kconfig | 2 ++ drivers/gpu/drm/imx/lcdc/Kconfig | 2 ++ drivers/gpu/drm/ingenic/Kconfig | 2 ++ drivers/gpu/drm/kmb/Kconfig | 2 ++ drivers/gpu/drm/mediatek/Kconfig | 2 ++ drivers/gpu/drm/meson/Kconfig | 2 ++ drivers/gpu/drm/msm/Kconfig | 1 + drivers/gpu/drm/omapdrm/Kconfig | 2 ++ drivers/gpu/drm/renesas/rcar-du/Kconfig | 2 ++ drivers/gpu/drm/renesas/rz-du/Kconfig | 2 ++ drivers/gpu/drm/renesas/shmobile/Kconfig | 2 ++ drivers/gpu/drm/rockchip/Kconfig | 4 ++++ drivers/gpu/drm/tegra/Kconfig | 1 + drivers/gpu/drm/tidss/Kconfig | 2 ++ drivers/gpu/drm/xlnx/Kconfig | 1 + 20 files changed, 38 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile index 68cc9258ffc4..fa432a1ac9e2 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile @@ -128,7 +128,6 @@ obj-$(CONFIG_DRM_TTM_HELPER) +=3D drm_ttm_helper.o drm_kms_helper-y :=3D \ drm_atomic_helper.o \ drm_atomic_state_helper.o \ - drm_bridge_connector.o \ drm_crtc_helper.o \ drm_damage_helper.o \ drm_encoder_slave.o \ diff --git a/drivers/gpu/drm/bridge/Kconfig b/drivers/gpu/drm/bridge/Kconfig index c621be1a99a8..3eb955333c80 100644 --- a/drivers/gpu/drm/bridge/Kconfig +++ b/drivers/gpu/drm/bridge/Kconfig @@ -390,6 +390,7 @@ config DRM_TI_SN65DSI86 depends on OF select DRM_DISPLAY_DP_HELPER select DRM_DISPLAY_HELPER + select DRM_BRIDGE_CONNECTOR select DRM_KMS_HELPER select REGMAP_I2C select DRM_PANEL diff --git a/drivers/gpu/drm/display/Kconfig b/drivers/gpu/drm/display/Kcon= fig index 479e62690d75..1a192a45961b 100644 --- a/drivers/gpu/drm/display/Kconfig +++ b/drivers/gpu/drm/display/Kconfig @@ -6,6 +6,12 @@ config DRM_DISPLAY_HELPER help DRM helpers for display adapters. =20 +config DRM_BRIDGE_CONNECTOR + bool + depends on DRM && DRM_BRIDGE && DRM_DISPLAY_HELPER + help + DRM connector implementation terminating DRM bridge chains. + config DRM_DISPLAY_DP_AUX_BUS tristate depends on DRM diff --git a/drivers/gpu/drm/display/Makefile b/drivers/gpu/drm/display/Mak= efile index 629df2f4d322..fbb9d2b8acd4 100644 --- a/drivers/gpu/drm/display/Makefile +++ b/drivers/gpu/drm/display/Makefile @@ -3,6 +3,8 @@ obj-$(CONFIG_DRM_DISPLAY_DP_AUX_BUS) +=3D drm_dp_aux_bus.o =20 drm_display_helper-y :=3D drm_display_helper_mod.o +drm_display_helper-$(CONFIG_DRM_BRIDGE_CONNECTOR) +=3D \ + drm_bridge_connector.o drm_display_helper-$(CONFIG_DRM_DISPLAY_DP_HELPER) +=3D \ drm_dp_dual_mode_helper.o \ drm_dp_helper.o \ diff --git a/drivers/gpu/drm/drm_bridge_connector.c b/drivers/gpu/drm/displ= ay/drm_bridge_connector.c similarity index 100% rename from drivers/gpu/drm/drm_bridge_connector.c rename to drivers/gpu/drm/display/drm_bridge_connector.c diff --git a/drivers/gpu/drm/imx/dcss/Kconfig b/drivers/gpu/drm/imx/dcss/Kc= onfig index 3ffc061d392b..59e3b6a1dff0 100644 --- a/drivers/gpu/drm/imx/dcss/Kconfig +++ b/drivers/gpu/drm/imx/dcss/Kconfig @@ -2,6 +2,8 @@ config DRM_IMX_DCSS tristate "i.MX8MQ DCSS" select IMX_IRQSTEER select DRM_KMS_HELPER + select DRM_DISPLAY_HELPER + select DRM_BRIDGE_CONNECTOR select DRM_GEM_DMA_HELPER select VIDEOMODE_HELPERS depends on DRM && ARCH_MXC && ARM64 diff --git a/drivers/gpu/drm/imx/lcdc/Kconfig b/drivers/gpu/drm/imx/lcdc/Kc= onfig index 7e57922bbd9d..9c28bb0f4662 100644 --- a/drivers/gpu/drm/imx/lcdc/Kconfig +++ b/drivers/gpu/drm/imx/lcdc/Kconfig @@ -3,5 +3,7 @@ config DRM_IMX_LCDC depends on DRM && (ARCH_MXC || COMPILE_TEST) select DRM_GEM_DMA_HELPER select DRM_KMS_HELPER + select DRM_DISPLAY_HELPER + select DRM_BRIDGE_CONNECTOR help Found on i.MX1, i.MX21, i.MX25 and i.MX27. diff --git a/drivers/gpu/drm/ingenic/Kconfig b/drivers/gpu/drm/ingenic/Kcon= fig index 3db117c5edd9..8cd7b750dffe 100644 --- a/drivers/gpu/drm/ingenic/Kconfig +++ b/drivers/gpu/drm/ingenic/Kconfig @@ -8,6 +8,8 @@ config DRM_INGENIC select DRM_BRIDGE select DRM_PANEL_BRIDGE select DRM_KMS_HELPER + select DRM_DISPLAY_HELPER + select DRM_BRIDGE_CONNECTOR select DRM_GEM_DMA_HELPER select REGMAP select REGMAP_MMIO diff --git a/drivers/gpu/drm/kmb/Kconfig b/drivers/gpu/drm/kmb/Kconfig index fd011367db1d..e5ae3ec52392 100644 --- a/drivers/gpu/drm/kmb/Kconfig +++ b/drivers/gpu/drm/kmb/Kconfig @@ -3,6 +3,8 @@ config DRM_KMB_DISPLAY depends on DRM depends on ARCH_KEEMBAY || COMPILE_TEST select DRM_KMS_HELPER + select DRM_DISPLAY_HELPER + select DRM_BRIDGE_CONNECTOR select DRM_GEM_DMA_HELPER select DRM_MIPI_DSI help diff --git a/drivers/gpu/drm/mediatek/Kconfig b/drivers/gpu/drm/mediatek/Kc= onfig index d6449ebae838..417ac8c9af41 100644 --- a/drivers/gpu/drm/mediatek/Kconfig +++ b/drivers/gpu/drm/mediatek/Kconfig @@ -9,6 +9,8 @@ config DRM_MEDIATEK depends on MTK_MMSYS select DRM_GEM_DMA_HELPER if DRM_FBDEV_EMULATION select DRM_KMS_HELPER + select DRM_DISPLAY_HELPER + select DRM_BRIDGE_CONNECTOR select DRM_MIPI_DSI select DRM_PANEL select MEMORY diff --git a/drivers/gpu/drm/meson/Kconfig b/drivers/gpu/drm/meson/Kconfig index 615fdd0ce41b..2544756538cc 100644 --- a/drivers/gpu/drm/meson/Kconfig +++ b/drivers/gpu/drm/meson/Kconfig @@ -4,6 +4,8 @@ config DRM_MESON depends on DRM && OF && (ARM || ARM64) depends on ARCH_MESON || COMPILE_TEST select DRM_KMS_HELPER + select DRM_DISPLAY_HELPER + select DRM_BRIDGE_CONNECTOR select DRM_GEM_DMA_HELPER select DRM_DISPLAY_CONNECTOR select VIDEOMODE_HELPERS diff --git a/drivers/gpu/drm/msm/Kconfig b/drivers/gpu/drm/msm/Kconfig index 26a4c71da63a..90c68106b63b 100644 --- a/drivers/gpu/drm/msm/Kconfig +++ b/drivers/gpu/drm/msm/Kconfig @@ -17,6 +17,7 @@ config DRM_MSM select DRM_DISPLAY_DP_AUX_BUS select DRM_DISPLAY_DP_HELPER select DRM_DISPLAY_HELPER + select DRM_BRIDGE_CONNECTOR select DRM_EXEC select DRM_KMS_HELPER select DRM_PANEL diff --git a/drivers/gpu/drm/omapdrm/Kconfig b/drivers/gpu/drm/omapdrm/Kcon= fig index 6c49270cb290..0c6d5afc1ef4 100644 --- a/drivers/gpu/drm/omapdrm/Kconfig +++ b/drivers/gpu/drm/omapdrm/Kconfig @@ -4,6 +4,8 @@ config DRM_OMAP depends on DRM && OF depends on ARCH_OMAP2PLUS select DRM_KMS_HELPER + select DRM_DISPLAY_HELPER + select DRM_BRIDGE_CONNECTOR select FB_DMAMEM_HELPERS_DEFERRED if DRM_FBDEV_EMULATION select VIDEOMODE_HELPERS select HDMI diff --git a/drivers/gpu/drm/renesas/rcar-du/Kconfig b/drivers/gpu/drm/rene= sas/rcar-du/Kconfig index c17e7c50492c..025677fe88d3 100644 --- a/drivers/gpu/drm/renesas/rcar-du/Kconfig +++ b/drivers/gpu/drm/renesas/rcar-du/Kconfig @@ -5,6 +5,8 @@ config DRM_RCAR_DU depends on ARM || ARM64 || COMPILE_TEST depends on ARCH_RENESAS || COMPILE_TEST select DRM_KMS_HELPER + select DRM_DISPLAY_HELPER + select DRM_BRIDGE_CONNECTOR select DRM_GEM_DMA_HELPER select VIDEOMODE_HELPERS help diff --git a/drivers/gpu/drm/renesas/rz-du/Kconfig b/drivers/gpu/drm/renesa= s/rz-du/Kconfig index 5f0db2c5fee6..e1a6dd322caf 100644 --- a/drivers/gpu/drm/renesas/rz-du/Kconfig +++ b/drivers/gpu/drm/renesas/rz-du/Kconfig @@ -6,6 +6,8 @@ config DRM_RZG2L_DU depends on VIDEO_RENESAS_VSP1 select DRM_GEM_DMA_HELPER select DRM_KMS_HELPER + select DRM_DISPLAY_HELPER + select DRM_BRIDGE_CONNECTOR select VIDEOMODE_HELPERS help Choose this option if you have an RZ/G2L alike chipset. diff --git a/drivers/gpu/drm/renesas/shmobile/Kconfig b/drivers/gpu/drm/ren= esas/shmobile/Kconfig index 027220b8fe1c..c329ab8a7a8b 100644 --- a/drivers/gpu/drm/renesas/shmobile/Kconfig +++ b/drivers/gpu/drm/renesas/shmobile/Kconfig @@ -5,6 +5,8 @@ config DRM_SHMOBILE depends on ARCH_RENESAS || ARCH_SHMOBILE || COMPILE_TEST select BACKLIGHT_CLASS_DEVICE select DRM_KMS_HELPER + select DRM_DISPLAY_HELPER + select DRM_BRIDGE_CONNECTOR select DRM_GEM_DMA_HELPER select VIDEOMODE_HELPERS help diff --git a/drivers/gpu/drm/rockchip/Kconfig b/drivers/gpu/drm/rockchip/Kc= onfig index 7df875e38517..23c49e91f1cc 100644 --- a/drivers/gpu/drm/rockchip/Kconfig +++ b/drivers/gpu/drm/rockchip/Kconfig @@ -86,6 +86,8 @@ config ROCKCHIP_LVDS bool "Rockchip LVDS support" depends on DRM_ROCKCHIP depends on PINCTRL && OF + select DRM_DISPLAY_HELPER + select DRM_BRIDGE_CONNECTOR help Choose this option to enable support for Rockchip LVDS controllers. Rockchip rk3288 SoC has LVDS TX Controller can be used, and it @@ -96,6 +98,8 @@ config ROCKCHIP_RGB bool "Rockchip RGB support" depends on DRM_ROCKCHIP depends on PINCTRL + select DRM_DISPLAY_HELPER + select DRM_BRIDGE_CONNECTOR help Choose this option to enable support for Rockchip RGB output. Some Rockchip CRTCs, like rv1108, can directly output parallel diff --git a/drivers/gpu/drm/tegra/Kconfig b/drivers/gpu/drm/tegra/Kconfig index 782f51d3044a..e688d8104652 100644 --- a/drivers/gpu/drm/tegra/Kconfig +++ b/drivers/gpu/drm/tegra/Kconfig @@ -8,6 +8,7 @@ config DRM_TEGRA select DRM_DISPLAY_DP_HELPER select DRM_DISPLAY_HDMI_HELPER select DRM_DISPLAY_HELPER + select DRM_BRIDGE_CONNECTOR select DRM_DISPLAY_DP_AUX_BUS select DRM_KMS_HELPER select DRM_MIPI_DSI diff --git a/drivers/gpu/drm/tidss/Kconfig b/drivers/gpu/drm/tidss/Kconfig index 378600806167..2385c56493b9 100644 --- a/drivers/gpu/drm/tidss/Kconfig +++ b/drivers/gpu/drm/tidss/Kconfig @@ -3,6 +3,8 @@ config DRM_TIDSS depends on DRM && OF depends on ARM || ARM64 || COMPILE_TEST select DRM_KMS_HELPER + select DRM_DISPLAY_HELPER + select DRM_BRIDGE_CONNECTOR select DRM_GEM_DMA_HELPER help The TI Keystone family SoCs introduced a new generation of diff --git a/drivers/gpu/drm/xlnx/Kconfig b/drivers/gpu/drm/xlnx/Kconfig index 68ee897de9d7..626e5ac4c33d 100644 --- a/drivers/gpu/drm/xlnx/Kconfig +++ b/drivers/gpu/drm/xlnx/Kconfig @@ -8,6 +8,7 @@ config DRM_ZYNQMP_DPSUB select DMA_ENGINE select DRM_DISPLAY_DP_HELPER select DRM_DISPLAY_HELPER + select DRM_BRIDGE_CONNECTOR select DRM_GEM_DMA_HELPER select DRM_KMS_HELPER select GENERIC_PHY --=20 2.39.2 From nobody Fri Dec 19 09:10:05 2025 Received: from mail-lj1-f171.google.com (mail-lj1-f171.google.com [209.85.208.171]) (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 CEA64157465 for ; Tue, 2 Jul 2024 09:48:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719913741; cv=none; b=Czu062krk7DFpTHwUkZp3JpCJIvxX/SoMMvRv1OlwqxWps6vr5tRc+2e0dGctJKdx0GCQqg3Os8GF6tsUfvGrM/0Ug5V1R8BJB/lOMM0J4NxHi/cnCg1zGLhtXrENO39HGSu8XSgM1xzc5cdpimC+p5F1HhBVOp+Asn+/NI9RH4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719913741; c=relaxed/simple; bh=XfWO1UT95i4nFh6ks6YHBz3BepXJnrLcVKL7lmB6nak=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=DfGtsNCTp8/YWPWe3LIQXpR7A9GwjnBZ1Xg5NoKdh1oM2VI+8bY1HXkSbsBQ/oqqXE5UTBy1g5wNPE6J6jKhwLxKh5TTcsEEYXwd9y0YmBPf++YSoG/AoYwkkfI20Nu9/E0EcuolichoNEFPpj4Dt7Krj9kxHdGrcsZGtPn4UdY= 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=se6Vi0Mf; arc=none smtp.client-ip=209.85.208.171 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="se6Vi0Mf" Received: by mail-lj1-f171.google.com with SMTP id 38308e7fff4ca-2ec595d0acbso48710881fa.1 for ; Tue, 02 Jul 2024 02:48:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1719913738; x=1720518538; 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=eQKBE1FE4gVeE/pTxSlRLGb8qXFL4Qosomf5ec/NnUU=; b=se6Vi0MfUsUjEtSfeGtC2cvAJrTgPXYpSlrlKvijhKT7u9Y4fv+XKyI1yU1Fr8U3L4 yZBEqu4i04o3BNnDd5L4OZu4epFSguIG6+srtmaH1ZVNr/OOQv9nwvPyOALhPOBVDjWz MAIdccJd+21gf+O8G24i3Q/FWXx4iL9tl/xJQmSQKbJXdkz5x853rtd4Rz+HumBvVCeg LMhx77k2UCS1wQ+HX8DdHUZFkMUHi46DZkjr2nK9aWpj08K66f4YId9ByFdj9e5VdYtV bS1qnLKDfEcVUsfyxy2DKokx2n5U0ffOIMo/Q2fcneaZUacUluCRYriepxrRffj/sPzE dfnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719913738; x=1720518538; 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=eQKBE1FE4gVeE/pTxSlRLGb8qXFL4Qosomf5ec/NnUU=; b=oMkORlLIWvtmupkn/arpRVWXusVaPloINP9MgSkzd8645se93TzOKkGhTRZiLIvJwR 75KXqT0vNQK83rl8gJMZHMlkRFQf0NNiCzfSA1VoFMzy2iTtEy/L3BLk1rUE8vV7jBN5 47uHW5n00RcoOxbFADOUAkOfmK11nh62zQYlAiQvPpPsSUFRxP8Pg0bKbYnMwmDAjGbV dqbakGl7/wVl66q+GO+iLXjwZPd/TpR99IKHlC4YtJcwSWX8x6KP9EUA4f1kNCWrH7fk HYuiEZFzFLwVS5ApOihHwGI4+p7wU0y8eaOwL6tzoMy+1vWSLoA33Pmd/Oa4hGIKLFCT 0iHQ== X-Forwarded-Encrypted: i=1; AJvYcCWoW7RZUldmdH9tZQA41xtvVXEWsOfaHQl2psbLLuOOvg2XedcjDZluAYLq7kgIEZJVlZOu9XgxAQ2WDQgGa/7iQy11BrbaJ36m2+aC X-Gm-Message-State: AOJu0YzoMGzRneWi80CLdnUI+43YFvvKgxnK5CRx9lHfMeYJB0uB2ShM 6zRuLF2xZ2jXIZwMkNrVQSKxPumJiM6lSWLJ0I0D7Jt5HLSgp/KaPcgTNxvxTzg= X-Google-Smtp-Source: AGHT+IFqBUb9Z/lQB5tnnDyAQuJJOp+uTr+Pgp7gBda/3vOoSNPxzuipgShTPcGYxiszIB8CQWowdg== X-Received: by 2002:a2e:a78f:0:b0:2ec:4e99:92 with SMTP id 38308e7fff4ca-2ee5e3c32e9mr78874021fa.29.1719913737970; Tue, 02 Jul 2024 02:48:57 -0700 (PDT) Received: from umbar.lan ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2ee5160e333sm16231161fa.5.2024.07.02.02.48.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jul 2024 02:48:57 -0700 (PDT) From: Dmitry Baryshkov Date: Tue, 02 Jul 2024 12:48:55 +0300 Subject: [PATCH v3 4/4] drm/bridge-connector: reset the HDMI connector state 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: <20240702-drm-bridge-connector-fix-hdmi-reset-v3-4-12b0e3124ca4@linaro.org> References: <20240702-drm-bridge-connector-fix-hdmi-reset-v3-0-12b0e3124ca4@linaro.org> In-Reply-To: <20240702-drm-bridge-connector-fix-hdmi-reset-v3-0-12b0e3124ca4@linaro.org> To: Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Dave Stevenson Cc: Rob Clark , Abhinav Kumar , Dmitry Baryshkov , dri-devel@lists.freedesktop.org, igt-dev@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2314; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=XfWO1UT95i4nFh6ks6YHBz3BepXJnrLcVKL7lmB6nak=; b=owGbwMvMwMXYbdNlx6SpcZXxtFoSQ1rzWdb9r/6I6H3gyF9qODH2lY8y17SPBf1qHDLNjUucT kuIepl0MhqzMDByMciKKbL4FLRMjdmUHPZhx9R6mEGsTCBTGLg4BWAin5nY//B5XWtTEbstXeAl e5cpTPjg5Bv6mSzbxX8zL5dOCQsN9w9VU3yc2/Bsbu603rUvpjwq1D/43/h+ppPUa84AowTVN1x 7bl38cu5UDd8Unw1/7nEb9q5ZZaG18dzsRl+usvX+jK9nnrizbGp+wfsoo6q9IsXLtBxcTUx7Ty j4hBdPe5iyu4rjTra+//LSHE4pI7v/af0tD3JNZaPUnjeYrvbssdi2KkdM87eDq/OkWdqPLkidL QrZ8u7jm5yX5x7O/ML992hwf8KVD54zrMK8pBtqm2dMPP5hgdPZ9nrujPS3bHXHPXucNgnKGGmF trMfWP7HXuCEqdek/ki3yxsvLF1st1dQfs/ST30WWfr+AA== X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A On HDMI connectors which use drm_bridge_connector and DRM_BRIDGE_OP_HDMI IGT chokes on the max_bpc property in several kms_properties tests due to the the drm_bridge_connector failing to reset HDMI-related properties. Call __drm_atomic_helper_connector_hdmi_reset() if the drm_bridge_connector has bridge_hdmi. It is impossible to call this function from HDMI bridges, there is is no function that corresponds to the drm_connector_funcs::reset(). Fixes: 6b4468b0c6ba ("drm/bridge-connector: implement glue code for HDMI co= nnector") Signed-off-by: Dmitry Baryshkov Reviewed-by: Maxime Ripard --- drivers/gpu/drm/display/Kconfig | 1 + drivers/gpu/drm/display/drm_bridge_connector.c | 13 ++++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/display/Kconfig b/drivers/gpu/drm/display/Kcon= fig index 1a192a45961b..bfd025f8c7b5 100644 --- a/drivers/gpu/drm/display/Kconfig +++ b/drivers/gpu/drm/display/Kconfig @@ -9,6 +9,7 @@ config DRM_DISPLAY_HELPER config DRM_BRIDGE_CONNECTOR bool depends on DRM && DRM_BRIDGE && DRM_DISPLAY_HELPER + select DRM_DISPLAY_HDMI_STATE_HELPER help DRM connector implementation terminating DRM bridge chains. =20 diff --git a/drivers/gpu/drm/display/drm_bridge_connector.c b/drivers/gpu/d= rm/display/drm_bridge_connector.c index 0869b663f17e..7ebb35438459 100644 --- a/drivers/gpu/drm/display/drm_bridge_connector.c +++ b/drivers/gpu/drm/display/drm_bridge_connector.c @@ -216,8 +216,19 @@ static void drm_bridge_connector_debugfs_init(struct d= rm_connector *connector, } } =20 +static void drm_bridge_connector_reset(struct drm_connector *connector) +{ + struct drm_bridge_connector *bridge_connector =3D + to_drm_bridge_connector(connector); + + drm_atomic_helper_connector_reset(connector); + if (bridge_connector->bridge_hdmi) + __drm_atomic_helper_connector_hdmi_reset(connector, + connector->state); +} + static const struct drm_connector_funcs drm_bridge_connector_funcs =3D { - .reset =3D drm_atomic_helper_connector_reset, + .reset =3D drm_bridge_connector_reset, .detect =3D drm_bridge_connector_detect, .fill_modes =3D drm_helper_probe_single_connector_modes, .atomic_duplicate_state =3D drm_atomic_helper_connector_duplicate_state, --=20 2.39.2