diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-05 16:00:44 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-05 16:00:44 -0700 |
commit | 9779714c8af09d57527f18d9aa2207dcc27a8687 (patch) | |
tree | 52182f2289d9b7a77fbe119f4cd5726ef6494e66 /include/drm/drm_crtc_helper.h | |
parent | 89a6c8cb9e6e11b6e3671dce7e037789b8f7cf62 (diff) | |
parent | 65b5ac1479840a3e87f086d68e5ef91f3002e8e2 (diff) | |
download | kernel_samsung_crespo-9779714c8af09d57527f18d9aa2207dcc27a8687.zip kernel_samsung_crespo-9779714c8af09d57527f18d9aa2207dcc27a8687.tar.gz kernel_samsung_crespo-9779714c8af09d57527f18d9aa2207dcc27a8687.tar.bz2 |
Merge branch 'kms-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb
* 'kms-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb:
kgdb,docs: Update the kgdb docs to include kms
drm_fb_helper: Preserve capability to use atomic kms
i915: when kgdb is active display compression should be off
drm/i915: use new fb debug hooks
drm: add KGDB/KDB support
fb: add hooks to handle KDB enter/exit
kgdboc: Add call backs to allow kernel mode switching
vt,console,kdb: automatically set kdb LINES variable
vt,console,kdb: implement atomic console enter/leave functions
Diffstat (limited to 'include/drm/drm_crtc_helper.h')
-rw-r--r-- | include/drm/drm_crtc_helper.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h index 1121f77..10f7d03 100644 --- a/include/drm/drm_crtc_helper.h +++ b/include/drm/drm_crtc_helper.h @@ -60,6 +60,8 @@ struct drm_crtc_helper_funcs { /* Move the crtc on the current fb to the given position *optional* */ 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); /* reload the current crtc LUT */ void (*load_lut)(struct drm_crtc *crtc); |