diff options
author | Dave Airlie <airlied@redhat.com> | 2014-11-14 18:37:20 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2014-11-14 18:37:20 -0500 |
commit | 4fb2ac6ebe3ece9cafb2bb6d4a2e8e4edb124637 (patch) | |
tree | 36cb74b3b66246863d8c4378b6e4fefd87169e41 /include/drm | |
parent | 8aa3dc3c17f886c14ef6bcb62720832409ded0a6 (diff) | |
parent | 37d74578d819b1798dd2cff724438e345d118980 (diff) |
Merge tag 'drm/fixes/for-3.19-rc1' of git://people.freedesktop.org/~tagr/linux into drm-next
drm: Miscellaneous fixes for v3.19-rc1
This is a small collection of fixes that I've been carrying around for a
while now. Many of these have been posted and reviewed or acked. The few
that haven't I deemed too trivial to bother.
* tag 'drm/fixes/for-3.19-rc1' of git://people.freedesktop.org/~tagr/linux:
video/hdmi: Relicense header under MIT license
drm/gma500: mdfld: Reuse video/mipi_display.h
drm: Make drm_mode_create_tv_properties() signature consistent
drm: Implement drm_get_pci_dev() dummy for !PCI
drm/prime: Use unsigned type for number of pages
drm/gem: Fix typo in kerneldoc
drm: Use const data when creating blob properties
drm: Use size_t for blob property sizes
Diffstat (limited to 'include/drm')
-rw-r--r-- | include/drm/drmP.h | 17 | ||||
-rw-r--r-- | include/drm/drm_crtc.h | 11 | ||||
-rw-r--r-- | include/drm/drm_dp_mst_helper.h | 2 |
3 files changed, 23 insertions, 7 deletions
diff --git a/include/drm/drmP.h b/include/drm/drmP.h index d7ebd7b207e3..be776fb2db18 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h | |||
@@ -986,7 +986,7 @@ extern void drm_gem_dmabuf_release(struct dma_buf *dma_buf); | |||
986 | 986 | ||
987 | extern int drm_prime_sg_to_page_addr_arrays(struct sg_table *sgt, struct page **pages, | 987 | extern int drm_prime_sg_to_page_addr_arrays(struct sg_table *sgt, struct page **pages, |
988 | dma_addr_t *addrs, int max_pages); | 988 | dma_addr_t *addrs, int max_pages); |
989 | extern struct sg_table *drm_prime_pages_to_sg(struct page **pages, int nr_pages); | 989 | extern struct sg_table *drm_prime_pages_to_sg(struct page **pages, unsigned int nr_pages); |
990 | extern void drm_prime_gem_destroy(struct drm_gem_object *obj, struct sg_table *sg); | 990 | extern void drm_prime_gem_destroy(struct drm_gem_object *obj, struct sg_table *sg); |
991 | 991 | ||
992 | 992 | ||
@@ -1028,10 +1028,25 @@ void drm_pci_agp_destroy(struct drm_device *dev); | |||
1028 | 1028 | ||
1029 | extern int drm_pci_init(struct drm_driver *driver, struct pci_driver *pdriver); | 1029 | extern int drm_pci_init(struct drm_driver *driver, struct pci_driver *pdriver); |
1030 | extern void drm_pci_exit(struct drm_driver *driver, struct pci_driver *pdriver); | 1030 | extern void drm_pci_exit(struct drm_driver *driver, struct pci_driver *pdriver); |
1031 | #ifdef CONFIG_PCI | ||
1031 | extern int drm_get_pci_dev(struct pci_dev *pdev, | 1032 | extern int drm_get_pci_dev(struct pci_dev *pdev, |
1032 | const struct pci_device_id *ent, | 1033 | const struct pci_device_id *ent, |
1033 | struct drm_driver *driver); | 1034 | struct drm_driver *driver); |
1034 | extern int drm_pci_set_busid(struct drm_device *dev, struct drm_master *master); | 1035 | extern int drm_pci_set_busid(struct drm_device *dev, struct drm_master *master); |
1036 | #else | ||
1037 | static inline int drm_get_pci_dev(struct pci_dev *pdev, | ||
1038 | const struct pci_device_id *ent, | ||
1039 | struct drm_driver *driver) | ||
1040 | { | ||
1041 | return -ENOSYS; | ||
1042 | } | ||
1043 | |||
1044 | static inline int drm_pci_set_busid(struct drm_device *dev, | ||
1045 | struct drm_master *master) | ||
1046 | { | ||
1047 | return -ENOSYS; | ||
1048 | } | ||
1049 | #endif | ||
1035 | 1050 | ||
1036 | #define DRM_PCIE_SPEED_25 1 | 1051 | #define DRM_PCIE_SPEED_25 1 |
1037 | #define DRM_PCIE_SPEED_50 2 | 1052 | #define DRM_PCIE_SPEED_50 2 |
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index cbb475654b1c..c95941076aaf 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h | |||
@@ -197,7 +197,7 @@ struct drm_framebuffer { | |||
197 | struct drm_property_blob { | 197 | struct drm_property_blob { |
198 | struct drm_mode_object base; | 198 | struct drm_mode_object base; |
199 | struct list_head head; | 199 | struct list_head head; |
200 | unsigned int length; | 200 | size_t length; |
201 | unsigned char data[]; | 201 | unsigned char data[]; |
202 | }; | 202 | }; |
203 | 203 | ||
@@ -1162,9 +1162,9 @@ extern void drm_mode_config_reset(struct drm_device *dev); | |||
1162 | extern void drm_mode_config_cleanup(struct drm_device *dev); | 1162 | extern void drm_mode_config_cleanup(struct drm_device *dev); |
1163 | 1163 | ||
1164 | extern int drm_mode_connector_set_path_property(struct drm_connector *connector, | 1164 | extern int drm_mode_connector_set_path_property(struct drm_connector *connector, |
1165 | char *path); | 1165 | const char *path); |
1166 | extern int drm_mode_connector_update_edid_property(struct drm_connector *connector, | 1166 | extern int drm_mode_connector_update_edid_property(struct drm_connector *connector, |
1167 | struct edid *edid); | 1167 | const struct edid *edid); |
1168 | 1168 | ||
1169 | static inline bool drm_property_type_is(struct drm_property *property, | 1169 | static inline bool drm_property_type_is(struct drm_property *property, |
1170 | uint32_t type) | 1170 | uint32_t type) |
@@ -1225,8 +1225,9 @@ extern void drm_property_destroy(struct drm_device *dev, struct drm_property *pr | |||
1225 | extern int drm_property_add_enum(struct drm_property *property, int index, | 1225 | extern int drm_property_add_enum(struct drm_property *property, int index, |
1226 | uint64_t value, const char *name); | 1226 | uint64_t value, const char *name); |
1227 | extern int drm_mode_create_dvi_i_properties(struct drm_device *dev); | 1227 | extern int drm_mode_create_dvi_i_properties(struct drm_device *dev); |
1228 | extern int drm_mode_create_tv_properties(struct drm_device *dev, int num_formats, | 1228 | extern int drm_mode_create_tv_properties(struct drm_device *dev, |
1229 | char *formats[]); | 1229 | unsigned int num_modes, |
1230 | char *modes[]); | ||
1230 | extern int drm_mode_create_scaling_mode_property(struct drm_device *dev); | 1231 | extern int drm_mode_create_scaling_mode_property(struct drm_device *dev); |
1231 | extern int drm_mode_create_aspect_ratio_property(struct drm_device *dev); | 1232 | extern int drm_mode_create_aspect_ratio_property(struct drm_device *dev); |
1232 | extern int drm_mode_create_dirty_info_property(struct drm_device *dev); | 1233 | extern int drm_mode_create_dirty_info_property(struct drm_device *dev); |
diff --git a/include/drm/drm_dp_mst_helper.h b/include/drm/drm_dp_mst_helper.h index 05e85ee10e74..cec6383bbdb8 100644 --- a/include/drm/drm_dp_mst_helper.h +++ b/include/drm/drm_dp_mst_helper.h | |||
@@ -371,7 +371,7 @@ struct drm_dp_sideband_msg_tx { | |||
371 | struct drm_dp_mst_topology_mgr; | 371 | struct drm_dp_mst_topology_mgr; |
372 | struct drm_dp_mst_topology_cbs { | 372 | struct drm_dp_mst_topology_cbs { |
373 | /* create a connector for a port */ | 373 | /* create a connector for a port */ |
374 | struct drm_connector *(*add_connector)(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port, char *path); | 374 | struct drm_connector *(*add_connector)(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port, const char *path); |
375 | void (*destroy_connector)(struct drm_dp_mst_topology_mgr *mgr, | 375 | void (*destroy_connector)(struct drm_dp_mst_topology_mgr *mgr, |
376 | struct drm_connector *connector); | 376 | struct drm_connector *connector); |
377 | void (*hotplug)(struct drm_dp_mst_topology_mgr *mgr); | 377 | void (*hotplug)(struct drm_dp_mst_topology_mgr *mgr); |