Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df099b9b authored by Leo (Sunpeng) Li's avatar Leo (Sunpeng) Li Committed by Alex Deucher
Browse files

drm/amd/display: Destroy connector state on reset 



When a DRM mode reset is called on resume, the connector state's
destructor is not called. This leaves a dangling reference on the CRTC
commit object, which was obtained by the connector state during commit
setup.

Signed-off-by: default avatarLeo (Sunpeng) Li <sunpeng.li@amd.com>
Reviewed-by: default avatarHarry Wentland <Harry.Wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent aa6d4a59

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+4 −2
Original line number Diff line number Diff line
@@ -2709,6 +2709,9 @@ void amdgpu_dm_connector_funcs_reset(struct drm_connector *connector) 
	struct dm_connector_state *state =

		to_dm_connector_state(connector->state);



	if (connector->state)

		__drm_atomic_helper_connector_destroy_state(connector->state);



	kfree(state);



	state = kzalloc(sizeof(*state), GFP_KERNEL);
@@ -2719,8 +2722,7 @@ void amdgpu_dm_connector_funcs_reset(struct drm_connector *connector) 
		state->underscan_hborder = 0;

		state->underscan_vborder = 0;



		connector->state = &state->base;

		connector->state->connector = connector;

		__drm_atomic_helper_connector_reset(connector, &state->base);

	}

}