diff options
author | Dave Airlie <airlied@redhat.com> | 2014-11-15 09:37:20 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2014-11-15 09:37:20 +1000 |
commit | 4fb2ac6ebe3ece9cafb2bb6d4a2e8e4edb124637 (patch) | |
tree | 36cb74b3b66246863d8c4378b6e4fefd87169e41 /drivers/gpu/drm/drm_prime.c | |
parent | 8aa3dc3c17f886c14ef6bcb62720832409ded0a6 (diff) | |
parent | 37d74578d819b1798dd2cff724438e345d118980 (diff) | |
download | linux-stable-4fb2ac6ebe3ece9cafb2bb6d4a2e8e4edb124637.tar.gz linux-stable-4fb2ac6ebe3ece9cafb2bb6d4a2e8e4edb124637.tar.bz2 linux-stable-4fb2ac6ebe3ece9cafb2bb6d4a2e8e4edb124637.zip |
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_prime.c')
-rw-r--r-- | drivers/gpu/drm/drm_prime.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c index 6872eca6555e..7482b06cd08f 100644 --- a/drivers/gpu/drm/drm_prime.c +++ b/drivers/gpu/drm/drm_prime.c @@ -669,7 +669,7 @@ int drm_prime_fd_to_handle_ioctl(struct drm_device *dev, void *data, * the driver is responsible for mapping the pages into the * importers address space for use with dma_buf itself. */ -struct sg_table *drm_prime_pages_to_sg(struct page **pages, int nr_pages) +struct sg_table *drm_prime_pages_to_sg(struct page **pages, unsigned int nr_pages) { struct sg_table *sg = NULL; int ret; |