sync with OpenBSD -current
This commit is contained in:
parent
2d743fc5aa
commit
0e1b66badd
34 changed files with 418 additions and 480 deletions
|
@ -3285,11 +3285,10 @@ get_sseu_config(struct intel_sseu *out_sseu,
|
|||
*/
|
||||
u32 i915_perf_oa_timestamp_frequency(struct drm_i915_private *i915)
|
||||
{
|
||||
/*
|
||||
* Wa_18013179988:dg2
|
||||
* Wa_14015846243:mtl
|
||||
*/
|
||||
if (IS_DG2(i915) || IS_METEORLAKE(i915)) {
|
||||
struct intel_gt *gt = to_gt(i915);
|
||||
|
||||
/* Wa_18013179988 */
|
||||
if (IS_DG2(i915) || IS_GFX_GT_IP_RANGE(gt, IP_VER(12, 70), IP_VER(12, 74))) {
|
||||
intel_wakeref_t wakeref;
|
||||
u32 reg, shift;
|
||||
|
||||
|
@ -4607,7 +4606,7 @@ static bool xehp_is_valid_b_counter_addr(struct i915_perf *perf, u32 addr)
|
|||
|
||||
static bool gen12_is_valid_mux_addr(struct i915_perf *perf, u32 addr)
|
||||
{
|
||||
if (IS_METEORLAKE(perf->i915))
|
||||
if (GRAPHICS_VER_FULL(perf->i915) >= IP_VER(12, 70))
|
||||
return reg_in_range_table(addr, mtl_oa_mux_regs);
|
||||
else
|
||||
return reg_in_range_table(addr, gen12_oa_mux_regs);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue