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=-13.6 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,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 52308C4363D for ; Tue, 6 Oct 2020 22:05:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D1430208B8 for ; Tue, 6 Oct 2020 22:05:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="jV3iCbGR" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727633AbgJFWFf (ORCPT ); Tue, 6 Oct 2020 18:05:35 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:32264 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727153AbgJFWFe (ORCPT ); Tue, 6 Oct 2020 18:05:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602021933; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=D0yKHCyJxum/tEvo7iuV0O9loM8q594QajFgJPXI2c4=; b=jV3iCbGRZ8MY8m1QOibtOh0sBplgSbigZsLVuXhGPZiwfnpv1rwRU5jwfJcNZA7MBnQzXm sSZLHcj26tM236MRNFq4NzxXGA/fidk5Plj8tOfBcaigzqtJkDenOGKB8oNfEllYGH7l5J cA5SRenuhB9mHfZ1CW2xlVG+xWR22Mk= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-366-xPplIlgbN-CLsIZqgGr0dQ-1; Tue, 06 Oct 2020 18:05:32 -0400 X-MC-Unique: xPplIlgbN-CLsIZqgGr0dQ-1 Received: by mail-wm1-f71.google.com with SMTP id g125so20785wme.1 for ; Tue, 06 Oct 2020 15:05:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=D0yKHCyJxum/tEvo7iuV0O9loM8q594QajFgJPXI2c4=; b=jOCyjhpjDzl2s/4uuZeitT1CqKbscsyUtPYr1tgnqF7iMjWk5F1W4JbpP2g+OD6BdK sASPPf73Eu4rk5iRho0EwW8qtAHk+9XBNi2dHhSatlvbtp5Y6QRQ4+E9AErLH1DkSsFc 0RCaqn9hyxgUxx+TlHfhERvQ0qCaWspep2s8r4cAPdjT2K4ae6uIN+6MTUNE4m+ckWg7 vQSiQTsotUuzyVplA4vD4ER7/mu7lT2mP6ffd/zGUVRMGnqJEStHtsi84Ws+rLTC1iZE 8kpPKBMVyxTfrxPedtLwsMUnkFe5s+Q2Mer8C68lgeSDMcwKAC2c8OJ1zzNqJFUhQ5qG CWKg== X-Gm-Message-State: AOAM5331pw98e/ZgPwgn0HEYDW/4vFpg36P5h1YFxaEfv9oDX+oX1j8k C0/3EWpO1+0Vx1wyfiFH2yKoDqFRzm+bCIqeDO17QiLMgbxhM9gEwYv7a06UbEZjvvGRqd6Affz 7ZepqraXP7rYab4+3qLOqdTkA X-Received: by 2002:adf:fd49:: with SMTP id h9mr33868wrs.115.1602021930625; Tue, 06 Oct 2020 15:05:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxbg7nuJicaHR4v9MJENcMoSYOrRrx86lmMYFazGdMK/ndKQQAW9w7ksDntXUfpn4zS04aZEA== X-Received: by 2002:adf:fd49:: with SMTP id h9mr33854wrs.115.1602021930461; Tue, 06 Oct 2020 15:05:30 -0700 (PDT) Received: from kherbst.pingu.com ([2a02:8308:b088:c000:2bdf:b7aa:eede:d65f]) by smtp.gmail.com with ESMTPSA id j17sm157785wrw.68.2020.10.06.15.05.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Oct 2020 15:05:29 -0700 (PDT) From: Karol Herbst To: linux-kernel@vger.kernel.org Cc: Karol Herbst , dann frazier , dri-devel , Dave Airlie , stable@vger.kernel.org, Jeremy Cline Subject: [PATCH 1/2] drm/nouveau/device: return error for unknown chipsets Date: Wed, 7 Oct 2020 00:05:27 +0200 Message-Id: <20201006220528.13925-1-kherbst@redhat.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c index 9f4ac2672cf2e..dcb70677d0acc 100644 --- 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_device_func *func, case 0x168: device->chip = &nv168_chipset; break; default: nvdev_error(device, "unknown chipset (%08x)\n", boot0); + ret = -ENODEV; goto done; } -- 2.26.2