diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-10-05 22:57:50 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-10-05 22:57:50 -0400 |
| commit | 96a03fce54af40b4f0820cd729608bc32c9b8949 (patch) | |
| tree | 91fbbaaacba4fe8562c5544460e99f3b09122e85 /include/drm | |
| parent | 0c8eb0dc65f5a78b252eeff6c729ba4741390e23 (diff) | |
| parent | a424d761a00c0233cb7734a8cd572ecd6d0362aa (diff) | |
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.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h index 59b7073b13fe..6a9f3935ea0b 100644 --- a/include/drm/drm_crtc_helper.h +++ b/include/drm/drm_crtc_helper.h | |||
| @@ -61,7 +61,8 @@ struct drm_crtc_helper_funcs { | |||
| 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, | 63 | int (*mode_set_base_atomic)(struct drm_crtc *crtc, |
| 64 | struct drm_framebuffer *fb, int x, int y); | 64 | struct drm_framebuffer *fb, int x, int y, |
| 65 | int is_enter); | ||
| 65 | 66 | ||
| 66 | /* reload the current crtc LUT */ | 67 | /* reload the current crtc LUT */ |
| 67 | void (*load_lut)(struct drm_crtc *crtc); | 68 | void (*load_lut)(struct drm_crtc *crtc); |