drm: restore crtc origin if mode_set_base fails

Signed-off-by: Ilija Hadzic <ihadzic@research.bell-labs.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
index 11040a5886d472339cf9be185a43a7c17f0bfdcf..acc9c36614dfecf52ff0ba1e17d47691abc80d63 100644 (file)
--- a/drivers/gpu/drm/drm_crtc_helper.c
+++ b/drivers/gpu/drm/drm_crtc_helper.c
@@ -822,6 +822,8 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set)
                ret = crtc_funcs->mode_set_base(set->crtc,
                                                set->x, set->y, save_set.fb);
                if (ret != 0) {
+                       set->crtc->x = save_set.x;
+                       set->crtc->y = save_set.y;
                        set->crtc->fb = save_set.fb;
                        goto fail;
                }