From patchwork Fri Jan 19 10:40:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Huacai Chen X-Patchwork-Id: 13523567 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 EDEB9C4725D for ; Fri, 19 Jan 2024 10:41:52 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id F12A410E100; Fri, 19 Jan 2024 10:41:51 +0000 (UTC) Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7E81910E100 for ; Fri, 19 Jan 2024 10:41:50 +0000 (UTC) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by ams.source.kernel.org (Postfix) with ESMTP id 0DD7EB81741; Fri, 19 Jan 2024 10:41:19 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C8FD8C433C7; Fri, 19 Jan 2024 10:41:16 +0000 (UTC) From: Huacai Chen To: David Airlie , Daniel Vetter , Huacai Chen , Jingfeng Sui Subject: [PATCH] drm/loongson: Error out if no VRAM detected Date: Fri, 19 Jan 2024 18:40:49 +0800 Message-Id: <20240119104049.335449-1-chenhuacai@loongson.cn> X-Mailer: git-send-email 2.39.3 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: dri-devel@lists.freedesktop.org, Huacai Chen Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" If there is no VRAM (it is true if there is a discreted card), we get such an error and Xorg fails to start: [ 136.401131] loongson 0000:00:06.1: [drm] *ERROR* Requesting(0MiB) failed [ 137.444342] loongson 0000:00:06.1: [drm] *ERROR* Requesting(0MiB) failed [ 138.871166] loongson 0000:00:06.1: [drm] *ERROR* Requesting(0MiB) failed [ 140.444078] loongson 0000:00:06.1: [drm] *ERROR* Requesting(0MiB) failed [ 142.403993] loongson 0000:00:06.1: [drm] *ERROR* Requesting(0MiB) failed [ 143.970625] loongson 0000:00:06.1: [drm] *ERROR* Requesting(0MiB) failed [ 145.862013] loongson 0000:00:06.1: [drm] *ERROR* Requesting(0MiB) failed So in lsdc_get_dedicated_vram() we error out if no VRAM (or VRAM is less than 1MB which is also an unusable case) detected. Signed-off-by: Huacai Chen Tested-by: Xiaotian Wu --- drivers/gpu/drm/loongson/lsdc_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/loongson/lsdc_drv.c b/drivers/gpu/drm/loongson/lsdc_drv.c index 89ccc0c43169..d8ff60b46abe 100644 --- a/drivers/gpu/drm/loongson/lsdc_drv.c +++ b/drivers/gpu/drm/loongson/lsdc_drv.c @@ -184,7 +184,7 @@ static int lsdc_get_dedicated_vram(struct lsdc_device *ldev, drm_info(ddev, "Dedicated vram start: 0x%llx, size: %uMiB\n", (u64)base, (u32)(size >> 20)); - return 0; + return (size > SZ_1M) ? 0 : -ENODEV; } static struct lsdc_device *