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 <[email protected]> --- drivers/gpu/drm/nouveau/nouveau_drm.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c index 8899f009f825e..b959d79f7e1c7 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drm.c +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c @@ -770,8 +770,12 @@ nouveau_drm_device_new(struct drm_driver *drm_driver, struct device *parent, goto done; } - if (nouveau_atomic) - driver_pci.driver_features |= DRIVER_ATOMIC; + if (nouveau_atomic) { + if (drm->device.info.chipset >= NV_DEVICE_INFO_V0_TESLA) + driver_pci.driver_features |= DRIVER_ATOMIC; + else + NV_WARN(drm, "Atomic modesetting not supported (needs nv50+)\n"); + } ret = nvif_device_map(&drm->device); if (ret) { -- 2.55.0
