diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2021-04-08 10:22:14 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2021-04-08 10:22:14 +0300 |
| commit | d527353e4bceae6d59606ad21ad00916401d22ad (patch) | |
| tree | 8ad569177aa89f15dcc485ee31d671cc98344ba8 /drivers/gpu/drm/i915/gt/gen6_ppgtt.h | |
| parent | 70bfb30743d5da73058b0a2271e9c127a84fb494 (diff) | |
| parent | 9c0fed84d5750e1eea6c664e073ffa2534a17743 (diff) | |
Merge drm/drm-next into drm-intel-next
Sync up with topic/i915-gem-next and drm-intel-gt-next.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/gt/gen6_ppgtt.h')
| -rw-r--r-- | drivers/gpu/drm/i915/gt/gen6_ppgtt.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/gt/gen6_ppgtt.h b/drivers/gpu/drm/i915/gt/gen6_ppgtt.h index 3357228f3304..6a61a5c3a85a 100644 --- a/drivers/gpu/drm/i915/gt/gen6_ppgtt.h +++ b/drivers/gpu/drm/i915/gt/gen6_ppgtt.h @@ -59,9 +59,9 @@ static inline struct gen6_ppgtt *to_gen6_ppgtt(struct i915_ppgtt *base) for (iter = gen6_pde_index(start); \ length > 0 && iter < I915_PDES && \ (pt = i915_pt_entry(pd, iter), true); \ - ({ u32 temp = ALIGN(start+1, 1 << GEN6_PDE_SHIFT); \ + ({ u32 temp = ALIGN(start + 1, 1 << GEN6_PDE_SHIFT); \ temp = min(temp - start, length); \ - start += temp, length -= temp; }), ++iter) + start += temp; length -= temp; }), ++iter) #define gen6_for_all_pdes(pt, pd, iter) \ for (iter = 0; \ |