Commit 951a6bf3 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-fixes-2025-01-16' of... 

Merge tag 'drm-misc-next-fixes-2025-01-16' of https://gitlab.freedesktop.org/drm/misc/kernel

 into drm-next

Several fixes for the new dmem cgroup controller and the HDMI framework
audio support

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

From: Maxime Ripard <mripard@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250116-bold-furry-perch-b1ca0e@houat
parents 24c61d55 f1359f46

Documentation/core-api/cgroup.rst

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ Cgroup Kernel APIs 
==================



Device Memory Cgroup API (dmemcg)

=========================

=================================

.. kernel-doc:: kernel/cgroup/dmem.c

   :export:

Documentation/gpu/index.rst

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ GPU Driver Developer's Guide 
   drm-usage-stats

   driver-uapi

   drm-client

   drm-compute

   drivers

   backlight

   vga-switcheroo

drivers/gpu/drm/display/drm_hdmi_state_helper.c

+5 −0
Original line number Diff line number Diff line
@@ -503,6 +503,9 @@ int drm_atomic_helper_connector_hdmi_check(struct drm_connector *connector, 
		connector_state_get_mode(new_conn_state);

	int ret;



	if (!new_conn_state->crtc || !new_conn_state->best_encoder)

		return 0;



	new_conn_state->hdmi.is_limited_range = hdmi_is_limited_range(connector, new_conn_state);



	ret = hdmi_compute_config(connector, new_conn_state, mode);
@@ -788,6 +791,8 @@ drm_atomic_helper_connector_hdmi_update(struct drm_connector *connector, 
	if (status == connector_status_disconnected) {

		// TODO: also handle CEC and scramber, HDMI sink disconnected.

		drm_connector_hdmi_audio_plugged_notify(connector, false);

		drm_edid_connector_update(connector, NULL);

		return;

	}



	if (connector->hdmi.funcs->read_edid)

drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c

+52 −0
Original line number Diff line number Diff line
@@ -1568,6 +1568,57 @@ static void drm_test_check_output_bpc_format_display_8bpc_only(struct kunit *tes 
	KUNIT_EXPECT_EQ(test, conn_state->hdmi.output_format, HDMI_COLORSPACE_RGB);

}



/* Test that atomic check succeeds when disabling a connector. */

static void drm_test_check_disable_connector(struct kunit *test)

{

	struct drm_atomic_helper_connector_hdmi_priv *priv;

	struct drm_modeset_acquire_ctx *ctx;

	struct drm_connector_state *conn_state;

	struct drm_crtc_state *crtc_state;

	struct drm_atomic_state *state;

	struct drm_display_mode *preferred;

	struct drm_connector *conn;

	struct drm_device *drm;

	struct drm_crtc *crtc;

	int ret;



	priv = drm_kunit_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);



	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->active = false;

	ret = drm_atomic_set_mode_for_crtc(crtc_state, NULL);

	KUNIT_EXPECT_EQ(test, ret, 0);



	conn_state = drm_atomic_get_connector_state(state, conn);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, conn_state);



	ret = drm_atomic_set_crtc_for_connector(conn_state, NULL);

	KUNIT_EXPECT_EQ(test, ret, 0);



	ret = drm_atomic_check_only(state);

	KUNIT_ASSERT_EQ(test, ret, 0);

}



static struct kunit_case drm_atomic_helper_connector_hdmi_check_tests[] = {

	KUNIT_CASE(drm_test_check_broadcast_rgb_auto_cea_mode),

	KUNIT_CASE(drm_test_check_broadcast_rgb_auto_cea_mode_vic_1),
@@ -1582,6 +1633,7 @@ static struct kunit_case drm_atomic_helper_connector_hdmi_check_tests[] = { 
	 */

	KUNIT_CASE(drm_test_check_broadcast_rgb_crtc_mode_changed),

	KUNIT_CASE(drm_test_check_broadcast_rgb_crtc_mode_not_changed),

	KUNIT_CASE(drm_test_check_disable_connector),

	KUNIT_CASE(drm_test_check_hdmi_funcs_reject_rate),

	KUNIT_CASE(drm_test_check_max_tmds_rate_bpc_fallback),

	KUNIT_CASE(drm_test_check_max_tmds_rate_format_fallback),

include/drm/display/drm_hdmi_state_helper.h

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
struct drm_atomic_state;

struct drm_connector;

struct drm_connector_state;

struct drm_display_mode;

struct hdmi_audio_infoframe;



enum drm_connector_status;