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

Commit 1ae1ddd5 authored by Jakob Bornecrantz's avatar Jakob Bornecrantz Committed by Dave Airlie
Browse files

drm/vmwgfx: Get connector status from detection function. 



Also make sure the ldu::active member is properly initialized.
Part of fix by Michel Daenzer <daenzer@vmware.com>.

Signed-off-by: default avatarJakob Bornecrantz <jakob@vmware.com>
Signed-off-by: default avatarMichel Daenzer <daenzer@vmware.com>
Signed-off-by: default avatarThomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 1925d456

drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c

+3 −7
Original line number Diff line number Diff line
@@ -456,13 +456,11 @@ static int vmw_ldu_init(struct vmw_private *dev_priv, unsigned unit) 
	encoder = &ldu->base.encoder;

	connector = &ldu->base.connector;



	INIT_LIST_HEAD(&ldu->active);



	drm_connector_init(dev, connector, &vmw_legacy_connector_funcs,

			   DRM_MODE_CONNECTOR_LVDS);

	/* Initial status */

	if (unit == 0)

		connector->status = connector_status_connected;

	else

		connector->status = connector_status_disconnected;

	connector->status = vmw_ldu_connector_detect(connector);



	drm_encoder_init(dev, encoder, &vmw_legacy_encoder_funcs,

			 DRM_MODE_ENCODER_LVDS);
@@ -470,8 +468,6 @@ static int vmw_ldu_init(struct vmw_private *dev_priv, unsigned unit) 
	encoder->possible_crtcs = (1 << unit);

	encoder->possible_clones = 0;



	INIT_LIST_HEAD(&ldu->active);



	drm_crtc_init(dev, crtc, &vmw_legacy_crtc_funcs);



	drm_connector_attach_property(connector,