File tree Expand file tree Collapse file tree 1 file changed +5
-6
lines changed Expand file tree Collapse file tree 1 file changed +5
-6
lines changed Original file line number Diff line number Diff line change @@ -1612,10 +1612,9 @@ static int alloc_noa_wait(struct i915_perf_stream *stream)
1612
1612
struct drm_i915_gem_object * bo ;
1613
1613
struct i915_vma * vma ;
1614
1614
const u64 delay_ticks = 0xffffffffffffffff -
1615
- DIV64_U64_ROUND_UP (
1616
- atomic64_read (& stream -> perf -> noa_programming_delay ) *
1617
- RUNTIME_INFO (i915 )-> cs_timestamp_frequency_khz ,
1618
- 1000000ull );
1615
+ DIV_ROUND_UP_ULL (atomic64_read (& stream -> perf -> noa_programming_delay ) *
1616
+ RUNTIME_INFO (i915 )-> cs_timestamp_frequency_khz ,
1617
+ 1000000 );
1619
1618
const u32 base = stream -> engine -> mmio_base ;
1620
1619
#define CS_GPR (x ) GEN8_RING_CS_GPR(base, x)
1621
1620
u32 * batch , * ts0 , * cs , * jump ;
@@ -3485,8 +3484,8 @@ i915_perf_open_ioctl_locked(struct i915_perf *perf,
3485
3484
3486
3485
static u64 oa_exponent_to_ns (struct i915_perf * perf , int exponent )
3487
3486
{
3488
- return div64_u64 ( 1000000000ULL * (2ULL << exponent ),
3489
- 1000ULL * RUNTIME_INFO (perf -> i915 )-> cs_timestamp_frequency_khz );
3487
+ return div_u64 ( 1000000 * (2ULL << exponent ),
3488
+ RUNTIME_INFO (perf -> i915 )-> cs_timestamp_frequency_khz );
3490
3489
}
3491
3490
3492
3491
/**
You can’t perform that action at this time.
0 commit comments