| Message ID | 1350007562-22323-10-git-send-email-rob.clark@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, 12 Oct 2012, Rob Clark <rob.clark@linaro.org> wrote: > From: Rob Clark <rob@ti.com> > > Replace references to and remove the connector property fxns, which > have been superseded with the more general object property fxns: "fxns"? meh. For this patch, Reviewed-by: Jani Nikula <jani.nikula@intel.com> > > + drm_connector_attach_property -> drm_object_attach_property > + drm_connector_property_set_value -> drm_object_property_set_value > + drm_connector_property_get_value -> drm_object_property_get_value > > Signed-off-by: Rob Clark <rob@ti.com> > --- > drivers/gpu/drm/drm_crtc.c | 31 +++++-------------------------- > drivers/gpu/drm/drm_fb_helper.c | 2 +- > drivers/gpu/drm/drm_sysfs.c | 6 +++--- > include/drm/drm_crtc.h | 8 -------- > 4 files changed, 9 insertions(+), 38 deletions(-) > > diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c > index 9c346a5..cee96f4 100644 > --- a/drivers/gpu/drm/drm_crtc.c > +++ b/drivers/gpu/drm/drm_crtc.c > @@ -561,11 +561,11 @@ int drm_connector_init(struct drm_device *dev, > dev->mode_config.num_connector++; > > if (connector_type != DRM_MODE_CONNECTOR_VIRTUAL) > - drm_connector_attach_property(connector, > + drm_object_attach_property(&connector->base, > dev->mode_config.edid_property, > 0); > > - drm_connector_attach_property(connector, > + drm_object_attach_property(&connector->base, > dev->mode_config.dpms_property, 0); > > out: > @@ -2917,27 +2917,6 @@ void drm_property_destroy(struct drm_device *dev, struct drm_property *property) > } > EXPORT_SYMBOL(drm_property_destroy); > > -void drm_connector_attach_property(struct drm_connector *connector, > - struct drm_property *property, uint64_t init_val) > -{ > - drm_object_attach_property(&connector->base, property, init_val); > -} > -EXPORT_SYMBOL(drm_connector_attach_property); > - > -int drm_connector_property_set_value(struct drm_connector *connector, > - struct drm_property *property, uint64_t value) > -{ > - return drm_object_property_set_value(&connector->base, property, value); > -} > -EXPORT_SYMBOL(drm_connector_property_set_value); > - > -int drm_connector_property_get_value(struct drm_connector *connector, > - struct drm_property *property, uint64_t *val) > -{ > - return drm_object_property_get_value(&connector->base, property, val); > -} > -EXPORT_SYMBOL(drm_connector_property_get_value); > - > void drm_object_attach_property(struct drm_mode_object *obj, > struct drm_property *property, > uint64_t init_val) > @@ -3174,7 +3153,7 @@ int drm_mode_connector_update_edid_property(struct drm_connector *connector, > /* Delete edid, when there is none. */ > if (!edid) { > connector->edid_blob_ptr = NULL; > - ret = drm_connector_property_set_value(connector, dev->mode_config.edid_property, 0); > + ret = drm_object_property_set_value(&connector->base, dev->mode_config.edid_property, 0); > return ret; > } > > @@ -3182,7 +3161,7 @@ int drm_mode_connector_update_edid_property(struct drm_connector *connector, > connector->edid_blob_ptr = drm_property_create_blob(connector->dev, > size, edid); > > - ret = drm_connector_property_set_value(connector, > + ret = drm_object_property_set_value(&connector->base, > dev->mode_config.edid_property, > connector->edid_blob_ptr->base.id); > > @@ -3246,7 +3225,7 @@ static int drm_mode_connector_set_obj_prop(struct drm_mode_object *obj, > > /* store the property value if successful */ > if (!ret) > - drm_connector_property_set_value(connector, property, value); > + drm_object_property_set_value(&connector->base, property, value); > return ret; > } > > diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c > index b5d05f5..712b3e88 100644 > --- a/drivers/gpu/drm/drm_fb_helper.c > +++ b/drivers/gpu/drm/drm_fb_helper.c > @@ -331,7 +331,7 @@ static void drm_fb_helper_dpms(struct fb_info *info, int dpms_mode) > for (j = 0; j < fb_helper->connector_count; j++) { > connector = fb_helper->connector_info[j]->connector; > connector->funcs->dpms(connector, dpms_mode); > - drm_connector_property_set_value(connector, > + drm_object_property_set_value(&connector->base, > dev->mode_config.dpms_property, dpms_mode); > } > } > diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c > index 45ac8d6..1990b5d 100644 > --- a/drivers/gpu/drm/drm_sysfs.c > +++ b/drivers/gpu/drm/drm_sysfs.c > @@ -182,7 +182,7 @@ static ssize_t dpms_show(struct device *device, > uint64_t dpms_status; > int ret; > > - ret = drm_connector_property_get_value(connector, > + ret = drm_object_property_get_value(&connector->base, > dev->mode_config.dpms_property, > &dpms_status); > if (ret) > @@ -277,7 +277,7 @@ static ssize_t subconnector_show(struct device *device, > return 0; > } > > - ret = drm_connector_property_get_value(connector, prop, &subconnector); > + ret = drm_object_property_get_value(&connector->base, prop, &subconnector); > if (ret) > return 0; > > @@ -318,7 +318,7 @@ static ssize_t select_subconnector_show(struct device *device, > return 0; > } > > - ret = drm_connector_property_get_value(connector, prop, &subconnector); > + ret = drm_object_property_get_value(&connector->base, prop, &subconnector); > if (ret) > return 0; > > diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h > index 0f532d4..a45cdc2 100644 > --- a/include/drm/drm_crtc.h > +++ b/include/drm/drm_crtc.h > @@ -917,12 +917,6 @@ extern void drm_mode_set_crtcinfo(struct drm_display_mode *p, > extern void drm_mode_connector_list_update(struct drm_connector *connector); > extern int drm_mode_connector_update_edid_property(struct drm_connector *connector, > struct edid *edid); > -extern int drm_connector_property_set_value(struct drm_connector *connector, > - struct drm_property *property, > - uint64_t value); > -extern int drm_connector_property_get_value(struct drm_connector *connector, > - struct drm_property *property, > - uint64_t *value); > extern int drm_object_property_set_value(struct drm_mode_object *obj, > struct drm_property *property, > uint64_t val); > @@ -937,8 +931,6 @@ extern void drm_framebuffer_reference(struct drm_framebuffer *fb); > extern void drm_framebuffer_remove(struct drm_framebuffer *fb); > extern void drm_framebuffer_cleanup(struct drm_framebuffer *fb); > > -extern void drm_connector_attach_property(struct drm_connector *connector, > - struct drm_property *property, uint64_t init_val); > extern void drm_object_attach_property(struct drm_mode_object *obj, > struct drm_property *property, > uint64_t init_val); > -- > 1.7.9.5 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index 9c346a5..cee96f4 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -561,11 +561,11 @@ int drm_connector_init(struct drm_device *dev, dev->mode_config.num_connector++; if (connector_type != DRM_MODE_CONNECTOR_VIRTUAL) - drm_connector_attach_property(connector, + drm_object_attach_property(&connector->base, dev->mode_config.edid_property, 0); - drm_connector_attach_property(connector, + drm_object_attach_property(&connector->base, dev->mode_config.dpms_property, 0); out: @@ -2917,27 +2917,6 @@ void drm_property_destroy(struct drm_device *dev, struct drm_property *property) } EXPORT_SYMBOL(drm_property_destroy); -void drm_connector_attach_property(struct drm_connector *connector, - struct drm_property *property, uint64_t init_val) -{ - drm_object_attach_property(&connector->base, property, init_val); -} -EXPORT_SYMBOL(drm_connector_attach_property); - -int drm_connector_property_set_value(struct drm_connector *connector, - struct drm_property *property, uint64_t value) -{ - return drm_object_property_set_value(&connector->base, property, value); -} -EXPORT_SYMBOL(drm_connector_property_set_value); - -int drm_connector_property_get_value(struct drm_connector *connector, - struct drm_property *property, uint64_t *val) -{ - return drm_object_property_get_value(&connector->base, property, val); -} -EXPORT_SYMBOL(drm_connector_property_get_value); - void drm_object_attach_property(struct drm_mode_object *obj, struct drm_property *property, uint64_t init_val) @@ -3174,7 +3153,7 @@ int drm_mode_connector_update_edid_property(struct drm_connector *connector, /* Delete edid, when there is none. */ if (!edid) { connector->edid_blob_ptr = NULL; - ret = drm_connector_property_set_value(connector, dev->mode_config.edid_property, 0); + ret = drm_object_property_set_value(&connector->base, dev->mode_config.edid_property, 0); return ret; } @@ -3182,7 +3161,7 @@ int drm_mode_connector_update_edid_property(struct drm_connector *connector, connector->edid_blob_ptr = drm_property_create_blob(connector->dev, size, edid); - ret = drm_connector_property_set_value(connector, + ret = drm_object_property_set_value(&connector->base, dev->mode_config.edid_property, connector->edid_blob_ptr->base.id); @@ -3246,7 +3225,7 @@ static int drm_mode_connector_set_obj_prop(struct drm_mode_object *obj, /* store the property value if successful */ if (!ret) - drm_connector_property_set_value(connector, property, value); + drm_object_property_set_value(&connector->base, property, value); return ret; } diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index b5d05f5..712b3e88 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -331,7 +331,7 @@ static void drm_fb_helper_dpms(struct fb_info *info, int dpms_mode) for (j = 0; j < fb_helper->connector_count; j++) { connector = fb_helper->connector_info[j]->connector; connector->funcs->dpms(connector, dpms_mode); - drm_connector_property_set_value(connector, + drm_object_property_set_value(&connector->base, dev->mode_config.dpms_property, dpms_mode); } } diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c index 45ac8d6..1990b5d 100644 --- a/drivers/gpu/drm/drm_sysfs.c +++ b/drivers/gpu/drm/drm_sysfs.c @@ -182,7 +182,7 @@ static ssize_t dpms_show(struct device *device, uint64_t dpms_status; int ret; - ret = drm_connector_property_get_value(connector, + ret = drm_object_property_get_value(&connector->base, dev->mode_config.dpms_property, &dpms_status); if (ret) @@ -277,7 +277,7 @@ static ssize_t subconnector_show(struct device *device, return 0; } - ret = drm_connector_property_get_value(connector, prop, &subconnector); + ret = drm_object_property_get_value(&connector->base, prop, &subconnector); if (ret) return 0; @@ -318,7 +318,7 @@ static ssize_t select_subconnector_show(struct device *device, return 0; } - ret = drm_connector_property_get_value(connector, prop, &subconnector); + ret = drm_object_property_get_value(&connector->base, prop, &subconnector); if (ret) return 0; diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index 0f532d4..a45cdc2 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h @@ -917,12 +917,6 @@ extern void drm_mode_set_crtcinfo(struct drm_display_mode *p, extern void drm_mode_connector_list_update(struct drm_connector *connector); extern int drm_mode_connector_update_edid_property(struct drm_connector *connector, struct edid *edid); -extern int drm_connector_property_set_value(struct drm_connector *connector, - struct drm_property *property, - uint64_t value); -extern int drm_connector_property_get_value(struct drm_connector *connector, - struct drm_property *property, - uint64_t *value); extern int drm_object_property_set_value(struct drm_mode_object *obj, struct drm_property *property, uint64_t val); @@ -937,8 +931,6 @@ extern void drm_framebuffer_reference(struct drm_framebuffer *fb); extern void drm_framebuffer_remove(struct drm_framebuffer *fb); extern void drm_framebuffer_cleanup(struct drm_framebuffer *fb); -extern void drm_connector_attach_property(struct drm_connector *connector, - struct drm_property *property, uint64_t init_val); extern void drm_object_attach_property(struct drm_mode_object *obj, struct drm_property *property, uint64_t init_val);