Commit a10234fd authored by Tvrtko Ursulin's avatar Tvrtko Ursulin
Browse files

drm/i915: Partial abandonment of legacy DRM logging macros 



Convert some usages of legacy DRM logging macros into versions which tell
us on which device have the events occurred.

v2:
 * Don't have struct drm_device as local. (Jani, Ville)

v3:
 * Store gt, not i915, in workaround list. (John)

Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Acked-by: default avatarJani Nikula <jani.nikula@intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: John Harrison <John.C.Harrison@Intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarAndrzej Hajda <andrzej.hajda@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221109104633.2579245-1-tvrtko.ursulin@linux.intel.com
parent 8c949515

drivers/gpu/drm/i915/gem/i915_gem_context.c

+1 −1
Original line number Diff line number Diff line
@@ -546,7 +546,7 @@ set_proto_ctx_engines_bond(struct i915_user_extension __user *base, void *data) 
	}



	if (intel_engine_uses_guc(master)) {

		DRM_DEBUG("bonding extension not supported with GuC submission");

		drm_dbg(&i915->drm, "bonding extension not supported with GuC submission");

		return -ENODEV;

	}

drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c

+17 −9
Original line number Diff line number Diff line
@@ -2148,7 +2148,8 @@ static int eb_move_to_gpu(struct i915_execbuffer *eb) 
	return err;

}



static int i915_gem_check_execbuffer(struct drm_i915_gem_execbuffer2 *exec)

static int i915_gem_check_execbuffer(struct drm_i915_private *i915,

				     struct drm_i915_gem_execbuffer2 *exec)

{

	if (exec->flags & __I915_EXEC_ILLEGAL_FLAGS)

		return -EINVAL;
@@ -2161,7 +2162,7 @@ static int i915_gem_check_execbuffer(struct drm_i915_gem_execbuffer2 *exec) 
	}



	if (exec->DR4 == 0xffffffff) {

		DRM_DEBUG("UXA submitting garbage DR4, fixing up\n");

		drm_dbg(&i915->drm, "UXA submitting garbage DR4, fixing up\n");

		exec->DR4 = 0;

	}

	if (exec->DR1 || exec->DR4)
@@ -2799,7 +2800,8 @@ add_timeline_fence_array(struct i915_execbuffer *eb, 


		syncobj = drm_syncobj_find(eb->file, user_fence.handle);

		if (!syncobj) {

			DRM_DEBUG("Invalid syncobj handle provided\n");

			drm_dbg(&eb->i915->drm,

				"Invalid syncobj handle provided\n");

			return -ENOENT;

		}
@@ -2807,7 +2809,8 @@ add_timeline_fence_array(struct i915_execbuffer *eb, 


		if (!fence && user_fence.flags &&

		    !(user_fence.flags & I915_EXEC_FENCE_SIGNAL)) {

			DRM_DEBUG("Syncobj handle has no fence\n");

			drm_dbg(&eb->i915->drm,

				"Syncobj handle has no fence\n");

			drm_syncobj_put(syncobj);

			return -EINVAL;

		}
@@ -2816,7 +2819,9 @@ add_timeline_fence_array(struct i915_execbuffer *eb, 
			err = dma_fence_chain_find_seqno(&fence, point);



		if (err && !(user_fence.flags & I915_EXEC_FENCE_SIGNAL)) {

			DRM_DEBUG("Syncobj handle missing requested point %llu\n", point);

			drm_dbg(&eb->i915->drm,

				"Syncobj handle missing requested point %llu\n",

				point);

			dma_fence_put(fence);

			drm_syncobj_put(syncobj);

			return err;
@@ -2842,7 +2847,8 @@ add_timeline_fence_array(struct i915_execbuffer *eb, 
			 * 0) would break the timeline.

			 */

			if (user_fence.flags & I915_EXEC_FENCE_WAIT) {

				DRM_DEBUG("Trying to wait & signal the same timeline point.\n");

				drm_dbg(&eb->i915->drm,

					"Trying to wait & signal the same timeline point.\n");

				dma_fence_put(fence);

				drm_syncobj_put(syncobj);

				return -EINVAL;
@@ -2913,14 +2919,16 @@ static int add_fence_array(struct i915_execbuffer *eb) 


		syncobj = drm_syncobj_find(eb->file, user_fence.handle);

		if (!syncobj) {

			DRM_DEBUG("Invalid syncobj handle provided\n");

			drm_dbg(&eb->i915->drm,

				"Invalid syncobj handle provided\n");

			return -ENOENT;

		}



		if (user_fence.flags & I915_EXEC_FENCE_WAIT) {

			fence = drm_syncobj_fence_get(syncobj);

			if (!fence) {

				DRM_DEBUG("Syncobj handle has no fence\n");

				drm_dbg(&eb->i915->drm,

					"Syncobj handle has no fence\n");

				drm_syncobj_put(syncobj);

				return -EINVAL;

			}
@@ -3515,7 +3523,7 @@ i915_gem_execbuffer2_ioctl(struct drm_device *dev, void *data, 
		return -EINVAL;

	}



	err = i915_gem_check_execbuffer(args);

	err = i915_gem_check_execbuffer(i915, args);

	if (err)

		return err;

drivers/gpu/drm/i915/gt/intel_execlists_submission.c

+8 −5
Original line number Diff line number Diff line
@@ -3921,6 +3921,7 @@ static struct intel_context * 
execlists_create_virtual(struct intel_engine_cs **siblings, unsigned int count,

			 unsigned long flags)

{

	struct drm_i915_private *i915 = siblings[0]->i915;

	struct virtual_engine *ve;

	unsigned int n;

	int err;
@@ -3929,7 +3930,7 @@ execlists_create_virtual(struct intel_engine_cs **siblings, unsigned int count, 
	if (!ve)

		return ERR_PTR(-ENOMEM);



	ve->base.i915 = siblings[0]->i915;

	ve->base.i915 = i915;

	ve->base.gt = siblings[0]->gt;

	ve->base.uncore = siblings[0]->uncore;

	ve->base.id = -1;
@@ -3988,7 +3989,8 @@ execlists_create_virtual(struct intel_engine_cs **siblings, unsigned int count, 


		GEM_BUG_ON(!is_power_of_2(sibling->mask));

		if (sibling->mask & ve->base.mask) {

			DRM_DEBUG("duplicate %s entry in load balancer\n",

			drm_dbg(&i915->drm,

				"duplicate %s entry in load balancer\n",

				sibling->name);

			err = -EINVAL;

			goto err_put;
@@ -4023,7 +4025,8 @@ execlists_create_virtual(struct intel_engine_cs **siblings, unsigned int count, 
		 */

		if (ve->base.class != OTHER_CLASS) {

			if (ve->base.class != sibling->class) {

				DRM_DEBUG("invalid mixing of engine class, sibling %d, already %d\n",

				drm_dbg(&i915->drm,

					"invalid mixing of engine class, sibling %d, already %d\n",

					sibling->class, ve->base.class);

				err = -EINVAL;

				goto err_put;

drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c

+2 −2
Original line number Diff line number Diff line
@@ -816,8 +816,8 @@ i915_gem_object_save_bit_17_swizzle(struct drm_i915_gem_object *obj, 
	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");

			drm_err(&to_i915(obj->base.dev)->drm,

				"Failed to allocate memory for bit 17 record\n");

			return;

		}

	}

drivers/gpu/drm/i915/gt/intel_gt.c

+2 −2
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ int intel_gt_init_hw(struct intel_gt *gt) 


	ret = i915_ppgtt_init_hw(gt);

	if (ret) {

		DRM_ERROR("Enabling PPGTT failed (%d)\n", ret);

		drm_err(&i915->drm, "Enabling PPGTT failed (%d)\n", ret);

		goto out;

	}
@@ -262,7 +262,7 @@ intel_gt_clear_error_registers(struct intel_gt *gt, 
		 * some errors might have become stuck,

		 * mask them.

		 */

		DRM_DEBUG_DRIVER("EIR stuck: 0x%08x, masking\n", eir);

		drm_dbg(&gt->i915->drm, "EIR stuck: 0x%08x, masking\n", eir);

		rmw_set(uncore, EMR, eir);

		intel_uncore_write(uncore, GEN2_IIR,

				   I915_MASTER_ERROR_INTERRUPT);