aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/drm_crtc.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2014-11-14 18:37:20 -0500
committerDave Airlie <airlied@redhat.com>2014-11-14 18:37:20 -0500
commit4fb2ac6ebe3ece9cafb2bb6d4a2e8e4edb124637 (patch)
tree36cb74b3b66246863d8c4378b6e4fefd87169e41 /drivers/gpu/drm/drm_crtc.c
parent8aa3dc3c17f886c14ef6bcb62720832409ded0a6 (diff)
parent37d74578d819b1798dd2cff724438e345d118980 (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 'drivers/gpu/drm/drm_crtc.c')
-rw-r--r--drivers/gpu/drm/drm_crtc.c23
1 files changed, 13 insertions, 10 deletions
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index 2beb219df1bd..e8fc946ed59c 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -1386,12 +1386,13 @@ EXPORT_SYMBOL(drm_mode_create_dvi_i_properties);
1386 * responsible for allocating a list of format names and passing them to 1386 * responsible for allocating a list of format names and passing them to
1387 * this routine. 1387 * this routine.
1388 */ 1388 */
1389int drm_mode_create_tv_properties(struct drm_device *dev, int num_modes, 1389int drm_mode_create_tv_properties(struct drm_device *dev,
1390 unsigned int num_modes,
1390 char *modes[]) 1391 char *modes[])
1391{ 1392{
1392 struct drm_property *tv_selector; 1393 struct drm_property *tv_selector;
1393 struct drm_property *tv_subconnector; 1394 struct drm_property *tv_subconnector;
1394 int i; 1395 unsigned int i;
1395 1396
1396 if (dev->mode_config.tv_select_subconnector_property) 1397 if (dev->mode_config.tv_select_subconnector_property)
1397 return 0; 1398 return 0;
@@ -2260,7 +2261,7 @@ static int __setplane_internal(struct drm_plane *plane,
2260{ 2261{
2261 int ret = 0; 2262 int ret = 0;
2262 unsigned int fb_width, fb_height; 2263 unsigned int fb_width, fb_height;
2263 int i; 2264 unsigned int i;
2264 2265
2265 /* No fb means shut it down */ 2266 /* No fb means shut it down */
2266 if (!fb) { 2267 if (!fb) {
@@ -3911,8 +3912,9 @@ done:
3911 return ret; 3912 return ret;
3912} 3913}
3913 3914
3914static struct drm_property_blob *drm_property_create_blob(struct drm_device *dev, int length, 3915static struct drm_property_blob *
3915 void *data) 3916drm_property_create_blob(struct drm_device *dev, size_t length,
3917 const void *data)
3916{ 3918{
3917 struct drm_property_blob *blob; 3919 struct drm_property_blob *blob;
3918 int ret; 3920 int ret;
@@ -4006,11 +4008,11 @@ done:
4006 * Zero on success, errno on failure. 4008 * Zero on success, errno on failure.
4007 */ 4009 */
4008int drm_mode_connector_set_path_property(struct drm_connector *connector, 4010int drm_mode_connector_set_path_property(struct drm_connector *connector,
4009 char *path) 4011 const char *path)
4010{ 4012{
4011 struct drm_device *dev = connector->dev; 4013 struct drm_device *dev = connector->dev;
4012 int ret, size; 4014 size_t size = strlen(path) + 1;
4013 size = strlen(path) + 1; 4015 int ret;
4014 4016
4015 connector->path_blob_ptr = drm_property_create_blob(connector->dev, 4017 connector->path_blob_ptr = drm_property_create_blob(connector->dev,
4016 size, path); 4018 size, path);
@@ -4036,10 +4038,11 @@ EXPORT_SYMBOL(drm_mode_connector_set_path_property);
4036 * Zero on success, errno on failure. 4038 * Zero on success, errno on failure.
4037 */ 4039 */
4038int drm_mode_connector_update_edid_property(struct drm_connector *connector, 4040int drm_mode_connector_update_edid_property(struct drm_connector *connector,
4039 struct edid *edid) 4041 const struct edid *edid)
4040{ 4042{
4041 struct drm_device *dev = connector->dev; 4043 struct drm_device *dev = connector->dev;
4042 int ret, size; 4044 size_t size;
4045 int ret;
4043 4046
4044 /* ignore requests to set edid when overridden */ 4047 /* ignore requests to set edid when overridden */
4045 if (connector->override_edid) 4048 if (connector->override_edid)