drm/i915/guc: Create the guc_to_i915() wrapper

Andi Shyti · Andi Shyti · commit be5bcc4be9d9 · 2023-12-08T12:31:01.000+01:00
Given a reference to "guc", the guc_to_i915() returns the pointer to "i915" private data. Signed-off-by: Andi Shyti <andi.shyti@linux.intel.com> Reviewed-by: Nirmoy Das <nirmoy.das@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20231206184322.57111-1-andi.shyti@linux.intel.com
diff --git a/drivers/gpu/drm/i915/gt/intel_gt.h b/drivers/gpu/drm/i915/gt/intel_gt.h
@@ -118,6 +118,11 @@ static inline struct intel_gt *gsc_to_gt(struct intel_gsc *gsc)
 	return container_of(gsc, struct intel_gt, gsc);
 }
 
+static inline struct drm_i915_private *guc_to_i915(struct intel_guc *guc)
+{
+	return guc_to_gt(guc)->i915;
+}
+
 void intel_gt_common_init_early(struct intel_gt *gt);
 int intel_root_gt_init_early(struct drm_i915_private *i915);
 int intel_gt_assign_ggtt(struct intel_gt *gt);
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.c b/drivers/gpu/drm/i915/gt/uc/intel_guc.c
@@ -330,7 +330,7 @@ static u32 guc_ctl_wa_flags(struct intel_guc *guc)
 
 static u32 guc_ctl_devid(struct intel_guc *guc)
 {
-	struct drm_i915_private *i915 = guc_to_gt(guc)->i915;
+	struct drm_i915_private *i915 = guc_to_i915(guc);
 
 	return (INTEL_DEVID(i915) << 16) | INTEL_REVID(i915);
 }
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_capture.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_capture.c
@@ -355,7 +355,7 @@ guc_capture_alloc_steered_lists(struct intel_guc *guc,
 static const struct __guc_mmio_reg_descr_group *
 guc_capture_get_device_reglist(struct intel_guc *guc)
 {
-	struct drm_i915_private *i915 = guc_to_gt(guc)->i915;
+	struct drm_i915_private *i915 = guc_to_i915(guc);
 	const struct __guc_mmio_reg_descr_group *lists;
 
 	if (GRAPHICS_VER(i915) >= 12)
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
@@ -265,7 +265,7 @@ int intel_guc_ct_init(struct intel_guc_ct *ct)
 	u32 *cmds;
 	int err;
 
-	err = i915_inject_probe_error(guc_to_gt(guc)->i915, -ENXIO);
+	err = i915_inject_probe_error(guc_to_i915(guc), -ENXIO);
 	if (err)
 		return err;
 
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c
@@ -520,7 +520,7 @@ void intel_guc_log_init_early(struct intel_guc_log *log)
 static int guc_log_relay_create(struct intel_guc_log *log)
 {
 	struct intel_guc *guc = log_to_guc(log);
-	struct drm_i915_private *i915 = guc_to_gt(guc)->i915;
+	struct drm_i915_private *i915 = guc_to_i915(guc);
 	struct rchan *guc_log_relay_chan;
 	size_t n_subbufs, subbuf_size;
 	int ret;
@@ -573,7 +573,7 @@ static void guc_log_relay_destroy(struct intel_guc_log *log)
 static void guc_log_copy_debuglogs_for_relay(struct intel_guc_log *log)
 {
 	struct intel_guc *guc = log_to_guc(log);
-	struct drm_i915_private *i915 = guc_to_gt(guc)->i915;
+	struct drm_i915_private *i915 = guc_to_i915(guc);
 	intel_wakeref_t wakeref;
 
 	_guc_log_copy_debuglogs_for_relay(log);
@@ -589,7 +589,7 @@ static void guc_log_copy_debuglogs_for_relay(struct intel_guc_log *log)
 static u32 __get_default_log_level(struct intel_guc_log *log)
 {
 	struct intel_guc *guc = log_to_guc(log);
-	struct drm_i915_private *i915 = guc_to_gt(guc)->i915;
+	struct drm_i915_private *i915 = guc_to_i915(guc);
 
 	/* A negative value means "use platform/config default" */
 	if (i915->params.guc_log_level < 0) {
@@ -664,7 +664,7 @@ void intel_guc_log_destroy(struct intel_guc_log *log)
 int intel_guc_log_set_level(struct intel_guc_log *log, u32 level)
 {
 	struct intel_guc *guc = log_to_guc(log);
-	struct drm_i915_private *i915 = guc_to_gt(guc)->i915;
+	struct drm_i915_private *i915 = guc_to_i915(guc);
 	intel_wakeref_t wakeref;
 	int ret = 0;
 
@@ -796,7 +796,7 @@ void intel_guc_log_relay_flush(struct intel_guc_log *log)
 static void guc_log_relay_stop(struct intel_guc_log *log)
 {
 	struct intel_guc *guc = log_to_guc(log);
-	struct drm_i915_private *i915 = guc_to_gt(guc)->i915;
+	struct drm_i915_private *i915 = guc_to_i915(guc);
 
 	if (!log->relay.started)
 		return;
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_rc.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_rc.c
@@ -14,7 +14,7 @@ static bool __guc_rc_supported(struct intel_guc *guc)
 {
 	/* GuC RC is unavailable for pre-Gen12 */
 	return guc->submission_supported &&
-		GRAPHICS_VER(guc_to_gt(guc)->i915) >= 12;
+		GRAPHICS_VER(guc_to_i915(guc)) >= 12;
 }
 
 static bool __guc_rc_selected(struct intel_guc *guc)
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c
@@ -34,7 +34,7 @@ static bool __detect_slpc_supported(struct intel_guc *guc)
 {
 	/* GuC SLPC is unavailable for pre-Gen12 */
 	return guc->submission_supported &&
-		GRAPHICS_VER(guc_to_gt(guc)->i915) >= 12;
+		GRAPHICS_VER(guc_to_i915(guc)) >= 12;
 }
 
 static bool __guc_slpc_selected(struct intel_guc *guc)
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
@@ -4626,12 +4626,12 @@ static bool __guc_submission_supported(struct intel_guc *guc)
 {
 	/* GuC submission is unavailable for pre-Gen11 */
 	return intel_guc_is_supported(guc) &&
-	       GRAPHICS_VER(guc_to_gt(guc)->i915) >= 11;
+	       GRAPHICS_VER(guc_to_i915(guc)) >= 11;
 }
 
 static bool __guc_submission_selected(struct intel_guc *guc)
 {
-	struct drm_i915_private *i915 = guc_to_gt(guc)->i915;
+	struct drm_i915_private *i915 = guc_to_i915(guc);
 
 	if (!intel_guc_submission_is_supported(guc))
 		return false;

Original file line number	Diff line number	Diff line change
`@@ -330,7 +330,7 @@ static u32 guc_ctl_wa_flags(struct intel_guc *guc)`
`330`	`330`
`331`	`331`	`static u32 guc_ctl_devid(struct intel_guc *guc)`
`332`	`332`	`{`
`333`		`- struct drm_i915_private *i915 = guc_to_gt(guc)->i915;`
	`333`	`+ struct drm_i915_private *i915 = guc_to_i915(guc);`
`334`	`334`
`335`	`335`	`return (INTEL_DEVID(i915) << 16) \| INTEL_REVID(i915);`
`336`	`336`	`}`
Original file line number	Diff line number	Diff line change
`@@ -355,7 +355,7 @@ guc_capture_alloc_steered_lists(struct intel_guc *guc,`
`355`	`355`	`static const struct __guc_mmio_reg_descr_group *`
`356`	`356`	`guc_capture_get_device_reglist(struct intel_guc *guc)`
`357`	`357`	`{`
`358`		`- struct drm_i915_private *i915 = guc_to_gt(guc)->i915;`
	`358`	`+ struct drm_i915_private *i915 = guc_to_i915(guc);`
`359`	`359`	`const struct __guc_mmio_reg_descr_group *lists;`
`360`	`360`
`361`	`361`	`if (GRAPHICS_VER(i915) >= 12)`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ static bool __guc_rc_supported(struct intel_guc *guc)`
`14`	`14`	`{`
`15`	`15`	`/* GuC RC is unavailable for pre-Gen12 */`
`16`	`16`	`return guc->submission_supported &&`
`17`		`- GRAPHICS_VER(guc_to_gt(guc)->i915) >= 12;`
	`17`	`+ GRAPHICS_VER(guc_to_i915(guc)) >= 12;`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`static bool __guc_rc_selected(struct intel_guc *guc)`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ static bool __detect_slpc_supported(struct intel_guc *guc)`
`34`	`34`	`{`
`35`	`35`	`/* GuC SLPC is unavailable for pre-Gen12 */`
`36`	`36`	`return guc->submission_supported &&`
`37`		`- GRAPHICS_VER(guc_to_gt(guc)->i915) >= 12;`
	`37`	`+ GRAPHICS_VER(guc_to_i915(guc)) >= 12;`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`static bool __guc_slpc_selected(struct intel_guc *guc)`
Original file line number	Diff line number	Diff line change
`@@ -4626,12 +4626,12 @@ static bool __guc_submission_supported(struct intel_guc *guc)`
`4626`	`4626`	`{`
`4627`	`4627`	`/* GuC submission is unavailable for pre-Gen11 */`
`4628`	`4628`	`return intel_guc_is_supported(guc) &&`
`4629`		`- GRAPHICS_VER(guc_to_gt(guc)->i915) >= 11;`
	`4629`	`+ GRAPHICS_VER(guc_to_i915(guc)) >= 11;`
`4630`	`4630`	`}`
`4631`	`4631`
`4632`	`4632`	`static bool __guc_submission_selected(struct intel_guc *guc)`
`4633`	`4633`	`{`
`4634`		`- struct drm_i915_private *i915 = guc_to_gt(guc)->i915;`
	`4634`	`+ struct drm_i915_private *i915 = guc_to_i915(guc);`
`4635`	`4635`
`4636`	`4636`	`if (!intel_guc_submission_is_supported(guc))`
`4637`	`4637`	`return false;`