From patchwork Sat Dec 2 22:55:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13477133 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 26A1EC4167B for ; Sat, 2 Dec 2023 22:56:03 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 10CB510E13D; Sat, 2 Dec 2023 22:56:02 +0000 (UTC) Received: from mail-lf1-x130.google.com (mail-lf1-x130.google.com [IPv6:2a00:1450:4864:20::130]) by gabe.freedesktop.org (Postfix) with ESMTPS id B2E3C10E234 for ; Sat, 2 Dec 2023 22:55:55 +0000 (UTC) Received: by mail-lf1-x130.google.com with SMTP id 2adb3069b0e04-50bc22c836bso4619908e87.0 for ; Sat, 02 Dec 2023 14:55:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1701557754; x=1702162554; darn=lists.freedesktop.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=ZjGFlHjx1ZkElLYY29NmAfOWv9VBYLIcznU6RxLMTLw=; b=QuntcIhOgP8m/WcbXZZrhLWm36nsPmep8dsL8Ots48+O+EzoUQ3ZCWvcJyWJ+RJT+P Fl4zMepEJIZEKWzaWdzenocHkwn4imy3ZcfJ25B4ElrgpZUFtAUOQ2y5ZNZaCT5iPqFu qfOx8pfEouipnnbNpD+ygv+vEnX96539Ok44nDQTynO/4CpPMrzCZxA14wOlUTn0dDh7 V8OKMV16uRTH/tfpS15JxOVj3rafbHRIAg7RGmJvs0TCbU3ifT7V4Kkju3uvS1PuLYqK OS50vqB7qS9BNT0UCjeRbNlym+k7VG0nbU8bTGklPzLmRrpTtnkgLhDaBYncP2L8yTBx 37Fg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701557754; x=1702162554; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ZjGFlHjx1ZkElLYY29NmAfOWv9VBYLIcznU6RxLMTLw=; b=ocH5Z6WWMqewaQuQnkLfyB/7jFbj9+74VVkEFkYrbkAUeKjytkwtxkCWXju17tBO/y QS80UPTUPZoM/8S58FGXrVLSgE8tBQlp4MQC+eMFmc6WQuRFAnAFHVjPQPejq/iXXVni XZf/xvk7S3ly4xTJgrl56FyblDusvtIrN8ssrKMw53goGOsdyPC459VU82UA9T0rlJWL fYdQG9UdQsIJ69W3RDe0A+5oo2ExUsczOIFrQl2/VOViKauwU16huTLLg5Uymjws7/8V KeugXxPuyt9wn0AdKM0m2IuNXBo5OO+mPhGzGeDl4ez/zkkdhxF6YGku1BIvaz0PoVl9 GL7A== X-Gm-Message-State: AOJu0YyfOnVAX85Ge4nIOZ6Lzq0lM+ZR3KeuDpHZyyLLxLZTYDBsCMBd EZoxSXLom09JFwI03LEdfy6mhg== X-Google-Smtp-Source: AGHT+IGK8BfhMZ07nbApQncwJAPh0Wwi4l8K1+n8mmoCubtUPG7R1hOs5Bo1yS2Gyp9tFAuZFbUUDw== X-Received: by 2002:a05:6512:1250:b0:50b:c541:bcd7 with SMTP id fb16-20020a056512125000b0050bc541bcd7mr2548153lfb.60.1701557753906; Sat, 02 Dec 2023 14:55:53 -0800 (PST) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id z13-20020a19650d000000b0050bf06c8098sm93515lfb.116.2023.12.02.14.55.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Dec 2023 14:55:53 -0800 (PST) From: Dmitry Baryshkov To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter Subject: [PATCH RESEND] drm/drv: propagate errors from drm_modeset_register_all() Date: Sun, 3 Dec 2023 01:55:52 +0300 Message-Id: <20231202225552.1283638-1-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Neil Armstrong , linux-arm-msm@vger.kernel.org, Abhinav Kumar , dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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 --- 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);