From fe4df61d9f9a2126b198669e2692d02c0456fa33 Mon Sep 17 00:00:00 2001 From: Thierry Reding Date: Fri, 25 Aug 2023 15:22:29 +0200 Subject: [PATCH] drm/tegra: Remove existing framebuffer only if we support display Tegra DRM doesn't support display on Tegra234 and later, so make sure not to remove any existing framebuffers in that case. Signed-off-by: Thierry Reding Change-Id: I410c6dc73b3b00caf9bef4b3a047c741223e75f0 Signed-off-by: Jon Hunter Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/2968311 Reviewed-by: Santosh Galma Tested-by: Santosh Galma GVS: Gerrit_Virtual_Submit --- drivers/gpu/drm/tegra/drm.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c index 917e231f..c40bbd2e 100644 --- a/drivers/gpu/drm/tegra/drm.c +++ b/drivers/gpu/drm/tegra/drm.c @@ -1297,13 +1297,15 @@ static int host1x_drm_probe(struct host1x_device *dev) drm_mode_config_reset(drm); + if (drm->mode_config.num_crtc > 0) { #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 15, 0) - err = drm_aperture_remove_framebuffers(false, &tegra_drm_driver); + err = drm_aperture_remove_framebuffers(false, &tegra_drm_driver); #else - err = drm_aperture_remove_framebuffers(false, "tegradrmfb"); + err = drm_aperture_remove_framebuffers(false, "tegradrmfb"); #endif - if (err < 0) - goto hub; + if (err < 0) + goto hub; + } err = tegra_drm_fb_init(drm); if (err < 0)