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

Commit cab00a9c authored by Xiangliang Yu's avatar Xiangliang Yu Committed by Greg Kroah-Hartman
Browse files

drm/amdgpu: fix unload driver issue for virtual display




[ Upstream commit 3a1d19a29670aa7eb58576a31883d0aa9fb77549 ]

Virtual display doesn't allocate amdgpu_encoder when initializing,
so will get invaild pointer if try to free amdgpu_encoder when
unloading driver.

Signed-off-by: default avatarXiangliang Yu <Xiangliang.Yu@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b75e47cf
Loading
Loading
Loading
Loading
+1 −4
Original line number Original line Diff line number Diff line
@@ -565,11 +565,8 @@ static const struct drm_encoder_helper_funcs dce_virtual_encoder_helper_funcs =


static void dce_virtual_encoder_destroy(struct drm_encoder *encoder)
static void dce_virtual_encoder_destroy(struct drm_encoder *encoder)
{
{
	struct amdgpu_encoder *amdgpu_encoder = to_amdgpu_encoder(encoder);

	kfree(amdgpu_encoder->enc_priv);
	drm_encoder_cleanup(encoder);
	drm_encoder_cleanup(encoder);
	kfree(amdgpu_encoder);
	kfree(encoder);
}
}


static const struct drm_encoder_funcs dce_virtual_encoder_funcs = {
static const struct drm_encoder_funcs dce_virtual_encoder_funcs = {