Commit 79f9efa0 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-2025-02-13' of... 

Merge tag 'drm-misc-fixes-2025-02-13' of https://gitlab.freedesktop.org/drm/misc/kernel

 into drm-fixes

Some locking fixes for the HDMI infrastructure tests, an unitialized
mutex fix for host1x, an unitialized variable fix for panthor, and a
config selection fix for hibmc.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Maxime Ripard <mripard@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250213-brilliant-terrier-from-hell-d06dd5@houat
parents a64dcfb4 e00a2e5d

drivers/gpu/drm/display/drm_dp_helper.c

+1 −1
Original line number Diff line number Diff line
@@ -2544,7 +2544,7 @@ u8 drm_dp_dsc_sink_bpp_incr(const u8 dsc_dpcd[DP_DSC_RECEIVER_CAP_SIZE]) 
{

	u8 bpp_increment_dpcd = dsc_dpcd[DP_DSC_BITS_PER_PIXEL_INC - DP_DSC_SUPPORT];



	switch (bpp_increment_dpcd) {

	switch (bpp_increment_dpcd & DP_DSC_BITS_PER_PIXEL_MASK) {

	case DP_DSC_BITS_PER_PIXEL_1_16:

		return 16;

	case DP_DSC_BITS_PER_PIXEL_1_8:

drivers/gpu/drm/hisilicon/hibmc/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -4,6 +4,8 @@ config DRM_HISI_HIBMC 
	depends on DRM && PCI

	depends on MMU

	select DRM_CLIENT_SELECTION

	select DRM_DISPLAY_HELPER

	select DRM_DISPLAY_DP_HELPER

	select DRM_KMS_HELPER

	select DRM_VRAM_HELPER

	select DRM_TTM

drivers/gpu/drm/panthor/panthor_drv.c

+1 −0
Original line number Diff line number Diff line
@@ -802,6 +802,7 @@ static void panthor_query_group_priorities_info(struct drm_file *file, 
{

	int prio;



	memset(arg, 0, sizeof(*arg));

	for (prio = PANTHOR_GROUP_PRIORITY_REALTIME; prio >= 0; prio--) {

		if (!group_priority_permit(file, prio))

			arg->allowed_mask |= BIT(prio);

drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c

+103 −97
Original line number Diff line number Diff line
@@ -70,10 +70,17 @@ static int light_up_connector(struct kunit *test, 
	state = drm_kunit_helper_atomic_state_alloc(test, drm, ctx);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state);



retry:

	conn_state = drm_atomic_get_connector_state(state, connector);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, conn_state);



	ret = drm_atomic_set_crtc_for_connector(conn_state, crtc);

	if (ret == -EDEADLK) {

		drm_atomic_state_clear(state);

		ret = drm_modeset_backoff(ctx);

		if (!ret)

			goto retry;

	}

	KUNIT_EXPECT_EQ(test, ret, 0);



	crtc_state = drm_atomic_get_crtc_state(state, crtc);
@@ -282,15 +289,16 @@ static void drm_test_check_broadcast_rgb_crtc_mode_changed(struct kunit *test) 
						    8);

	KUNIT_ASSERT_NOT_NULL(test, priv);



	ctx = drm_kunit_helper_acquire_ctx_alloc(test);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx);



	drm = &priv->drm;

	crtc = priv->crtc;

	conn = &priv->connector;



	preferred = find_preferred_mode(conn);

	KUNIT_ASSERT_NOT_NULL(test, preferred);



	drm = &priv->drm;

	crtc = priv->crtc;

	ctx = drm_kunit_helper_acquire_ctx_alloc(test);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx);



	ret = light_up_connector(test, drm, crtc, conn, preferred, ctx);

	KUNIT_ASSERT_EQ(test, ret, 0);
@@ -345,15 +353,16 @@ static void drm_test_check_broadcast_rgb_crtc_mode_not_changed(struct kunit *tes 
						    8);

	KUNIT_ASSERT_NOT_NULL(test, priv);



	ctx = drm_kunit_helper_acquire_ctx_alloc(test);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx);



	drm = &priv->drm;

	crtc = priv->crtc;

	conn = &priv->connector;



	preferred = find_preferred_mode(conn);

	KUNIT_ASSERT_NOT_NULL(test, preferred);



	drm = &priv->drm;

	crtc = priv->crtc;

	ctx = drm_kunit_helper_acquire_ctx_alloc(test);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx);



	ret = light_up_connector(test, drm, crtc, conn, preferred, ctx);

	KUNIT_ASSERT_EQ(test, ret, 0);
@@ -408,18 +417,18 @@ static void drm_test_check_broadcast_rgb_auto_cea_mode(struct kunit *test) 
						    8);

	KUNIT_ASSERT_NOT_NULL(test, priv);



	drm = &priv->drm;

	crtc = priv->crtc;

	conn = &priv->connector;

	KUNIT_ASSERT_TRUE(test, conn->display_info.is_hdmi);



	ctx = drm_kunit_helper_acquire_ctx_alloc(test);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx);



	preferred = find_preferred_mode(conn);

	KUNIT_ASSERT_NOT_NULL(test, preferred);

	KUNIT_ASSERT_NE(test, drm_match_cea_mode(preferred), 1);



	drm = &priv->drm;

	crtc = priv->crtc;

	ctx = drm_kunit_helper_acquire_ctx_alloc(test);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx);



	ret = light_up_connector(test, drm, crtc, conn, preferred, ctx);

	KUNIT_ASSERT_EQ(test, ret, 0);
@@ -474,7 +483,6 @@ static void drm_test_check_broadcast_rgb_auto_cea_mode_vic_1(struct kunit *test) 
	mode = drm_kunit_display_mode_from_cea_vic(test, drm, 1);

	KUNIT_ASSERT_NOT_NULL(test, mode);



	drm = &priv->drm;

	crtc = priv->crtc;

	ret = light_up_connector(test, drm, crtc, conn, mode, ctx);

	KUNIT_ASSERT_EQ(test, ret, 0);
@@ -520,18 +528,18 @@ static void drm_test_check_broadcast_rgb_full_cea_mode(struct kunit *test) 
						    8);

	KUNIT_ASSERT_NOT_NULL(test, priv);



	drm = &priv->drm;

	crtc = priv->crtc;

	conn = &priv->connector;

	KUNIT_ASSERT_TRUE(test, conn->display_info.is_hdmi);



	ctx = drm_kunit_helper_acquire_ctx_alloc(test);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx);



	preferred = find_preferred_mode(conn);

	KUNIT_ASSERT_NOT_NULL(test, preferred);

	KUNIT_ASSERT_NE(test, drm_match_cea_mode(preferred), 1);



	drm = &priv->drm;

	crtc = priv->crtc;

	ctx = drm_kunit_helper_acquire_ctx_alloc(test);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx);



	ret = light_up_connector(test, drm, crtc, conn, preferred, ctx);

	KUNIT_ASSERT_EQ(test, ret, 0);
@@ -588,7 +596,6 @@ static void drm_test_check_broadcast_rgb_full_cea_mode_vic_1(struct kunit *test) 
	mode = drm_kunit_display_mode_from_cea_vic(test, drm, 1);

	KUNIT_ASSERT_NOT_NULL(test, mode);



	drm = &priv->drm;

	crtc = priv->crtc;

	ret = light_up_connector(test, drm, crtc, conn, mode, ctx);

	KUNIT_ASSERT_EQ(test, ret, 0);
@@ -636,18 +643,18 @@ static void drm_test_check_broadcast_rgb_limited_cea_mode(struct kunit *test) 
						    8);

	KUNIT_ASSERT_NOT_NULL(test, priv);



	drm = &priv->drm;

	crtc = priv->crtc;

	conn = &priv->connector;

	KUNIT_ASSERT_TRUE(test, conn->display_info.is_hdmi);



	ctx = drm_kunit_helper_acquire_ctx_alloc(test);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx);



	preferred = find_preferred_mode(conn);

	KUNIT_ASSERT_NOT_NULL(test, preferred);

	KUNIT_ASSERT_NE(test, drm_match_cea_mode(preferred), 1);



	drm = &priv->drm;

	crtc = priv->crtc;

	ctx = drm_kunit_helper_acquire_ctx_alloc(test);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx);



	ret = light_up_connector(test, drm, crtc, conn, preferred, ctx);

	KUNIT_ASSERT_EQ(test, ret, 0);
@@ -704,7 +711,6 @@ static void drm_test_check_broadcast_rgb_limited_cea_mode_vic_1(struct kunit *te 
	mode = drm_kunit_display_mode_from_cea_vic(test, drm, 1);

	KUNIT_ASSERT_NOT_NULL(test, mode);



	drm = &priv->drm;

	crtc = priv->crtc;

	ret = light_up_connector(test, drm, crtc, conn, mode, ctx);

	KUNIT_ASSERT_EQ(test, ret, 0);
@@ -754,20 +760,20 @@ static void drm_test_check_output_bpc_crtc_mode_changed(struct kunit *test) 
						    10);

	KUNIT_ASSERT_NOT_NULL(test, priv);



	drm = &priv->drm;

	crtc = priv->crtc;

	conn = &priv->connector;

	ret = set_connector_edid(test, conn,

				 test_edid_hdmi_1080p_rgb_yuv_dc_max_200mhz,

				 ARRAY_SIZE(test_edid_hdmi_1080p_rgb_yuv_dc_max_200mhz));

	KUNIT_ASSERT_GT(test, ret, 0);



	ctx = drm_kunit_helper_acquire_ctx_alloc(test);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx);



	preferred = find_preferred_mode(conn);

	KUNIT_ASSERT_NOT_NULL(test, preferred);



	drm = &priv->drm;

	crtc = priv->crtc;

	ctx = drm_kunit_helper_acquire_ctx_alloc(test);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx);



	ret = light_up_connector(test, drm, crtc, conn, preferred, ctx);

	KUNIT_ASSERT_EQ(test, ret, 0);
@@ -828,20 +834,20 @@ static void drm_test_check_output_bpc_crtc_mode_not_changed(struct kunit *test) 
						    10);

	KUNIT_ASSERT_NOT_NULL(test, priv);



	drm = &priv->drm;

	crtc = priv->crtc;

	conn = &priv->connector;

	ret = set_connector_edid(test, conn,

				 test_edid_hdmi_1080p_rgb_yuv_dc_max_200mhz,

				 ARRAY_SIZE(test_edid_hdmi_1080p_rgb_yuv_dc_max_200mhz));

	KUNIT_ASSERT_GT(test, ret, 0);



	ctx = drm_kunit_helper_acquire_ctx_alloc(test);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx);



	preferred = find_preferred_mode(conn);

	KUNIT_ASSERT_NOT_NULL(test, preferred);



	drm = &priv->drm;

	crtc = priv->crtc;

	ctx = drm_kunit_helper_acquire_ctx_alloc(test);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx);



	ret = light_up_connector(test, drm, crtc, conn, preferred, ctx);

	KUNIT_ASSERT_EQ(test, ret, 0);
@@ -899,6 +905,8 @@ static void drm_test_check_output_bpc_dvi(struct kunit *test) 
						    12);

	KUNIT_ASSERT_NOT_NULL(test, priv);



	drm = &priv->drm;

	crtc = priv->crtc;

	conn = &priv->connector;

	ret = set_connector_edid(test, conn,

				 test_edid_dvi_1080p,
@@ -908,14 +916,12 @@ static void drm_test_check_output_bpc_dvi(struct kunit *test) 
	info = &conn->display_info;

	KUNIT_ASSERT_FALSE(test, info->is_hdmi);



	ctx = drm_kunit_helper_acquire_ctx_alloc(test);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx);



	preferred = find_preferred_mode(conn);

	KUNIT_ASSERT_NOT_NULL(test, preferred);



	drm = &priv->drm;

	crtc = priv->crtc;

	ctx = drm_kunit_helper_acquire_ctx_alloc(test);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx);



	ret = light_up_connector(test, drm, crtc, conn, preferred, ctx);

	KUNIT_ASSERT_EQ(test, ret, 0);
@@ -946,21 +952,21 @@ static void drm_test_check_tmds_char_rate_rgb_8bpc(struct kunit *test) 
						    8);

	KUNIT_ASSERT_NOT_NULL(test, priv);



	drm = &priv->drm;

	crtc = priv->crtc;

	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);



	ctx = drm_kunit_helper_acquire_ctx_alloc(test);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx);



	preferred = find_preferred_mode(conn);

	KUNIT_ASSERT_NOT_NULL(test, preferred);

	KUNIT_ASSERT_FALSE(test, preferred->flags & DRM_MODE_FLAG_DBLCLK);



	drm = &priv->drm;

	crtc = priv->crtc;

	ctx = drm_kunit_helper_acquire_ctx_alloc(test);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx);



	ret = light_up_connector(test, drm, crtc, conn, preferred, ctx);

	KUNIT_ASSERT_EQ(test, ret, 0);
@@ -993,21 +999,21 @@ static void drm_test_check_tmds_char_rate_rgb_10bpc(struct kunit *test) 
						    10);

	KUNIT_ASSERT_NOT_NULL(test, priv);



	drm = &priv->drm;

	crtc = priv->crtc;

	conn = &priv->connector;

	ret = set_connector_edid(test, conn,

				 test_edid_hdmi_1080p_rgb_yuv_dc_max_340mhz,

				 ARRAY_SIZE(test_edid_hdmi_1080p_rgb_yuv_dc_max_340mhz));

	KUNIT_ASSERT_GT(test, ret, 0);



	ctx = drm_kunit_helper_acquire_ctx_alloc(test);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx);



	preferred = find_preferred_mode(conn);

	KUNIT_ASSERT_NOT_NULL(test, preferred);

	KUNIT_ASSERT_FALSE(test, preferred->flags & DRM_MODE_FLAG_DBLCLK);



	drm = &priv->drm;

	crtc = priv->crtc;

	ctx = drm_kunit_helper_acquire_ctx_alloc(test);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx);



	ret = light_up_connector(test, drm, crtc, conn, preferred, ctx);

	KUNIT_ASSERT_EQ(test, ret, 0);
@@ -1040,21 +1046,21 @@ static void drm_test_check_tmds_char_rate_rgb_12bpc(struct kunit *test) 
						    12);

	KUNIT_ASSERT_NOT_NULL(test, priv);



	drm = &priv->drm;

	crtc = priv->crtc;

	conn = &priv->connector;

	ret = set_connector_edid(test, conn,

				 test_edid_hdmi_1080p_rgb_yuv_dc_max_340mhz,

				 ARRAY_SIZE(test_edid_hdmi_1080p_rgb_yuv_dc_max_340mhz));

	KUNIT_ASSERT_GT(test, ret, 0);



	ctx = drm_kunit_helper_acquire_ctx_alloc(test);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx);



	preferred = find_preferred_mode(conn);

	KUNIT_ASSERT_NOT_NULL(test, preferred);

	KUNIT_ASSERT_FALSE(test, preferred->flags & DRM_MODE_FLAG_DBLCLK);



	drm = &priv->drm;

	crtc = priv->crtc;

	ctx = drm_kunit_helper_acquire_ctx_alloc(test);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx);



	ret = light_up_connector(test, drm, crtc, conn, preferred, ctx);

	KUNIT_ASSERT_EQ(test, ret, 0);
@@ -1091,15 +1097,16 @@ static void drm_test_check_hdmi_funcs_reject_rate(struct kunit *test) 
						    8);

	KUNIT_ASSERT_NOT_NULL(test, priv);



	ctx = drm_kunit_helper_acquire_ctx_alloc(test);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx);



	drm = &priv->drm;

	crtc = priv->crtc;

	conn = &priv->connector;



	preferred = find_preferred_mode(conn);

	KUNIT_ASSERT_NOT_NULL(test, preferred);



	drm = &priv->drm;

	crtc = priv->crtc;

	ctx = drm_kunit_helper_acquire_ctx_alloc(test);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx);



	ret = light_up_connector(test, drm, crtc, conn, preferred, ctx);

	KUNIT_ASSERT_EQ(test, ret, 0);
@@ -1147,6 +1154,8 @@ static void drm_test_check_max_tmds_rate_bpc_fallback(struct kunit *test) 
						    12);

	KUNIT_ASSERT_NOT_NULL(test, priv);



	drm = &priv->drm;

	crtc = priv->crtc;

	conn = &priv->connector;

	ret = set_connector_edid(test, conn,

				 test_edid_hdmi_1080p_rgb_yuv_dc_max_200mhz,
@@ -1157,9 +1166,6 @@ static void drm_test_check_max_tmds_rate_bpc_fallback(struct kunit *test) 
	KUNIT_ASSERT_TRUE(test, info->is_hdmi);

	KUNIT_ASSERT_GT(test, info->max_tmds_clock, 0);



	ctx = drm_kunit_helper_acquire_ctx_alloc(test);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx);



	preferred = find_preferred_mode(conn);

	KUNIT_ASSERT_NOT_NULL(test, preferred);

	KUNIT_ASSERT_FALSE(test, preferred->flags & DRM_MODE_FLAG_DBLCLK);
@@ -1170,8 +1176,9 @@ static void drm_test_check_max_tmds_rate_bpc_fallback(struct kunit *test) 
	rate = drm_hdmi_compute_mode_clock(preferred, 10, HDMI_COLORSPACE_RGB);

	KUNIT_ASSERT_LT(test, rate, info->max_tmds_clock * 1000);



	drm = &priv->drm;

	crtc = priv->crtc;

	ctx = drm_kunit_helper_acquire_ctx_alloc(test);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx);



	ret = light_up_connector(test, drm, crtc, conn, preferred, ctx);

	KUNIT_EXPECT_EQ(test, ret, 0);
@@ -1216,6 +1223,8 @@ static void drm_test_check_max_tmds_rate_format_fallback(struct kunit *test) 
						    12);

	KUNIT_ASSERT_NOT_NULL(test, priv);



	drm = &priv->drm;

	crtc = priv->crtc;

	conn = &priv->connector;

	ret = set_connector_edid(test, conn,

				 test_edid_hdmi_1080p_rgb_yuv_dc_max_200mhz,
@@ -1226,9 +1235,6 @@ static void drm_test_check_max_tmds_rate_format_fallback(struct kunit *test) 
	KUNIT_ASSERT_TRUE(test, info->is_hdmi);

	KUNIT_ASSERT_GT(test, info->max_tmds_clock, 0);



	ctx = drm_kunit_helper_acquire_ctx_alloc(test);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx);



	preferred = find_preferred_mode(conn);

	KUNIT_ASSERT_NOT_NULL(test, preferred);

	KUNIT_ASSERT_FALSE(test, preferred->flags & DRM_MODE_FLAG_DBLCLK);
@@ -1242,8 +1248,9 @@ static void drm_test_check_max_tmds_rate_format_fallback(struct kunit *test) 
	rate = drm_hdmi_compute_mode_clock(preferred, 12, HDMI_COLORSPACE_YUV422);

	KUNIT_ASSERT_LT(test, rate, info->max_tmds_clock * 1000);



	drm = &priv->drm;

	crtc = priv->crtc;

	ctx = drm_kunit_helper_acquire_ctx_alloc(test);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx);



	ret = light_up_connector(test, drm, crtc, conn, preferred, ctx);

	KUNIT_EXPECT_EQ(test, ret, 0);
@@ -1290,9 +1297,6 @@ static void drm_test_check_output_bpc_format_vic_1(struct kunit *test) 
	KUNIT_ASSERT_TRUE(test, info->is_hdmi);

	KUNIT_ASSERT_GT(test, info->max_tmds_clock, 0);



	ctx = drm_kunit_helper_acquire_ctx_alloc(test);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx);



	mode = drm_kunit_display_mode_from_cea_vic(test, drm, 1);

	KUNIT_ASSERT_NOT_NULL(test, mode);
@@ -1306,7 +1310,9 @@ static void drm_test_check_output_bpc_format_vic_1(struct kunit *test) 
	rate = mode->clock * 1500;

	KUNIT_ASSERT_LT(test, rate, info->max_tmds_clock * 1000);



	drm = &priv->drm;

	ctx = drm_kunit_helper_acquire_ctx_alloc(test);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx);



	crtc = priv->crtc;

	ret = light_up_connector(test, drm, crtc, conn, mode, ctx);

	KUNIT_EXPECT_EQ(test, ret, 0);
@@ -1340,6 +1346,8 @@ static void drm_test_check_output_bpc_format_driver_rgb_only(struct kunit *test) 
						    12);

	KUNIT_ASSERT_NOT_NULL(test, priv);



	drm = &priv->drm;

	crtc = priv->crtc;

	conn = &priv->connector;

	ret = set_connector_edid(test, conn,

				 test_edid_hdmi_1080p_rgb_yuv_dc_max_200mhz,
@@ -1350,9 +1358,6 @@ static void drm_test_check_output_bpc_format_driver_rgb_only(struct kunit *test) 
	KUNIT_ASSERT_TRUE(test, info->is_hdmi);

	KUNIT_ASSERT_GT(test, info->max_tmds_clock, 0);



	ctx = drm_kunit_helper_acquire_ctx_alloc(test);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx);



	preferred = find_preferred_mode(conn);

	KUNIT_ASSERT_NOT_NULL(test, preferred);
@@ -1371,8 +1376,9 @@ static void drm_test_check_output_bpc_format_driver_rgb_only(struct kunit *test) 
	rate = drm_hdmi_compute_mode_clock(preferred, 12, HDMI_COLORSPACE_YUV422);

	KUNIT_ASSERT_LT(test, rate, info->max_tmds_clock * 1000);



	drm = &priv->drm;

	crtc = priv->crtc;

	ctx = drm_kunit_helper_acquire_ctx_alloc(test);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx);



	ret = light_up_connector(test, drm, crtc, conn, preferred, ctx);

	KUNIT_EXPECT_EQ(test, ret, 0);
@@ -1407,6 +1413,8 @@ static void drm_test_check_output_bpc_format_display_rgb_only(struct kunit *test 
						    12);

	KUNIT_ASSERT_NOT_NULL(test, priv);



	drm = &priv->drm;

	crtc = priv->crtc;

	conn = &priv->connector;

	ret = set_connector_edid(test, conn,

				 test_edid_hdmi_1080p_rgb_max_200mhz,
@@ -1417,9 +1425,6 @@ static void drm_test_check_output_bpc_format_display_rgb_only(struct kunit *test 
	KUNIT_ASSERT_TRUE(test, info->is_hdmi);

	KUNIT_ASSERT_GT(test, info->max_tmds_clock, 0);



	ctx = drm_kunit_helper_acquire_ctx_alloc(test);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx);



	preferred = find_preferred_mode(conn);

	KUNIT_ASSERT_NOT_NULL(test, preferred);
@@ -1438,8 +1443,9 @@ static void drm_test_check_output_bpc_format_display_rgb_only(struct kunit *test 
	rate = drm_hdmi_compute_mode_clock(preferred, 12, HDMI_COLORSPACE_YUV422);

	KUNIT_ASSERT_LT(test, rate, info->max_tmds_clock * 1000);



	drm = &priv->drm;

	crtc = priv->crtc;

	ctx = drm_kunit_helper_acquire_ctx_alloc(test);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx);



	ret = light_up_connector(test, drm, crtc, conn, preferred, ctx);

	KUNIT_EXPECT_EQ(test, ret, 0);
@@ -1473,6 +1479,8 @@ static void drm_test_check_output_bpc_format_driver_8bpc_only(struct kunit *test 
						    8);

	KUNIT_ASSERT_NOT_NULL(test, priv);



	drm = &priv->drm;

	crtc = priv->crtc;

	conn = &priv->connector;

	ret = set_connector_edid(test, conn,

				 test_edid_hdmi_1080p_rgb_yuv_dc_max_340mhz,
@@ -1483,9 +1491,6 @@ static void drm_test_check_output_bpc_format_driver_8bpc_only(struct kunit *test 
	KUNIT_ASSERT_TRUE(test, info->is_hdmi);

	KUNIT_ASSERT_GT(test, info->max_tmds_clock, 0);



	ctx = drm_kunit_helper_acquire_ctx_alloc(test);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx);



	preferred = find_preferred_mode(conn);

	KUNIT_ASSERT_NOT_NULL(test, preferred);
@@ -1496,8 +1501,9 @@ static void drm_test_check_output_bpc_format_driver_8bpc_only(struct kunit *test 
	rate = drm_hdmi_compute_mode_clock(preferred, 12, HDMI_COLORSPACE_RGB);

	KUNIT_ASSERT_LT(test, rate, info->max_tmds_clock * 1000);



	drm = &priv->drm;

	crtc = priv->crtc;

	ctx = drm_kunit_helper_acquire_ctx_alloc(test);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx);



	ret = light_up_connector(test, drm, crtc, conn, preferred, ctx);

	KUNIT_EXPECT_EQ(test, ret, 0);
@@ -1533,6 +1539,8 @@ static void drm_test_check_output_bpc_format_display_8bpc_only(struct kunit *tes 
						    12);

	KUNIT_ASSERT_NOT_NULL(test, priv);



	drm = &priv->drm;

	crtc = priv->crtc;

	conn = &priv->connector;

	ret = set_connector_edid(test, conn,

				 test_edid_hdmi_1080p_rgb_max_340mhz,
@@ -1543,9 +1551,6 @@ static void drm_test_check_output_bpc_format_display_8bpc_only(struct kunit *tes 
	KUNIT_ASSERT_TRUE(test, info->is_hdmi);

	KUNIT_ASSERT_GT(test, info->max_tmds_clock, 0);



	ctx = drm_kunit_helper_acquire_ctx_alloc(test);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx);



	preferred = find_preferred_mode(conn);

	KUNIT_ASSERT_NOT_NULL(test, preferred);
@@ -1556,8 +1561,9 @@ static void drm_test_check_output_bpc_format_display_8bpc_only(struct kunit *tes 
	rate = drm_hdmi_compute_mode_clock(preferred, 12, HDMI_COLORSPACE_RGB);

	KUNIT_ASSERT_LT(test, rate, info->max_tmds_clock * 1000);



	drm = &priv->drm;

	crtc = priv->crtc;

	ctx = drm_kunit_helper_acquire_ctx_alloc(test);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx);



	ret = light_up_connector(test, drm, crtc, conn, preferred, ctx);

	KUNIT_EXPECT_EQ(test, ret, 0);

drivers/gpu/host1x/dev.c

+2 −0
Original line number Diff line number Diff line
@@ -619,6 +619,8 @@ static int host1x_probe(struct platform_device *pdev) 
		goto free_contexts;

	}



	mutex_init(&host->intr_mutex);



	pm_runtime_enable(&pdev->dev);



	err = devm_tegra_core_dev_init_opp_table_common(&pdev->dev);