mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-03 23:58:05 +00:00
Code Issues Releases Wiki Activity

Two regression fixes targeting stable:

Browse source 
- Fix -EDEADLK handling regression (Ville)
 - Drop the page table optimisation (Matt)
 -----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCAAdFiEEbSBwaO7dZQkcLOKj+mJfZA7rE8oFAmDwPE0ACgkQ+mJfZA7r
 E8okMgf8C2MRTCdSQf9KkSkoC770tC37gNaJGJ0waHstQeAWhWNSxzDtheG2GNBs
 5/5UW/7Ap1g1ML0AhehhmLRlMsVSGmkJJUc/zdFU+ovctJpCiBbOnK5SNJTafnkS
 izP0SFF+JuKSMu0A1eMEK1fvRbJmT+ZkIVxZfn9OzMGc7UMqe3SUxUC/ujJgCgTi
 6oZTuqxVDXYqX6OTrP+T+CrQP2Dpt/YZn7Fn0S+iRJjddeUmRI0MstnYzKRJK82w
 KsDRWff/1B9dyKznQu2bAikMeoK4e+WxfexefbOKn4pP4MPql4yV+V3Gxjfy5f/u
 h03zRGKytQjnWqmvQ8WBGByf6onUrA==
 =bJUl
 -----END PGP SIGNATURE-----

Merge tag 'drm-intel-fixes-2021-07-15' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes

Two regression fixes targeting stable:
- Fix -EDEADLK handling regression (Ville)
- Drop the page table optimisation (Matt)

Signed-off-by: Dave Airlie <airlied@redhat.com>

From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/YPA8y1DSCp2EbtpC@intel.com
This commit is contained in:
Dave Airlie 2021-07-16 10:52:58 +10:00
commit 876d98e551
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/gpu/drm/i915/gt/gen8_ppgtt.c
View file

@ -303,10 +303,7 @@ static void __gen8_ppgtt_alloc(struct i915_address_space * const vm,
__i915_gem_object_pin_pages(pt->base);
i915_gem_object_make_unshrinkable(pt->base);
if (lvl ||
gen8_pt_count(*start, end) < I915_PDES ||
intel_vgpu_active(vm->i915))
fill_px(pt, vm->scratch[lvl]->encode);
fill_px(pt, vm->scratch[lvl]->encode);
spin_lock(&pd->lock);
if (likely(!pd->entry[idx])) {

2
drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c
View file

@ -348,7 +348,7 @@ static struct i915_fence_reg *fence_find(struct i915_ggtt *ggtt)
if (intel_has_pending_fb_unpin(ggtt->vm.i915))
return ERR_PTR(-EAGAIN);
return ERR_PTR(-EDEADLK);
return ERR_PTR(-ENOBUFS);
}
int __i915_vma_pin_fence(struct i915_vma *vma)