renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-07 13:13:57 +08:00
Code

drm/i915/gvt: Cleanup struct intel_gvt_mmio_info

Browse Source 
The size, length, addr_mask fields actually are not necessary. Every
tracked mmio has DWORD size, and addr_mask is a legacy field.

Signed-off-by: Changbin Du <changbin.du@intel.com>
Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
This commit is contained in:
Changbin Du 2017-06-06 15:56:10 +08:00 committed by Zhenyu Wang
parent 65f9f6febf
commit d8d94ba3fc
3 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/gpu/drm/i915/gvt/firmware.c
View File

@ -102,13 +102,8 @@ static int expose_firmware_sysfs(struct intel_gvt *gvt)
p = firmware + h->mmio_offset; p = firmware + h->mmio_offset;
hash_for_each(gvt->mmio.mmio_info_table, i, e, node) { hash_for_each(gvt->mmio.mmio_info_table, i, e, node)
int j; *(u32 *)(p + e->offset) = I915_READ_NOTRACE(_MMIO(e->offset));
for (j = 0; j < e->length; j += 4)
*(u32 *)(p + e->offset + j) =
I915_READ_NOTRACE(_MMIO(e->offset + j));
}
memcpy(gvt->firmware.mmio, p, info->mmio_size); memcpy(gvt->firmware.mmio, p, info->mmio_size);

7
drivers/gpu/drm/i915/gvt/handlers.c
View File

@ -131,9 +131,7 @@ static int new_mmio_info(struct intel_gvt *gvt,
if (p) if (p)
gvt_err("dup mmio definition offset %x\n", gvt_err("dup mmio definition offset %x\n",
info->offset); info->offset);
info->size = size;
info->length = (i + 4) < end ? 4 : (end - i);
info->addr_mask = addr_mask;
info->ro_mask = ro_mask; info->ro_mask = ro_mask;
info->device = device; info->device = device;
info->read = read ? read : intel_vgpu_default_mmio_read; info->read = read ? read : intel_vgpu_default_mmio_read;
@ -3114,9 +3112,6 @@ int intel_vgpu_mmio_reg_rw(struct intel_vgpu *vgpu, unsigned int offset,
goto default_rw; goto default_rw;
} }
if (WARN_ON(bytes > mmio_info->size))
return -EINVAL;
if (is_read) if (is_read)
return mmio_info->read(vgpu, offset, pdata, bytes); return mmio_info->read(vgpu, offset, pdata, bytes);
else { else {

3
drivers/gpu/drm/i915/gvt/mmio.h
View File

@ -57,9 +57,6 @@ typedef int (*gvt_mmio_func)(struct intel_vgpu *, unsigned int, void *,
struct intel_gvt_mmio_info { struct intel_gvt_mmio_info {
u32 offset; u32 offset;
u32 size;
u32 length;
u32 addr_mask;
u64 ro_mask; u64 ro_mask;
u32 device; u32 device;
gvt_mmio_func read; gvt_mmio_func read;