On Thu, Jan 05, 2023 at 08:15:28AM +0800, Zhenyu Wang wrote: > On 2023.01.04 06:34:28 -0500, Rodrigo Vivi wrote: > > On Wed, Jan 04, 2023 at 04:05:13PM +0800, Zhenyu Wang wrote: > > > > > > Hi, > > > > > > Here's accumulated current gvt-fixes. Several of them handle > > > for error or destroy path issues and one from Zhi to fix up > > > left vgpu status tracking. > > > > > > thanks! > > > --- > > > The following changes since commit 6217e9f05a74df48c77ee68993d587cdfdb1feb7: > > > > I'm kind of confused on your baseline here. > > > > It is including a strange merge commit in the middle of the commits: > > Zhenyu Wang ??? M?????? Merge tag 'drm-intel-fixes-2022-12-30' into gvt-fixes > > commit c063c8c07864246ba3831b017cea8d3096e236a8 > > > > Please rebase on top of v6.2-rc2 so we have the same base here. > > (and please remind to sign-off-by when pushing the commits) > > > > oh, I tried to sycn up by back merge with vfio iommufd of gvt changes > to apply Zhi's patch properly, so it should stand on that tag..but anyway I'd say for the fixes branches probably a rebase is better than back merges. Keep the rebase in sync with -rc tags is probably the best way. or rebase on drm-intel-fixes. > I just refresh with rebase and fixed two invalid r-b tags. Please pull > below one. pulled. Thanks > > thanks! > --- > The following changes since commit 88603b6dc419445847923fcb7fe5080067a30f98: > > Linux 6.2-rc2 (2023-01-01 13:53:16 -0800) > > are available in the Git repository at: > > https://github.com/intel/gvt-linux.git tags/gvt-fixes-2023-01-05 > > for you to fetch changes up to 4a61648af68f5ba4884f0e3b494ee1cabc4b6620: > > drm/i915/gvt: fix double free bug in split_2MB_gtt_entry (2023-01-04 23:21:19 +0800) > > ---------------------------------------------------------------- > gvt-fixes-2023-01-05 > > - Fix one missed unpin in error of intel_vgpu_shadow_mm_pin() > - Fix two debugfs destroy oops issues for vgpu and gvt entries > - Fix one potential double free issue in gtt shadow pt code > - Fix to use atomic bit flag for vgpu status > > ---------------------------------------------------------------- > Dan Carpenter (1): > drm/i915: unpin on error in intel_vgpu_shadow_mm_pin() > > Zheng Wang (1): > drm/i915/gvt: fix double free bug in split_2MB_gtt_entry > > Zhenyu Wang (2): > drm/i915/gvt: fix gvt debugfs destroy > drm/i915/gvt: fix vgpu debugfs clean in remove > > Zhi Wang (1): > drm/i915/gvt: use atomic operations to change the vGPU status > > drivers/gpu/drm/i915/gvt/debugfs.c | 36 +++++++++++++++++++++++++++++++----- > drivers/gpu/drm/i915/gvt/dmabuf.c | 3 ++- > drivers/gpu/drm/i915/gvt/gtt.c | 21 +++++++++++++++------ > drivers/gpu/drm/i915/gvt/gvt.h | 15 ++++++++++----- > drivers/gpu/drm/i915/gvt/interrupt.c | 2 +- > drivers/gpu/drm/i915/gvt/kvmgt.c | 35 +++++++++++++---------------------- > drivers/gpu/drm/i915/gvt/scheduler.c | 4 +++- > drivers/gpu/drm/i915/gvt/vgpu.c | 12 +++++------- > 8 files changed, 80 insertions(+), 48 deletions(-)