提交 2f8aa3b8 编写于 作者: C Chris Wilson 提交者: Daniel Vetter

drm/i915/gt: Add some missing blank lines after declaration

Trivial checkpatch cleanup.
Signed-off-by: NChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: NMichal Wajdeczko <michal.wajdeczko@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210122192913.4518-2-chris@chris-wilson.co.ukSigned-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
上级 24f90d66
...@@ -36,6 +36,7 @@ void intel_gt_debugfs_register_files(struct dentry *root, ...@@ -36,6 +36,7 @@ void intel_gt_debugfs_register_files(struct dentry *root,
{ {
while (count--) { while (count--) {
umode_t mode = files->fops->write ? 0644 : 0444; umode_t mode = files->fops->write ? 0644 : 0444;
if (!files->eval || files->eval(data)) if (!files->eval || files->eval(data))
debugfs_create_file(files->name, debugfs_create_file(files->name,
mode, root, data, mode, root, data,
......
...@@ -145,6 +145,7 @@ static unsigned int gen8_pt_count(u64 start, u64 end) ...@@ -145,6 +145,7 @@ static unsigned int gen8_pt_count(u64 start, u64 end)
static unsigned int gen8_pd_top_count(const struct i915_address_space *vm) static unsigned int gen8_pd_top_count(const struct i915_address_space *vm)
{ {
unsigned int shift = __gen8_pte_shift(vm->top); unsigned int shift = __gen8_pte_shift(vm->top);
return (vm->total + (1ull << shift) - 1) >> shift; return (vm->total + (1ull << shift) - 1) >> shift;
} }
......
...@@ -580,6 +580,7 @@ static void detect_bit_6_swizzle(struct i915_ggtt *ggtt) ...@@ -580,6 +580,7 @@ static void detect_bit_6_swizzle(struct i915_ggtt *ggtt)
} }
} else { } else {
u32 dimm_c0, dimm_c1; u32 dimm_c0, dimm_c1;
dimm_c0 = intel_uncore_read(uncore, MAD_DIMM_C0); dimm_c0 = intel_uncore_read(uncore, MAD_DIMM_C0);
dimm_c1 = intel_uncore_read(uncore, MAD_DIMM_C1); dimm_c1 = intel_uncore_read(uncore, MAD_DIMM_C1);
dimm_c0 &= MAD_DIMM_A_SIZE_MASK | MAD_DIMM_B_SIZE_MASK; dimm_c0 &= MAD_DIMM_A_SIZE_MASK | MAD_DIMM_B_SIZE_MASK;
...@@ -769,10 +770,12 @@ i915_gem_object_do_bit_17_swizzle(struct drm_i915_gem_object *obj, ...@@ -769,10 +770,12 @@ i915_gem_object_do_bit_17_swizzle(struct drm_i915_gem_object *obj,
i = 0; i = 0;
for_each_sgt_page(page, sgt_iter, pages) { for_each_sgt_page(page, sgt_iter, pages) {
char new_bit_17 = page_to_phys(page) >> 17; char new_bit_17 = page_to_phys(page) >> 17;
if ((new_bit_17 & 0x1) != (test_bit(i, obj->bit_17) != 0)) { if ((new_bit_17 & 0x1) != (test_bit(i, obj->bit_17) != 0)) {
swizzle_page(page); swizzle_page(page);
set_page_dirty(page); set_page_dirty(page);
} }
i++; i++;
} }
} }
......
...@@ -62,6 +62,7 @@ static int render_state_setup(struct intel_renderstate *so, ...@@ -62,6 +62,7 @@ static int render_state_setup(struct intel_renderstate *so,
if (i * 4 == rodata->reloc[reloc_index]) { if (i * 4 == rodata->reloc[reloc_index]) {
u64 r = s + so->vma->node.start; u64 r = s + so->vma->node.start;
s = lower_32_bits(r); s = lower_32_bits(r);
if (HAS_64BIT_RELOC(i915)) { if (HAS_64BIT_RELOC(i915)) {
if (i + 1 >= rodata->batch_items || if (i + 1 >= rodata->batch_items ||
......
...@@ -81,6 +81,7 @@ static inline u32 intel_ring_offset(const struct i915_request *rq, void *addr) ...@@ -81,6 +81,7 @@ static inline u32 intel_ring_offset(const struct i915_request *rq, void *addr)
{ {
/* Don't write ring->size (equivalent to 0) as that hangs some GPUs. */ /* Don't write ring->size (equivalent to 0) as that hangs some GPUs. */
u32 offset = addr - rq->ring->vaddr; u32 offset = addr - rq->ring->vaddr;
GEM_BUG_ON(offset > rq->ring->size); GEM_BUG_ON(offset > rq->ring->size);
return intel_ring_wrap(rq->ring, offset); return intel_ring_wrap(rq->ring, offset);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册