aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau
diff options
context:
space:
mode:
authorJason Wessel <jason.wessel@windriver.com>2010-09-26 07:47:25 -0400
committerDave Airlie <airlied@redhat.com>2010-10-05 21:50:31 -0400
commit413d45d3627be4748058dea697718ed6fb88bd01 (patch)
tree038e5d5e80eefbb5d9771c489460653c6ef3cf79 /drivers/gpu/drm/nouveau
parentbe64c2bb4731b0e6223a496eed615b816ac879ec (diff)
drm, kdb, kms: Add an enter argument to mode_set_base_atomic() API
Some devices such as the radeon chips receive information from user space which needs to be saved when executing an atomic mode set operation, else the user space would have to be queried again for the information. This patch extends the mode_set_base_atomic() call to pass an argument to indicate if this is an entry or an exit from an atomic kernel mode set change. Individual drm drivers can properly save and restore state accordingly. Signed-off-by: Jason Wessel <jason.wessel@windriver.com> CC: Jesse Barnes <jbarnes@virtuousgeek.org> CC: David Airlie <airlied@linux.ie> CC: dri-devel@lists.freedesktop.org Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau')
-rw-r--r--drivers/gpu/drm/nouveau/nv04_crtc.c2
-rw-r--r--drivers/gpu/drm/nouveau/nv50_crtc.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nv04_crtc.c b/drivers/gpu/drm/nouveau/nv04_crtc.c
index f5bbd46f76b..fb669dd39c3 100644
--- a/drivers/gpu/drm/nouveau/nv04_crtc.c
+++ b/drivers/gpu/drm/nouveau/nv04_crtc.c
@@ -858,7 +858,7 @@ nv04_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y,
858static int 858static int
859nv04_crtc_mode_set_base_atomic(struct drm_crtc *crtc, 859nv04_crtc_mode_set_base_atomic(struct drm_crtc *crtc,
860 struct drm_framebuffer *fb, 860 struct drm_framebuffer *fb,
861 int x, int y) 861 int x, int y, int enter)
862{ 862{
863 return nv04_crtc_do_mode_set_base(crtc, fb, x, y, true); 863 return nv04_crtc_do_mode_set_base(crtc, fb, x, y, true);
864} 864}
diff --git a/drivers/gpu/drm/nouveau/nv50_crtc.c b/drivers/gpu/drm/nouveau/nv50_crtc.c
index f41b44864e8..727a7a12fed 100644
--- a/drivers/gpu/drm/nouveau/nv50_crtc.c
+++ b/drivers/gpu/drm/nouveau/nv50_crtc.c
@@ -712,7 +712,7 @@ nv50_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y,
712static int 712static int
713nv50_crtc_mode_set_base_atomic(struct drm_crtc *crtc, 713nv50_crtc_mode_set_base_atomic(struct drm_crtc *crtc,
714 struct drm_framebuffer *fb, 714 struct drm_framebuffer *fb,
715 int x, int y) 715 int x, int y, int enter)
716{ 716{
717 return nv50_crtc_do_mode_set_base(crtc, fb, x, y, true, true); 717 return nv50_crtc_do_mode_set_base(crtc, fb, x, y, true, true);
718} 718}