diff options
author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2010-08-05 10:22:31 -0400 |
---|---|---|
committer | Jason Wessel <jason.wessel@windriver.com> | 2010-08-05 10:22:31 -0400 |
commit | 1a7aba7f4e45014c5a4741164b1ecb4ffe616fb7 (patch) | |
tree | f6884f1f17cf8715b6c3d21fc821847cebc3f7ad /include/drm | |
parent | d219adc1228a3887486b58a430e736b0831f192c (diff) |
drm: add KGDB/KDB support
Implement the callbacks for KDB entry/exit via the drm helpers.
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
Diffstat (limited to 'include/drm')
-rw-r--r-- | include/drm/drm_crtc_helper.h | 2 | ||||
-rw-r--r-- | include/drm/drm_fb_helper.h | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h index 1121f7799c6f..10f7d03e58a9 100644 --- a/include/drm/drm_crtc_helper.h +++ b/include/drm/drm_crtc_helper.h | |||
@@ -60,6 +60,8 @@ struct drm_crtc_helper_funcs { | |||
60 | /* Move the crtc on the current fb to the given position *optional* */ | 60 | /* Move the crtc on the current fb to the given position *optional* */ |
61 | int (*mode_set_base)(struct drm_crtc *crtc, int x, int y, | 61 | int (*mode_set_base)(struct drm_crtc *crtc, int x, int y, |
62 | struct drm_framebuffer *old_fb); | 62 | struct drm_framebuffer *old_fb); |
63 | int (*mode_set_base_atomic)(struct drm_crtc *crtc, | ||
64 | struct drm_framebuffer *fb, int x, int y); | ||
63 | 65 | ||
64 | /* reload the current crtc LUT */ | 66 | /* reload the current crtc LUT */ |
65 | void (*load_lut)(struct drm_crtc *crtc); | 67 | void (*load_lut)(struct drm_crtc *crtc); |
diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h index f0a6afc47e76..f22e7fe4b6db 100644 --- a/include/drm/drm_fb_helper.h +++ b/include/drm/drm_fb_helper.h | |||
@@ -32,6 +32,8 @@ | |||
32 | 32 | ||
33 | struct drm_fb_helper; | 33 | struct drm_fb_helper; |
34 | 34 | ||
35 | #include <linux/kgdb.h> | ||
36 | |||
35 | struct drm_fb_helper_crtc { | 37 | struct drm_fb_helper_crtc { |
36 | uint32_t crtc_id; | 38 | uint32_t crtc_id; |
37 | struct drm_mode_set mode_set; | 39 | struct drm_mode_set mode_set; |
@@ -78,6 +80,7 @@ struct drm_fb_helper_connector { | |||
78 | 80 | ||
79 | struct drm_fb_helper { | 81 | struct drm_fb_helper { |
80 | struct drm_framebuffer *fb; | 82 | struct drm_framebuffer *fb; |
83 | struct drm_framebuffer *saved_fb; | ||
81 | struct drm_device *dev; | 84 | struct drm_device *dev; |
82 | struct drm_display_mode *mode; | 85 | struct drm_display_mode *mode; |
83 | int crtc_count; | 86 | int crtc_count; |
@@ -126,5 +129,7 @@ int drm_fb_helper_setcmap(struct fb_cmap *cmap, struct fb_info *info); | |||
126 | bool drm_fb_helper_hotplug_event(struct drm_fb_helper *fb_helper); | 129 | bool drm_fb_helper_hotplug_event(struct drm_fb_helper *fb_helper); |
127 | bool drm_fb_helper_initial_config(struct drm_fb_helper *fb_helper, int bpp_sel); | 130 | bool drm_fb_helper_initial_config(struct drm_fb_helper *fb_helper, int bpp_sel); |
128 | int drm_fb_helper_single_add_all_connectors(struct drm_fb_helper *fb_helper); | 131 | int drm_fb_helper_single_add_all_connectors(struct drm_fb_helper *fb_helper); |
132 | int drm_fb_helper_debug_enter(struct fb_info *info); | ||
133 | int drm_fb_helper_debug_leave(struct fb_info *info); | ||
129 | 134 | ||
130 | #endif | 135 | #endif |