diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-12-05 23:08:09 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-12-05 23:08:09 -0500 |
| commit | 8de9e417757fb9f130f55a38f4ee7027b60de1c7 (patch) | |
| tree | c701a9e568ebead069a7f967e38e69b0dd7a731b /include | |
| parent | 00f09afd1740c3b2a1434bf48a124b316aab19f2 (diff) | |
| parent | 584955632841c069678833f3320b4f6d21a8215e (diff) | |
Merge branch 'connector-to-object-prop' of git://github.com/robclark/kernel-omap4 into drm-next
* 'connector-to-object-prop' of git://github.com/robclark/kernel-omap4:
drm: remove legacy drm_connector_property fxns
drm/nouveau: drm_connector_property -> drm_object_property
drm/i915: One more drm_connector_property -> drm_object_property
drm/i2c: drm_connector_property -> drm_object_property
drm/vmwgfx: drm_connector_property -> drm_object_property
drm/udl: drm_connector_property -> drm_object_property
drm/shmob: drm_connector_property -> drm_object_property
drm/radeon: drm_connector_property -> drm_object_property
drm/gma500: drm_connector_property -> drm_object_property
Diffstat (limited to 'include')
| -rw-r--r-- | include/drm/drm_crtc.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index c0635b7f8696..ee9b0b59237f 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h | |||
| @@ -920,12 +920,6 @@ extern void drm_mode_set_crtcinfo(struct drm_display_mode *p, | |||
| 920 | extern void drm_mode_connector_list_update(struct drm_connector *connector); | 920 | extern void drm_mode_connector_list_update(struct drm_connector *connector); |
| 921 | extern int drm_mode_connector_update_edid_property(struct drm_connector *connector, | 921 | extern int drm_mode_connector_update_edid_property(struct drm_connector *connector, |
| 922 | struct edid *edid); | 922 | struct edid *edid); |
| 923 | extern int drm_connector_property_set_value(struct drm_connector *connector, | ||
| 924 | struct drm_property *property, | ||
| 925 | uint64_t value); | ||
| 926 | extern int drm_connector_property_get_value(struct drm_connector *connector, | ||
| 927 | struct drm_property *property, | ||
| 928 | uint64_t *value); | ||
| 929 | extern int drm_object_property_set_value(struct drm_mode_object *obj, | 923 | extern int drm_object_property_set_value(struct drm_mode_object *obj, |
| 930 | struct drm_property *property, | 924 | struct drm_property *property, |
| 931 | uint64_t val); | 925 | uint64_t val); |
| @@ -947,8 +941,6 @@ extern int drmfb_remove(struct drm_device *dev, struct drm_framebuffer *fb); | |||
| 947 | extern void drm_crtc_probe_connector_modes(struct drm_device *dev, int maxX, int maxY); | 941 | extern void drm_crtc_probe_connector_modes(struct drm_device *dev, int maxX, int maxY); |
| 948 | extern bool drm_crtc_in_use(struct drm_crtc *crtc); | 942 | extern bool drm_crtc_in_use(struct drm_crtc *crtc); |
| 949 | 943 | ||
| 950 | extern void drm_connector_attach_property(struct drm_connector *connector, | ||
| 951 | struct drm_property *property, uint64_t init_val); | ||
| 952 | extern void drm_object_attach_property(struct drm_mode_object *obj, | 944 | extern void drm_object_attach_property(struct drm_mode_object *obj, |
| 953 | struct drm_property *property, | 945 | struct drm_property *property, |
| 954 | uint64_t init_val); | 946 | uint64_t init_val); |