From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BED55C43457 for ; Mon, 12 Oct 2020 13:55:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 851F822202 for ; Mon, 12 Oct 2020 13:55:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602510937; bh=43pJc85teSld/oMk5esnfNwkGoTJ2luiiuKOBOYXS6A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=TCakUEFT2SwzA67MiJY+YybBWMYjSDkPH4giji+U7epoTdnPxoV8zro398yR6X6Cl P4vVRTrkrhBhpXgLVD6EUSELNENe5OfgsXnSkNghz3G0WSwAXh7/sCeO/zCyDukqKm HGVF7g68nQ4lF7Sc9OVdskk8bTSL+kzScfdq/QZw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390426AbgJLNzg (ORCPT ); Mon, 12 Oct 2020 09:55:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:47038 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389652AbgJLNpk (ORCPT ); Mon, 12 Oct 2020 09:45:40 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 563C822264; Mon, 12 Oct 2020 13:44:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602510259; bh=43pJc85teSld/oMk5esnfNwkGoTJ2luiiuKOBOYXS6A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=E48XvjKvmf1VU5FbXerHKAExqT317dwQiSeIyXqy8JpsVVjZlj4bCWyhv5IbDdhcT 0JE9peWZlvWWftjqh1YLpJW+HuXn3yiGvkY+/vQNhbFiAcqjLlF6xzX6LSG4HLsFD4 unR9J/96KRGSYQhKGe4Oo2UpylzpqxN9rv8UXAGA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Karol Herbst , dann frazier , dri-devel , Dave Airlie , Jeremy Cline Subject: [PATCH 5.8 009/124] drm/nouveau/device: return error for unknown chipsets Date: Mon, 12 Oct 2020 15:30:13 +0200 Message-Id: <20201012133147.302175389@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201012133146.834528783@linuxfoundation.org> References: <20201012133146.834528783@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Karol Herbst commit c3e0276c31ca8c7b8615da890727481260d4676f upstream. Previously the code relied on device->pri to be NULL and to fail probing later. We really should just return an error inside nvkm_device_ctor for unsupported GPUs. Fixes: 24d5ff40a732 ("drm/nouveau/device: rework mmio mapping code to get rid of second map") Signed-off-by: Karol Herbst Cc: dann frazier Cc: dri-devel Cc: Dave Airlie Cc: stable@vger.kernel.org Reviewed-by: Jeremy Cline Signed-off-by: Dave Airlie Link: https://patchwork.freedesktop.org/patch/msgid/20201006220528.13925-1-kherbst@redhat.com Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 1 + 1 file changed, 1 insertion(+) --- a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c @@ -3149,6 +3149,7 @@ nvkm_device_ctor(const struct nvkm_devic case 0x168: device->chip = &nv168_chipset; break; default: nvdev_error(device, "unknown chipset (%08x)\n", boot0); + ret = -ENODEV; goto done; }