[git,pull] drm/vmwgfx fixes for 5.12-rc8

Pull-request

git://anongit.freedesktop.org/drm/drm tags/drm-fixes-2021-04-18

Message

Dave Airlie April 17, 2021, 11:48 p.m. UTC

Hi Linus,

Back from holidays and this was in the cracks (Zack forgot to cc
Daniel/lists), I've just piled it onto drm fixes.

It contains two regression fixes for vmwgfx, one due to a refactor
which meant locks were being used before initialisation, and the other
in fixing up some warnings from the core when destroying pinned
buffers.

Dave.

drm-fixes-2021-04-18:
drm/vmwgfx fixes for 5.12-rc7

vmwgfx:
- fixed unpinning before destruction
- lockdep init reordering
The following changes since commit 4d2e1288372ccc5ac60290bc10cace49c9bfa6d0:

  Merge tag 'drm-intel-fixes-2021-04-15' of
git://anongit.freedesktop.org/drm/drm-intel into drm-fixes (2021-04-15
15:24:17 +0200)

are available in the Git repository at:

  git://anongit.freedesktop.org/drm/drm tags/drm-fixes-2021-04-18

for you to fetch changes up to 796b556cbfdbe0d65b9793e63653ad24f9fa033c:

  Merge tag 'vmwgfx-fixes-2021-04-14' of
gitlab.freedesktop.org:zack/vmwgfx into drm-fixes (2021-04-18 09:27:00
+1000)

----------------------------------------------------------------
drm/vmwgfx fixes for 5.12-rc7

vmwgfx:
- fixed unpinning before destruction
- lockdep init reordering

----------------------------------------------------------------
Dave Airlie (1):
      Merge tag 'vmwgfx-fixes-2021-04-14' of
gitlab.freedesktop.org:zack/vmwgfx into drm-fixes

Zack Rusin (3):
      drm/vmwgfx: Make sure we unpin no longer needed buffers
      drm/vmwgfx: Fix the lockdep breakage
      drm/vmwgfx: Make sure bo's are unpinned before putting them back

 drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c |  4 ++++
 drivers/gpu/drm/vmwgfx/vmwgfx_drv.c     | 17 ++++++++---------
 drivers/gpu/drm/vmwgfx/vmwgfx_drv.h     |  5 +----
 drivers/gpu/drm/vmwgfx/vmwgfx_mob.c     | 14 ++++++++++++++
 4 files changed, 27 insertions(+), 13 deletions(-)

Comments

[e-mail] April 18, 2021, 3:29 a.m. UTC | #1

The pull request you sent on Sun, 18 Apr 2021 09:48:56 +1000:

> git://anongit.freedesktop.org/drm/drm tags/drm-fixes-2021-04-18

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

Thank you!