]> git.baikalelectronics.ru Git - kernel.git/commitdiff
drm/i915: Move GGTT fence registers under gt/
authorChris Wilson <chris@chris-wilson.co.uk>
Mon, 16 Mar 2020 11:38:43 +0000 (11:38 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Mon, 16 Mar 2020 20:28:26 +0000 (20:28 +0000)
Since the fence registers control HW detiling through the GGTT
aperture, make them a part of the intel_ggtt under gt/

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200316113846.4974-1-chris@chris-wilson.co.uk
14 files changed:
drivers/gpu/drm/i915/Makefile
drivers/gpu/drm/i915/gt/intel_ggtt.c
drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c [new file with mode: 0644]
drivers/gpu/drm/i915/gt/intel_ggtt_fencing.h [new file with mode: 0644]
drivers/gpu/drm/i915/gt/intel_gtt.h
drivers/gpu/drm/i915/gt/intel_reset.c
drivers/gpu/drm/i915/gvt/aperture_gm.c
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/i915_gem_fence_reg.c [deleted file]
drivers/gpu/drm/i915/i915_gem_fence_reg.h [deleted file]
drivers/gpu/drm/i915/i915_vma.h
drivers/gpu/drm/i915/selftests/i915_gem.c

index 9f887a86e555d26954e2d663437be6c01a88f755..1b2ed963179c0e18ad4ef2f7ee7fba6cf0f7ae99 100644 (file)
@@ -92,6 +92,7 @@ gt-y += \
        gt/intel_engine_pool.o \
        gt/intel_engine_user.o \
        gt/intel_ggtt.o \
+       gt/intel_ggtt_fencing.o \
        gt/intel_gt.o \
        gt/intel_gt_irq.o \
        gt/intel_gt_pm.o \
@@ -153,7 +154,6 @@ i915-y += \
          i915_buddy.o \
          i915_cmd_parser.o \
          i915_gem_evict.o \
-         i915_gem_fence_reg.o \
          i915_gem_gtt.o \
          i915_gem.o \
          i915_globals.o \
index aed498a0d032b1a5a890e821b2b74830a0e41fb3..a7b72fa569a7f42db71440ff29ecad298705b0f6 100644 (file)
@@ -65,7 +65,7 @@ static int ggtt_init_hw(struct i915_ggtt *ggtt)
                                              ggtt->mappable_end);
        }
 
-       i915_ggtt_init_fences(ggtt);
+       intel_ggtt_init_fences(ggtt);
 
        return 0;
 }
diff --git a/drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c b/drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c
new file mode 100644 (file)
index 0000000..94af756
--- /dev/null
@@ -0,0 +1,904 @@
+/*
+ * Copyright © 2008-2015 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+#include "i915_drv.h"
+#include "i915_scatterlist.h"
+#include "i915_pvinfo.h"
+#include "i915_vgpu.h"
+
+/**
+ * DOC: fence register handling
+ *
+ * Important to avoid confusions: "fences" in the i915 driver are not execution
+ * fences used to track command completion but hardware detiler objects which
+ * wrap a given range of the global GTT. Each platform has only a fairly limited
+ * set of these objects.
+ *
+ * Fences are used to detile GTT memory mappings. They're also connected to the
+ * hardware frontbuffer render tracking and hence interact with frontbuffer
+ * compression. Furthermore on older platforms fences are required for tiled
+ * objects used by the display engine. They can also be used by the render
+ * engine - they're required for blitter commands and are optional for render
+ * commands. But on gen4+ both display (with the exception of fbc) and rendering
+ * have their own tiling state bits and don't need fences.
+ *
+ * Also note that fences only support X and Y tiling and hence can't be used for
+ * the fancier new tiling formats like W, Ys and Yf.
+ *
+ * Finally note that because fences are such a restricted resource they're
+ * dynamically associated with objects. Furthermore fence state is committed to
+ * the hardware lazily to avoid unnecessary stalls on gen2/3. Therefore code must
+ * explicitly call i915_gem_object_get_fence() to synchronize fencing status
+ * for cpu access. Also note that some code wants an unfenced view, for those
+ * cases the fence can be removed forcefully with i915_gem_object_put_fence().
+ *
+ * Internally these functions will synchronize with userspace access by removing
+ * CPU ptes into GTT mmaps (not the GTT ptes themselves) as needed.
+ */
+
+#define pipelined 0
+
+static struct drm_i915_private *fence_to_i915(struct i915_fence_reg *fence)
+{
+       return fence->ggtt->vm.i915;
+}
+
+static struct intel_uncore *fence_to_uncore(struct i915_fence_reg *fence)
+{
+       return fence->ggtt->vm.gt->uncore;
+}
+
+static void i965_write_fence_reg(struct i915_fence_reg *fence,
+                                struct i915_vma *vma)
+{
+       i915_reg_t fence_reg_lo, fence_reg_hi;
+       int fence_pitch_shift;
+       u64 val;
+
+       if (INTEL_GEN(fence_to_i915(fence)) >= 6) {
+               fence_reg_lo = FENCE_REG_GEN6_LO(fence->id);
+               fence_reg_hi = FENCE_REG_GEN6_HI(fence->id);
+               fence_pitch_shift = GEN6_FENCE_PITCH_SHIFT;
+
+       } else {
+               fence_reg_lo = FENCE_REG_965_LO(fence->id);
+               fence_reg_hi = FENCE_REG_965_HI(fence->id);
+               fence_pitch_shift = I965_FENCE_PITCH_SHIFT;
+       }
+
+       val = 0;
+       if (vma) {
+               unsigned int stride = i915_gem_object_get_stride(vma->obj);
+
+               GEM_BUG_ON(!i915_vma_is_map_and_fenceable(vma));
+               GEM_BUG_ON(!IS_ALIGNED(vma->node.start, I965_FENCE_PAGE));
+               GEM_BUG_ON(!IS_ALIGNED(vma->fence_size, I965_FENCE_PAGE));
+               GEM_BUG_ON(!IS_ALIGNED(stride, 128));
+
+               val = (vma->node.start + vma->fence_size - I965_FENCE_PAGE) << 32;
+               val |= vma->node.start;
+               val |= (u64)((stride / 128) - 1) << fence_pitch_shift;
+               if (i915_gem_object_get_tiling(vma->obj) == I915_TILING_Y)
+                       val |= BIT(I965_FENCE_TILING_Y_SHIFT);
+               val |= I965_FENCE_REG_VALID;
+       }
+
+       if (!pipelined) {
+               struct intel_uncore *uncore = fence_to_uncore(fence);
+
+               /*
+                * To w/a incoherency with non-atomic 64-bit register updates,
+                * we split the 64-bit update into two 32-bit writes. In order
+                * for a partial fence not to be evaluated between writes, we
+                * precede the update with write to turn off the fence register,
+                * and only enable the fence as the last step.
+                *
+                * For extra levels of paranoia, we make sure each step lands
+                * before applying the next step.
+                */
+               intel_uncore_write_fw(uncore, fence_reg_lo, 0);
+               intel_uncore_posting_read_fw(uncore, fence_reg_lo);
+
+               intel_uncore_write_fw(uncore, fence_reg_hi, upper_32_bits(val));
+               intel_uncore_write_fw(uncore, fence_reg_lo, lower_32_bits(val));
+               intel_uncore_posting_read_fw(uncore, fence_reg_lo);
+       }
+}
+
+static void i915_write_fence_reg(struct i915_fence_reg *fence,
+                                struct i915_vma *vma)
+{
+       u32 val;
+
+       val = 0;
+       if (vma) {
+               unsigned int tiling = i915_gem_object_get_tiling(vma->obj);
+               bool is_y_tiled = tiling == I915_TILING_Y;
+               unsigned int stride = i915_gem_object_get_stride(vma->obj);
+
+               GEM_BUG_ON(!i915_vma_is_map_and_fenceable(vma));
+               GEM_BUG_ON(vma->node.start & ~I915_FENCE_START_MASK);
+               GEM_BUG_ON(!is_power_of_2(vma->fence_size));
+               GEM_BUG_ON(!IS_ALIGNED(vma->node.start, vma->fence_size));
+
+               if (is_y_tiled && HAS_128_BYTE_Y_TILING(fence_to_i915(fence)))
+                       stride /= 128;
+               else
+                       stride /= 512;
+               GEM_BUG_ON(!is_power_of_2(stride));
+
+               val = vma->node.start;
+               if (is_y_tiled)
+                       val |= BIT(I830_FENCE_TILING_Y_SHIFT);
+               val |= I915_FENCE_SIZE_BITS(vma->fence_size);
+               val |= ilog2(stride) << I830_FENCE_PITCH_SHIFT;
+
+               val |= I830_FENCE_REG_VALID;
+       }
+
+       if (!pipelined) {
+               struct intel_uncore *uncore = fence_to_uncore(fence);
+               i915_reg_t reg = FENCE_REG(fence->id);
+
+               intel_uncore_write_fw(uncore, reg, val);
+               intel_uncore_posting_read_fw(uncore, reg);
+       }
+}
+
+static void i830_write_fence_reg(struct i915_fence_reg *fence,
+                                struct i915_vma *vma)
+{
+       u32 val;
+
+       val = 0;
+       if (vma) {
+               unsigned int stride = i915_gem_object_get_stride(vma->obj);
+
+               GEM_BUG_ON(!i915_vma_is_map_and_fenceable(vma));
+               GEM_BUG_ON(vma->node.start & ~I830_FENCE_START_MASK);
+               GEM_BUG_ON(!is_power_of_2(vma->fence_size));
+               GEM_BUG_ON(!is_power_of_2(stride / 128));
+               GEM_BUG_ON(!IS_ALIGNED(vma->node.start, vma->fence_size));
+
+               val = vma->node.start;
+               if (i915_gem_object_get_tiling(vma->obj) == I915_TILING_Y)
+                       val |= BIT(I830_FENCE_TILING_Y_SHIFT);
+               val |= I830_FENCE_SIZE_BITS(vma->fence_size);
+               val |= ilog2(stride / 128) << I830_FENCE_PITCH_SHIFT;
+               val |= I830_FENCE_REG_VALID;
+       }
+
+       if (!pipelined) {
+               struct intel_uncore *uncore = fence_to_uncore(fence);
+               i915_reg_t reg = FENCE_REG(fence->id);
+
+               intel_uncore_write_fw(uncore, reg, val);
+               intel_uncore_posting_read_fw(uncore, reg);
+       }
+}
+
+static void fence_write(struct i915_fence_reg *fence,
+                       struct i915_vma *vma)
+{
+       struct drm_i915_private *i915 = fence_to_i915(fence);
+
+       /*
+        * Previous access through the fence register is marshalled by
+        * the mb() inside the fault handlers (i915_gem_release_mmaps)
+        * and explicitly managed for internal users.
+        */
+
+       if (IS_GEN(i915, 2))
+               i830_write_fence_reg(fence, vma);
+       else if (IS_GEN(i915, 3))
+               i915_write_fence_reg(fence, vma);
+       else
+               i965_write_fence_reg(fence, vma);
+
+       /*
+        * Access through the fenced region afterwards is
+        * ordered by the posting reads whilst writing the registers.
+        */
+
+       fence->dirty = false;
+}
+
+static int fence_update(struct i915_fence_reg *fence,
+                       struct i915_vma *vma)
+{
+       struct i915_ggtt *ggtt = fence->ggtt;
+       struct intel_uncore *uncore = fence_to_uncore(fence);
+       intel_wakeref_t wakeref;
+       struct i915_vma *old;
+       int ret;
+
+       if (vma) {
+               GEM_BUG_ON(!i915_vma_is_map_and_fenceable(vma));
+               GEM_BUG_ON(!i915_gem_object_get_stride(vma->obj) ||
+                          !i915_gem_object_get_tiling(vma->obj));
+
+               ret = i915_vma_sync(vma);
+               if (ret)
+                       return ret;
+       }
+
+       old = xchg(&fence->vma, NULL);
+       if (old) {
+               /* XXX Ideally we would move the waiting to outside the mutex */
+               ret = i915_vma_sync(old);
+               if (ret) {
+                       fence->vma = old;
+                       return ret;
+               }
+
+               i915_vma_flush_writes(old);
+
+               /*
+                * Ensure that all userspace CPU access is completed before
+                * stealing the fence.
+                */
+               if (old != vma) {
+                       GEM_BUG_ON(old->fence != fence);
+                       i915_vma_revoke_mmap(old);
+                       old->fence = NULL;
+               }
+
+               list_move(&fence->link, &ggtt->fence_list);
+       }
+
+       /*
+        * We only need to update the register itself if the device is awake.
+        * If the device is currently powered down, we will defer the write
+        * to the runtime resume, see intel_ggtt_restore_fences().
+        *
+        * This only works for removing the fence register, on acquisition
+        * the caller must hold the rpm wakeref. The fence register must
+        * be cleared before we can use any other fences to ensure that
+        * the new fences do not overlap the elided clears, confusing HW.
+        */
+       wakeref = intel_runtime_pm_get_if_in_use(uncore->rpm);
+       if (!wakeref) {
+               GEM_BUG_ON(vma);
+               return 0;
+       }
+
+       WRITE_ONCE(fence->vma, vma);
+       fence_write(fence, vma);
+
+       if (vma) {
+               vma->fence = fence;
+               list_move_tail(&fence->link, &ggtt->fence_list);
+       }
+
+       intel_runtime_pm_put(uncore->rpm, wakeref);
+       return 0;
+}
+
+/**
+ * i915_vma_revoke_fence - force-remove fence for a VMA
+ * @vma: vma to map linearly (not through a fence reg)
+ *
+ * This function force-removes any fence from the given object, which is useful
+ * if the kernel wants to do untiled GTT access.
+ *
+ * Returns:
+ *
+ * 0 on success, negative error code on failure.
+ */
+int i915_vma_revoke_fence(struct i915_vma *vma)
+{
+       struct i915_fence_reg *fence = vma->fence;
+
+       lockdep_assert_held(&vma->vm->mutex);
+       if (!fence)
+               return 0;
+
+       if (atomic_read(&fence->pin_count))
+               return -EBUSY;
+
+       return fence_update(fence, NULL);
+}
+
+static struct i915_fence_reg *fence_find(struct i915_ggtt *ggtt)
+{
+       struct i915_fence_reg *fence;
+
+       list_for_each_entry(fence, &ggtt->fence_list, link) {
+               GEM_BUG_ON(fence->vma && fence->vma->fence != fence);
+
+               if (atomic_read(&fence->pin_count))
+                       continue;
+
+               return fence;
+       }
+
+       /* Wait for completion of pending flips which consume fences */
+       if (intel_has_pending_fb_unpin(ggtt->vm.i915))
+               return ERR_PTR(-EAGAIN);
+
+       return ERR_PTR(-EDEADLK);
+}
+
+int __i915_vma_pin_fence(struct i915_vma *vma)
+{
+       struct i915_ggtt *ggtt = i915_vm_to_ggtt(vma->vm);
+       struct i915_fence_reg *fence;
+       struct i915_vma *set = i915_gem_object_is_tiled(vma->obj) ? vma : NULL;
+       int err;
+
+       lockdep_assert_held(&vma->vm->mutex);
+
+       /* Just update our place in the LRU if our fence is getting reused. */
+       if (vma->fence) {
+               fence = vma->fence;
+               GEM_BUG_ON(fence->vma != vma);
+               atomic_inc(&fence->pin_count);
+               if (!fence->dirty) {
+                       list_move_tail(&fence->link, &ggtt->fence_list);
+                       return 0;
+               }
+       } else if (set) {
+               fence = fence_find(ggtt);
+               if (IS_ERR(fence))
+                       return PTR_ERR(fence);
+
+               GEM_BUG_ON(atomic_read(&fence->pin_count));
+               atomic_inc(&fence->pin_count);
+       } else {
+               return 0;
+       }
+
+       err = fence_update(fence, set);
+       if (err)
+               goto out_unpin;
+
+       GEM_BUG_ON(fence->vma != set);
+       GEM_BUG_ON(vma->fence != (set ? fence : NULL));
+
+       if (set)
+               return 0;
+
+out_unpin:
+       atomic_dec(&fence->pin_count);
+       return err;
+}
+
+/**
+ * i915_vma_pin_fence - set up fencing for a vma
+ * @vma: vma to map through a fence reg
+ *
+ * When mapping objects through the GTT, userspace wants to be able to write
+ * to them without having to worry about swizzling if the object is tiled.
+ * This function walks the fence regs looking for a free one for @obj,
+ * stealing one if it can't find any.
+ *
+ * It then sets up the reg based on the object's properties: address, pitch
+ * and tiling format.
+ *
+ * For an untiled surface, this removes any existing fence.
+ *
+ * Returns:
+ *
+ * 0 on success, negative error code on failure.
+ */
+int i915_vma_pin_fence(struct i915_vma *vma)
+{
+       int err;
+
+       if (!vma->fence && !i915_gem_object_is_tiled(vma->obj))
+               return 0;
+
+       /*
+        * Note that we revoke fences on runtime suspend. Therefore the user
+        * must keep the device awake whilst using the fence.
+        */
+       assert_rpm_wakelock_held(vma->vm->gt->uncore->rpm);
+       GEM_BUG_ON(!i915_vma_is_pinned(vma));
+       GEM_BUG_ON(!i915_vma_is_ggtt(vma));
+
+       err = mutex_lock_interruptible(&vma->vm->mutex);
+       if (err)
+               return err;
+
+       err = __i915_vma_pin_fence(vma);
+       mutex_unlock(&vma->vm->mutex);
+
+       return err;
+}
+
+/**
+ * i915_reserve_fence - Reserve a fence for vGPU
+ * @ggtt: Global GTT
+ *
+ * This function walks the fence regs looking for a free one and remove
+ * it from the fence_list. It is used to reserve fence for vGPU to use.
+ */
+struct i915_fence_reg *i915_reserve_fence(struct i915_ggtt *ggtt)
+{
+       struct i915_fence_reg *fence;
+       int count;
+       int ret;
+
+       lockdep_assert_held(&ggtt->vm.mutex);
+
+       /* Keep at least one fence available for the display engine. */
+       count = 0;
+       list_for_each_entry(fence, &ggtt->fence_list, link)
+               count += !atomic_read(&fence->pin_count);
+       if (count <= 1)
+               return ERR_PTR(-ENOSPC);
+
+       fence = fence_find(ggtt);
+       if (IS_ERR(fence))
+               return fence;
+
+       if (fence->vma) {
+               /* Force-remove fence from VMA */
+               ret = fence_update(fence, NULL);
+               if (ret)
+                       return ERR_PTR(ret);
+       }
+
+       list_del(&fence->link);
+
+       return fence;
+}
+
+/**
+ * i915_unreserve_fence - Reclaim a reserved fence
+ * @fence: the fence reg
+ *
+ * This function add a reserved fence register from vGPU to the fence_list.
+ */
+void i915_unreserve_fence(struct i915_fence_reg *fence)
+{
+       struct i915_ggtt *ggtt = fence->ggtt;
+
+       lockdep_assert_held(&ggtt->vm.mutex);
+
+       list_add(&fence->link, &ggtt->fence_list);
+}
+
+/**
+ * intel_ggtt_restore_fences - restore fence state
+ * @ggtt: Global GTT
+ *
+ * Restore the hw fence state to match the software tracking again, to be called
+ * after a gpu reset and on resume. Note that on runtime suspend we only cancel
+ * the fences, to be reacquired by the user later.
+ */
+void intel_ggtt_restore_fences(struct i915_ggtt *ggtt)
+{
+       int i;
+
+       rcu_read_lock(); /* keep obj alive as we dereference */
+       for (i = 0; i < ggtt->num_fences; i++) {
+               struct i915_fence_reg *reg = &ggtt->fence_regs[i];
+               struct i915_vma *vma = READ_ONCE(reg->vma);
+
+               GEM_BUG_ON(vma && vma->fence != reg);
+
+               /*
+                * Commit delayed tiling changes if we have an object still
+                * attached to the fence, otherwise just clear the fence.
+                */
+               if (vma && !i915_gem_object_is_tiled(vma->obj))
+                       vma = NULL;
+
+               fence_write(reg, vma);
+       }
+       rcu_read_unlock();
+}
+
+/**
+ * DOC: tiling swizzling details
+ *
+ * The idea behind tiling is to increase cache hit rates by rearranging
+ * pixel data so that a group of pixel accesses are in the same cacheline.
+ * Performance improvement from doing this on the back/depth buffer are on
+ * the order of 30%.
+ *
+ * Intel architectures make this somewhat more complicated, though, by
+ * adjustments made to addressing of data when the memory is in interleaved
+ * mode (matched pairs of DIMMS) to improve memory bandwidth.
+ * For interleaved memory, the CPU sends every sequential 64 bytes
+ * to an alternate memory channel so it can get the bandwidth from both.
+ *
+ * The GPU also rearranges its accesses for increased bandwidth to interleaved
+ * memory, and it matches what the CPU does for non-tiled.  However, when tiled
+ * it does it a little differently, since one walks addresses not just in the
+ * X direction but also Y.  So, along with alternating channels when bit
+ * 6 of the address flips, it also alternates when other bits flip --  Bits 9
+ * (every 512 bytes, an X tile scanline) and 10 (every two X tile scanlines)
+ * are common to both the 915 and 965-class hardware.
+ *
+ * The CPU also sometimes XORs in higher bits as well, to improve
+ * bandwidth doing strided access like we do so frequently in graphics.  This
+ * is called "Channel XOR Randomization" in the MCH documentation.  The result
+ * is that the CPU is XORing in either bit 11 or bit 17 to bit 6 of its address
+ * decode.
+ *
+ * All of this bit 6 XORing has an effect on our memory management,
+ * as we need to make sure that the 3d driver can correctly address object
+ * contents.
+ *
+ * If we don't have interleaved memory, all tiling is safe and no swizzling is
+ * required.
+ *
+ * When bit 17 is XORed in, we simply refuse to tile at all.  Bit
+ * 17 is not just a page offset, so as we page an object out and back in,
+ * individual pages in it will have different bit 17 addresses, resulting in
+ * each 64 bytes being swapped with its neighbor!
+ *
+ * Otherwise, if interleaved, we have to tell the 3d driver what the address
+ * swizzling it needs to do is, since it's writing with the CPU to the pages
+ * (bit 6 and potentially bit 11 XORed in), and the GPU is reading from the
+ * pages (bit 6, 9, and 10 XORed in), resulting in a cumulative bit swizzling
+ * required by the CPU of XORing in bit 6, 9, 10, and potentially 11, in order
+ * to match what the GPU expects.
+ */
+
+/**
+ * detect_bit_6_swizzle - detect bit 6 swizzling pattern
+ * @ggtt: Global GGTT
+ *
+ * Detects bit 6 swizzling of address lookup between IGD access and CPU
+ * access through main memory.
+ */
+static void detect_bit_6_swizzle(struct i915_ggtt *ggtt)
+{
+       struct intel_uncore *uncore = ggtt->vm.gt->uncore;
+       struct drm_i915_private *i915 = ggtt->vm.i915;
+       u32 swizzle_x = I915_BIT_6_SWIZZLE_UNKNOWN;
+       u32 swizzle_y = I915_BIT_6_SWIZZLE_UNKNOWN;
+
+       if (INTEL_GEN(i915) >= 8 || IS_VALLEYVIEW(i915)) {
+               /*
+                * On BDW+, swizzling is not used. We leave the CPU memory
+                * controller in charge of optimizing memory accesses without
+                * the extra address manipulation GPU side.
+                *
+                * VLV and CHV don't have GPU swizzling.
+                */
+               swizzle_x = I915_BIT_6_SWIZZLE_NONE;
+               swizzle_y = I915_BIT_6_SWIZZLE_NONE;
+       } else if (INTEL_GEN(i915) >= 6) {
+               if (i915->preserve_bios_swizzle) {
+                       if (intel_uncore_read(uncore, DISP_ARB_CTL) &
+                           DISP_TILE_SURFACE_SWIZZLING) {
+                               swizzle_x = I915_BIT_6_SWIZZLE_9_10;
+                               swizzle_y = I915_BIT_6_SWIZZLE_9;
+                       } else {
+                               swizzle_x = I915_BIT_6_SWIZZLE_NONE;
+                               swizzle_y = I915_BIT_6_SWIZZLE_NONE;
+                       }
+               } else {
+                       u32 dimm_c0, dimm_c1;
+                       dimm_c0 = intel_uncore_read(uncore, MAD_DIMM_C0);
+                       dimm_c1 = intel_uncore_read(uncore, MAD_DIMM_C1);
+                       dimm_c0 &= MAD_DIMM_A_SIZE_MASK | MAD_DIMM_B_SIZE_MASK;
+                       dimm_c1 &= MAD_DIMM_A_SIZE_MASK | MAD_DIMM_B_SIZE_MASK;
+                       /*
+                        * Enable swizzling when the channels are populated
+                        * with identically sized dimms. We don't need to check
+                        * the 3rd channel because no cpu with gpu attached
+                        * ships in that configuration. Also, swizzling only
+                        * makes sense for 2 channels anyway.
+                        */
+                       if (dimm_c0 == dimm_c1) {
+                               swizzle_x = I915_BIT_6_SWIZZLE_9_10;
+                               swizzle_y = I915_BIT_6_SWIZZLE_9;
+                       } else {
+                               swizzle_x = I915_BIT_6_SWIZZLE_NONE;
+                               swizzle_y = I915_BIT_6_SWIZZLE_NONE;
+                       }
+               }
+       } else if (IS_GEN(i915, 5)) {
+               /*
+                * On Ironlake whatever DRAM config, GPU always do
+                * same swizzling setup.
+                */
+               swizzle_x = I915_BIT_6_SWIZZLE_9_10;
+               swizzle_y = I915_BIT_6_SWIZZLE_9;
+       } else if (IS_GEN(i915, 2)) {
+               /*
+                * As far as we know, the 865 doesn't have these bit 6
+                * swizzling issues.
+                */
+               swizzle_x = I915_BIT_6_SWIZZLE_NONE;
+               swizzle_y = I915_BIT_6_SWIZZLE_NONE;
+       } else if (IS_G45(i915) || IS_I965G(i915) || IS_G33(i915)) {
+               /*
+                * The 965, G33, and newer, have a very flexible memory
+                * configuration.  It will enable dual-channel mode
+                * (interleaving) on as much memory as it can, and the GPU
+                * will additionally sometimes enable different bit 6
+                * swizzling for tiled objects from the CPU.
+                *
+                * Here's what I found on the G965:
+                *    slot fill         memory size  swizzling
+                * 0A   0B   1A   1B    1-ch   2-ch
+                * 512  0    0    0     512    0     O
+                * 512  0    512  0     16     1008  X
+                * 512  0    0    512   16     1008  X
+                * 0    512  0    512   16     1008  X
+                * 1024 1024 1024 0     2048   1024  O
+                *
+                * We could probably detect this based on either the DRB
+                * matching, which was the case for the swizzling required in
+                * the table above, or from the 1-ch value being less than
+                * the minimum size of a rank.
+                *
+                * Reports indicate that the swizzling actually
+                * varies depending upon page placement inside the
+                * channels, i.e. we see swizzled pages where the
+                * banks of memory are paired and unswizzled on the
+                * uneven portion, so leave that as unknown.
+                */
+               if (intel_uncore_read(uncore, C0DRB3) ==
+                   intel_uncore_read(uncore, C1DRB3)) {
+                       swizzle_x = I915_BIT_6_SWIZZLE_9_10;
+                       swizzle_y = I915_BIT_6_SWIZZLE_9;
+               }
+       } else {
+               u32 dcc = intel_uncore_read(uncore, DCC);
+
+               /*
+                * On 9xx chipsets, channel interleave by the CPU is
+                * determined by DCC.  For single-channel, neither the CPU
+                * nor the GPU do swizzling.  For dual channel interleaved,
+                * the GPU's interleave is bit 9 and 10 for X tiled, and bit
+                * 9 for Y tiled.  The CPU's interleave is independent, and
+                * can be based on either bit 11 (haven't seen this yet) or
+                * bit 17 (common).
+                */
+               switch (dcc & DCC_ADDRESSING_MODE_MASK) {
+               case DCC_ADDRESSING_MODE_SINGLE_CHANNEL:
+               case DCC_ADDRESSING_MODE_DUAL_CHANNEL_ASYMMETRIC:
+                       swizzle_x = I915_BIT_6_SWIZZLE_NONE;
+                       swizzle_y = I915_BIT_6_SWIZZLE_NONE;
+                       break;
+               case DCC_ADDRESSING_MODE_DUAL_CHANNEL_INTERLEAVED:
+                       if (dcc & DCC_CHANNEL_XOR_DISABLE) {
+                               /*
+                                * This is the base swizzling by the GPU for
+                                * tiled buffers.
+                                */
+                               swizzle_x = I915_BIT_6_SWIZZLE_9_10;
+                               swizzle_y = I915_BIT_6_SWIZZLE_9;
+                       } else if ((dcc & DCC_CHANNEL_XOR_BIT_17) == 0) {
+                               /* Bit 11 swizzling by the CPU in addition. */
+                               swizzle_x = I915_BIT_6_SWIZZLE_9_10_11;
+                               swizzle_y = I915_BIT_6_SWIZZLE_9_11;
+                       } else {
+                               /* Bit 17 swizzling by the CPU in addition. */
+                               swizzle_x = I915_BIT_6_SWIZZLE_9_10_17;
+                               swizzle_y = I915_BIT_6_SWIZZLE_9_17;
+                       }
+                       break;
+               }
+
+               /* check for L-shaped memory aka modified enhanced addressing */
+               if (IS_GEN(i915, 4) &&
+                   !(intel_uncore_read(uncore, DCC2) & DCC2_MODIFIED_ENHANCED_DISABLE)) {
+                       swizzle_x = I915_BIT_6_SWIZZLE_UNKNOWN;
+                       swizzle_y = I915_BIT_6_SWIZZLE_UNKNOWN;
+               }
+
+               if (dcc == 0xffffffff) {
+                       drm_err(&i915->drm, "Couldn't read from MCHBAR.  "
+                                 "Disabling tiling.\n");
+                       swizzle_x = I915_BIT_6_SWIZZLE_UNKNOWN;
+                       swizzle_y = I915_BIT_6_SWIZZLE_UNKNOWN;
+               }
+       }
+
+       if (swizzle_x == I915_BIT_6_SWIZZLE_UNKNOWN ||
+           swizzle_y == I915_BIT_6_SWIZZLE_UNKNOWN) {
+               /*
+                * Userspace likes to explode if it sees unknown swizzling,
+                * so lie. We will finish the lie when reporting through
+                * the get-tiling-ioctl by reporting the physical swizzle
+                * mode as unknown instead.
+                *
+                * As we don't strictly know what the swizzling is, it may be
+                * bit17 dependent, and so we need to also prevent the pages
+                * from being moved.
+                */
+               i915->quirks |= QUIRK_PIN_SWIZZLED_PAGES;
+               swizzle_x = I915_BIT_6_SWIZZLE_NONE;
+               swizzle_y = I915_BIT_6_SWIZZLE_NONE;
+       }
+
+       i915->ggtt.bit_6_swizzle_x = swizzle_x;
+       i915->ggtt.bit_6_swizzle_y = swizzle_y;
+}
+
+/*
+ * Swap every 64 bytes of this page around, to account for it having a new
+ * bit 17 of its physical address and therefore being interpreted differently
+ * by the GPU.
+ */
+static void swizzle_page(struct page *page)
+{
+       char temp[64];
+       char *vaddr;
+       int i;
+
+       vaddr = kmap(page);
+
+       for (i = 0; i < PAGE_SIZE; i += 128) {
+               memcpy(temp, &vaddr[i], 64);
+               memcpy(&vaddr[i], &vaddr[i + 64], 64);
+               memcpy(&vaddr[i + 64], temp, 64);
+       }
+
+       kunmap(page);
+}
+
+/**
+ * i915_gem_object_do_bit_17_swizzle - fixup bit 17 swizzling
+ * @obj: i915 GEM buffer object
+ * @pages: the scattergather list of physical pages
+ *
+ * This function fixes up the swizzling in case any page frame number for this
+ * object has changed in bit 17 since that state has been saved with
+ * i915_gem_object_save_bit_17_swizzle().
+ *
+ * This is called when pinning backing storage again, since the kernel is free
+ * to move unpinned backing storage around (either by directly moving pages or
+ * by swapping them out and back in again).
+ */
+void
+i915_gem_object_do_bit_17_swizzle(struct drm_i915_gem_object *obj,
+                                 struct sg_table *pages)
+{
+       struct sgt_iter sgt_iter;
+       struct page *page;
+       int i;
+
+       if (obj->bit_17 == NULL)
+               return;
+
+       i = 0;
+       for_each_sgt_page(page, sgt_iter, pages) {
+               char new_bit_17 = page_to_phys(page) >> 17;
+               if ((new_bit_17 & 0x1) != (test_bit(i, obj->bit_17) != 0)) {
+                       swizzle_page(page);
+                       set_page_dirty(page);
+               }
+               i++;
+       }
+}
+
+/**
+ * i915_gem_object_save_bit_17_swizzle - save bit 17 swizzling
+ * @obj: i915 GEM buffer object
+ * @pages: the scattergather list of physical pages
+ *
+ * This function saves the bit 17 of each page frame number so that swizzling
+ * can be fixed up later on with i915_gem_object_do_bit_17_swizzle(). This must
+ * be called before the backing storage can be unpinned.
+ */
+void
+i915_gem_object_save_bit_17_swizzle(struct drm_i915_gem_object *obj,
+                                   struct sg_table *pages)
+{
+       const unsigned int page_count = obj->base.size >> PAGE_SHIFT;
+       struct sgt_iter sgt_iter;
+       struct page *page;
+       int i;
+
+       if (obj->bit_17 == NULL) {
+               obj->bit_17 = bitmap_zalloc(page_count, GFP_KERNEL);
+               if (obj->bit_17 == NULL) {
+                       DRM_ERROR("Failed to allocate memory for bit 17 "
+                                 "record\n");
+                       return;
+               }
+       }
+
+       i = 0;
+
+       for_each_sgt_page(page, sgt_iter, pages) {
+               if (page_to_phys(page) & (1 << 17))
+                       __set_bit(i, obj->bit_17);
+               else
+                       __clear_bit(i, obj->bit_17);
+               i++;
+       }
+}
+
+void intel_ggtt_init_fences(struct i915_ggtt *ggtt)
+{
+       struct drm_i915_private *i915 = ggtt->vm.i915;
+       struct intel_uncore *uncore = ggtt->vm.gt->uncore;
+       int num_fences;
+       int i;
+
+       INIT_LIST_HEAD(&ggtt->fence_list);
+       INIT_LIST_HEAD(&ggtt->userfault_list);
+       intel_wakeref_auto_init(&ggtt->userfault_wakeref, uncore->rpm);
+
+       detect_bit_6_swizzle(ggtt);
+
+       if (!i915_ggtt_has_aperture(ggtt))
+               num_fences = 0;
+       else if (INTEL_GEN(i915) >= 7 &&
+                !(IS_VALLEYVIEW(i915) || IS_CHERRYVIEW(i915)))
+               num_fences = 32;
+       else if (INTEL_GEN(i915) >= 4 ||
+                IS_I945G(i915) || IS_I945GM(i915) ||
+                IS_G33(i915) || IS_PINEVIEW(i915))
+               num_fences = 16;
+       else
+               num_fences = 8;
+
+       if (intel_vgpu_active(i915))
+               num_fences = intel_uncore_read(uncore,
+                                              vgtif_reg(avail_rs.fence_num));
+
+       /* Initialize fence registers to zero */
+       for (i = 0; i < num_fences; i++) {
+               struct i915_fence_reg *fence = &ggtt->fence_regs[i];
+
+               fence->ggtt = ggtt;
+               fence->id = i;
+               list_add_tail(&fence->link, &ggtt->fence_list);
+       }
+       ggtt->num_fences = num_fences;
+
+       intel_ggtt_restore_fences(ggtt);
+}
+
+void intel_gt_init_swizzling(struct intel_gt *gt)
+{
+       struct drm_i915_private *i915 = gt->i915;
+       struct intel_uncore *uncore = gt->uncore;
+
+       if (INTEL_GEN(i915) < 5 ||
+           i915->ggtt.bit_6_swizzle_x == I915_BIT_6_SWIZZLE_NONE)
+               return;
+
+       intel_uncore_rmw(uncore, DISP_ARB_CTL, 0, DISP_TILE_SURFACE_SWIZZLING);
+
+       if (IS_GEN(i915, 5))
+               return;
+
+       intel_uncore_rmw(uncore, TILECTL, 0, TILECTL_SWZCTL);
+
+       if (IS_GEN(i915, 6))
+               intel_uncore_write(uncore,
+                                  ARB_MODE,
+                                  _MASKED_BIT_ENABLE(ARB_MODE_SWIZZLE_SNB));
+       else if (IS_GEN(i915, 7))
+               intel_uncore_write(uncore,
+                                  ARB_MODE,
+                                  _MASKED_BIT_ENABLE(ARB_MODE_SWIZZLE_IVB));
+       else if (IS_GEN(i915, 8))
+               intel_uncore_write(uncore,
+                                  GAMTARBMODE,
+                                  _MASKED_BIT_ENABLE(ARB_MODE_SWIZZLE_BDW));
+       else
+               MISSING_CASE(INTEL_GEN(i915));
+}
diff --git a/drivers/gpu/drm/i915/gt/intel_ggtt_fencing.h b/drivers/gpu/drm/i915/gt/intel_ggtt_fencing.h
new file mode 100644 (file)
index 0000000..3b3eb5b
--- /dev/null
@@ -0,0 +1,70 @@
+/*
+ * Copyright © 2016 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ */
+
+#ifndef __INTEL_GGTT_FENCING_H__
+#define __INTEL_GGTT_FENCING_H__
+
+#include <linux/list.h>
+#include <linux/types.h>
+
+struct drm_i915_gem_object;
+struct i915_ggtt;
+struct i915_vma;
+struct intel_gt;
+struct sg_table;
+
+#define I965_FENCE_PAGE 4096UL
+
+struct i915_fence_reg {
+       struct list_head link;
+       struct i915_ggtt *ggtt;
+       struct i915_vma *vma;
+       atomic_t pin_count;
+       int id;
+       /**
+        * Whether the tiling parameters for the currently
+        * associated fence register have changed. Note that
+        * for the purposes of tracking tiling changes we also
+        * treat the unfenced register, the register slot that
+        * the object occupies whilst it executes a fenced
+        * command (such as BLT on gen2/3), as a "fence".
+        */
+       bool dirty;
+};
+
+struct i915_fence_reg *i915_reserve_fence(struct i915_ggtt *ggtt);
+void i915_unreserve_fence(struct i915_fence_reg *fence);
+
+void intel_ggtt_restore_fences(struct i915_ggtt *ggtt);
+
+void i915_gem_object_do_bit_17_swizzle(struct drm_i915_gem_object *obj,
+                                      struct sg_table *pages);
+void i915_gem_object_save_bit_17_swizzle(struct drm_i915_gem_object *obj,
+                                        struct sg_table *pages);
+
+void intel_ggtt_init_fences(struct i915_ggtt *ggtt);
+
+void intel_gt_init_swizzling(struct intel_gt *gt);
+
+#endif
index b3116fe8d1807dd09e5a3e54076e1c7105a3ea9a..ce6ff9d3a35073f77d621f0f86cca44087d01f9a 100644 (file)
@@ -26,7 +26,7 @@
 #include <drm/drm_mm.h>
 
 #include "gt/intel_reset.h"
-#include "i915_gem_fence_reg.h"
+#include "gt/intel_ggtt_fencing.h"
 #include "i915_selftest.h"
 #include "i915_vma_types.h"
 
index 8b170c1876b33a18a59ac3f634ac7940880ae2f4..9a15bdf31c7f295eec460e81b6257662603efc51 100644 (file)
@@ -750,7 +750,7 @@ static int gt_reset(struct intel_gt *gt, intel_engine_mask_t stalled_mask)
        for_each_engine(engine, gt, id)
                __intel_engine_reset(engine, stalled_mask & engine->mask);
 
-       i915_gem_restore_fences(gt->ggtt);
+       intel_ggtt_restore_fences(gt->ggtt);
 
        return err;
 }
index 8b13f091cee20b528695716e8631a8386424b049..0d6d5987130821926002fbbf9d1f85bf43196788 100644 (file)
@@ -35,7 +35,7 @@
  */
 
 #include "i915_drv.h"
-#include "i915_gem_fence_reg.h"
+#include "gt/intel_ggtt_fencing.h"
 #include "gvt.h"
 
 static int alloc_gm(struct intel_vgpu *vgpu, bool high_gm)
index 480f756bdadce3abb08041576dbd66dcdedf15be..9327d56dba5aa257618f2542836cea33d2515cb9 100644 (file)
@@ -1288,7 +1288,7 @@ static int i915_drm_resume(struct drm_device *dev)
                drm_err(&dev_priv->drm, "failed to re-enable GGTT\n");
 
        i915_ggtt_resume(&dev_priv->ggtt);
-       i915_gem_restore_fences(&dev_priv->ggtt);
+       intel_ggtt_restore_fences(&dev_priv->ggtt);
 
        intel_csr_ucode_resume(dev_priv);
 
@@ -1606,7 +1606,7 @@ static int intel_runtime_suspend(struct device *kdev)
 
                intel_gt_runtime_resume(&dev_priv->gt);
 
-               i915_gem_restore_fences(&dev_priv->ggtt);
+               intel_ggtt_restore_fences(&dev_priv->ggtt);
 
                enable_rpm_wakeref_asserts(rpm);
 
@@ -1687,7 +1687,7 @@ static int intel_runtime_resume(struct device *kdev)
         * we can do is to hope that things will still work (and disable RPM).
         */
        intel_gt_runtime_resume(&dev_priv->gt);
-       i915_gem_restore_fences(&dev_priv->ggtt);
+       intel_ggtt_restore_fences(&dev_priv->ggtt);
 
        /*
         * On VLV/CHV display interrupts are part of the display
index 1f5b9a584f71795ea6cb9869e96338ab6e39d808..ddd5b40cbbbc3ddcc63b34966d4266647f86d306 100644 (file)
@@ -92,7 +92,6 @@
 #include "intel_wopcm.h"
 
 #include "i915_gem.h"
-#include "i915_gem_fence_reg.h"
 #include "i915_gem_gtt.h"
 #include "i915_gpu_error.h"
 #include "i915_perf_types.h"
index ca5420012a22bfb8f88433c15217df8592f5c0f8..2c53be0bd9fdb52a0bf9bbb22dd045338ab7c224 100644 (file)
@@ -1156,7 +1156,7 @@ err_unlock:
                /* Minimal basic recovery for KMS */
                ret = i915_ggtt_enable_hw(dev_priv);
                i915_ggtt_resume(&dev_priv->ggtt);
-               i915_gem_restore_fences(&dev_priv->ggtt);
+               intel_ggtt_restore_fences(&dev_priv->ggtt);
                intel_init_clock_gating(dev_priv);
        }
 
diff --git a/drivers/gpu/drm/i915/i915_gem_fence_reg.c b/drivers/gpu/drm/i915/i915_gem_fence_reg.c
deleted file mode 100644 (file)
index d152b64..0000000
+++ /dev/null
@@ -1,911 +0,0 @@
-/*
- * Copyright © 2008-2015 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- */
-
-#include "i915_drv.h"
-#include "i915_scatterlist.h"
-#include "i915_pvinfo.h"
-#include "i915_vgpu.h"
-
-/**
- * DOC: fence register handling
- *
- * Important to avoid confusions: "fences" in the i915 driver are not execution
- * fences used to track command completion but hardware detiler objects which
- * wrap a given range of the global GTT. Each platform has only a fairly limited
- * set of these objects.
- *
- * Fences are used to detile GTT memory mappings. They're also connected to the
- * hardware frontbuffer render tracking and hence interact with frontbuffer
- * compression. Furthermore on older platforms fences are required for tiled
- * objects used by the display engine. They can also be used by the render
- * engine - they're required for blitter commands and are optional for render
- * commands. But on gen4+ both display (with the exception of fbc) and rendering
- * have their own tiling state bits and don't need fences.
- *
- * Also note that fences only support X and Y tiling and hence can't be used for
- * the fancier new tiling formats like W, Ys and Yf.
- *
- * Finally note that because fences are such a restricted resource they're
- * dynamically associated with objects. Furthermore fence state is committed to
- * the hardware lazily to avoid unnecessary stalls on gen2/3. Therefore code must
- * explicitly call i915_gem_object_get_fence() to synchronize fencing status
- * for cpu access. Also note that some code wants an unfenced view, for those
- * cases the fence can be removed forcefully with i915_gem_object_put_fence().
- *
- * Internally these functions will synchronize with userspace access by removing
- * CPU ptes into GTT mmaps (not the GTT ptes themselves) as needed.
- */
-
-#define pipelined 0
-
-static struct drm_i915_private *fence_to_i915(struct i915_fence_reg *fence)
-{
-       return fence->ggtt->vm.i915;
-}
-
-static struct intel_uncore *fence_to_uncore(struct i915_fence_reg *fence)
-{
-       return fence->ggtt->vm.gt->uncore;
-}
-
-static void i965_write_fence_reg(struct i915_fence_reg *fence,
-                                struct i915_vma *vma)
-{
-       i915_reg_t fence_reg_lo, fence_reg_hi;
-       int fence_pitch_shift;
-       u64 val;
-
-       if (INTEL_GEN(fence_to_i915(fence)) >= 6) {
-               fence_reg_lo = FENCE_REG_GEN6_LO(fence->id);
-               fence_reg_hi = FENCE_REG_GEN6_HI(fence->id);
-               fence_pitch_shift = GEN6_FENCE_PITCH_SHIFT;
-
-       } else {
-               fence_reg_lo = FENCE_REG_965_LO(fence->id);
-               fence_reg_hi = FENCE_REG_965_HI(fence->id);
-               fence_pitch_shift = I965_FENCE_PITCH_SHIFT;
-       }
-
-       val = 0;
-       if (vma) {
-               unsigned int stride = i915_gem_object_get_stride(vma->obj);
-
-               GEM_BUG_ON(!i915_vma_is_map_and_fenceable(vma));
-               GEM_BUG_ON(!IS_ALIGNED(vma->node.start, I965_FENCE_PAGE));
-               GEM_BUG_ON(!IS_ALIGNED(vma->fence_size, I965_FENCE_PAGE));
-               GEM_BUG_ON(!IS_ALIGNED(stride, 128));
-
-               val = (vma->node.start + vma->fence_size - I965_FENCE_PAGE) << 32;
-               val |= vma->node.start;
-               val |= (u64)((stride / 128) - 1) << fence_pitch_shift;
-               if (i915_gem_object_get_tiling(vma->obj) == I915_TILING_Y)
-                       val |= BIT(I965_FENCE_TILING_Y_SHIFT);
-               val |= I965_FENCE_REG_VALID;
-       }
-
-       if (!pipelined) {
-               struct intel_uncore *uncore = fence_to_uncore(fence);
-
-               /*
-                * To w/a incoherency with non-atomic 64-bit register updates,
-                * we split the 64-bit update into two 32-bit writes. In order
-                * for a partial fence not to be evaluated between writes, we
-                * precede the update with write to turn off the fence register,
-                * and only enable the fence as the last step.
-                *
-                * For extra levels of paranoia, we make sure each step lands
-                * before applying the next step.
-                */
-               intel_uncore_write_fw(uncore, fence_reg_lo, 0);
-               intel_uncore_posting_read_fw(uncore, fence_reg_lo);
-
-               intel_uncore_write_fw(uncore, fence_reg_hi, upper_32_bits(val));
-               intel_uncore_write_fw(uncore, fence_reg_lo, lower_32_bits(val));
-               intel_uncore_posting_read_fw(uncore, fence_reg_lo);
-       }
-}
-
-static void i915_write_fence_reg(struct i915_fence_reg *fence,
-                                struct i915_vma *vma)
-{
-       u32 val;
-
-       val = 0;
-       if (vma) {
-               unsigned int tiling = i915_gem_object_get_tiling(vma->obj);
-               bool is_y_tiled = tiling == I915_TILING_Y;
-               unsigned int stride = i915_gem_object_get_stride(vma->obj);
-
-               GEM_BUG_ON(!i915_vma_is_map_and_fenceable(vma));
-               GEM_BUG_ON(vma->node.start & ~I915_FENCE_START_MASK);
-               GEM_BUG_ON(!is_power_of_2(vma->fence_size));
-               GEM_BUG_ON(!IS_ALIGNED(vma->node.start, vma->fence_size));
-
-               if (is_y_tiled && HAS_128_BYTE_Y_TILING(fence_to_i915(fence)))
-                       stride /= 128;
-               else
-                       stride /= 512;
-               GEM_BUG_ON(!is_power_of_2(stride));
-
-               val = vma->node.start;
-               if (is_y_tiled)
-                       val |= BIT(I830_FENCE_TILING_Y_SHIFT);
-               val |= I915_FENCE_SIZE_BITS(vma->fence_size);
-               val |= ilog2(stride) << I830_FENCE_PITCH_SHIFT;
-
-               val |= I830_FENCE_REG_VALID;
-       }
-
-       if (!pipelined) {
-               struct intel_uncore *uncore = fence_to_uncore(fence);
-               i915_reg_t reg = FENCE_REG(fence->id);
-
-               intel_uncore_write_fw(uncore, reg, val);
-               intel_uncore_posting_read_fw(uncore, reg);
-       }
-}
-
-static void i830_write_fence_reg(struct i915_fence_reg *fence,
-                                struct i915_vma *vma)
-{
-       u32 val;
-
-       val = 0;
-       if (vma) {
-               unsigned int stride = i915_gem_object_get_stride(vma->obj);
-
-               GEM_BUG_ON(!i915_vma_is_map_and_fenceable(vma));
-               GEM_BUG_ON(vma->node.start & ~I830_FENCE_START_MASK);
-               GEM_BUG_ON(!is_power_of_2(vma->fence_size));
-               GEM_BUG_ON(!is_power_of_2(stride / 128));
-               GEM_BUG_ON(!IS_ALIGNED(vma->node.start, vma->fence_size));
-
-               val = vma->node.start;
-               if (i915_gem_object_get_tiling(vma->obj) == I915_TILING_Y)
-                       val |= BIT(I830_FENCE_TILING_Y_SHIFT);
-               val |= I830_FENCE_SIZE_BITS(vma->fence_size);
-               val |= ilog2(stride / 128) << I830_FENCE_PITCH_SHIFT;
-               val |= I830_FENCE_REG_VALID;
-       }
-
-       if (!pipelined) {
-               struct intel_uncore *uncore = fence_to_uncore(fence);
-               i915_reg_t reg = FENCE_REG(fence->id);
-
-               intel_uncore_write_fw(uncore, reg, val);
-               intel_uncore_posting_read_fw(uncore, reg);
-       }
-}
-
-static void fence_write(struct i915_fence_reg *fence,
-                       struct i915_vma *vma)
-{
-       struct drm_i915_private *i915 = fence_to_i915(fence);
-
-       /*
-        * Previous access through the fence register is marshalled by
-        * the mb() inside the fault handlers (i915_gem_release_mmaps)
-        * and explicitly managed for internal users.
-        */
-
-       if (IS_GEN(i915, 2))
-               i830_write_fence_reg(fence, vma);
-       else if (IS_GEN(i915, 3))
-               i915_write_fence_reg(fence, vma);
-       else
-               i965_write_fence_reg(fence, vma);
-
-       /*
-        * Access through the fenced region afterwards is
-        * ordered by the posting reads whilst writing the registers.
-        */
-
-       fence->dirty = false;
-}
-
-static int fence_update(struct i915_fence_reg *fence,
-                       struct i915_vma *vma)
-{
-       struct i915_ggtt *ggtt = fence->ggtt;
-       struct intel_uncore *uncore = fence_to_uncore(fence);
-       intel_wakeref_t wakeref;
-       struct i915_vma *old;
-       int ret;
-
-       if (vma) {
-               if (!i915_vma_is_map_and_fenceable(vma))
-                       return -EINVAL;
-
-               if (drm_WARN(&uncore->i915->drm,
-                            !i915_gem_object_get_stride(vma->obj) ||
-                            !i915_gem_object_get_tiling(vma->obj),
-                            "bogus fence setup with stride: 0x%x, tiling mode: %i\n",
-                            i915_gem_object_get_stride(vma->obj),
-                            i915_gem_object_get_tiling(vma->obj)))
-                       return -EINVAL;
-
-               ret = i915_vma_sync(vma);
-               if (ret)
-                       return ret;
-       }
-
-       old = xchg(&fence->vma, NULL);
-       if (old) {
-               /* XXX Ideally we would move the waiting to outside the mutex */
-               ret = i915_vma_sync(old);
-               if (ret) {
-                       fence->vma = old;
-                       return ret;
-               }
-
-               i915_vma_flush_writes(old);
-
-               /*
-                * Ensure that all userspace CPU access is completed before
-                * stealing the fence.
-                */
-               if (old != vma) {
-                       GEM_BUG_ON(old->fence != fence);
-                       i915_vma_revoke_mmap(old);
-                       old->fence = NULL;
-               }
-
-               list_move(&fence->link, &ggtt->fence_list);
-       }
-
-       /*
-        * We only need to update the register itself if the device is awake.
-        * If the device is currently powered down, we will defer the write
-        * to the runtime resume, see i915_gem_restore_fences().
-        *
-        * This only works for removing the fence register, on acquisition
-        * the caller must hold the rpm wakeref. The fence register must
-        * be cleared before we can use any other fences to ensure that
-        * the new fences do not overlap the elided clears, confusing HW.
-        */
-       wakeref = intel_runtime_pm_get_if_in_use(uncore->rpm);
-       if (!wakeref) {
-               GEM_BUG_ON(vma);
-               return 0;
-       }
-
-       WRITE_ONCE(fence->vma, vma);
-       fence_write(fence, vma);
-
-       if (vma) {
-               vma->fence = fence;
-               list_move_tail(&fence->link, &ggtt->fence_list);
-       }
-
-       intel_runtime_pm_put(uncore->rpm, wakeref);
-       return 0;
-}
-
-/**
- * i915_vma_revoke_fence - force-remove fence for a VMA
- * @vma: vma to map linearly (not through a fence reg)
- *
- * This function force-removes any fence from the given object, which is useful
- * if the kernel wants to do untiled GTT access.
- *
- * Returns:
- *
- * 0 on success, negative error code on failure.
- */
-int i915_vma_revoke_fence(struct i915_vma *vma)
-{
-       struct i915_fence_reg *fence = vma->fence;
-
-       lockdep_assert_held(&vma->vm->mutex);
-       if (!fence)
-               return 0;
-
-       if (atomic_read(&fence->pin_count))
-               return -EBUSY;
-
-       return fence_update(fence, NULL);
-}
-
-static struct i915_fence_reg *fence_find(struct i915_ggtt *ggtt)
-{
-       struct i915_fence_reg *fence;
-
-       list_for_each_entry(fence, &ggtt->fence_list, link) {
-               GEM_BUG_ON(fence->vma && fence->vma->fence != fence);
-
-               if (atomic_read(&fence->pin_count))
-                       continue;
-
-               return fence;
-       }
-
-       /* Wait for completion of pending flips which consume fences */
-       if (intel_has_pending_fb_unpin(ggtt->vm.i915))
-               return ERR_PTR(-EAGAIN);
-
-       return ERR_PTR(-EDEADLK);
-}
-
-int __i915_vma_pin_fence(struct i915_vma *vma)
-{
-       struct i915_ggtt *ggtt = i915_vm_to_ggtt(vma->vm);
-       struct i915_fence_reg *fence;
-       struct i915_vma *set = i915_gem_object_is_tiled(vma->obj) ? vma : NULL;
-       int err;
-
-       lockdep_assert_held(&vma->vm->mutex);
-
-       /* Just update our place in the LRU if our fence is getting reused. */
-       if (vma->fence) {
-               fence = vma->fence;
-               GEM_BUG_ON(fence->vma != vma);
-               atomic_inc(&fence->pin_count);
-               if (!fence->dirty) {
-                       list_move_tail(&fence->link, &ggtt->fence_list);
-                       return 0;
-               }
-       } else if (set) {
-               fence = fence_find(ggtt);
-               if (IS_ERR(fence))
-                       return PTR_ERR(fence);
-
-               GEM_BUG_ON(atomic_read(&fence->pin_count));
-               atomic_inc(&fence->pin_count);
-       } else {
-               return 0;
-       }
-
-       err = fence_update(fence, set);
-       if (err)
-               goto out_unpin;
-
-       GEM_BUG_ON(fence->vma != set);
-       GEM_BUG_ON(vma->fence != (set ? fence : NULL));
-
-       if (set)
-               return 0;
-
-out_unpin:
-       atomic_dec(&fence->pin_count);
-       return err;
-}
-
-/**
- * i915_vma_pin_fence - set up fencing for a vma
- * @vma: vma to map through a fence reg
- *
- * When mapping objects through the GTT, userspace wants to be able to write
- * to them without having to worry about swizzling if the object is tiled.
- * This function walks the fence regs looking for a free one for @obj,
- * stealing one if it can't find any.
- *
- * It then sets up the reg based on the object's properties: address, pitch
- * and tiling format.
- *
- * For an untiled surface, this removes any existing fence.
- *
- * Returns:
- *
- * 0 on success, negative error code on failure.
- */
-int i915_vma_pin_fence(struct i915_vma *vma)
-{
-       int err;
-
-       if (!vma->fence && !i915_gem_object_is_tiled(vma->obj))
-               return 0;
-
-       /*
-        * Note that we revoke fences on runtime suspend. Therefore the user
-        * must keep the device awake whilst using the fence.
-        */
-       assert_rpm_wakelock_held(vma->vm->gt->uncore->rpm);
-       GEM_BUG_ON(!i915_vma_is_pinned(vma));
-       GEM_BUG_ON(!i915_vma_is_ggtt(vma));
-
-       err = mutex_lock_interruptible(&vma->vm->mutex);
-       if (err)
-               return err;
-
-       err = __i915_vma_pin_fence(vma);
-       mutex_unlock(&vma->vm->mutex);
-
-       return err;
-}
-
-/**
- * i915_reserve_fence - Reserve a fence for vGPU
- * @ggtt: Global GTT
- *
- * This function walks the fence regs looking for a free one and remove
- * it from the fence_list. It is used to reserve fence for vGPU to use.
- */
-struct i915_fence_reg *i915_reserve_fence(struct i915_ggtt *ggtt)
-{
-       struct i915_fence_reg *fence;
-       int count;
-       int ret;
-
-       lockdep_assert_held(&ggtt->vm.mutex);
-
-       /* Keep at least one fence available for the display engine. */
-       count = 0;
-       list_for_each_entry(fence, &ggtt->fence_list, link)
-               count += !atomic_read(&fence->pin_count);
-       if (count <= 1)
-               return ERR_PTR(-ENOSPC);
-
-       fence = fence_find(ggtt);
-       if (IS_ERR(fence))
-               return fence;
-
-       if (fence->vma) {
-               /* Force-remove fence from VMA */
-               ret = fence_update(fence, NULL);
-               if (ret)
-                       return ERR_PTR(ret);
-       }
-
-       list_del(&fence->link);
-
-       return fence;
-}
-
-/**
- * i915_unreserve_fence - Reclaim a reserved fence
- * @fence: the fence reg
- *
- * This function add a reserved fence register from vGPU to the fence_list.
- */
-void i915_unreserve_fence(struct i915_fence_reg *fence)
-{
-       struct i915_ggtt *ggtt = fence->ggtt;
-
-       lockdep_assert_held(&ggtt->vm.mutex);
-
-       list_add(&fence->link, &ggtt->fence_list);
-}
-
-/**
- * i915_gem_restore_fences - restore fence state
- * @ggtt: Global GTT
- *
- * Restore the hw fence state to match the software tracking again, to be called
- * after a gpu reset and on resume. Note that on runtime suspend we only cancel
- * the fences, to be reacquired by the user later.
- */
-void i915_gem_restore_fences(struct i915_ggtt *ggtt)
-{
-       int i;
-
-       rcu_read_lock(); /* keep obj alive as we dereference */
-       for (i = 0; i < ggtt->num_fences; i++) {
-               struct i915_fence_reg *reg = &ggtt->fence_regs[i];
-               struct i915_vma *vma = READ_ONCE(reg->vma);
-
-               GEM_BUG_ON(vma && vma->fence != reg);
-
-               /*
-                * Commit delayed tiling changes if we have an object still
-                * attached to the fence, otherwise just clear the fence.
-                */
-               if (vma && !i915_gem_object_is_tiled(vma->obj))
-                       vma = NULL;
-
-               fence_write(reg, vma);
-       }
-       rcu_read_unlock();
-}
-
-/**
- * DOC: tiling swizzling details
- *
- * The idea behind tiling is to increase cache hit rates by rearranging
- * pixel data so that a group of pixel accesses are in the same cacheline.
- * Performance improvement from doing this on the back/depth buffer are on
- * the order of 30%.
- *
- * Intel architectures make this somewhat more complicated, though, by
- * adjustments made to addressing of data when the memory is in interleaved
- * mode (matched pairs of DIMMS) to improve memory bandwidth.
- * For interleaved memory, the CPU sends every sequential 64 bytes
- * to an alternate memory channel so it can get the bandwidth from both.
- *
- * The GPU also rearranges its accesses for increased bandwidth to interleaved
- * memory, and it matches what the CPU does for non-tiled.  However, when tiled
- * it does it a little differently, since one walks addresses not just in the
- * X direction but also Y.  So, along with alternating channels when bit
- * 6 of the address flips, it also alternates when other bits flip --  Bits 9
- * (every 512 bytes, an X tile scanline) and 10 (every two X tile scanlines)
- * are common to both the 915 and 965-class hardware.
- *
- * The CPU also sometimes XORs in higher bits as well, to improve
- * bandwidth doing strided access like we do so frequently in graphics.  This
- * is called "Channel XOR Randomization" in the MCH documentation.  The result
- * is that the CPU is XORing in either bit 11 or bit 17 to bit 6 of its address
- * decode.
- *
- * All of this bit 6 XORing has an effect on our memory management,
- * as we need to make sure that the 3d driver can correctly address object
- * contents.
- *
- * If we don't have interleaved memory, all tiling is safe and no swizzling is
- * required.
- *
- * When bit 17 is XORed in, we simply refuse to tile at all.  Bit
- * 17 is not just a page offset, so as we page an object out and back in,
- * individual pages in it will have different bit 17 addresses, resulting in
- * each 64 bytes being swapped with its neighbor!
- *
- * Otherwise, if interleaved, we have to tell the 3d driver what the address
- * swizzling it needs to do is, since it's writing with the CPU to the pages
- * (bit 6 and potentially bit 11 XORed in), and the GPU is reading from the
- * pages (bit 6, 9, and 10 XORed in), resulting in a cumulative bit swizzling
- * required by the CPU of XORing in bit 6, 9, 10, and potentially 11, in order
- * to match what the GPU expects.
- */
-
-/**
- * detect_bit_6_swizzle - detect bit 6 swizzling pattern
- * @ggtt: Global GGTT
- *
- * Detects bit 6 swizzling of address lookup between IGD access and CPU
- * access through main memory.
- */
-static void detect_bit_6_swizzle(struct i915_ggtt *ggtt)
-{
-       struct intel_uncore *uncore = ggtt->vm.gt->uncore;
-       struct drm_i915_private *i915 = ggtt->vm.i915;
-       u32 swizzle_x = I915_BIT_6_SWIZZLE_UNKNOWN;
-       u32 swizzle_y = I915_BIT_6_SWIZZLE_UNKNOWN;
-
-       if (INTEL_GEN(i915) >= 8 || IS_VALLEYVIEW(i915)) {
-               /*
-                * On BDW+, swizzling is not used. We leave the CPU memory
-                * controller in charge of optimizing memory accesses without
-                * the extra address manipulation GPU side.
-                *
-                * VLV and CHV don't have GPU swizzling.
-                */
-               swizzle_x = I915_BIT_6_SWIZZLE_NONE;
-               swizzle_y = I915_BIT_6_SWIZZLE_NONE;
-       } else if (INTEL_GEN(i915) >= 6) {
-               if (i915->preserve_bios_swizzle) {
-                       if (intel_uncore_read(uncore, DISP_ARB_CTL) &
-                           DISP_TILE_SURFACE_SWIZZLING) {
-                               swizzle_x = I915_BIT_6_SWIZZLE_9_10;
-                               swizzle_y = I915_BIT_6_SWIZZLE_9;
-                       } else {
-                               swizzle_x = I915_BIT_6_SWIZZLE_NONE;
-                               swizzle_y = I915_BIT_6_SWIZZLE_NONE;
-                       }
-               } else {
-                       u32 dimm_c0, dimm_c1;
-                       dimm_c0 = intel_uncore_read(uncore, MAD_DIMM_C0);
-                       dimm_c1 = intel_uncore_read(uncore, MAD_DIMM_C1);
-                       dimm_c0 &= MAD_DIMM_A_SIZE_MASK | MAD_DIMM_B_SIZE_MASK;
-                       dimm_c1 &= MAD_DIMM_A_SIZE_MASK | MAD_DIMM_B_SIZE_MASK;
-                       /*
-                        * Enable swizzling when the channels are populated
-                        * with identically sized dimms. We don't need to check
-                        * the 3rd channel because no cpu with gpu attached
-                        * ships in that configuration. Also, swizzling only
-                        * makes sense for 2 channels anyway.
-                        */
-                       if (dimm_c0 == dimm_c1) {
-                               swizzle_x = I915_BIT_6_SWIZZLE_9_10;
-                               swizzle_y = I915_BIT_6_SWIZZLE_9;
-                       } else {
-                               swizzle_x = I915_BIT_6_SWIZZLE_NONE;
-                               swizzle_y = I915_BIT_6_SWIZZLE_NONE;
-                       }
-               }
-       } else if (IS_GEN(i915, 5)) {
-               /*
-                * On Ironlake whatever DRAM config, GPU always do
-                * same swizzling setup.
-                */
-               swizzle_x = I915_BIT_6_SWIZZLE_9_10;
-               swizzle_y = I915_BIT_6_SWIZZLE_9;
-       } else if (IS_GEN(i915, 2)) {
-               /*
-                * As far as we know, the 865 doesn't have these bit 6
-                * swizzling issues.
-                */
-               swizzle_x = I915_BIT_6_SWIZZLE_NONE;
-               swizzle_y = I915_BIT_6_SWIZZLE_NONE;
-       } else if (IS_G45(i915) || IS_I965G(i915) || IS_G33(i915)) {
-               /*
-                * The 965, G33, and newer, have a very flexible memory
-                * configuration.  It will enable dual-channel mode
-                * (interleaving) on as much memory as it can, and the GPU
-                * will additionally sometimes enable different bit 6
-                * swizzling for tiled objects from the CPU.
-                *
-                * Here's what I found on the G965:
-                *    slot fill         memory size  swizzling
-                * 0A   0B   1A   1B    1-ch   2-ch
-                * 512  0    0    0     512    0     O
-                * 512  0    512  0     16     1008  X
-                * 512  0    0    512   16     1008  X
-                * 0    512  0    512   16     1008  X
-                * 1024 1024 1024 0     2048   1024  O
-                *
-                * We could probably detect this based on either the DRB
-                * matching, which was the case for the swizzling required in
-                * the table above, or from the 1-ch value being less than
-                * the minimum size of a rank.
-                *
-                * Reports indicate that the swizzling actually
-                * varies depending upon page placement inside the
-                * channels, i.e. we see swizzled pages where the
-                * banks of memory are paired and unswizzled on the
-                * uneven portion, so leave that as unknown.
-                */
-               if (intel_uncore_read(uncore, C0DRB3) ==
-                   intel_uncore_read(uncore, C1DRB3)) {
-                       swizzle_x = I915_BIT_6_SWIZZLE_9_10;
-                       swizzle_y = I915_BIT_6_SWIZZLE_9;
-               }
-       } else {
-               u32 dcc = intel_uncore_read(uncore, DCC);
-
-               /*
-                * On 9xx chipsets, channel interleave by the CPU is
-                * determined by DCC.  For single-channel, neither the CPU
-                * nor the GPU do swizzling.  For dual channel interleaved,
-                * the GPU's interleave is bit 9 and 10 for X tiled, and bit
-                * 9 for Y tiled.  The CPU's interleave is independent, and
-                * can be based on either bit 11 (haven't seen this yet) or
-                * bit 17 (common).
-                */
-               switch (dcc & DCC_ADDRESSING_MODE_MASK) {
-               case DCC_ADDRESSING_MODE_SINGLE_CHANNEL:
-               case DCC_ADDRESSING_MODE_DUAL_CHANNEL_ASYMMETRIC:
-                       swizzle_x = I915_BIT_6_SWIZZLE_NONE;
-                       swizzle_y = I915_BIT_6_SWIZZLE_NONE;
-                       break;
-               case DCC_ADDRESSING_MODE_DUAL_CHANNEL_INTERLEAVED:
-                       if (dcc & DCC_CHANNEL_XOR_DISABLE) {
-                               /*
-                                * This is the base swizzling by the GPU for
-                                * tiled buffers.
-                                */
-                               swizzle_x = I915_BIT_6_SWIZZLE_9_10;
-                               swizzle_y = I915_BIT_6_SWIZZLE_9;
-                       } else if ((dcc & DCC_CHANNEL_XOR_BIT_17) == 0) {
-                               /* Bit 11 swizzling by the CPU in addition. */
-                               swizzle_x = I915_BIT_6_SWIZZLE_9_10_11;
-                               swizzle_y = I915_BIT_6_SWIZZLE_9_11;
-                       } else {
-                               /* Bit 17 swizzling by the CPU in addition. */
-                               swizzle_x = I915_BIT_6_SWIZZLE_9_10_17;
-                               swizzle_y = I915_BIT_6_SWIZZLE_9_17;
-                       }
-                       break;
-               }
-
-               /* check for L-shaped memory aka modified enhanced addressing */
-               if (IS_GEN(i915, 4) &&
-                   !(intel_uncore_read(uncore, DCC2) & DCC2_MODIFIED_ENHANCED_DISABLE)) {
-                       swizzle_x = I915_BIT_6_SWIZZLE_UNKNOWN;
-                       swizzle_y = I915_BIT_6_SWIZZLE_UNKNOWN;
-               }
-
-               if (dcc == 0xffffffff) {
-                       drm_err(&i915->drm, "Couldn't read from MCHBAR.  "
-                                 "Disabling tiling.\n");
-                       swizzle_x = I915_BIT_6_SWIZZLE_UNKNOWN;
-                       swizzle_y = I915_BIT_6_SWIZZLE_UNKNOWN;
-               }
-       }
-
-       if (swizzle_x == I915_BIT_6_SWIZZLE_UNKNOWN ||
-           swizzle_y == I915_BIT_6_SWIZZLE_UNKNOWN) {
-               /*
-                * Userspace likes to explode if it sees unknown swizzling,
-                * so lie. We will finish the lie when reporting through
-                * the get-tiling-ioctl by reporting the physical swizzle
-                * mode as unknown instead.
-                *
-                * As we don't strictly know what the swizzling is, it may be
-                * bit17 dependent, and so we need to also prevent the pages
-                * from being moved.
-                */
-               i915->quirks |= QUIRK_PIN_SWIZZLED_PAGES;
-               swizzle_x = I915_BIT_6_SWIZZLE_NONE;
-               swizzle_y = I915_BIT_6_SWIZZLE_NONE;
-       }
-
-       i915->ggtt.bit_6_swizzle_x = swizzle_x;
-       i915->ggtt.bit_6_swizzle_y = swizzle_y;
-}
-
-/*
- * Swap every 64 bytes of this page around, to account for it having a new
- * bit 17 of its physical address and therefore being interpreted differently
- * by the GPU.
- */
-static void i915_gem_swizzle_page(struct page *page)
-{
-       char temp[64];
-       char *vaddr;
-       int i;
-
-       vaddr = kmap(page);
-
-       for (i = 0; i < PAGE_SIZE; i += 128) {
-               memcpy(temp, &vaddr[i], 64);
-               memcpy(&vaddr[i], &vaddr[i + 64], 64);
-               memcpy(&vaddr[i + 64], temp, 64);
-       }
-
-       kunmap(page);
-}
-
-/**
- * i915_gem_object_do_bit_17_swizzle - fixup bit 17 swizzling
- * @obj: i915 GEM buffer object
- * @pages: the scattergather list of physical pages
- *
- * This function fixes up the swizzling in case any page frame number for this
- * object has changed in bit 17 since that state has been saved with
- * i915_gem_object_save_bit_17_swizzle().
- *
- * This is called when pinning backing storage again, since the kernel is free
- * to move unpinned backing storage around (either by directly moving pages or
- * by swapping them out and back in again).
- */
-void
-i915_gem_object_do_bit_17_swizzle(struct drm_i915_gem_object *obj,
-                                 struct sg_table *pages)
-{
-       struct sgt_iter sgt_iter;
-       struct page *page;
-       int i;
-
-       if (obj->bit_17 == NULL)
-               return;
-
-       i = 0;
-       for_each_sgt_page(page, sgt_iter, pages) {
-               char new_bit_17 = page_to_phys(page) >> 17;
-               if ((new_bit_17 & 0x1) != (test_bit(i, obj->bit_17) != 0)) {
-                       i915_gem_swizzle_page(page);
-                       set_page_dirty(page);
-               }
-               i++;
-       }
-}
-
-/**
- * i915_gem_object_save_bit_17_swizzle - save bit 17 swizzling
- * @obj: i915 GEM buffer object
- * @pages: the scattergather list of physical pages
- *
- * This function saves the bit 17 of each page frame number so that swizzling
- * can be fixed up later on with i915_gem_object_do_bit_17_swizzle(). This must
- * be called before the backing storage can be unpinned.
- */
-void
-i915_gem_object_save_bit_17_swizzle(struct drm_i915_gem_object *obj,
-                                   struct sg_table *pages)
-{
-       const unsigned int page_count = obj->base.size >> PAGE_SHIFT;
-       struct sgt_iter sgt_iter;
-       struct page *page;
-       int i;
-
-       if (obj->bit_17 == NULL) {
-               obj->bit_17 = bitmap_zalloc(page_count, GFP_KERNEL);
-               if (obj->bit_17 == NULL) {
-                       DRM_ERROR("Failed to allocate memory for bit 17 "
-                                 "record\n");
-                       return;
-               }
-       }
-
-       i = 0;
-
-       for_each_sgt_page(page, sgt_iter, pages) {
-               if (page_to_phys(page) & (1 << 17))
-                       __set_bit(i, obj->bit_17);
-               else
-                       __clear_bit(i, obj->bit_17);
-               i++;
-       }
-}
-
-void i915_ggtt_init_fences(struct i915_ggtt *ggtt)
-{
-       struct drm_i915_private *i915 = ggtt->vm.i915;
-       struct intel_uncore *uncore = ggtt->vm.gt->uncore;
-       int num_fences;
-       int i;
-
-       INIT_LIST_HEAD(&ggtt->fence_list);
-       INIT_LIST_HEAD(&ggtt->userfault_list);
-       intel_wakeref_auto_init(&ggtt->userfault_wakeref, uncore->rpm);
-
-       detect_bit_6_swizzle(ggtt);
-
-       if (!i915_ggtt_has_aperture(ggtt))
-               num_fences = 0;
-       else if (INTEL_GEN(i915) >= 7 &&
-                !(IS_VALLEYVIEW(i915) || IS_CHERRYVIEW(i915)))
-               num_fences = 32;
-       else if (INTEL_GEN(i915) >= 4 ||
-                IS_I945G(i915) || IS_I945GM(i915) ||
-                IS_G33(i915) || IS_PINEVIEW(i915))
-               num_fences = 16;
-       else
-               num_fences = 8;
-
-       if (intel_vgpu_active(i915))
-               num_fences = intel_uncore_read(uncore,
-                                              vgtif_reg(avail_rs.fence_num));
-
-       /* Initialize fence registers to zero */
-       for (i = 0; i < num_fences; i++) {
-               struct i915_fence_reg *fence = &ggtt->fence_regs[i];
-
-               fence->ggtt = ggtt;
-               fence->id = i;
-               list_add_tail(&fence->link, &ggtt->fence_list);
-       }
-       ggtt->num_fences = num_fences;
-
-       i915_gem_restore_fences(ggtt);
-}
-
-void intel_gt_init_swizzling(struct intel_gt *gt)
-{
-       struct drm_i915_private *i915 = gt->i915;
-       struct intel_uncore *uncore = gt->uncore;
-
-       if (INTEL_GEN(i915) < 5 ||
-           i915->ggtt.bit_6_swizzle_x == I915_BIT_6_SWIZZLE_NONE)
-               return;
-
-       intel_uncore_rmw(uncore, DISP_ARB_CTL, 0, DISP_TILE_SURFACE_SWIZZLING);
-
-       if (IS_GEN(i915, 5))
-               return;
-
-       intel_uncore_rmw(uncore, TILECTL, 0, TILECTL_SWZCTL);
-
-       if (IS_GEN(i915, 6))
-               intel_uncore_write(uncore,
-                                  ARB_MODE,
-                                  _MASKED_BIT_ENABLE(ARB_MODE_SWIZZLE_SNB));
-       else if (IS_GEN(i915, 7))
-               intel_uncore_write(uncore,
-                                  ARB_MODE,
-                                  _MASKED_BIT_ENABLE(ARB_MODE_SWIZZLE_IVB));
-       else if (IS_GEN(i915, 8))
-               intel_uncore_write(uncore,
-                                  GAMTARBMODE,
-                                  _MASKED_BIT_ENABLE(ARB_MODE_SWIZZLE_BDW));
-       else
-               MISSING_CASE(INTEL_GEN(i915));
-}
diff --git a/drivers/gpu/drm/i915/i915_gem_fence_reg.h b/drivers/gpu/drm/i915/i915_gem_fence_reg.h
deleted file mode 100644 (file)
index 7bd521c..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright © 2016 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- *
- */
-
-#ifndef __I915_FENCE_REG_H__
-#define __I915_FENCE_REG_H__
-
-#include <linux/list.h>
-#include <linux/types.h>
-
-struct drm_i915_gem_object;
-struct i915_ggtt;
-struct i915_vma;
-struct intel_gt;
-struct sg_table;
-
-#define I965_FENCE_PAGE 4096UL
-
-struct i915_fence_reg {
-       struct list_head link;
-       struct i915_ggtt *ggtt;
-       struct i915_vma *vma;
-       atomic_t pin_count;
-       int id;
-       /**
-        * Whether the tiling parameters for the currently
-        * associated fence register have changed. Note that
-        * for the purposes of tracking tiling changes we also
-        * treat the unfenced register, the register slot that
-        * the object occupies whilst it executes a fenced
-        * command (such as BLT on gen2/3), as a "fence".
-        */
-       bool dirty;
-};
-
-/* i915_gem_fence_reg.c */
-struct i915_fence_reg *i915_reserve_fence(struct i915_ggtt *ggtt);
-void i915_unreserve_fence(struct i915_fence_reg *fence);
-
-void i915_gem_restore_fences(struct i915_ggtt *ggtt);
-
-void i915_gem_object_do_bit_17_swizzle(struct drm_i915_gem_object *obj,
-                                      struct sg_table *pages);
-void i915_gem_object_save_bit_17_swizzle(struct drm_i915_gem_object *obj,
-                                        struct sg_table *pages);
-
-void i915_ggtt_init_fences(struct i915_ggtt *ggtt);
-
-void intel_gt_init_swizzling(struct intel_gt *gt);
-
-#endif
index e1ced1df13e1c7bffb0a1980eaf09b684e01f48e..2764c277326f4eecdcb35e576b392fd8b51d8c62 100644 (file)
@@ -33,7 +33,6 @@
 #include "gem/i915_gem_object.h"
 
 #include "i915_gem_gtt.h"
-#include "i915_gem_fence_reg.h"
 
 #include "i915_active.h"
 #include "i915_request.h"
index 623759b73bb4f9410e5fe939fd2a2b1af847f606..7ea517a21e0b4adccbb5d2b1cd3487df7d1c367d 100644 (file)
@@ -125,7 +125,7 @@ static void pm_resume(struct drm_i915_private *i915)
         */
        with_intel_runtime_pm(&i915->runtime_pm, wakeref) {
                i915_ggtt_resume(&i915->ggtt);
-               i915_gem_restore_fences(&i915->ggtt);
+               intel_ggtt_restore_fences(&i915->ggtt);
 
                i915_gem_resume(i915);
        }