From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 8 Jul 2021 19:28:15 +0000 (-0700)
Subject: Merge tag 'drm-next-2021-07-08-1' of git://anongit.freedesktop.org/drm/drm
X-Git-Tag: v5.14-rc1~41
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f55966571d5eb2876a11e48e798b4592fa1ffbb7;p=thirdparty%2Flinux.git

Merge tag 'drm-next-2021-07-08-1' of git://anongit.freedesktop.org/drm/drm

Pull drm fixes from Dave Airlie:
 "Some fixes for rc1 that came in the past weeks, mainly a bunch of
  amdgpu fixes, some i915 and the rest are misc around the place. I'm
  sending this a bit early so some more stuff may show up, but I'll
  probably take tomorrow off.

  dma-buf:
   - doc fixes

  amdgpu:
   - Misc Navi fixes
   - Powergating fix
   - Yellow Carp updates
   - Beige Goby updates
   - S0ix fix
   - Revert overlay validation fix
   - GPU reset fix for DC
   - PPC64 fix
   - Add new dimgrey cavefish DID
   - RAS fix
   - TTM fixes

  amdkfd:
   - SVM fixes

  radeon:
   - Fix missing drm_gem_object_put in error path
   - NULL ptr deref fix

  i915:
   - display DP VSC fix
   - DG1 display fix
   - IRQ fixes
   - IRQ demidlayering

  gma500:
   - bo leaks in error paths fixed"

* tag 'drm-next-2021-07-08-1' of git://anongit.freedesktop.org/drm/drm: (52 commits)
  drm/i915: Drop all references to DRM IRQ midlayer
  drm/i915: Use the correct IRQ during resume
  drm/i915/display/dg1: Correctly map DPLLs during state readout
  drm/i915/display: Do not zero past infoframes.vsc
  drm/amdgpu: Conditionally reset SDMA RAS error counts
  drm/amdkfd: Maintain svm_bo reference in page->zone_device_data
  drm/amdkfd: add invalid pages debug at vram migration
  drm/amdkfd: skip migration for pages already in VRAM
  drm/amdkfd: skip invalid pages during migrations
  drm/amdkfd: classify and map mixed svm range pages in GPU
  drm/amdkfd: use hmm range fault to get both domain pfns
  drm/amdgpu: get owner ref in validate and map
  drm/amdkfd: set owner ref to svm range prefault
  drm/amdkfd: add owner ref param to get hmm pages
  drm/amdkfd: device pgmap owner at the svm migrate init
  drm/amdkfd: inc counter on child ranges with xnack off
  drm/amd/display: Extend DMUB diagnostic logging to DCN3.1
  drm/amdgpu: Update NV SIMD-per-CU to 2
  drm/amdgpu: add new dimgrey cavefish DID
  drm/amd/pm: skip PrepareMp1ForUnload message in s0ix
  ...
---

f55966571d5eb2876a11e48e798b4592fa1ffbb7
diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index cdfc20b0b2ebc,05ff22a4893a8..3a55f08e00e1d
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@@ -695,9 -692,8 +691,9 @@@ int amdgpu_ttm_tt_get_user_pages(struc
  	readonly = amdgpu_ttm_tt_is_readonly(ttm);
  	r = amdgpu_hmm_range_get_pages(&bo->notifier, mm, pages, start,
  				       ttm->num_pages, &gtt->range, readonly,
- 				       true);
 -				       false, NULL);
 -out_putmm:
++				       true, NULL);
 +out_unlock:
 +	mmap_read_unlock(mm);
  	mmput(mm);
  
  	return r;