Commit 47368ab4 authored by Dmitry Baryshkov's avatar Dmitry Baryshkov
Browse files

drm/display: hdmi: add generic mode_valid helper 



Add drm_hdmi_connector_mode_valid(), generic helper for HDMI connectors.
It can be either used directly or as a part of the .mode_valid callback.

Reviewed-by: default avatarMaxime Ripard <mripard@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20241130-hdmi-mode-valid-v5-4-742644ec3b1f@linaro.org


Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
parent a8403be6

drivers/gpu/drm/display/drm_hdmi_state_helper.c

+21 −0
Original line number Diff line number Diff line
@@ -521,6 +521,27 @@ int drm_atomic_helper_connector_hdmi_check(struct drm_connector *connector, 
}

EXPORT_SYMBOL(drm_atomic_helper_connector_hdmi_check);



/**

 * drm_hdmi_connector_mode_valid() - Check if mode is valid for HDMI connector

 * @connector: DRM connector to validate the mode

 * @mode: Display mode to validate

 *

 * Generic .mode_valid implementation for HDMI connectors.

 */

enum drm_mode_status

drm_hdmi_connector_mode_valid(struct drm_connector *connector,

			      struct drm_display_mode *mode)

{

	unsigned long long clock;



	clock = drm_hdmi_compute_mode_clock(mode, 8, HDMI_COLORSPACE_RGB);

	if (!clock)

		return MODE_ERROR;



	return hdmi_clock_valid(connector, mode, clock);

}

EXPORT_SYMBOL(drm_hdmi_connector_mode_valid);



static int clear_device_infoframe(struct drm_connector *connector,

				  enum hdmi_infoframe_type type)

{

drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c

+175 −5
Original line number Diff line number Diff line
@@ -124,6 +124,18 @@ static const struct drm_connector_hdmi_funcs reject_connector_hdmi_funcs = { 
	.tmds_char_rate_valid	= reject_connector_tmds_char_rate_valid,

};



static enum drm_mode_status

reject_100MHz_connector_tmds_char_rate_valid(const struct drm_connector *connector,

					     const struct drm_display_mode *mode,

					     unsigned long long tmds_rate)

{

	return (tmds_rate > 100ULL * 1000 * 1000) ? MODE_BAD : MODE_OK;

}



static const struct drm_connector_hdmi_funcs reject_100_MHz_connector_hdmi_funcs = {

	.tmds_char_rate_valid	= reject_100MHz_connector_tmds_char_rate_valid,

};



static int dummy_connector_get_modes(struct drm_connector *connector)

{

	struct drm_atomic_helper_connector_hdmi_priv *priv =
@@ -146,6 +158,7 @@ static int dummy_connector_get_modes(struct drm_connector *connector) 
static const struct drm_connector_helper_funcs dummy_connector_helper_funcs = {

	.atomic_check	= drm_atomic_helper_connector_hdmi_check,

	.get_modes	= dummy_connector_get_modes,

	.mode_valid	= drm_hdmi_connector_mode_valid,

};



static void dummy_hdmi_connector_reset(struct drm_connector *connector)
@@ -163,9 +176,10 @@ static const struct drm_connector_funcs dummy_connector_funcs = { 


static

struct drm_atomic_helper_connector_hdmi_priv *

drm_kunit_helper_connector_hdmi_init(struct kunit *test,

drm_kunit_helper_connector_hdmi_init_funcs(struct kunit *test,

					   unsigned int formats,

				     unsigned int max_bpc)

					   unsigned int max_bpc,

					   const struct drm_connector_hdmi_funcs *hdmi_funcs)

{

	struct drm_atomic_helper_connector_hdmi_priv *priv;

	struct drm_connector *conn;
@@ -207,7 +221,7 @@ drm_kunit_helper_connector_hdmi_init(struct kunit *test, 
	ret = drmm_connector_hdmi_init(drm, conn,

				       "Vendor", "Product",

				       &dummy_connector_funcs,

				       &dummy_connector_hdmi_funcs,

				       hdmi_funcs,

				       DRM_MODE_CONNECTOR_HDMIA,

				       NULL,

				       formats,
@@ -219,7 +233,24 @@ drm_kunit_helper_connector_hdmi_init(struct kunit *test, 


	drm_mode_config_reset(drm);



	ret = set_connector_edid(test, conn,

	return priv;

}



static

struct drm_atomic_helper_connector_hdmi_priv *

drm_kunit_helper_connector_hdmi_init(struct kunit *test,

				     unsigned int formats,

				     unsigned int max_bpc)

{

	struct drm_atomic_helper_connector_hdmi_priv *priv;

	int ret;



	priv = drm_kunit_helper_connector_hdmi_init_funcs(test,

							  formats, max_bpc,

							  &dummy_connector_hdmi_funcs);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, priv);



	ret = set_connector_edid(test, &priv->connector,

				 test_edid_hdmi_1080p_rgb_max_200mhz,

				 ARRAY_SIZE(test_edid_hdmi_1080p_rgb_max_200mhz));

	KUNIT_ASSERT_GT(test, ret, 0);
@@ -1733,9 +1764,148 @@ static struct kunit_suite drm_atomic_helper_connector_hdmi_reset_test_suite = { 
	.test_cases	= drm_atomic_helper_connector_hdmi_reset_tests,

};



/*

 * Test that the default behaviour for drm_hdmi_connector_mode_valid() is not

 * to reject any modes. Pass a correct EDID and verify that preferred mode

 * matches the expectations (1080p).

 */

static void drm_test_check_mode_valid(struct kunit *test)

{

	struct drm_atomic_helper_connector_hdmi_priv *priv;

	struct drm_connector *conn;

	struct drm_display_mode *preferred;



	priv = drm_kunit_helper_connector_hdmi_init(test,

						    BIT(HDMI_COLORSPACE_RGB),

						    8);

	KUNIT_ASSERT_NOT_NULL(test, priv);



	conn = &priv->connector;

	preferred = find_preferred_mode(conn);

	KUNIT_ASSERT_NOT_NULL(test, preferred);



	KUNIT_EXPECT_EQ(test, preferred->hdisplay, 1920);

	KUNIT_EXPECT_EQ(test, preferred->vdisplay, 1080);

	KUNIT_EXPECT_EQ(test, preferred->clock, 148500);

}



/*

 * Test that the drm_hdmi_connector_mode_valid() will reject modes depending on

 * the .tmds_char_rate_valid() behaviour.

 * Pass a correct EDID and verify that high-rate modes are filtered.

 */

static void drm_test_check_mode_valid_reject_rate(struct kunit *test)

{

	struct drm_atomic_helper_connector_hdmi_priv *priv;

	struct drm_connector *conn;

	struct drm_display_mode *preferred;

	int ret;



	priv = drm_kunit_helper_connector_hdmi_init_funcs(test,

							  BIT(HDMI_COLORSPACE_RGB),

							  8,

							  &reject_100_MHz_connector_hdmi_funcs);

	KUNIT_ASSERT_NOT_NULL(test, priv);



	conn = &priv->connector;



	ret = set_connector_edid(test, conn,

				 test_edid_hdmi_1080p_rgb_max_200mhz,

				 ARRAY_SIZE(test_edid_hdmi_1080p_rgb_max_200mhz));

	KUNIT_ASSERT_GT(test, ret, 0);



	/*

	 * Unlike the drm_test_check_mode_valid() here 1080p is rejected, but

	 * 480p is allowed.

	 */

	preferred = find_preferred_mode(conn);

	KUNIT_ASSERT_NOT_NULL(test, preferred);

	KUNIT_EXPECT_EQ(test, preferred->hdisplay, 640);

	KUNIT_EXPECT_EQ(test, preferred->vdisplay, 480);

	KUNIT_EXPECT_EQ(test, preferred->clock, 25200);

}



/*

 * Test that the drm_hdmi_connector_mode_valid() will not mark any modes as

 * valid if .tmds_char_rate_valid() rejects all of them. Pass a correct EDID

 * and verify that there is no preferred mode and no modes were set for the

 * connector.

 */

static void drm_test_check_mode_valid_reject(struct kunit *test)

{

	struct drm_atomic_helper_connector_hdmi_priv *priv;

	struct drm_connector *conn;

	struct drm_display_mode *preferred;

	int ret;



	priv = drm_kunit_helper_connector_hdmi_init_funcs(test,

							  BIT(HDMI_COLORSPACE_RGB),

							  8,

							  &reject_connector_hdmi_funcs);

	KUNIT_ASSERT_NOT_NULL(test, priv);



	conn = &priv->connector;



	/* should reject all modes */

	ret = set_connector_edid(test, conn,

				 test_edid_hdmi_1080p_rgb_max_200mhz,

				 ARRAY_SIZE(test_edid_hdmi_1080p_rgb_max_200mhz));

	KUNIT_ASSERT_EQ(test, ret, 0);



	preferred = find_preferred_mode(conn);

	KUNIT_ASSERT_NULL(test, preferred);

}



/*

 * Test that the drm_hdmi_connector_mode_valid() will reject modes that don't

 * pass the info.max_tmds_clock filter. Pass crafted EDID and verify that

 * high-rate modes are filtered.

 */

static void drm_test_check_mode_valid_reject_max_clock(struct kunit *test)

{

	struct drm_atomic_helper_connector_hdmi_priv *priv;

	struct drm_connector *conn;

	struct drm_display_mode *preferred;

	int ret;



	priv = drm_kunit_helper_connector_hdmi_init(test,

						    BIT(HDMI_COLORSPACE_RGB),

						    8);

	KUNIT_ASSERT_NOT_NULL(test, priv);



	conn = &priv->connector;



	ret = set_connector_edid(test, conn,

				 test_edid_hdmi_1080p_rgb_max_100mhz,

				 ARRAY_SIZE(test_edid_hdmi_1080p_rgb_max_100mhz));

	KUNIT_ASSERT_GT(test, ret, 0);



	KUNIT_ASSERT_EQ(test, conn->display_info.max_tmds_clock, 100 * 1000);



	preferred = find_preferred_mode(conn);

	KUNIT_ASSERT_NOT_NULL(test, preferred);

	KUNIT_EXPECT_EQ(test, preferred->hdisplay, 640);

	KUNIT_EXPECT_EQ(test, preferred->vdisplay, 480);

	KUNIT_EXPECT_EQ(test, preferred->clock, 25200);

}



static struct kunit_case drm_atomic_helper_connector_hdmi_mode_valid_tests[] = {

	KUNIT_CASE(drm_test_check_mode_valid),

	KUNIT_CASE(drm_test_check_mode_valid_reject),

	KUNIT_CASE(drm_test_check_mode_valid_reject_rate),

	KUNIT_CASE(drm_test_check_mode_valid_reject_max_clock),

	{ }

};



static struct kunit_suite drm_atomic_helper_connector_hdmi_mode_valid_test_suite = {

	.name		= "drm_atomic_helper_connector_hdmi_mode_valid",

	.test_cases	= drm_atomic_helper_connector_hdmi_mode_valid_tests,

};



kunit_test_suites(

	&drm_atomic_helper_connector_hdmi_check_test_suite,

	&drm_atomic_helper_connector_hdmi_reset_test_suite,

	&drm_atomic_helper_connector_hdmi_mode_valid_test_suite,

);



MODULE_AUTHOR("Maxime Ripard <mripard@kernel.org>");

drivers/gpu/drm/tests/drm_kunit_edid.h

+102 −0
Original line number Diff line number Diff line
@@ -61,6 +61,108 @@ static const unsigned char test_edid_dvi_1080p[] = { 
	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xab

};



/*

 * edid-decode (hex):

 *

 * 00 ff ff ff ff ff ff 00 31 d8 2a 00 00 00 00 00

 * 00 21 01 03 81 a0 5a 78 02 00 00 00 00 00 00 00

 * 00 00 00 20 00 00 01 01 01 01 01 01 01 01 01 01

 * 01 01 01 01 01 01 02 3a 80 18 71 38 2d 40 58 2c

 * 45 00 40 84 63 00 00 1e 00 00 00 fc 00 54 65 73

 * 74 20 45 44 49 44 0a 20 20 20 00 00 00 fd 00 32

 * 46 1e 46 0f 00 0a 20 20 20 20 20 20 00 00 00 10

 * 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01 92

 *

 * 02 03 1b 81 e3 05 00 20 41 10 e2 00 4a 6d 03 0c

 * 00 12 34 00 14 20 00 00 00 00 00 00 00 00 00 00

 * 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00

 * 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00

 * 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00

 * 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00

 * 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00

 * 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 e4

 *

 * ----------------

 *

 * Block 0, Base EDID:

 *   EDID Structure Version & Revision: 1.3

 *   Vendor & Product Identification:

 *     Manufacturer: LNX

 *     Model: 42

 *     Made in: 2023

 *   Basic Display Parameters & Features:

 *     Digital display

 *     DFP 1.x compatible TMDS

 *     Maximum image size: 160 cm x 90 cm

 *     Gamma: 2.20

 *     Monochrome or grayscale display

 *     First detailed timing is the preferred timing

 *   Color Characteristics:

 *     Red  : 0.0000, 0.0000

 *     Green: 0.0000, 0.0000

 *     Blue : 0.0000, 0.0000

 *     White: 0.0000, 0.0000

 *   Established Timings I & II:

 *     DMT 0x04:   640x480    59.940476 Hz   4:3     31.469 kHz     25.175000 MHz

 *   Standard Timings: none

 *   Detailed Timing Descriptors:

 *     DTD 1:  1920x1080   60.000000 Hz  16:9     67.500 kHz    148.500000 MHz (1600 mm x 900 mm)

 *                  Hfront   88 Hsync  44 Hback  148 Hpol P

 *                  Vfront    4 Vsync   5 Vback   36 Vpol P

 *     Display Product Name: 'Test EDID'

 *     Display Range Limits:

 *       Monitor ranges (GTF): 50-70 Hz V, 30-70 kHz H, max dotclock 150 MHz

 *     Dummy Descriptor:

 *   Extension blocks: 1

 * Checksum: 0x92

 *

 * ----------------

 *

 * Block 1, CTA-861 Extension Block:

 *   Revision: 3

 *   Underscans IT Video Formats by default

 *   Native detailed modes: 1

 *   Colorimetry Data Block:

 *     sRGB

 *   Video Data Block:

 *     VIC  16:  1920x1080   60.000000 Hz  16:9     67.500 kHz    148.500000 MHz

 *   Video Capability Data Block:

 *     YCbCr quantization: No Data

 *     RGB quantization: Selectable (via AVI Q)

 *     PT scan behavior: No Data

 *     IT scan behavior: Always Underscanned

 *     CE scan behavior: Always Underscanned

 *   Vendor-Specific Data Block (HDMI), OUI 00-0C-03:

 *     Source physical address: 1.2.3.4

 *     Maximum TMDS clock: 100 MHz

 *     Extended HDMI video details:

 * Checksum: 0xe4  Unused space in Extension Block: 100 bytes

 */

static const unsigned char test_edid_hdmi_1080p_rgb_max_100mhz[] = {

	0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x31, 0xd8, 0x2a, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x21, 0x01, 0x03, 0x81, 0xa0, 0x5a, 0x78,

	0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20,

	0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,

	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x3a, 0x80, 0x18, 0x71, 0x38,

	0x2d, 0x40, 0x58, 0x2c, 0x45, 0x00, 0x40, 0x84, 0x63, 0x00, 0x00, 0x1e,

	0x00, 0x00, 0x00, 0xfc, 0x00, 0x54, 0x65, 0x73, 0x74, 0x20, 0x45, 0x44,

	0x49, 0x44, 0x0a, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0xfd, 0x00, 0x32,

	0x46, 0x00, 0x00, 0xc4, 0x00, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,

	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x41, 0x02, 0x03, 0x1b, 0x81,

	0xe3, 0x05, 0x00, 0x20, 0x41, 0x10, 0xe2, 0x00, 0x4a, 0x6d, 0x03, 0x0c,

	0x00, 0x12, 0x34, 0x00, 0x14, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0xe4

};



/*

 * edid-decode (hex):

 *

include/drm/display/drm_hdmi_state_helper.h

+4 −0
Original line number Diff line number Diff line
@@ -20,4 +20,8 @@ int drm_atomic_helper_connector_hdmi_clear_audio_infoframe(struct drm_connector 
int drm_atomic_helper_connector_hdmi_update_infoframes(struct drm_connector *connector,

						       struct drm_atomic_state *state);



enum drm_mode_status

drm_hdmi_connector_mode_valid(struct drm_connector *connector,

			      struct drm_display_mode *mode);



#endif // DRM_HDMI_STATE_HELPER_H_