geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

propogate failed fixups back up

main
Alan Hourihane 2008-03-04 17:51:56 +00:00
parent 5662934ee4
commit 3ea1902be9
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
linux-core/drm_crtc.c
View File

@ -458,12 +458,12 @@ bool drm_crtc_set_mode(struct drm_crtc *crtc, struct drm_display_mode *mode,
if (output->crtc != crtc) if (output->crtc != crtc)
continue; continue;
if (!output->funcs->mode_fixup(output, mode, adjusted_mode)) { if (!(ret = output->funcs->mode_fixup(output, mode, adjusted_mode))) {
goto done; goto done;
} }
} }
if (!crtc->funcs->mode_fixup(crtc, mode, adjusted_mode)) { if (!(ret = crtc->funcs->mode_fixup(crtc, mode, adjusted_mode))) {
goto done; goto done;
} }
@ -517,10 +517,16 @@ bool drm_crtc_set_mode(struct drm_crtc *crtc, struct drm_display_mode *mode,
// drm_crtc_set_screen_sub_pixel_order(dev); // drm_crtc_set_screen_sub_pixel_order(dev);
done: done:
if (!ret) {
crtc->mode = saved_mode;
crtc->x = saved_x;
crtc->y = saved_y;
}
if (didLock) if (didLock)
crtc->funcs->unlock (crtc); crtc->funcs->unlock (crtc);
return true; return ret;
} }
EXPORT_SYMBOL(drm_crtc_set_mode); EXPORT_SYMBOL(drm_crtc_set_mode);