mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-06 00:39:48 +00:00
Merge tag 'gvt-next-fixes-2021-04-21' of https://github.com/intel/gvt-linux into drm-intel-next-fixes
gvt-next-fixes-2021-04-21 - Remove one unused function warning (Jiapeng) - Fix intel_gvt_init_device() return type (Dan) - Remove one duplicated register accessible check (Zhenyu) Signed-off-by: Jani Nikula <jani.nikula@intel.com> From: Zhenyu Wang <zhenyuw@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20210421094522.GU1551@zhen-hp.sh.intel.com
This commit is contained in:
commit
e65a4d3784
3 changed files with 4 additions and 15 deletions
|
@ -941,11 +941,6 @@ static int cmd_reg_handler(struct parser_exec_state *s,
|
||||||
|
|
||||||
/* below are all lri handlers */
|
/* below are all lri handlers */
|
||||||
vreg = &vgpu_vreg(s->vgpu, offset);
|
vreg = &vgpu_vreg(s->vgpu, offset);
|
||||||
if (!intel_gvt_mmio_is_cmd_accessible(gvt, offset)) {
|
|
||||||
gvt_vgpu_err("%s access to non-render register (%x)\n",
|
|
||||||
cmd, offset);
|
|
||||||
return -EBADRQC;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (is_cmd_update_pdps(offset, s) &&
|
if (is_cmd_update_pdps(offset, s) &&
|
||||||
cmd_pdp_mmio_update_handler(s, offset, index))
|
cmd_pdp_mmio_update_handler(s, offset, index))
|
||||||
|
|
|
@ -587,12 +587,6 @@ static void _ppgtt_set_root_entry(struct intel_vgpu_mm *mm,
|
||||||
entry, index, false, 0, mm->vgpu);
|
entry, index, false, 0, mm->vgpu);
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void ppgtt_set_guest_root_entry(struct intel_vgpu_mm *mm,
|
|
||||||
struct intel_gvt_gtt_entry *entry, unsigned long index)
|
|
||||||
{
|
|
||||||
_ppgtt_set_root_entry(mm, entry, index, true);
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline void ppgtt_set_shadow_root_entry(struct intel_vgpu_mm *mm,
|
static inline void ppgtt_set_shadow_root_entry(struct intel_vgpu_mm *mm,
|
||||||
struct intel_gvt_gtt_entry *entry, unsigned long index)
|
struct intel_gvt_gtt_entry *entry, unsigned long index)
|
||||||
{
|
{
|
||||||
|
|
|
@ -126,7 +126,7 @@ static bool intel_get_gvt_attrs(struct attribute_group ***intel_vgpu_type_groups
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool intel_gvt_init_vgpu_type_groups(struct intel_gvt *gvt)
|
static int intel_gvt_init_vgpu_type_groups(struct intel_gvt *gvt)
|
||||||
{
|
{
|
||||||
int i, j;
|
int i, j;
|
||||||
struct intel_vgpu_type *type;
|
struct intel_vgpu_type *type;
|
||||||
|
@ -144,7 +144,7 @@ static bool intel_gvt_init_vgpu_type_groups(struct intel_gvt *gvt)
|
||||||
gvt_vgpu_type_groups[i] = group;
|
gvt_vgpu_type_groups[i] = group;
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
return 0;
|
||||||
|
|
||||||
unwind:
|
unwind:
|
||||||
for (j = 0; j < i; j++) {
|
for (j = 0; j < i; j++) {
|
||||||
|
@ -152,7 +152,7 @@ static bool intel_gvt_init_vgpu_type_groups(struct intel_gvt *gvt)
|
||||||
kfree(group);
|
kfree(group);
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return -ENOMEM;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void intel_gvt_cleanup_vgpu_type_groups(struct intel_gvt *gvt)
|
static void intel_gvt_cleanup_vgpu_type_groups(struct intel_gvt *gvt)
|
||||||
|
@ -373,7 +373,7 @@ int intel_gvt_init_device(struct drm_i915_private *i915)
|
||||||
goto out_clean_thread;
|
goto out_clean_thread;
|
||||||
|
|
||||||
ret = intel_gvt_init_vgpu_type_groups(gvt);
|
ret = intel_gvt_init_vgpu_type_groups(gvt);
|
||||||
if (ret == false) {
|
if (ret) {
|
||||||
gvt_err("failed to init vgpu type groups: %d\n", ret);
|
gvt_err("failed to init vgpu type groups: %d\n", ret);
|
||||||
goto out_clean_types;
|
goto out_clean_types;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue