Received: by 2002:a89:288:0:b0:1f7:eeee:6653 with SMTP id j8csp513828lqh; Tue, 7 May 2024 06:22:20 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCXmvrCO9CYw3VZQKur7SxMfXlW6JGlgaEZuB0uEEI2RtsYBZILYXoDOOhiVrETAxila3B5gHhuOp+az0hCJL/jHGKPNKz++faS+My90nQ== X-Google-Smtp-Source: AGHT+IHGwiblWeWkc7dnevvqEYHItUYeV7RdNZOAD5R5P7ZZcxxvtLYGYaP9V52yVvLYMDYJVF5q X-Received: by 2002:a05:6a21:6d81:b0:1a3:ae18:f1e4 with SMTP id wl1-20020a056a216d8100b001a3ae18f1e4mr14372421pzb.34.1715088139674; Tue, 07 May 2024 06:22:19 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1715088139; cv=pass; d=google.com; s=arc-20160816; b=K/YXxefygvsDnnZrMapda/b1ZNnKCTtqjeyZBrZHoTTphooKIpJIn76NhTICOSLb9e gcUh7ibqrWyMvc0+hBrQ3BNvGPfOMIZDr6n2If9qCDinvpqmFrVd0YWVrHRsWm566Sdv 4/FezSXMAn9bZdJvoHKpBdRkM+9qoWHLBF/bj3VTi+U7v4qq7oyrOOPRkrJ1IyWoMQnL aPJqhV9AVAOeTMAtFie3A5jUyr2TeWRGL+koiq1CFjAYpMgl6Y0JJdBgofbNn5uH0/IV 08oLuFGvq54UzwN2VEmfXGeeBMblQNprjoT7cBLTpfh+oXUdFzwvcAyIujz4cSYokHp2 QLlA== 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=3sSWOQYiFnSxtCVBLWxZsmLYGhKcYRGpeJyRhzXzCPQ=; fh=ufmwd8Wo0DI+kdMOJWC7ZXqsyLxoMBbO0En/E/GApYU=; b=Jd62yC4aT/4xnSvZBW6PXyS2/QlU5z0212cD9Gazbjw3a573BCJjSBfjh3sixCGtJz 8c83p+ukOGObXs4RX9o0rRV1UUKiV99hQ5sE5bI407RA+Ts5JrZf2SB2DNVl6z2Sx4iH NvX9EIPskLLnzm+EhW5aeCu9XGpiNutzQAlFdNKoZQxgy/H+LN6G6Wz649Ogh/L42P6I rkd8zNgPUBgbk5BSBCaxOZUJTV0BIdNNlGUNMB6VsNsoGAj4wWx1K1U6J7u8hWYs6lFZ zLakm2obzqF+VkTjknyU16xjYbUlL4xyX410h6xcqV54PSCjqseNOUZ30hzchMNAuIMN XTPg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ABPQz5U4; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-171385-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-171385-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id m16-20020a056a00081000b006f46032766csi6460594pfk.256.2024.05.07.06.22.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 May 2024 06:22:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-171385-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ABPQz5U4; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-171385-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-171385-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 sv.mirrors.kernel.org (Postfix) with ESMTPS id D97C2282C12 for ; Tue, 7 May 2024 13:22:12 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id AEA661635BD; Tue, 7 May 2024 13:18:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ABPQz5U4" 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 B13F215E813; Tue, 7 May 2024 13:18:23 +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=1715087903; cv=none; b=FbOlJXYGYcW4ToRbjEPH7LpeJDycA38omm9Xs7HoRHpob8eTf95ytaSoRvPx9OhE6nH51gnbmgRfEUtaszL4j1XEOXyHnQ36s5JABSJHALp2VVo+fxctZ3No/JrLes1tLhdRGsoOVnFfM2LuDJKYIUEgX51nGDkKEgCUINyK/1g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715087903; c=relaxed/simple; bh=uVl9xOyVk9U87YPq57W+/cP/Zw0Y1GWDSmUbflWVwuw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=KcXQJMvyjI3/YBeW+v0MHxlo/XFezjsi762rISqlXpRvzt22QIPNgqUyNJZLJTl2Yw9qnAduXgAGcCCWGHHy/BWAt27XK6d6JVDnnLhI6A/P0V039HNxt9O+VrzgBOWtwOgR88Q4ieja7eKrkZzJackkdYh0ipdUOnVk+Viz2A4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ABPQz5U4; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id ED8DFC4AF68; Tue, 7 May 2024 13:18:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1715087903; bh=uVl9xOyVk9U87YPq57W+/cP/Zw0Y1GWDSmUbflWVwuw=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=ABPQz5U4zhBZqPPt1NwBLs1/sqMxMHCO566l8RV+y1jgH243+B8TlC3hVcGJnfo50 A9FXvefAjSSXUScdtl4v/5vDauJJWCvs5YBR4Pn0JvL2YBHk/RIM8+xE/0ZcSAeCzr u8O0mgnFiLFwYNToyto9qyRW64D6m85ZNEF+jvtz1JnhU4fMcoCvxcdY15dhI+zGj8 fwsLFQvRw1I7m6eh/+104WFqZtIttStlPTU27HRWKc5hjeUIdQ3jif7GpGWyn2kqHH BDEwQZUGkOKosjB19HFG/5+IP0YetcBZOTwnV2ocgTWtQsX8H2S+/YTaFHQolvIbqY VMAprJYJh+AFw== From: Maxime Ripard Date: Tue, 07 May 2024 15:17:32 +0200 Subject: [PATCH v13 14/28] 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: <20240507-kms-hdmi-connector-state-v13-14-8fafc5efe8be@kernel.org> References: <20240507-kms-hdmi-connector-state-v13-0-8fafc5efe8be@kernel.org> In-Reply-To: <20240507-kms-hdmi-connector-state-v13-0-8fafc5efe8be@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 , Andy Yan 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.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=3898; i=mripard@kernel.org; h=from:subject:message-id; bh=uVl9xOyVk9U87YPq57W+/cP/Zw0Y1GWDSmUbflWVwuw=; b=owGbwMvMwCmsHn9OcpHtvjLG02pJDGlWmm81uQVm8n0q9KxM+FSWwcO0LOiYz3WtpTwz6la/Y 5kbfaurYyoLgzAng6yYIssTmbDTy9sXVznYr/wBM4eVCWQIAxenAExE5B9jw7pvik1HHBIuJZ28 m7w3dq4fr/qsqScr75XHyoexvX5pNqn8Gd/D+6yXfdLMk90O/DjfxlhfvfW6bnZAzJWIDaX5Jdm yFRURksl3w9exfz9uNXXH9huP94u6/X2fa9gWqSXJ6u/dVA8A 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 --- drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c | 65 ++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c b/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c index 7f9a48902db4..ead998a691e7 100644 --- a/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c +++ b/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c @@ -113,10 +113,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; @@ -491,11 +503,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.45.0