Commit e829cf0b authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

drm/udl: Init connector before encoder and CRTC 



To mimic simple-pipe, we initialize the connector before the rest of
the display pipeline.

v2:
	* remove unnecessary calls to drm_connector_{register,unregister}()

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: default avatarEmil Velikov <emil.l.velikov@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191210084905.5570-2-tzimmermann@suse.de
parent 919dfb78

drivers/gpu/drm/udl/udl_connector.c

+3 −6
Original line number Diff line number Diff line
@@ -104,7 +104,6 @@ static void udl_connector_destroy(struct drm_connector *connector) 
					struct udl_drm_connector,

					connector);



	drm_connector_unregister(connector);

	drm_connector_cleanup(connector);

	kfree(udl_connector->edid);

	kfree(connector);
@@ -123,24 +122,22 @@ static const struct drm_connector_funcs udl_connector_funcs = { 
	.set_property = udl_connector_set_property,

};



int udl_connector_init(struct drm_device *dev, struct drm_encoder *encoder)

struct drm_connector *udl_connector_init(struct drm_device *dev)

{

	struct udl_drm_connector *udl_connector;

	struct drm_connector *connector;



	udl_connector = kzalloc(sizeof(struct udl_drm_connector), GFP_KERNEL);

	if (!udl_connector)

		return -ENOMEM;

		return ERR_PTR(-ENOMEM);



	connector = &udl_connector->connector;

	drm_connector_init(dev, connector, &udl_connector_funcs,

			   DRM_MODE_CONNECTOR_DVII);

	drm_connector_helper_add(connector, &udl_connector_helper_funcs);



	drm_connector_register(connector);

	drm_connector_attach_encoder(connector, encoder);

	connector->polled = DRM_CONNECTOR_POLL_HPD |

		DRM_CONNECTOR_POLL_CONNECT | DRM_CONNECTOR_POLL_DISCONNECT;



	return 0;

	return connector;

}

drivers/gpu/drm/udl/udl_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ struct udl_device { 
int udl_modeset_init(struct drm_device *dev);

void udl_modeset_restore(struct drm_device *dev);

void udl_modeset_cleanup(struct drm_device *dev);

int udl_connector_init(struct drm_device *dev, struct drm_encoder *encoder);

struct drm_connector *udl_connector_init(struct drm_device *dev);



struct drm_encoder *udl_encoder_init(struct drm_device *dev);

drivers/gpu/drm/udl/udl_modeset.c

+14 −2
Original line number Diff line number Diff line
@@ -421,7 +421,10 @@ static const struct drm_mode_config_funcs udl_mode_funcs = { 


int udl_modeset_init(struct drm_device *dev)

{

	struct drm_connector *connector;

	struct drm_encoder *encoder;

	int ret;



	drm_mode_config_init(dev);



	dev->mode_config.min_width = 640;
@@ -435,13 +438,22 @@ int udl_modeset_init(struct drm_device *dev) 


	dev->mode_config.funcs = &udl_mode_funcs;



	connector = udl_connector_init(dev);

	if (IS_ERR(connector)) {

		ret = PTR_ERR(connector);

		goto err_drm_mode_config_cleanup;

	}



	udl_crtc_init(dev);



	encoder = udl_encoder_init(dev);



	udl_connector_init(dev, encoder);

	drm_connector_attach_encoder(connector, encoder);



	return 0;



err_drm_mode_config_cleanup:

	drm_mode_config_cleanup(dev);

	return ret;

}



void udl_modeset_restore(struct drm_device *dev)

CRA Git | Maintained and supported by SUSTech CRA and CCSE