samsung_sm8750/android_kernel_samsung_sm8750
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'drm/fixes/for-3.19-rc1' of git://people.freedesktop.org/~tagr/linux into drm-next

Browse Source 
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
This commit is contained in:
Dave Airlie
2014-11-15 09:37:20 +10:00
parent 8aa3dc3c17 37d74578d8
commit 4fb2ac6ebe
10 changed files with 88 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/gpu/drm/drm_crtc.c
View File

@@ -1386,12 +1386,13 @@ EXPORT_SYMBOL(drm_mode_create_dvi_i_properties);
* responsible for allocating a list of format names and passing them to
* this routine.
*/
int drm_mode_create_tv_properties(struct drm_device *dev, int num_modes,
int drm_mode_create_tv_properties(struct drm_device *dev,
unsigned int num_modes,
char *modes[])
{
struct drm_property *tv_selector;
struct drm_property *tv_subconnector;
int i;
unsigned int i;
if (dev->mode_config.tv_select_subconnector_property)
return 0;
@@ -2260,7 +2261,7 @@ static int __setplane_internal(struct drm_plane *plane,
{
int ret = 0;
unsigned int fb_width, fb_height;
int i;
unsigned int i;
/* No fb means shut it down */
if (!fb) {
@@ -3911,8 +3912,9 @@ done:
return ret;
}
static struct drm_property_blob *drm_property_create_blob(struct drm_device *dev, int length,
void *data)
static struct drm_property_blob *
drm_property_create_blob(struct drm_device *dev, size_t length,
const void *data)
{
struct drm_property_blob *blob;
int ret;
@@ -4006,11 +4008,11 @@ done:
* 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);
@@ -4036,10 +4038,11 @@ EXPORT_SYMBOL(drm_mode_connector_set_path_property);
* Zero on success, errno on failure.
*/
int drm_mode_connector_update_edid_property(struct drm_connector *connector,
struct edid *edid)
const struct edid *edid)
{
struct drm_device *dev = connector->dev;
int ret, size;
size_t size;
int ret;
/* ignore requests to set edid when overridden */
if (connector->override_edid)