mbox series

[git,pull] drm fixes for 5.14-rc2

Message ID CAPM=9tzb9KSspAtVkSH3pYN97hQ815MoOBTSiuHzUJnnb2fhRA@mail.gmail.com (mailing list archive)
State New, archived
Headers show
Series [git,pull] drm fixes for 5.14-rc2 | expand

Pull-request

git://anongit.freedesktop.org/drm/drm tags/drm-fixes-2021-07-16

Message

Dave Airlie July 16, 2021, 3:41 a.m. UTC 
Hi Linus,

Regular rc2 fixes though a bit more than usual at rc2 stage, people
must have been testing early or else some fixes from last week got a
bit laggy. There is one larger change in the amd fixes to amalgamate
some power management code on the newer chips with the code from the
older chips, it should only affects chips where support was introduced
in rc1 and it should make future fixes easier to maintain probably a
good idea to merge it now. Otherwise it's mostly fixes across the
board.

Dave.

drm-fixes-2021-07-16:
drm fixes for 5.14-rc2

dma-buf:
- Fix fence leak in sync_file_merge() error code

drm/panel:
- nt35510: Don't fail on DSI reads

fbdev:
- Avoid use-after-free by not deleting current video mode

ttm:
- Avoid NULL-ptr deref in ttm_range_man_fini()

vmwgfx:
- Fix a merge commit

qxl:
- fix a TTM regression

amdgpu:
- SR-IOV fixes
- RAS fixes
- eDP fixes
- SMU13 code unification to facilitate fixes in the future
- Add new renoir DID
- Yellow Carp fixes
- Beige Goby fixes
- Revert a bunch of TLB fixes that caused regressions
- Revert an LTTPR display regression

amdkfd
- Fix VRAM access regression
- SVM fixes

i915:
- Fix -EDEADLK handling regression
- Drop the page table optimisation
The following changes since commit e73f0f0ee7541171d89f2e2491130c7771ba58d3:

  Linux 5.14-rc1 (2021-07-11 15:07:40 -0700)

are available in the Git repository at:

  git://anongit.freedesktop.org/drm/drm tags/drm-fixes-2021-07-16

for you to fetch changes up to 876d98e5511d8cfd12fc617a6717e7a8ea07be17:

  Merge tag 'drm-intel-fixes-2021-07-15' of
git://anongit.freedesktop.org/drm/drm-intel into drm-fixes (2021-07-16
10:53:02 +1000)

----------------------------------------------------------------
drm fixes for 5.14-rc2

dma-buf:
- Fix fence leak in sync_file_merge() error code

drm/panel:
- nt35510: Don't fail on DSI reads

fbdev:
- Avoid use-after-free by not deleting current video mode

ttm:
- Avoid NULL-ptr deref in ttm_range_man_fini()

vmwgfx:
- Fix a merge commit

qxl:
- fix a TTM regression

amdgpu:
- SR-IOV fixes
- RAS fixes
- eDP fixes
- SMU13 code unification to facilitate fixes in the future
- Add new renoir DID
- Yellow Carp fixes
- Beige Goby fixes
- Revert a bunch of TLB fixes that caused regressions
- Revert an LTTPR display regression

amdkfd
- Fix VRAM access regression
- SVM fixes

i915:
- Fix -EDEADLK handling regression
- Drop the page table optimisation

----------------------------------------------------------------
Aaron Liu (1):
      drm/amd/pm: Add waiting for response of mode-reset message for yellow carp

Chengming Gui (1):
      drm/amd/pm: Fix BACO state setting for Beige_Goby

Christian König (1):
      drm/qxl: add NULL check for bo->resource

Daniel Vetter (1):
      Merge tag 'drm-misc-fixes-2021-07-13' of
git://anongit.freedesktop.org/drm/drm-misc into drm-fixes

Dave Airlie (3):
      Merge tag 'amd-drm-fixes-5.14-2021-07-14' of
https://gitlab.freedesktop.org/agd5f/linux into drm-fixes
      Merge tag 'drm-misc-fixes-2021-07-15' of
git://anongit.freedesktop.org/drm/drm-misc into drm-fixes
      Merge tag 'drm-intel-fixes-2021-07-15' of
git://anongit.freedesktop.org/drm/drm-intel into drm-fixes

Dmytro Laktyushkin (1):
      drm/amd/display: remove faulty assert

Emily Deng (1):
      drm/amdgpu: Correct the irq numbers for virtual crtc

Emily.Deng (1):
      drm/amdgpu: Restore msix after FLR

Eric Huang (5):
      Revert "drm/amdkfd: Add memory sync before TLB flush on unmap"
      Revert "drm/amdgpu: Fix warning of Function parameter or member
not described"
      Revert "drm/amdkfd: Make TLB flush conditional on mapping"
      Revert "drm/amdgpu: Add table_freed parameter to amdgpu_vm_bo_update"
      Revert "drm/amdkfd: Add heavy-weight TLB flush after unmapping"

Felix Kuehling (1):
      drm/amdkfd: Allow CPU access for all VRAM BOs

Jason Ekstrand (1):
      dma-buf/sync_file: Don't leak fences on merge failure

Jingwen Chen (1):
      drm/amdgpu: SRIOV flr_work should take write_lock

Jinzhou Su (1):
      drm/amdgpu: add another Renoir DID

Linus Walleij (1):
      drm/panel: nt35510: Do not fail if DSI read fails

Luben Tuikov (1):
      drm/amdgpu: Return error if no RAS

Matthew Auld (1):
      drm/i915/gtt: drop the page table optimisation

Nicholas Kazlauskas (1):
      drm/amd/display: Fix updating infoframe for DCN3.1 eDP

Philip Yang (1):
      drm/amdkfd: handle fault counters on invalid address

Thomas Zimmermann (1):
      Merge remote-tracking branch 'drm-misc/drm-misc-next-fixes' into
drm-misc-fixes

Ville Syrjälä (1):
      drm/i915/gt: Fix -EDEADLK handling regression

Wesley Chalmers (1):
      Revert "drm/amd/display: Always write repeater mode regardless of LTTPR"

Xiaomeng Hou (2):
      drm/amd/pm: drop smu_v13_0_1.c|h files for yellow carp
      drm/amd/display: update header file name

Zack Rusin (2):
      drm/vmwgfx: Fix implicit declaration error
      drm/vmwgfx: Fix a bad merge in otable batch takedown

Zhan Liu (1):
      drm/amdgpu/display - only update eDP's backlight level when necessary

Zhen Lei (1):
      fbmem: Do not delete the mode that is still in use

Zheyu Ma (1):
      drm/ttm: add a check against null pointer dereference

 drivers/dma-buf/sync_file.c                        |  13 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h         |   2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c   |  22 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c             |   6 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c            |   1 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c            |   2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c            |  18 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c            |  49 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h            |   6 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c             |  11 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h             |   2 +-
 drivers/gpu/drm/amd/amdgpu/dce_virtual.c           |   2 +-
 drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c              |   4 +-
 drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c              |   4 +-
 drivers/gpu/drm/amd/amdkfd/kfd_chardev.c           |  45 +-
 drivers/gpu/drm/amd/amdkfd/kfd_process.c           |   3 +-
 drivers/gpu/drm/amd/amdkfd/kfd_svm.c               |  30 +-
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c  |   2 +-
 .../drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.c   |   4 +-
 drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c   |   8 +-
 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c |   2 +-
 .../drm/amd/include/asic_reg/mp/mp_13_0_1_offset.h | 355 --------------
 .../amd/include/asic_reg/mp/mp_13_0_1_sh_mask.h    | 531 ---------------------
 drivers/gpu/drm/amd/pm/inc/smu_v13_0.h             |   1 +
 drivers/gpu/drm/amd/pm/inc/smu_v13_0_1.h           |  57 ---
 drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c     |   1 +
 drivers/gpu/drm/amd/pm/swsmu/smu13/Makefile        |   2 +-
 drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c     |  24 +
 drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_1.c   | 311 ------------
 .../gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c   |  49 +-
 drivers/gpu/drm/i915/gt/gen8_ppgtt.c               |   5 +-
 drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c       |   2 +-
 drivers/gpu/drm/panel/panel-novatek-nt35510.c      |   4 +-
 drivers/gpu/drm/qxl/qxl_ttm.c                      |   2 +-
 drivers/gpu/drm/ttm/ttm_range_manager.c            |   3 +
 drivers/gpu/drm/vmwgfx/vmwgfx_drv.c                |   1 +
 drivers/gpu/drm/vmwgfx/vmwgfx_mob.c                |   1 -
 drivers/video/fbdev/core/fbmem.c                   |  12 +-
 38 files changed, 202 insertions(+), 1395 deletions(-)
 delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_13_0_1_offset.h
 delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_13_0_1_sh_mask.h
 delete mode 100644 drivers/gpu/drm/amd/pm/inc/smu_v13_0_1.h
 delete mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_1.c

Comments

pr-tracker-bot@kernel.org July 16, 2021, 7:28 p.m. UTC | #1 
The pull request you sent on Fri, 16 Jul 2021 13:41:18 +1000:

> git://anongit.freedesktop.org/drm/drm tags/drm-fixes-2021-07-16

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/786cb0a2f9bba267c8a80caf906b94c76d18f7e8

Thank you!
Kirill A. Shutemov July 17, 2021, 9:43 p.m. UTC | #2 
On Fri, Jul 16, 2021 at 01:41:18PM +1000, Dave Airlie wrote:
> Hi Linus,
> 
> Regular rc2 fixes though a bit more than usual at rc2 stage, people
> must have been testing early or else some fixes from last week got a
> bit laggy. There is one larger change in the amd fixes to amalgamate
> some power management code on the newer chips with the code from the
> older chips, it should only affects chips where support was introduced
> in rc1 and it should make future fixes easier to maintain probably a
> good idea to merge it now. Otherwise it's mostly fixes across the
> board.
> 
> Dave.
> 
> drm-fixes-2021-07-16:
> drm fixes for 5.14-rc2

Dave, Daniel,

Looks like the fix[1] for nouveau regression[2] is missing. Hm?

[1] https://lore.kernel.org/nouveau/20210609172902.1937-1-christian.koenig@amd.com/
[2] https://lore.kernel.org/lkml/YOC4uekpD7iA3xPi@Red/T/#u
Christian König July 19, 2021, 6:11 a.m. UTC | #3 
Am 17.07.21 um 23:43 schrieb Kirill A. Shutemov:
> On Fri, Jul 16, 2021 at 01:41:18PM +1000, Dave Airlie wrote:
>> Hi Linus,
>>
>> Regular rc2 fixes though a bit more than usual at rc2 stage, people
>> must have been testing early or else some fixes from last week got a
>> bit laggy. There is one larger change in the amd fixes to amalgamate
>> some power management code on the newer chips with the code from the
>> older chips, it should only affects chips where support was introduced
>> in rc1 and it should make future fixes easier to maintain probably a
>> good idea to merge it now. Otherwise it's mostly fixes across the
>> board.
>>
>> Dave.
>>
>> drm-fixes-2021-07-16:
>> drm fixes for 5.14-rc2
> Dave, Daniel,

My fault, I've pushed it to drm-misc-next after the branch of.

Just cherry-picked that to drm-misc-fixes. Should be in the next -rc

Thanks for the notice,
Christian.

>
> Looks like the fix[1] for nouveau regression[2] is missing. Hm?
>
> [1] https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flore.kernel.org%2Fnouveau%2F20210609172902.1937-1-christian.koenig%40amd.com%2F&data=04%7C01%7Cchristian.koenig%40amd.com%7Cdfa76642807a4953a9dc08d9496bda6a%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637621549856073674%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=8wYkOJYcSoLt3P6cFdTsaYrvX2UEhm7M5RKkaSn5dws%3D&reserved=0
> [2] https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flore.kernel.org%2Flkml%2FYOC4uekpD7iA3xPi%40Red%2FT%2F%23u&data=04%7C01%7Cchristian.koenig%40amd.com%7Cdfa76642807a4953a9dc08d9496bda6a%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637621549856073674%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=h5QYbNjhPDAqioojBPTY7uVvfJx6XwEV7ic8rwuMxMc%3D&reserved=0
>