From: Dave Airlie <airlied@redhat.com>
Date: Mon, 15 Aug 2016 06:53:57 +0000 (+1000)
Subject: Merge tag 'drm-intel-next-2016-08-08' of git://anongit.freedesktop.org/drm-intel... 
X-Git-Tag: v4.13~2107^2~40
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=fc93ff608b15ae32cde3006b7af860b59cac20ec;p=mirror_ubuntu-bionic-kernel.git

Merge tag 'drm-intel-next-2016-08-08' of git://anongit.freedesktop.org/drm-intel into drm-next

- refactor ddi buffer programming a bit (Ville)
- large-scale renaming to untangle naming in the gem code (Chris)
- rework vma/active tracking for accurately reaping idle mappings of shared
  objects (Chris)
- misc dp sst/mst probing corner case fixes (Ville)
- tons of cleanup&tunings all around in gem
- lockless (rcu-protected) request lookup, plus use it everywhere for
  non(b)locking waits (Chris)
- pipe crc debugfs fixes (Rodrigo)
- random fixes all over

* tag 'drm-intel-next-2016-08-08' of git://anongit.freedesktop.org/drm-intel: (222 commits)
  drm/i915: Update DRIVER_DATE to 20160808
  drm/i915: fix aliasing_ppgtt leak
  drm/i915: Update comment before i915_spin_request
  drm/i915: Use drm official vblank_no_hw_counter callback.
  drm/i915: Fix copy_to_user usage for pipe_crc
  Revert "drm/i915: Track active streams also for DP SST"
  drm/i915: fix WaInsertDummyPushConstPs
  drm/i915: Assert that the request hasn't been retired
  drm/i915: Repack fence tiling mode and stride into a single integer
  drm/i915: Document and reject invalid tiling modes
  drm/i915: Remove locking for get_tiling
  drm/i915: Remove pinned check from madvise ioctl
  drm/i915: Reduce locking inside swfinish ioctl
  drm/i915: Remove (struct_mutex) locking for busy-ioctl
  drm/i915: Remove (struct_mutex) locking for wait-ioctl
  drm/i915: Do a nonblocking wait first in pread/pwrite
  drm/i915: Remove unused no-shrinker-steal
  drm/i915: Tidy generation of the GTT mmap offset
  drm/i915/shrinker: Wait before acquiring struct_mutex under oom
  drm/i915: Simplify do_idling() (Ironlake vt-d w/a)
  ...
---

fc93ff608b15ae32cde3006b7af860b59cac20ec
diff --cc drivers/gpu/drm/i915/intel_display.c
index 8cc361114112,9cbf5431c1e3..c6f27ab99e8f
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@@ -2583,17 -2583,17 +2583,17 @@@ valid_fb
  	plane_state->crtc_w = fb->width;
  	plane_state->crtc_h = fb->height;
  
 -	intel_state->src.x1 = plane_state->src_x;
 -	intel_state->src.y1 = plane_state->src_y;
 -	intel_state->src.x2 = plane_state->src_x + plane_state->src_w;
 -	intel_state->src.y2 = plane_state->src_y + plane_state->src_h;
 -	intel_state->dst.x1 = plane_state->crtc_x;
 -	intel_state->dst.y1 = plane_state->crtc_y;
 -	intel_state->dst.x2 = plane_state->crtc_x + plane_state->crtc_w;
 -	intel_state->dst.y2 = plane_state->crtc_y + plane_state->crtc_h;
 +	intel_state->base.src.x1 = plane_state->src_x;
 +	intel_state->base.src.y1 = plane_state->src_y;
 +	intel_state->base.src.x2 = plane_state->src_x + plane_state->src_w;
 +	intel_state->base.src.y2 = plane_state->src_y + plane_state->src_h;
 +	intel_state->base.dst.x1 = plane_state->crtc_x;
 +	intel_state->base.dst.y1 = plane_state->crtc_y;
 +	intel_state->base.dst.x2 = plane_state->crtc_x + plane_state->crtc_w;
 +	intel_state->base.dst.y2 = plane_state->crtc_y + plane_state->crtc_h;
  
  	obj = intel_fb_obj(fb);
- 	if (obj->tiling_mode != I915_TILING_NONE)
+ 	if (i915_gem_object_is_tiled(obj))
  		dev_priv->preserve_bios_swizzle = true;
  
  	drm_framebuffer_reference(fb);