9870 fix GCC 6 warnings

Reviewed by: John Levon <john.levon@joyent.com>
Reviewed by: Toomas Soome <tsoome@me.com>

6 files changed, 21 insertions, 21 deletions

diff --git a/usr/src/cmd/mdb/i915/i915.c b/usr/src/cmd/mdb/i915/i915.c
index ad094df..ae41953 100644
--- a/usr/src/cmd/mdb/i915/i915.c
+++ b/usr/src/cmd/mdb/i915/i915.c
@@ -777,7 +777,7 @@ i915_error_reg_dump(uintptr_t addr, uint_t flags, int argc,
 	if (ret == DCMD_OK)
 		mdb_printf("ERROR_GEN6: 0x%lx\n", val);
 
-		mdb_printf("\nBlitter command stream:\n");
+	mdb_printf("\nBlitter command stream:\n");
 	ret = i915_read(dev_priv, (uintptr_t)0x22064, &val);
 	if (ret == DCMD_OK)
 		mdb_printf("  BLT EIR: 0x%08x\n", val);
diff --git a/usr/src/uts/common/io/drm/drm_crtc_helper.c b/usr/src/uts/common/io/drm/drm_crtc_helper.c
index 50eb0be..ff10fa8 100644
--- a/usr/src/uts/common/io/drm/drm_crtc_helper.c
+++ b/usr/src/uts/common/io/drm/drm_crtc_helper.c
@@ -988,7 +988,7 @@ output_poll_execute(struct work_struct *work)
 		if (!connector->polled || connector->polled == DRM_CONNECTOR_POLL_HPD)
 			continue;
 
-			repoll = true;
+		repoll = true;
 
 		old_status = connector->status;
 		/* if we are connected and don't want to poll for disconnect
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)))