diff options
| author | Jens Axboe <axboe@fb.com> | 2015-10-09 18:40:29 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2015-10-09 18:40:29 +0200 |
| commit | 54ef2b96879334caf8803fdd93b4c556d709d6fd (patch) | |
| tree | 05cfeb36feeb4451f8f4c7069a86ae3490027daf /drivers/gpu/drm/drm_fb_helper.c | |
| parent | cdrom: Random writing support for BD-RE media (diff) | |
| parent | Merge tag 'v4.3-rc4' into for-4.4/core (diff) | |
| download | linux-54ef2b96879334caf8803fdd93b4c556d709d6fd.tar.xz linux-54ef2b96879334caf8803fdd93b4c556d709d6fd.zip | |
Merge branch 'for-4.4/core' into for-4.4/drivers
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/gpu/drm/drm_fb_helper.c')
| -rw-r--r-- | drivers/gpu/drm/drm_fb_helper.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index 418d299f3b12..ca08c472311b 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -345,7 +345,11 @@ static bool restore_fbdev_mode(struct drm_fb_helper *fb_helper) struct drm_crtc *crtc = mode_set->crtc; int ret; - if (crtc->funcs->cursor_set) { + if (crtc->funcs->cursor_set2) { + ret = crtc->funcs->cursor_set2(crtc, NULL, 0, 0, 0, 0, 0); + if (ret) + error = true; + } else if (crtc->funcs->cursor_set) { ret = crtc->funcs->cursor_set(crtc, NULL, 0, 0, 0); if (ret) error = true; |