From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (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 AA2884854F1 for ; Thu, 13 Aug 2026 17:44:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786643082; cv=none; b=gBZRv4t1x+ld07hofKOFS6sSaeLuX3rHOJ1E77ffFYDBbQG0UxC/pSN8PeqvxwjaQcQ7tBbtiayRjNgMFj4UZW+ufD82auLeDpuRYilAdR/MDBJQYPpwimp4MFDKdPkG38xw419O9zTdh1BuMlhKTi2hfisofDdUQA8voa1nQOo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786643082; c=relaxed/simple; bh=JmfmJ+BVkA0Lvu6Ld1ANuTuq6fbGZCUsZkt8eqpkkmo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QegGhljFuaAVt52k46FLjjX1xND60eLRcKKxnQGaWtg7RwDOhDISm5iObbrsc+FkWFi+Bu1dPTf99XMX2KDBVduJkKelg74AVEClgi4s7xiHV3b2IBGJPWT4tGSVEuiwmVIL7UWd5AVXN4+CwiV56TZ/eXGKjIoI1eXfbDJzMO4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=gN0ktFVW; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="gN0ktFVW" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1786643079; 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: in-reply-to:in-reply-to:references:references; bh=a17nsuStiS7IsQuNSpzGOKtORn1O8u7fu4ZIRonx//w=; b=gN0ktFVWO+HtELF4Vi1Nh3Ug07eeyM7i9GiMLgG4bm1t+v9gH34+bBUx+EJcjezXbPrnNC qCmcKuCGAUjRD0qLFeZ2O2E5Sb6gh5heR0GucenZ7zISi3EHcWa3DCAKb6Em2tu9Ry9FaW NF0D4P6fafY9ZWe/Gkf7IMj7aHj5SGk= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-119-se-oAB3mOCq_R7iWyeTgUA-1; Thu, 13 Aug 2026 13:44:36 -0400 X-MC-Unique: se-oAB3mOCq_R7iWyeTgUA-1 X-Mimecast-MFC-AGG-ID: se-oAB3mOCq_R7iWyeTgUA_1786643074 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 58AD019560B2; Thu, 13 Aug 2026 17:44:34 +0000 (UTC) Received: from GoldenWind.redhat.com (unknown [10.22.80.207]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 9C9D8195DF9A; Thu, 13 Aug 2026 17:44:32 +0000 (UTC) From: Lyude Paul To: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, nouveau@lists.freedesktop.org Cc: "Maarten Lankhorst" , "Simona Vetter" , "David Airlie" , "Thomas Zimmermann" , "Maxime Ripard" , "Danilo Krummrich" , "Lyude Paul" Subject: [PATCH v6 4/5] drm/nouveau/kms: Only allow enabling atomic modesetting on nv50+ Date: Thu, 13 Aug 2026 13:42:55 -0400 Message-ID: <20260813174416.1812656-5-lyude@redhat.com> In-Reply-To: <20260813174416.1812656-1-lyude@redhat.com> References: <20260813174416.1812656-1-lyude@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 Atomic modesetting support was never added for pre-nv50 chipsets, so make sure we don't allow it to be forced on. Additionally, print a small warning when it's not supported. Signed-off-by: Lyude Paul --- V2: * Check against info.family, not info.chipset V6: * Check against device->card_type so we can perform the check before setting up nvif drivers/gpu/drm/nouveau/nouveau_drm.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c index d021a3049be1a..82a8061e6d3e2 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drm.c +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c @@ -739,10 +739,17 @@ nouveau_drm_device_new(struct device *parent, struct nvkm_device *device) struct nouveau_drm *drm; int ret; - if (nouveau_atomic) - driver = &driver_atomic_kms; - else + if (device->card_type >= NV_50) { + if (nouveau_atomic) + driver = &driver_atomic_kms; + else + driver = &driver_legacy_kms; + } else { + if (nouveau_atomic) + dev_warn(parent, "Atomic modesetting not supported (needs nv50+)\n"); + driver = &driver_legacy_kms; + } drm = kzalloc_obj(*drm); if (!drm) -- 2.55.0