mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 10:49:33 +00:00
drm/i915: Eliminate IS_MTL_MEDIA_STEP
Stepping-specific media behavior shouldn't be tied to MTL as a platform, but rather specifically to the Xe_LPM+ IP. Future non-MTL platforms may re-use this IP and will need to follow the exact same logic and apply the same workarounds. IS_MTL_MEDIA_STEP() is dropped in favor of IS_MEDIA_GT_IP_STEP, which checks the media IP version associated with a specific IP and also ensures that we're operating on the media GT, not the primary GT. v2: - Switch to the IS_GT_IP_STEP macro. v3: - Switch back to long-form IS_MEDIA_GT_IP_STEP. (Jani) v4: - Build IS_MEDIA_GT_IP_STEP on top of IS_MEDIA_GT_IP_RANGE and IS_MEDIA_STEP building blocks and name the parameters from/until rather than begin/fixed.. (Jani) v5: - Tweak macro comment wording. (Gustavo) - Add a check to catch NULL gt in IS_MEDIA_GT_IP_RANGE; this allows it to be used safely on i915->media_gt, which may be NULL on some platforms. (Gustavo) Cc: Jani Nikula <jani.nikula@linux.intel.com> Cc: Gustavo Sousa <gustavo.sousa@intel.com> Signed-off-by: Matt Roper <matthew.d.roper@intel.com> Reviewed-by: Gustavo Sousa <gustavo.sousa@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20230821180619.650007-16-matthew.d.roper@intel.com
This commit is contained in:
parent
5a213086a0
commit
81af8abe65
4 changed files with 37 additions and 17 deletions
|
@ -25,6 +25,20 @@ struct drm_printer;
|
||||||
GRAPHICS_VER_FULL((gt)->i915) >= (from) && \
|
GRAPHICS_VER_FULL((gt)->i915) >= (from) && \
|
||||||
GRAPHICS_VER_FULL((gt)->i915) <= (until)))
|
GRAPHICS_VER_FULL((gt)->i915) <= (until)))
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Check that the GT is a media GT and has an IP version within the
|
||||||
|
* specified range (inclusive).
|
||||||
|
*
|
||||||
|
* Only usable on platforms with a standalone media design (i.e., IP version 13
|
||||||
|
* and higher).
|
||||||
|
*/
|
||||||
|
#define IS_MEDIA_GT_IP_RANGE(gt, from, until) ( \
|
||||||
|
BUILD_BUG_ON_ZERO((from) < IP_VER(13, 0)) + \
|
||||||
|
BUILD_BUG_ON_ZERO((until) < (from)) + \
|
||||||
|
((gt) && (gt)->type == GT_MEDIA && \
|
||||||
|
MEDIA_VER_FULL((gt)->i915) >= (from) && \
|
||||||
|
MEDIA_VER_FULL((gt)->i915) <= (until)))
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Check that the GT is a graphics GT with a specific IP version and has
|
* Check that the GT is a graphics GT with a specific IP version and has
|
||||||
* a stepping in the range [from, until). The lower stepping bound is
|
* a stepping in the range [from, until). The lower stepping bound is
|
||||||
|
@ -45,6 +59,24 @@ struct drm_printer;
|
||||||
(IS_GFX_GT_IP_RANGE((gt), (ipver), (ipver)) && \
|
(IS_GFX_GT_IP_RANGE((gt), (ipver), (ipver)) && \
|
||||||
IS_GRAPHICS_STEP((gt)->i915, (from), (until))))
|
IS_GRAPHICS_STEP((gt)->i915, (from), (until))))
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Check that the GT is a media GT with a specific IP version and has
|
||||||
|
* a stepping in the range [from, until). The lower stepping bound is
|
||||||
|
* inclusive, the upper bound is exclusive. The most common use-case of this
|
||||||
|
* macro is for checking bounds for workarounds, which usually have a stepping
|
||||||
|
* ("from") at which the hardware issue is first present and another stepping
|
||||||
|
* ("until") at which a hardware fix is present and the software workaround is
|
||||||
|
* no longer necessary. "STEP_FOREVER" can be passed as "until" for
|
||||||
|
* workarounds that have no upper stepping bound for the specified IP version.
|
||||||
|
*
|
||||||
|
* This macro may only be used to match on platforms that have a standalone
|
||||||
|
* media design (i.e., media version 13 or higher).
|
||||||
|
*/
|
||||||
|
#define IS_MEDIA_GT_IP_STEP(gt, ipver, from, until) ( \
|
||||||
|
BUILD_BUG_ON_ZERO((until) <= (from)) + \
|
||||||
|
(IS_MEDIA_GT_IP_RANGE((gt), (ipver), (ipver)) && \
|
||||||
|
IS_MEDIA_STEP((gt)->i915, (from), (until))))
|
||||||
|
|
||||||
#define GT_TRACE(gt, fmt, ...) do { \
|
#define GT_TRACE(gt, fmt, ...) do { \
|
||||||
const struct intel_gt *gt__ __maybe_unused = (gt); \
|
const struct intel_gt *gt__ __maybe_unused = (gt); \
|
||||||
GEM_TRACE("%s " fmt, dev_name(gt__->i915->drm.dev), \
|
GEM_TRACE("%s " fmt, dev_name(gt__->i915->drm.dev), \
|
||||||
|
|
|
@ -524,8 +524,7 @@ static bool rc6_supported(struct intel_rc6 *rc6)
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (IS_MTL_MEDIA_STEP(gt->i915, STEP_A0, STEP_B0) &&
|
if (IS_MEDIA_GT_IP_STEP(gt, IP_VER(13, 0), STEP_A0, STEP_B0)) {
|
||||||
gt->type == GT_MEDIA) {
|
|
||||||
drm_notice(&i915->drm,
|
drm_notice(&i915->drm,
|
||||||
"Media RC6 disabled on A step\n");
|
"Media RC6 disabled on A step\n");
|
||||||
return false;
|
return false;
|
||||||
|
|
|
@ -690,10 +690,6 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,
|
||||||
(IS_METEORLAKE(__i915) && \
|
(IS_METEORLAKE(__i915) && \
|
||||||
IS_DISPLAY_STEP(__i915, since, until))
|
IS_DISPLAY_STEP(__i915, since, until))
|
||||||
|
|
||||||
#define IS_MTL_MEDIA_STEP(__i915, since, until) \
|
|
||||||
(IS_METEORLAKE(__i915) && \
|
|
||||||
IS_MEDIA_STEP(__i915, since, until))
|
|
||||||
|
|
||||||
#define IS_DG2_DISPLAY_STEP(__i915, since, until) \
|
#define IS_DG2_DISPLAY_STEP(__i915, since, until) \
|
||||||
(IS_DG2(__i915) && \
|
(IS_DG2(__i915) && \
|
||||||
IS_DISPLAY_STEP(__i915, since, until))
|
IS_DISPLAY_STEP(__i915, since, until))
|
||||||
|
|
|
@ -4191,7 +4191,7 @@ static int read_properties_unlocked(struct i915_perf *perf,
|
||||||
* C6 disable in BIOS. Fail if Media C6 is enabled on steppings where OAM
|
* C6 disable in BIOS. Fail if Media C6 is enabled on steppings where OAM
|
||||||
* does not work as expected.
|
* does not work as expected.
|
||||||
*/
|
*/
|
||||||
if (IS_MTL_MEDIA_STEP(props->engine->i915, STEP_A0, STEP_C0) &&
|
if (IS_MEDIA_GT_IP_STEP(props->engine->gt, IP_VER(13, 0), STEP_A0, STEP_C0) &&
|
||||||
props->engine->oa_group->type == TYPE_OAM &&
|
props->engine->oa_group->type == TYPE_OAM &&
|
||||||
intel_check_bios_c6_setup(&props->engine->gt->rc6)) {
|
intel_check_bios_c6_setup(&props->engine->gt->rc6)) {
|
||||||
drm_dbg(&perf->i915->drm,
|
drm_dbg(&perf->i915->drm,
|
||||||
|
@ -5300,16 +5300,9 @@ int i915_perf_ioctl_version(struct drm_i915_private *i915)
|
||||||
* C6 disable in BIOS. If Media C6 is enabled in BIOS, return version 6
|
* C6 disable in BIOS. If Media C6 is enabled in BIOS, return version 6
|
||||||
* to indicate that OA media is not supported.
|
* to indicate that OA media is not supported.
|
||||||
*/
|
*/
|
||||||
if (IS_MTL_MEDIA_STEP(i915, STEP_A0, STEP_C0)) {
|
if (IS_MEDIA_GT_IP_STEP(i915->media_gt, IP_VER(13, 0), STEP_A0, STEP_C0) &&
|
||||||
struct intel_gt *gt;
|
intel_check_bios_c6_setup(&i915->media_gt->rc6))
|
||||||
int i;
|
return 6;
|
||||||
|
|
||||||
for_each_gt(gt, i915, i) {
|
|
||||||
if (gt->type == GT_MEDIA &&
|
|
||||||
intel_check_bios_c6_setup(>->rc6))
|
|
||||||
return 6;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return 7;
|
return 7;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue