drm/i915: Update l3_remap to take a request structure (6909a666) · Commits · 戴 / test

drivers/gpu/drm/i915/i915_drv.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -2885,7 +2885,7 @@ bool i915_gem_clflush_object(struct drm_i915_gem_object *obj, bool force);
		int __must_check i915_gem_init(struct drm_device *dev);
		int i915_gem_init_rings(struct drm_device *dev);
		int __must_check i915_gem_init_hw(struct drm_device *dev);
		int i915_gem_l3_remap(struct intel_engine_cs *ring, int slice);
		int i915_gem_l3_remap(struct drm_i915_gem_request *req, int slice);
		void i915_gem_init_swizzling(struct drm_device *dev);
		void i915_gem_cleanup_ringbuffer(struct drm_device *dev);
		int __must_check i915_gpu_idle(struct drm_device *dev);

+3 −2

Original line number	Diff line number	Diff line
		@@ -4882,8 +4882,9 @@ err:
		return ret;
		}

		int i915_gem_l3_remap(struct intel_engine_cs *ring, int slice)
		int i915_gem_l3_remap(struct drm_i915_gem_request *req, int slice)
		{
		struct intel_engine_cs *ring = req->ring;
		struct drm_device *dev = ring->dev;
		struct drm_i915_private *dev_priv = dev->dev_private;
		u32 reg_base = GEN7_L3LOG_BASE + (slice * 0x200);
		@@ -5105,7 +5106,7 @@ i915_gem_init_hw(struct drm_device *dev)

		if (ring->id == RCS) {
		for (j = 0; j < NUM_L3_SLICES(dev); j++)
		i915_gem_l3_remap(ring, j);
		i915_gem_l3_remap(req, j);
		}

		ret = i915_ppgtt_init_ring(req);

+1 −1

Original line number	Diff line number	Diff line
		@@ -720,7 +720,7 @@ static int do_switch(struct drm_i915_gem_request *req)
		if (!(to->remap_slice & (1<<i)))
		continue;

		ret = i915_gem_l3_remap(ring, i);
		ret = i915_gem_l3_remap(req, i);
		/* If it failed, try again next round */
		if (ret)
		DRM_DEBUG_DRIVER("L3 remapping failed\n");