Message ID | 1466501283-19976-3-git-send-email-chris@chris-wilson.co.uk (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Tue, Jun 21, 2016 at 10:28:02AM +0100, Chris Wilson wrote: > drm_dev_register() will now register all known connectors, so we no > longer have to do so manually. > > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> > Cc: Eric Anholt <eric@anholt.net> > Cc: David Airlie <airlied@linux.ie> > Cc: Daniel Vetter <daniel.vetter@ffwll.ch> > Cc: dri-devel@lists.freedesktop.org > --- > drivers/gpu/drm/vc4/vc4_drv.c | 12 ------------ > 1 file changed, 12 deletions(-) > > diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c > index 98cf2c4d622e..1cd6b7b36241 100644 > --- a/drivers/gpu/drm/vc4/vc4_drv.c > +++ b/drivers/gpu/drm/vc4/vc4_drv.c > @@ -211,22 +211,10 @@ static int vc4_drm_bind(struct device *dev) > if (ret < 0) > goto unbind_all; > > - /* Connector registration has to occur after DRM device > - * registration, because it creates sysfs entries based on the > - * DRM device. > - */ > - list_for_each_entry(connector, &drm->mode_config.connector_list, head) { > - ret = drm_connector_register(connector); > - if (ret) > - goto unregister; > - } > - > vc4_kms_load(drm); Semi-related: This should be called before drm_dev_register, with this ordering userspace might be able to peak at a not-yet set up drm device. -Daniel > > return 0; > > -unregister: > - drm_dev_unregister(drm); > unbind_all: > component_unbind_all(dev, drm); > gem_destroy: > -- > 2.8.1 >
diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c index 98cf2c4d622e..1cd6b7b36241 100644 --- a/drivers/gpu/drm/vc4/vc4_drv.c +++ b/drivers/gpu/drm/vc4/vc4_drv.c @@ -211,22 +211,10 @@ static int vc4_drm_bind(struct device *dev) if (ret < 0) goto unbind_all; - /* Connector registration has to occur after DRM device - * registration, because it creates sysfs entries based on the - * DRM device. - */ - list_for_each_entry(connector, &drm->mode_config.connector_list, head) { - ret = drm_connector_register(connector); - if (ret) - goto unregister; - } - vc4_kms_load(drm); return 0; -unregister: - drm_dev_unregister(drm); unbind_all: component_unbind_all(dev, drm); gem_destroy:
drm_dev_register() will now register all known connectors, so we no longer have to do so manually. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Eric Anholt <eric@anholt.net> Cc: David Airlie <airlied@linux.ie> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: dri-devel@lists.freedesktop.org --- drivers/gpu/drm/vc4/vc4_drv.c | 12 ------------ 1 file changed, 12 deletions(-)