Commit 5644dc0a authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: rename i915_rev_steppings->intel_step_info 



Matter of taste. Match the prefix for everything else related to
steppings. No functional changes.

Reviewed-by: default avatarJosé Roberto de Souza <jose.souza@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/d3ba7c448e596fd2425a29bcc7ea8493505a30f9.1616764798.git.jani.nikula@intel.com
parent 26475ca9

drivers/gpu/drm/i915/intel_device_info.h

+1 −1
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ struct intel_runtime_info { 


	u32 rawclk_freq;



	struct i915_rev_steppings step;

	struct intel_step_info step;

};



struct intel_driver_caps {

drivers/gpu/drm/i915/intel_step.c

+6 −6
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 




/* FIXME: what about REVID_E0 */

static const struct i915_rev_steppings kbl_revids[] = {

static const struct intel_step_info kbl_revids[] = {

	[0] = { .gt_step = STEP_A0, .display_step = STEP_A0 },

	[1] = { .gt_step = STEP_B0, .display_step = STEP_B0 },

	[2] = { .gt_step = STEP_C0, .display_step = STEP_B0 },
@@ -26,7 +26,7 @@ static const struct i915_rev_steppings kbl_revids[] = { 
	[7] = { .gt_step = STEP_G0, .display_step = STEP_C0 },

};



static const struct i915_rev_steppings tgl_uy_revid_step_tbl[] = {

static const struct intel_step_info tgl_uy_revid_step_tbl[] = {

	[0] = { .gt_step = STEP_A0, .display_step = STEP_A0 },

	[1] = { .gt_step = STEP_B0, .display_step = STEP_C0 },

	[2] = { .gt_step = STEP_B1, .display_step = STEP_C0 },
@@ -34,12 +34,12 @@ static const struct i915_rev_steppings tgl_uy_revid_step_tbl[] = { 
};



/* Same GT stepping between tgl_uy_revids and tgl_revids don't mean the same HW */

static const struct i915_rev_steppings tgl_revid_step_tbl[] = {

static const struct intel_step_info tgl_revid_step_tbl[] = {

	[0] = { .gt_step = STEP_A0, .display_step = STEP_B0 },

	[1] = { .gt_step = STEP_B0, .display_step = STEP_D0 },

};



static const struct i915_rev_steppings adls_revid_step_tbl[] = {

static const struct intel_step_info adls_revid_step_tbl[] = {

	[0x0] = { .gt_step = STEP_A0, .display_step = STEP_A0 },

	[0x1] = { .gt_step = STEP_A0, .display_step = STEP_A2 },

	[0x4] = { .gt_step = STEP_B0, .display_step = STEP_B0 },
@@ -49,10 +49,10 @@ static const struct i915_rev_steppings adls_revid_step_tbl[] = { 


void intel_step_init(struct drm_i915_private *i915)

{

	const struct i915_rev_steppings *revids = NULL;

	const struct intel_step_info *revids = NULL;

	int size = 0;

	int revid = INTEL_REVID(i915);

	struct i915_rev_steppings step = {};

	struct intel_step_info step = {};



	if (IS_ALDERLAKE_S(i915)) {

		revids = adls_revid_step_tbl;

drivers/gpu/drm/i915/intel_step.h

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 


struct drm_i915_private;



struct i915_rev_steppings {

struct intel_step_info {

	u8 gt_step;

	u8 display_step;

};