| Message ID | d32a6b1f0a3b79f1fbc8d0894080908526f6e61e.1562843413.git.andrzej.p@collabora.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Associate ddc adapters with connectors | expand |
Acked-by: Thomas Zimmermann <tzimmermann@suse.de> Am 11.07.19 um 13:26 schrieb Andrzej Pietrasiewicz: > Use the ddc pointer provided by the generic connector. > > Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@collabora.com> > --- > drivers/gpu/drm/mgag200/mgag200_mode.c | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/mgag200/mgag200_mode.c b/drivers/gpu/drm/mgag200/mgag200_mode.c > index a25054015e8c..8fb9444b2142 100644 > --- a/drivers/gpu/drm/mgag200/mgag200_mode.c > +++ b/drivers/gpu/drm/mgag200/mgag200_mode.c > @@ -1703,6 +1703,11 @@ static struct drm_connector *mga_vga_init(struct drm_device *dev) > return NULL; > > connector = &mga_connector->base; > + mga_connector->i2c = mgag200_i2c_create(dev); > + if (!mga_connector->i2c) > + DRM_ERROR("failed to add ddc bus\n"); > + > + connector->ddc = &mga_connector->i2c->adapter; > > drm_connector_init(dev, connector, > &mga_vga_connector_funcs, DRM_MODE_CONNECTOR_VGA); > @@ -1711,10 +1716,6 @@ static struct drm_connector *mga_vga_init(struct drm_device *dev) > > drm_connector_register(connector); > > - mga_connector->i2c = mgag200_i2c_create(dev); > - if (!mga_connector->i2c) > - DRM_ERROR("failed to add ddc bus\n"); > - > return connector; > } > >
Hi Andrzej. On Thu, Jul 11, 2019 at 01:26:43PM +0200, Andrzej Pietrasiewicz wrote: > Use the ddc pointer provided by the generic connector. > > Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@collabora.com> > --- > drivers/gpu/drm/mgag200/mgag200_mode.c | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/mgag200/mgag200_mode.c b/drivers/gpu/drm/mgag200/mgag200_mode.c > index a25054015e8c..8fb9444b2142 100644 > --- a/drivers/gpu/drm/mgag200/mgag200_mode.c > +++ b/drivers/gpu/drm/mgag200/mgag200_mode.c > @@ -1703,6 +1703,11 @@ static struct drm_connector *mga_vga_init(struct drm_device *dev) > return NULL; > > connector = &mga_connector->base; > + mga_connector->i2c = mgag200_i2c_create(dev); > + if (!mga_connector->i2c) > + DRM_ERROR("failed to add ddc bus\n"); > + > + connector->ddc = &mga_connector->i2c->adapter; > > drm_connector_init(dev, connector, > &mga_vga_connector_funcs, DRM_MODE_CONNECTOR_VGA); Like on other patch, assigning connector->ddc before drm_connector_init() looks wrong. Sam
diff --git a/drivers/gpu/drm/mgag200/mgag200_mode.c b/drivers/gpu/drm/mgag200/mgag200_mode.c index a25054015e8c..8fb9444b2142 100644 --- a/drivers/gpu/drm/mgag200/mgag200_mode.c +++ b/drivers/gpu/drm/mgag200/mgag200_mode.c @@ -1703,6 +1703,11 @@ static struct drm_connector *mga_vga_init(struct drm_device *dev) return NULL; connector = &mga_connector->base; + mga_connector->i2c = mgag200_i2c_create(dev); + if (!mga_connector->i2c) + DRM_ERROR("failed to add ddc bus\n"); + + connector->ddc = &mga_connector->i2c->adapter; drm_connector_init(dev, connector, &mga_vga_connector_funcs, DRM_MODE_CONNECTOR_VGA); @@ -1711,10 +1716,6 @@ static struct drm_connector *mga_vga_init(struct drm_device *dev) drm_connector_register(connector); - mga_connector->i2c = mgag200_i2c_create(dev); - if (!mga_connector->i2c) - DRM_ERROR("failed to add ddc bus\n"); - return connector; }
Use the ddc pointer provided by the generic connector. Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@collabora.com> --- drivers/gpu/drm/mgag200/mgag200_mode.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)