Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6c1f325 authored by Thomas Hellstrom's avatar Thomas Hellstrom
Browse files

drm/vmwgfx: Correctly set the enabled state on crtcs 



Failure to do this would make the drm_mode_get_crtc ioctl return
without crtc mode info, indicating that no mode was set.

Signed-off-by: default avatarThomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: default avatarJakob Bornecrantz <jakob@vmware.com>
parent 1b28c3e6

drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c

+2 −0
Original line number Diff line number Diff line
@@ -260,6 +260,7 @@ static int vmw_ldu_crtc_set_config(struct drm_mode_set *set) 
		connector->encoder = NULL;

		encoder->crtc = NULL;

		crtc->fb = NULL;

		crtc->enabled = false;



		vmw_ldu_del_active(dev_priv, ldu);
@@ -285,6 +286,7 @@ static int vmw_ldu_crtc_set_config(struct drm_mode_set *set) 
	crtc->x = set->x;

	crtc->y = set->y;

	crtc->mode = *mode;

	crtc->enabled = true;



	vmw_ldu_add_active(dev_priv, ldu, vfb);

drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c

+3 −0
Original line number Diff line number Diff line
@@ -310,6 +310,7 @@ static int vmw_sou_crtc_set_config(struct drm_mode_set *set) 
		crtc->fb = NULL;

		crtc->x = 0;

		crtc->y = 0;

		crtc->enabled = false;



		vmw_sou_del_active(dev_priv, sou);
@@ -370,6 +371,7 @@ static int vmw_sou_crtc_set_config(struct drm_mode_set *set) 
		crtc->fb = NULL;

		crtc->x = 0;

		crtc->y = 0;

		crtc->enabled = false;



		return ret;

	}
@@ -382,6 +384,7 @@ static int vmw_sou_crtc_set_config(struct drm_mode_set *set) 
	crtc->fb = fb;

	crtc->x = set->x;

	crtc->y = set->y;

	crtc->enabled = true;



	return 0;

}