aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2016-11-04 03:20:36 -0400
committerBen Skeggs <bskeggs@redhat.com>2016-11-06 23:04:59 -0500
commit5f674a5c4667953fa48150e6d4e68c91877302ce (patch)
tree8b3a29df52bf1c307f387e66a61b1609c0df8521
parentd92c8adf80fdcd4d08965fe8f8c55b19eb5e870f (diff)
drm/nouveau/kms/nv50: turn mode_set_base_atomic() into a stub
This cannot currently be supported with atomic modesettting. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r--drivers/gpu/drm/nouveau/nv50_display.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c
index 03a3e3fc84ab..9f0b70d8a6b6 100644
--- a/drivers/gpu/drm/nouveau/nv50_display.c
+++ b/drivers/gpu/drm/nouveau/nv50_display.c
@@ -2530,9 +2530,7 @@ nv50_crtc_mode_set_base_atomic(struct drm_crtc *crtc,
2530 struct drm_framebuffer *fb, int x, int y, 2530 struct drm_framebuffer *fb, int x, int y,
2531 enum mode_set_atomic state) 2531 enum mode_set_atomic state)
2532{ 2532{
2533 struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc); 2533 WARN_ON(1);
2534 nv50_display_flip_stop(crtc);
2535 nv50_crtc_set_image(nv_crtc, fb, x, y, true);
2536 return 0; 2534 return 0;
2537} 2535}
2538 2536