Received: by 2002:ab2:710b:0:b0:1ef:a325:1205 with SMTP id z11csp463549lql; Mon, 11 Mar 2024 07:54:08 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCUrP5A6yR/cUvWfb5L+6weU8/thrmMSRNY2Zh9+I1+6FguJ32oR66HxHRw5bdhLWX7kh9bNIP73CFhrtN6VeiNmiL0CDUTuZjComI0VZw== X-Google-Smtp-Source: AGHT+IHsCTgDuSDE9SGL3TBiKeNkwxIzNLdjgm/f65qBUI9hpnhjhDEHaAANhnXoxlyJQFpnvZok X-Received: by 2002:a05:620a:55a1:b0:788:4723:6f23 with SMTP id vr1-20020a05620a55a100b0078847236f23mr7362715qkn.31.1710168848175; Mon, 11 Mar 2024 07:54:08 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1710168848; cv=pass; d=google.com; s=arc-20160816; b=YTkgBavtAJLDWUdvUZZ3K7xp+GnnQuGs4aljwVGwGOV8DDccbm/xCb0ZDOpBVEGs9T O3tT/pA+e886o35cBRwEd5KR65RDVoveq/2WtJaxGmUGP+dHsfBfoRQ2W+x/SN8Rigli i4ebwI5JitvgBOyv6WJbuCDXguwX9d01S/YmxJxdl/h4tC9MmCL+zMbPrAD+ebQhjUKT g5gcoxOWPRpLKhiYsMZUxrZnuhS5O1nh/VWDBpLleg/+an3iRZ8u0bnOcMBkXLWYKB60 qxc3oQv0XV6QtamRz9TpqOHusbEzX8qnYVmGZblTylEkLG2mNCdlUl/7SnPSG3NyW0q3 OPbw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:list-unsubscribe:list-subscribe:list-id:precedence :subject:date:from:dkim-signature; bh=wsAmgFhchod3E8j7cwsydYsPwjHd0toBCaTsGQOveRU=; fh=8wcoxKk21hICD+6obVirG13fsSSMhKa/pufykSf87d0=; b=bOcHgWzh04bRbPUCJvh/t4jdQHek2PUetLC9+e8bh4tRsbwczuB/xpPCbSdXcq2ujF DsH+ZACRay9MUAt0tdVi9Z2fn4UfV4Kf0Ea/8AU90mOBguSR3e49sKF8vR74qTPPy4AL ydxJTM8/wCk9pG3ToRdoaWwqqggfDYtUTjKjXB8S/sWLTjf0RrHlB27Zzo8Rcy+SNCDB 18qM2kIvyF9JE3XsF2H7qz02DeeWwmthUSMrA+DeML7jj0tFMV0Nhw9mxSndC3fjLL48 9IaArk3p95LbYbMRqipVALvzZx/nKikqe3XrBVvnpaPLp47OWr4drCpCdoyqM9E1u/ab elqg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=hy6ynmx8; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-99011-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-99011-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id b28-20020a05620a04fc00b0078870b3d014si1654994qkh.197.2024.03.11.07.54.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Mar 2024 07:54:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-99011-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=hy6ynmx8; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-99011-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-99011-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id D16A71C218FA for ; Mon, 11 Mar 2024 14:54:07 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 0BCF853E26; Mon, 11 Mar 2024 14:50:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="hy6ynmx8" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CD83F535AE; Mon, 11 Mar 2024 14:50:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710168638; cv=none; b=P2ueJoP3kZJ9LGtyHE2IoerQM4M3QIUP2Iwq9umAOclXBeejsi/H3DZXObaWXcdMfd0Ws1Ad5w8Xxp0rN5IT8vsn0dzuCnnULwtz7JcPS03xSonu4vzEJkX3K2Ez2qzNc5/FKx3x7mIpL7cZuZ3W8mIasYQzusdZses9WIB+gMI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710168638; c=relaxed/simple; bh=FYtMepddDx3HCIUl7lef+T8X++8b141JfngL4arDBvg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=la/XlWOCc6WXVlid2gzYUdycwnnSNxw2IZ0neTLSQEBhPT+Glb43UL6KJQ0sRANi2C+gcP3N36wYH6a1hFdePz0KRu7t5eBrRw0+1+g/XMdWJ6HgJFaHCKZiml6n37jRBxKO4eeU/lzSbfX7UiRI4EQQG+SNRPt7DYZC8atRW+c= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=hy6ynmx8; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id EFBA5C433F1; Mon, 11 Mar 2024 14:50:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1710168638; bh=FYtMepddDx3HCIUl7lef+T8X++8b141JfngL4arDBvg=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=hy6ynmx8940Oh31udQVQIzWpHC1P8RVpjL1gSSCt2gFRtxppGXQ1k6pvnXxphTfB+ 3pDeRibqVaH54cbIj3Bjy3km2B8EnbI3tMDCSDrWLxPRmXLlfetFzMypB3I2AoNrpT Ak9GIWMi6pjrk/Ru4vBsLKPIBH1HY2A5lksCGJFVRkEuzisLdxr4atG6Ve7UHfGbCZ U5AckXr0cJFwLhkex78wDl/bTmcH/5YYdUwSpwsRdxV5w8efKdzA6INIB1uCl3hp5D y26iZTJn1nYCKiZxDvv4fzxkjjLKaMzCPRbZtjnQNAqjB0k0/oCHHeEOoAgivIjdNY 2MRPkdhrZ9hzw== From: Maxime Ripard Date: Mon, 11 Mar 2024 15:49:41 +0100 Subject: [PATCH v9 13/27] drm/tests: Add HDMI connector rate filter hook tests 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: 7bit Message-Id: <20240311-kms-hdmi-connector-state-v9-13-d45890323344@kernel.org> References: <20240311-kms-hdmi-connector-state-v9-0-d45890323344@kernel.org> In-Reply-To: <20240311-kms-hdmi-connector-state-v9-0-d45890323344@kernel.org> To: Maarten Lankhorst , Thomas Zimmermann , David Airlie , Daniel Vetter , Jonathan Corbet , Sandy Huang , =?utf-8?q?Heiko_St=C3=BCbner?= , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland Cc: Hans Verkuil , Sebastian Wick , =?utf-8?q?Ville_Syrj=C3=A4l=C3=A4?= , dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-sunxi@lists.linux.dev, Maxime Ripard , Dave Stevenson X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=3906; i=mripard@kernel.org; h=from:subject:message-id; bh=FYtMepddDx3HCIUl7lef+T8X++8b141JfngL4arDBvg=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDKnvpXhOzQ88r6Gq/HXbtMty+1fnl37MPnLrzdllcaveZ LZ/rNs9vaOUhUGMi0FWTJElRth8SdypWa872fjmwcxhZQIZwsDFKQATWdLH8D/se+USMZ7nD2fo z6k7bbmIaVbL1u9WG8LZFvpMmVTc2LmDkeGNftSzeG2lm+InG65cdLuyVJf54n+ZQK0zL3f+COj ezssAAA== X-Developer-Key: i=mripard@kernel.org; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D The previous patch adds a new hook for HDMI connectors to filter out configurations based on the TMDS character rate. Let's add some tests to make sure it works as expected. Reviewed-by: Dave Stevenson Signed-off-by: Maxime Ripard --- .../gpu/drm/tests/drm_atomic_state_helper_test.c | 65 ++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/drivers/gpu/drm/tests/drm_atomic_state_helper_test.c b/drivers/gpu/drm/tests/drm_atomic_state_helper_test.c index 989661ad3aee..5a8750153510 100644 --- a/drivers/gpu/drm/tests/drm_atomic_state_helper_test.c +++ b/drivers/gpu/drm/tests/drm_atomic_state_helper_test.c @@ -111,10 +111,22 @@ static int set_connector_edid(struct kunit *test, struct drm_connector *connecto } static const struct drm_connector_hdmi_funcs dummy_connector_hdmi_funcs = { }; +static enum drm_mode_status +reject_connector_tmds_char_rate_valid(const struct drm_connector *connector, + const struct drm_display_mode *mode, + unsigned long long tmds_rate) +{ + return MODE_BAD; +} + +static const struct drm_connector_hdmi_funcs reject_connector_hdmi_funcs = { + .tmds_char_rate_valid = reject_connector_tmds_char_rate_valid, +}; + static int dummy_connector_get_modes(struct drm_connector *connector) { struct drm_atomic_helper_connector_hdmi_priv *priv = connector_to_priv(connector); const struct drm_edid *edid; @@ -489,11 +501,64 @@ static void drm_test_check_tmds_char_rate_rgb_12bpc(struct kunit *test) KUNIT_ASSERT_EQ(test, conn_state->hdmi.output_bpc, 12); KUNIT_ASSERT_EQ(test, conn_state->hdmi.output_format, HDMI_COLORSPACE_RGB); KUNIT_EXPECT_EQ(test, conn_state->hdmi.tmds_char_rate, preferred->clock * 1500); } +/* + * Test that if we filter a rate through our hook, it's indeed rejected + * by the whole atomic_check logic. + * + * We do so by first doing a commit on the pipeline to make sure that it + * works, change the HDMI helpers pointer, and then try the same commit + * again to see if it fails as it should. + */ +static void drm_test_check_hdmi_funcs_reject_rate(struct kunit *test) +{ + struct drm_atomic_helper_connector_hdmi_priv *priv; + struct drm_modeset_acquire_ctx *ctx; + struct drm_atomic_state *state; + struct drm_display_mode *preferred; + struct drm_crtc_state *crtc_state; + struct drm_connector *conn; + struct drm_device *drm; + struct drm_crtc *crtc; + int ret; + + priv = drm_atomic_helper_connector_hdmi_init(test, + BIT(HDMI_COLORSPACE_RGB), + 8); + KUNIT_ASSERT_NOT_NULL(test, priv); + + ctx = drm_kunit_helper_acquire_ctx_alloc(test); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx); + + conn = &priv->connector; + preferred = find_preferred_mode(conn); + KUNIT_ASSERT_NOT_NULL(test, preferred); + + drm = &priv->drm; + crtc = priv->crtc; + ret = light_up_connector(test, drm, crtc, conn, preferred, ctx); + KUNIT_ASSERT_EQ(test, ret, 0); + + /* You shouldn't be doing that at home. */ + conn->hdmi.funcs = &reject_connector_hdmi_funcs; + + state = drm_kunit_helper_atomic_state_alloc(test, drm, ctx); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state); + + crtc_state = drm_atomic_get_crtc_state(state, crtc); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, crtc_state); + + crtc_state->connectors_changed = true; + + ret = drm_atomic_check_only(state); + KUNIT_EXPECT_LT(test, ret, 0); +} + static struct kunit_case drm_atomic_helper_connector_hdmi_check_tests[] = { + KUNIT_CASE(drm_test_check_hdmi_funcs_reject_rate), KUNIT_CASE(drm_test_check_output_bpc_crtc_mode_changed), KUNIT_CASE(drm_test_check_output_bpc_crtc_mode_not_changed), KUNIT_CASE(drm_test_check_tmds_char_rate_rgb_8bpc), KUNIT_CASE(drm_test_check_tmds_char_rate_rgb_10bpc), KUNIT_CASE(drm_test_check_tmds_char_rate_rgb_12bpc), -- 2.43.2