Re: [PULL] drm-next (merge window fixes really)

2022-01-18 Thread pr-tracker-bot
The pull request you sent on Fri, 14 Jan 2022 18:20:41 +0100:

> git://anongit.freedesktop.org/drm/drm-tip drm-tip

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/59d41458f143b7a20997b1e78b5c15d9d3e998c3

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html


[PULL] drm-next (merge window fixes really)

2022-01-14 Thread Daniel Vetter
Hi Linus,

drm-next-2022-01-14:
drm fixes for 5.17-rc1:

drivers fixes:
- i915 fixes for ttm backend + one pm wakelock fix
- amdgpu fixes, fairly big pile of small things all over. Note this
  doesn't yet containe the fixed version of the otg sync patch that
  blew up
- small driver fixes: meson, sun4i, vga16fb probe fix

drm core fixes:
- cma-buf heap locking
- ttm compilation
- self refresh helper state check
- wrong error message in atomic helpers
- mipi-dbi buffer mapping

Note there's some conflicts:
- One of the pulls was based on previous release, so I had to redo your
  merge (since I really didn't want to roll forward to a random point in
  the merge window). I tried to pick your exact solution to prevent
  further merge conflict lolz.

- amgpu has some conflicts, you should be fine by just going with the
  version in this pull. Alex tested that what I have in our shared
  rerere/integration tree, if you want to fetch that:

git://anongit.freedesktop.org/drm/drm-tip drm-tip

I also wasted some time chasing a arm32 bad udelay compile issue until I
realized it's not a regression in this set but been there already, hence
why this pull is a bit late. Alex is looking into that one.

Next week's drm pull is back to Dave.

Cheers, Daniel

The following changes since commit cb6846fbb83b574c85c2a80211b402a6347b60b1:

  Merge tag 'amd-drm-next-5.17-2021-12-30' of 
ssh://gitlab.freedesktop.org/agd5f/linux into drm-next (2021-12-31 10:59:17 
+1000)

are available in the Git repository at:

  git://anongit.freedesktop.org/drm/drm tags/drm-next-2022-01-14

for you to fetch changes up to 4efdddbce7c1329f00c458e85dcaf105aebdc0ed:

  Merge tag 'amd-drm-next-5.17-2022-01-12' of 
https://gitlab.freedesktop.org/agd5f/linux into drm-next (2022-01-14 15:42:28 
+0100)


drm fixes for 5.17-rc1:

drivers fixes:
- i915 fixes for ttm backend + one pm wakelock fix
- amdgpu fixes, fairly big pile of small things all over. Note this
  doesn't yet containe the fixed version of the otg sync patch that
  blew up
- small driver fixes: meson, sun4i, vga16fb probe fix

drm core fixes:
- cma-buf heap locking
- ttm compilation
- self refresh helper state check
- wrong error message in atomic helpers
- mipi-dbi buffer mapping


Alexander Stein (2):
  dt-bindings: display: meson-vpu: Add missing amlogic,canvas property
  dt-bindings: display: meson-dw-hdmi: add missing sound-name-prefix 
property

Charlene Liu (1):
  drm/amd/display: Add check for forced_clocks debug option

Claudio Suarez (1):
  drm: fix error found in some cases after the patch d1af5cd86997

Daniel Vetter (5):
  Merge tag 'drm-intel-next-fixes-2022-01-13' of 
git://anongit.freedesktop.org/drm/drm-intel into drm-next
  Merge tag 'drm-misc-next-fixes-2022-01-13' of 
git://anongit.freedesktop.org/drm/drm-misc into drm-next
  Merge tag 'drm-misc-fixes-2022-01-14' of 
git://anongit.freedesktop.org/drm/drm-misc into drm-next
  Merge tag 'drm-misc-next-fixes-2022-01-14' of 
git://anongit.freedesktop.org/drm/drm-misc into drm-next
  Merge tag 'amd-drm-next-5.17-2022-01-12' of 
https://gitlab.freedesktop.org/agd5f/linux into drm-next

Evan Quan (1):
  drm/amd/pm: keep the BACO feature enabled for suspend

Felix Kuehling (3):
  drm/amdkfd: Use prange->list head for insert_list
  drm/amdkfd: Use prange->update_list head for remove_list
  drm/amdkfd: Fix DQM asserts on Hawaii

Greg Kroah-Hartman (2):
  drm/amdgpu: use default_groups in kobj_type
  drm/amdkfd: use default_groups in kobj_type

Guchun Chen (1):
  drm/amdgpu: use spin_lock_irqsave to avoid deadlock by local interrupt

Harry Wentland (1):
  drm/amdgpu: Use correct VIEWPORT_DIMENSION for DCN2

James Yao (1):
  drm/amdgpu: add dummy event6 for vega10

Javier Martinez Canillas (1):
  video: vga16fb: Only probe for EGA and VGA 16 color graphic cards

Jiasheng Jiang (1):
  drm/amdkfd: Check for null pointer after calling kmemdup

Jiawei Gu (1):
  drm/amdgpu: Clear garbage data in err_data before usage

Johannes Berg (1):
  drm/ttm: fix compilation on ARCH=um

José Expósito (1):
  drm/amd/display: invalid parameter check in dmub_hpd_callback

Juston Li (1):
  drm/i915/pxp: Hold RPM wakelock during PXP unbind

Kent Russell (1):
  drm/amdkfd: Fix ASIC name typos

Leslie Shi (1):
  drm/amdgpu: Unmap MMIO mappings when device is not unplugged

Liu Ying (1):
  drm/atomic: Check new_crtc_state->active to determine if CRTC needs 
disable in self refresh mode

Lukas Bulwahn (1):
  drm/amdkfd: make SPDX License expression more sound

Mario Limonciello (4):
  drm/amdgpu: explicitly check for s0ix when evicting resources
  drm/amdgpu: don't set s3 and s0ix at the same time
  drm/amd/display: explicitly set is_dsc_supported to false before use
  drm/amd/display: reset dcn31