diff options
Diffstat (limited to 'usr/src/uts/intel/io/i915')
| -rw-r--r-- | usr/src/uts/intel/io/i915/i915_gem.c | 26 | ||||
| -rw-r--r-- | usr/src/uts/intel/io/i915/intel_bios.c | 6 | ||||
| -rw-r--r-- | usr/src/uts/intel/io/i915/intel_display.c | 2 | ||||
| -rw-r--r-- | usr/src/uts/intel/io/i915/intel_ringbuffer.c | 4 |
4 files changed, 19 insertions, 19 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; diff --git a/usr/src/uts/intel/io/i915/intel_bios.c b/usr/src/uts/intel/io/i915/intel_bios.c index 717f5bf..5dd716e 100644 --- a/usr/src/uts/intel/io/i915/intel_bios.c +++ b/usr/src/uts/intel/io/i915/intel_bios.c @@ -305,9 +305,9 @@ parse_sdvo_panel_data(struct drm_i915_private *dev_priv, if (index == -1) { struct bdb_sdvo_lvds_options *sdvo_lvds_options; - sdvo_lvds_options = find_section(bdb, BDB_SDVO_LVDS_OPTIONS); - if (!sdvo_lvds_options) - return; + sdvo_lvds_options = find_section(bdb, BDB_SDVO_LVDS_OPTIONS); + if (!sdvo_lvds_options) + return; index = sdvo_lvds_options->panel_type; } diff --git a/usr/src/uts/intel/io/i915/intel_display.c b/usr/src/uts/intel/io/i915/intel_display.c index da0bf65..7aca768 100644 --- a/usr/src/uts/intel/io/i915/intel_display.c +++ b/usr/src/uts/intel/io/i915/intel_display.c @@ -7163,7 +7163,7 @@ void intel_mark_fb_busy(struct drm_i915_gem_object *obj, if (to_intel_framebuffer(crtc->fb)->obj != obj) continue; - intel_increase_pllclock(crtc); + intel_increase_pllclock(crtc); if (ring && intel_fbc_enabled(dev)) ring->fbc_dirty = true; } diff --git a/usr/src/uts/intel/io/i915/intel_ringbuffer.c b/usr/src/uts/intel/io/i915/intel_ringbuffer.c index 5cde51d..e8ba348 100644 --- a/usr/src/uts/intel/io/i915/intel_ringbuffer.c +++ b/usr/src/uts/intel/io/i915/intel_ringbuffer.c @@ -121,8 +121,8 @@ gen4_render_ring_flush(struct intel_ring_buffer *ring, cmd = MI_FLUSH | MI_NO_WRITE_FLUSH; if ((invalidate_domains|flush_domains) & I915_GEM_DOMAIN_RENDER) cmd &= ~MI_NO_WRITE_FLUSH; - if (invalidate_domains & I915_GEM_DOMAIN_INSTRUCTION) - cmd |= MI_EXE_FLUSH; + if (invalidate_domains & I915_GEM_DOMAIN_INSTRUCTION) + cmd |= MI_EXE_FLUSH; if (invalidate_domains & I915_GEM_DOMAIN_COMMAND && (IS_GEN4(dev) || IS_GEN5(dev))) |