diff options
| author | Alexander Pyhalov <apyhalov@gmail.com> | 2018-10-05 09:23:09 +0300 |
|---|---|---|
| committer | Alexander Pyhalov <apyhalov@gmail.com> | 2018-10-05 16:56:45 +0300 |
| commit | e1cb3391f921057bc8ef7c675f59728365b11b64 (patch) | |
| tree | ee32ba38666856c393901fd724804729c41e005c /usr/src/uts/intel/io/i915/i915_gem.c | |
| parent | e21a8450bf5315e6723291e399ddc335ccf05375 (diff) | |
| download | illumos-gfx-drm-e1cb3391f921057bc8ef7c675f59728365b11b64.tar.gz | |
9870 fix GCC 6 warnings
Reviewed by: John Levon <john.levon@joyent.com>
Reviewed by: Toomas Soome <tsoome@me.com>
Diffstat (limited to 'usr/src/uts/intel/io/i915/i915_gem.c')
| -rw-r--r-- | usr/src/uts/intel/io/i915/i915_gem.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/usr/src/uts/intel/io/i915/i915_gem.c b/usr/src/uts/intel/io/i915/i915_gem.c index 04b2b4e..18d5af8 100644 --- a/usr/src/uts/intel/io/i915/i915_gem.c +++ b/usr/src/uts/intel/io/i915/i915_gem.c @@ -259,7 +259,7 @@ slow_shmem_bit17_copy(caddr_t gpu_page, int is_read) { - int ret; + int ret = 0; /* Use the unswizzled path if this page isn't affected. */ if ((page_to_phys(gpu_page) & (1 << 17)) == 0) { if (is_read) @@ -369,12 +369,12 @@ i915_gem_shmem_pread(struct drm_device *dev, if ((data_page_offset + page_length) > DRM_PAGE_SIZE) page_length = PAGE_SIZE - data_page_offset; - slow_shmem_bit17_copy(obj->page_list[shmem_page_index], - shmem_page_offset, - user_data + data_page_index * DRM_PAGE_SIZE, - data_page_offset, - page_length, - 1); + slow_shmem_bit17_copy(obj->page_list[shmem_page_index], + shmem_page_offset, + user_data + data_page_index * DRM_PAGE_SIZE, + data_page_offset, + page_length, + 1); remain -= page_length; data_ptr += page_length; @@ -553,12 +553,12 @@ i915_gem_shmem_pwrite(struct drm_device *dev, if ((data_page_offset + page_length) > DRM_PAGE_SIZE) page_length = PAGE_SIZE - data_page_offset; - slow_shmem_bit17_copy(obj->page_list[shmem_page_index], - shmem_page_offset, - user_data + data_page_index * DRM_PAGE_SIZE, - data_page_offset, - page_length, - 0); + slow_shmem_bit17_copy(obj->page_list[shmem_page_index], + shmem_page_offset, + user_data + data_page_index * DRM_PAGE_SIZE, + data_page_offset, + page_length, + 0); remain -= page_length; data_ptr += page_length; |