Merge tag 'drm/fixes/for-3.19-rc1' of git://people.freedesktop.org/~tagr/linux into...
authorDave Airlie <airlied@redhat.com>
Fri, 14 Nov 2014 23:37:20 +0000 (09:37 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 14 Nov 2014 23:37:20 +0000 (09:37 +1000)
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

1  2 
drivers/gpu/drm/drm_crtc.c
drivers/gpu/drm/drm_prime.c
drivers/gpu/drm/i915/intel_dp_mst.c
include/drm/drmP.h
include/drm/drm_crtc.h
include/drm/drm_dp_mst_helper.h

index 2beb219df1bd3254b94d1a422d5397be432d2658,776ec41b73c9c33a869faa322df5c05ec79c2c9d..e8fc946ed59c39610b86c97c4f9788589aeeac75
@@@ -3992,25 -4021,12 +3994,25 @@@ done
        return ret;
  }
  
 +/**
 + * drm_mode_connector_set_path_property - set tile property on connector
 + * @connector: connector to set property on.
 + * @path: path to use for property.
 + *
 + * This creates a property to expose to userspace to specify a
 + * connector path. This is mainly used for DisplayPort MST where
 + * connectors have a topology and we want to allow userspace to give
 + * them more meaningful names.
 + *
 + * Returns:
 + * Zero on success, errno on failure.
 + */
  int drm_mode_connector_set_path_property(struct drm_connector *connector,
-                                        char *path)
+                                        const char *path)
  {
        struct drm_device *dev = connector->dev;
-       int ret, size;
-       size = strlen(path) + 1;
+       size_t size = strlen(path) + 1;
+       int ret;
  
        connector->path_blob_ptr = drm_property_create_blob(connector->dev,
                                                            size, path);
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge