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

Commit 4fc6f659 authored by Jerry (Fangzhi) Zuo's avatar Jerry (Fangzhi) Zuo Committed by Alex Deucher
Browse files

drm/amd/display: Miss register MST encoder cbs 



It is to fix: MST display failed to resume from S3

Need to properly setup MST encoder cbs. Otherwise drm_device
encoder doesn't register its own cbs, leading to NULL
encoder->funcs in drm_atomic_helper_resume().

Signed-off-by: default avatarJerry (Fangzhi) Zuo <Jerry.Zuo@amd.com>
Reviewed-by: default avatarRoman Li <Roman.Li@amd.com>
Acked-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent fcb4019e

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

+11 −1
Original line number Diff line number Diff line
@@ -245,6 +245,16 @@ static const struct drm_connector_helper_funcs dm_dp_mst_connector_helper_funcs 
	.best_encoder = dm_mst_best_encoder,

};



static void amdgpu_dm_encoder_destroy(struct drm_encoder *encoder)

{

	drm_encoder_cleanup(encoder);

	kfree(encoder);

}



static const struct drm_encoder_funcs amdgpu_dm_encoder_funcs = {

	.destroy = amdgpu_dm_encoder_destroy,

};



static struct amdgpu_encoder *

dm_dp_create_fake_mst_encoder(struct amdgpu_dm_connector *connector)

{
@@ -268,7 +278,7 @@ dm_dp_create_fake_mst_encoder(struct amdgpu_dm_connector *connector) 
	drm_encoder_init(

		dev,

		&amdgpu_encoder->base,

		NULL,

		&amdgpu_dm_encoder_funcs,

		DRM_MODE_ENCODER_DPMST,

		NULL);