From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6399E2114; Tue, 23 Jan 2024 00:24:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705969494; cv=none; b=EnHzWjATty3DHs0LEU4uYexhfFIGJjH1VfMYdwDSulFSQyzVTc88Mc/CB6L4U7pFGIYjQGTK1bjRGdyVGR28Bv1up2sKFSXaxFB25W2k+MH1RnHNFMV4ugAo7tWL9+3OHjdl0kNYljL47IyETGgmJhx4QKPtbWlbJ9LcJaWLa9Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705969494; c=relaxed/simple; bh=pmH7iKS8+I1ZFsFm/FLKO4uDRcvJVpBxSHag4aUPrLc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XmhqtwgwR1oqqaYjSx4ZiHFBGzob+z2wuo2yd4T2L6nGD5Q+qZ7xSH0uCUvcLNRAiWgrQYbPyrXhYLCn82JRz9A35e/wk1N86Y1bGAS1rjLgu/+aZY5iaRv6w9n//hGP3E46cL7pyCwTFlPamb/Yl4USBu4ZMgaPXuOnxcReMrY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=kCXLcsVr; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="kCXLcsVr" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 15D78C43399; Tue, 23 Jan 2024 00:24:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1705969494; bh=pmH7iKS8+I1ZFsFm/FLKO4uDRcvJVpBxSHag4aUPrLc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kCXLcsVrn6RZgUb5udB3/hIk2UVrS1ppK8j0Y1I3hiMjf+150JNzvlp2jvs4MdQzJ sHOxYAIygzkjC7+Be3hKFJg3FqCix14Ha39ykwzCw82rtOATMTVGHOVQefCA/Kt39b tCxrqsNzX+4XXuArgebOFKt33temPRzz+QJz8GM4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Neil Armstrong , Dmitry Baryshkov , Maxime Ripard , Sasha Levin Subject: [PATCH 6.7 282/641] drm/drv: propagate errors from drm_modeset_register_all() Date: Mon, 22 Jan 2024 15:53:06 -0800 Message-ID: <20240122235826.729782824@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240122235818.091081209@linuxfoundation.org> References: <20240122235818.091081209@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.7-stable review patch. If anyone has any objections, please let me know. ------------------ From: Dmitry Baryshkov [ Upstream commit 5f8dec200923a76dc57187965fd59c1136f5d085 ] In case the drm_modeset_register_all() function fails, its error code will be ignored. Instead make the drm_dev_register() bail out in case of such an error. Fixes: 79190ea2658a ("drm: Add callbacks for late registering") Reviewed-by: Neil Armstrong Signed-off-by: Dmitry Baryshkov Signed-off-by: Maxime Ripard Link: https://patchwork.freedesktop.org/patch/msgid/20231202225552.1283638-1-dmitry.baryshkov@linaro.org Signed-off-by: Sasha Levin --- drivers/gpu/drm/drm_drv.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c index 535f16e7882e..3c835c99daad 100644 --- a/drivers/gpu/drm/drm_drv.c +++ b/drivers/gpu/drm/drm_drv.c @@ -949,8 +949,11 @@ int drm_dev_register(struct drm_device *dev, unsigned long flags) goto err_minors; } - if (drm_core_check_feature(dev, DRIVER_MODESET)) - drm_modeset_register_all(dev); + if (drm_core_check_feature(dev, DRIVER_MODESET)) { + ret = drm_modeset_register_all(dev); + if (ret) + goto err_unload; + } DRM_INFO("Initialized %s %d.%d.%d %s for %s on minor %d\n", driver->name, driver->major, driver->minor, @@ -960,6 +963,9 @@ int drm_dev_register(struct drm_device *dev, unsigned long flags) goto out_unlock; +err_unload: + if (dev->driver->unload) + dev->driver->unload(dev); err_minors: remove_compat_control_link(dev); drm_minor_unregister(dev, DRM_MINOR_ACCEL); -- 2.43.0