diff options
author | Joonas Lahtinen <joonas.lahtinen@linux.intel.com> | 2021-09-15 13:23:27 +0300 |
---|---|---|
committer | Joonas Lahtinen <joonas.lahtinen@linux.intel.com> | 2021-09-15 13:23:27 +0300 |
commit | d5dd580deb54483cce0cb5bbe3f1a132a28c767d (patch) | |
tree | 8803403033d49e5b57b81a68b02326943b24b067 /drivers/gpu/drm/i915/intel_step.c | |
parent | e935405102783219b883b1e50539908f21463e9a (diff) | |
parent | 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f (diff) | |
download | linux-d5dd580deb54483cce0cb5bbe3f1a132a28c767d.tar.bz2 |
Merge drm/drm-next into drm-intel-gt-next
Close the divergence which has caused patches not to apply and
have a solid baseline for the PXP patches that Rodrigo will send
a topic branch PR for.
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_step.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_step.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_step.c b/drivers/gpu/drm/i915/intel_step.c index 12c92e554253..6cf967631395 100644 --- a/drivers/gpu/drm/i915/intel_step.c +++ b/drivers/gpu/drm/i915/intel_step.c @@ -118,6 +118,7 @@ static const struct intel_step_info dg2_g10_revid_step_tbl[] = { static const struct intel_step_info dg2_g11_revid_step_tbl[] = { [0x0] = { .gt_step = STEP_A0, .display_step = STEP_B0 }, [0x4] = { .gt_step = STEP_B0, .display_step = STEP_C0 }, + [0x5] = { .gt_step = STEP_B1, .display_step = STEP_C0 }, }; void intel_step_init(struct drm_i915_private *i915) @@ -210,3 +211,17 @@ void intel_step_init(struct drm_i915_private *i915) RUNTIME_INFO(i915)->step = step; } + +#define STEP_NAME_CASE(name) \ + case STEP_##name: \ + return #name; + +const char *intel_step_name(enum intel_step step) +{ + switch (step) { + STEP_NAME_LIST(STEP_NAME_CASE); + + default: + return "**"; + } +} |