aboutsummaryrefslogtreecommitdiffstats
path: root/include/drm
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2010-10-06 12:57:50 +1000
committerDave Airlie <airlied@redhat.com>2010-10-06 12:57:50 +1000
commit96a03fce54af40b4f0820cd729608bc32c9b8949 (patch)
tree91fbbaaacba4fe8562c5544460e99f3b09122e85 /include/drm
parent0c8eb0dc65f5a78b252eeff6c729ba4741390e23 (diff)
parenta424d761a00c0233cb7734a8cd572ecd6d0362aa (diff)
downloadmrst-s0i3-test-96a03fce54af40b4f0820cd729608bc32c9b8949.tar.gz
mrst-s0i3-test-96a03fce54af40b4f0820cd729608bc32c9b8949.tar.xz
mrst-s0i3-test-96a03fce54af40b4f0820cd729608bc32c9b8949.zip
Merge branch 'drm-kdb-next' into drm-core-next
* drm-kdb-next: drm/nouveau/kms: Avoid a hang entering KDB with VT accel on. radeon, kdb, kms: Save and restore the LUT on atomic KMS enter/exit drm, kdb, kms: Add an enter argument to mode_set_base_atomic() API drm/nouveau/kms: Implement KDB debug hooks for nouveau KMS. drm/radeon/kms: Implement KDB debug hooks for radeon KMS.
Diffstat (limited to 'include/drm')
-rw-r--r--include/drm/drm_crtc_helper.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
index 59b7073b13f..6a9f3935ea0 100644
--- a/include/drm/drm_crtc_helper.h
+++ b/include/drm/drm_crtc_helper.h
@@ -61,7 +61,8 @@ struct drm_crtc_helper_funcs {
int (*mode_set_base)(struct drm_crtc *crtc, int x, int y,
struct drm_framebuffer *old_fb);
int (*mode_set_base_atomic)(struct drm_crtc *crtc,
- struct drm_framebuffer *fb, int x, int y);
+ struct drm_framebuffer *fb, int x, int y,
+ int is_enter);
/* reload the current crtc LUT */
void (*load_lut)(struct drm_crtc *crtc);