Message ID | 20191126134707.22385-2-tzimmermann@suse.de (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | drm/udl: Convert to simple-pipe helpers and clean up | expand |
On Tue, Nov 26, 2019 at 02:47:01PM +0100, Thomas Zimmermann wrote: > To mimic simple-pipe, we initialize the connector before the rest of > the display pipeline. > > Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> > --- > drivers/gpu/drm/udl/udl_connector.c | 7 +++---- > drivers/gpu/drm/udl/udl_drv.h | 2 +- > drivers/gpu/drm/udl/udl_modeset.c | 16 ++++++++++++++-- > 3 files changed, 18 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/udl/udl_connector.c b/drivers/gpu/drm/udl/udl_connector.c > index b4ae3e89a7b4..68e113ae44f7 100644 > --- a/drivers/gpu/drm/udl/udl_connector.c > +++ b/drivers/gpu/drm/udl/udl_connector.c > @@ -123,14 +123,14 @@ 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, > @@ -138,9 +138,8 @@ int udl_connector_init(struct drm_device *dev, struct drm_encoder *encoder) > drm_connector_helper_add(connector, &udl_connector_helper_funcs); > > drm_connector_register(connector); While at it, might want to ditch this line, it's a no-op and only meant to be called by drivers for hotplugged connectors. But kinda separate patch, plus there's an entire pile of drivers which get this wrong. > - drm_connector_attach_encoder(connector, encoder); > connector->polled = DRM_CONNECTOR_POLL_HPD | > DRM_CONNECTOR_POLL_CONNECT | DRM_CONNECTOR_POLL_DISCONNECT; > > - return 0; > + return connector; > } > diff --git a/drivers/gpu/drm/udl/udl_drv.h b/drivers/gpu/drm/udl/udl_drv.h > index 66cbe04f832a..8dc04717abac 100644 > --- a/drivers/gpu/drm/udl/udl_drv.h > +++ b/drivers/gpu/drm/udl/udl_drv.h > @@ -78,7 +78,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); > > diff --git a/drivers/gpu/drm/udl/udl_modeset.c b/drivers/gpu/drm/udl/udl_modeset.c > index 91af25caed64..5bb1522036c7 100644 > --- a/drivers/gpu/drm/udl/udl_modeset.c > +++ b/drivers/gpu/drm/udl/udl_modeset.c > @@ -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) Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> > -- > 2.23.0 >
diff --git a/drivers/gpu/drm/udl/udl_connector.c b/drivers/gpu/drm/udl/udl_connector.c index b4ae3e89a7b4..68e113ae44f7 100644 --- a/drivers/gpu/drm/udl/udl_connector.c +++ b/drivers/gpu/drm/udl/udl_connector.c @@ -123,14 +123,14 @@ 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, @@ -138,9 +138,8 @@ int udl_connector_init(struct drm_device *dev, struct drm_encoder *encoder) 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; } diff --git a/drivers/gpu/drm/udl/udl_drv.h b/drivers/gpu/drm/udl/udl_drv.h index 66cbe04f832a..8dc04717abac 100644 --- a/drivers/gpu/drm/udl/udl_drv.h +++ b/drivers/gpu/drm/udl/udl_drv.h @@ -78,7 +78,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); diff --git a/drivers/gpu/drm/udl/udl_modeset.c b/drivers/gpu/drm/udl/udl_modeset.c index 91af25caed64..5bb1522036c7 100644 --- a/drivers/gpu/drm/udl/udl_modeset.c +++ b/drivers/gpu/drm/udl/udl_modeset.c @@ -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)
To mimic simple-pipe, we initialize the connector before the rest of the display pipeline. Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> --- drivers/gpu/drm/udl/udl_connector.c | 7 +++---- drivers/gpu/drm/udl/udl_drv.h | 2 +- drivers/gpu/drm/udl/udl_modeset.c | 16 ++++++++++++++-- 3 files changed, 18 insertions(+), 7 deletions(-)