From patchwork Thu Sep 22 14:25:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 12985317 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 50414C54EE9 for ; Thu, 22 Sep 2022 14:32:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=BpKDvT77rfG/55yoB/53CSIVzA/ajGZd4PVcgQ6/yP4=; b=z3o5ohg/8jFA2I Dq7U9jDv69+RG+GkEamuibu2iJIWGttF/zxUBKmcXICzGN07fDKodgFvrnwXah5nY3D68+ExOkQiz hN38OkizWz67XWVljdXeCj9WB67kAqMR01afPxuz6zAqO5KHzZQy811glHAFco1FCK3VG6xbHPoHH yQROoctvPgdWPM2shr6WNjujRdvj1RFww8l0YkGWluqEAW9vm9WfDnjObJbu+vjWmGOt9RjnLwiEN wwi8+MkeBDdeRF+Q/gVDa7jyY8seInz0I2dhPkzt4H8u1epYbMeQY5Iod/HKMq+hjCS6Q577WLfwW iU6z4miuwCRdThJdku3Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1obNEK-00G2o2-W8; Thu, 22 Sep 2022 14:31:09 +0000 Received: from wnew4-smtp.messagingengine.com ([64.147.123.18]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1obN9W-00G0Hm-Jx for linux-arm-kernel@lists.infradead.org; Thu, 22 Sep 2022 14:26:12 +0000 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailnew.west.internal (Postfix) with ESMTP id 7C2FB2B05B17; Thu, 22 Sep 2022 10:26:06 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Thu, 22 Sep 2022 10:26:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cerno.tech; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm2; t=1663856766; x= 1663863966; bh=rvMfktgHy5FhCaD+KHa3yzMfq+yFQMkfoAap0/0FluY=; b=O FaiSKEhRINEVsGsTUwjEfoFmSO7lPr3iFSHKlUPUf9u/kOQkY/0cJ8U0vxK+W2HU E7kSoygrS2qCOCMuUzbC6OB2zHukP+rqQv1VOPOXDGptTFtelDiAXy8PI+tCKbZr Q1s8rG+lHqhFTq2QE5BDAAlMPfk81rau9ybmqTKEEezNvY44TiymESXwjB+32H7U EUB9h7ietgBVsbtyEDgIoCroZmp9EnusNo18DFvvWDNitLN1Pi9oMZp6jgTBxqY2 xraHnqiEwOqPZVlBCOfojiBJL+Qn0AbQzXm+FTTxgA1Hsb9w3cVl++GU2CV7lUlP fbEF8jVKMMtThD8Zbp/Kg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1663856766; x= 1663863966; bh=rvMfktgHy5FhCaD+KHa3yzMfq+yFQMkfoAap0/0FluY=; b=v R3hAs7aZ7pw1v0EfIpiMXRV9SDLJ56RA69Ge19CtZVq5vf3/8MCMVvU+7kNtO2X1 xhQo0BBjFJtshZ2FcTOlhZl6sj+v6CcD4sHYX1YN9Uq0rhTo6ITSKHBjvLZlfSCe DZKnYYeMCT5ZSbsPYngkAov9Q/DmDnCnKViLKCRYmjL2bo+of1zLQJZaZzfwth+G hceZgWh8R8dsX8LIETElUDKEDYNrJMuGjwJfYG9DJvM5GCXArABtr3/KAxTXeIRp ymgHsIudnaM00BR2D1d/uWL4CST/yr4fyJQSb2r6GSrmiKoAAUwcwVymueTDj10W m64Q4RfRQUyOToyiztauw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrfeefgedgudejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephfffufgggfgtkfhfjgfvvefosehtkeertdertdejnecuhfhrohhmpeforgig ihhmvgcutfhiphgrrhguuceomhgrgihimhgvsegtvghrnhhordhtvggthheqnecuggftrf grthhtvghrnhepvdfgveejhfdtteevvefhleeiueeutefgvdegveekgedujeffgeffgfet tdellefhnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomh epmhgrgihimhgvsegtvghrnhhordhtvggthh X-ME-Proxy: Feedback-ID: i8771445c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 22 Sep 2022 10:26:04 -0400 (EDT) From: Maxime Ripard Date: Thu, 22 Sep 2022 16:25:22 +0200 Subject: [PATCH v2 05/33] drm/atomic: Add TV subconnector property to get/set_property MIME-Version: 1.0 Message-Id: <20220728-rpi-analog-tv-properties-v2-5-f733a0ed9f90@cerno.tech> References: <20220728-rpi-analog-tv-properties-v2-0-f733a0ed9f90@cerno.tech> In-Reply-To: <20220728-rpi-analog-tv-properties-v2-0-f733a0ed9f90@cerno.tech> To: Jernej Skrabec , Rodrigo Vivi , Ben Skeggs , David Airlie , Maxime Ripard , Joonas Lahtinen , Emma Anholt , Karol Herbst , Samuel Holland , Jani Nikula , Thomas Zimmermann , Daniel Vetter , Lyude Paul , Maarten Lankhorst , Tvrtko Ursulin , Chen-Yu Tsai Cc: =?unknown-8bit?q?Hans_de_Goede_=3Chdegoede=40redhat=2Ecom=3E=2C_nouveau?= =?unknown-8bit?q?=40lists=2Efreedesktop=2Eorg=2C_Geert_Uytterhoeven_=3Cgeer?= =?unknown-8bit?q?t=40linux-m68k=2Eorg=3E=2C?= =?unknown-8bit?q?_Dave_Stevenson_=3Cdave=2Estevenson=40raspberrypi=2Ecom=3E?= =?unknown-8bit?q?=2C_linux-kernel=40vger=2Ekernel=2Eorg=2C_linux-arm-kernel?= =?unknown-8bit?q?=40lists=2Einfradead=2Eorg=2C?= =?unknown-8bit?q?_Phil_Elwell_=3Cphil=40raspberrypi=2Ecom=3E=2C_intel-gfx=40?= =?unknown-8bit?q?lists=2Efreedesktop=2Eorg=2C_Noralf_Tr=C3=B8nnes_=3Cnoralf?= =?unknown-8bit?q?=40tronnes=2Eorg=3E=2C?= =?unknown-8bit?q?_Dom_Cobley_=3Cdom=40raspberrypi=2Ecom=3E=2C_linux-sunxi=40?= =?unknown-8bit?q?lists=2Elinux=2Edev=2C_Maxime_Ripard_=3Cmaxime=40cerno=2Et?= =?unknown-8bit?q?ech=3E=2C?= =?unknown-8bit?q?_Mateusz_Kwiatkowski_=3Ckfyatek+publicgit=40gmail=2Ecom=3E?= =?unknown-8bit?q?=2C_dri-devel=40lists=2Efreedesktop=2Eorg?= X-Mailer: b4 0.10.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2310; i=maxime@cerno.tech; h=from:subject:message-id; bh=qDYM7aQiVENXoG6IHQvxJCBCpTNzU5wd8MrHn657838=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDMk6BQEJzp2ye1L/+Ekt4lj9prDhf0QHr+D2fdv3dkiG8C1g 0lDsKGVhEONikBVTZIkRNl8Sd2rW6042vnkwc1iZQIYwcHEKwERS8hgZ5j7fV1RYlsfcWP/huorE1c Tv+WrnjUS0jGPDfZqjQy4XMvzTvpWzU5SZ97wBX1HPUuXrP850n/uUoKiW97XLaEr6PkEGAA== X-Developer-Key: i=maxime@cerno.tech; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220922_072610_726107_F3E2F7FD X-CRM114-Status: UNSURE ( 8.54 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The subconnector property was created by drm_mode_create_tv_properties(), but wasn't exposed to the userspace through the generic atomic_get/set_property implementation, and wasn't stored in any generic state structure. Let's solve this. Reviewed-by: Noralf Trønnes Signed-off-by: Maxime Ripard diff --git a/drivers/gpu/drm/drm_atomic_uapi.c b/drivers/gpu/drm/drm_atomic_uapi.c index c74c78a28171..c06d0639d552 100644 --- a/drivers/gpu/drm/drm_atomic_uapi.c +++ b/drivers/gpu/drm/drm_atomic_uapi.c @@ -688,6 +688,8 @@ static int drm_atomic_connector_set_property(struct drm_connector *connector, return -EINVAL; } else if (property == config->tv_select_subconnector_property) { state->tv.select_subconnector = val; + } else if (property == config->tv_subconnector_property) { + state->tv.subconnector = val; } else if (property == config->tv_left_margin_property) { state->tv.margins.left = val; } else if (property == config->tv_right_margin_property) { @@ -796,6 +798,8 @@ drm_atomic_connector_get_property(struct drm_connector *connector, *val = connector->dpms; } else if (property == config->tv_select_subconnector_property) { *val = state->tv.select_subconnector; + } else if (property == config->tv_subconnector_property) { + *val = state->tv.subconnector; } else if (property == config->tv_left_margin_property) { *val = state->tv.margins.left; } else if (property == config->tv_right_margin_property) { diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h index 60b5662dec7c..1d5e3cccb9e3 100644 --- a/include/drm/drm_connector.h +++ b/include/drm/drm_connector.h @@ -693,6 +693,7 @@ struct drm_connector_tv_margins { /** * struct drm_tv_connector_state - TV connector related states * @select_subconnector: selected subconnector + * @subconnector: detected subconnector * @margins: TV margins * @mode: TV mode * @brightness: brightness in percent @@ -704,6 +705,7 @@ struct drm_connector_tv_margins { */ struct drm_tv_connector_state { enum drm_mode_subconnector select_subconnector; + enum drm_mode_subconnector subconnector; struct drm_connector_tv_margins margins; unsigned int mode; unsigned int brightness;