[PULL] drm-misc-fixes

[Thomas Zimmermann]

Hi Dave and Daniel,

here's the PR for drm-misc-fixes. I merged drm-misc-next-fixes into
it to pick up patches that were left over from the previous release
cycle. The vmwgfx change comes from that. The other patches fix
current errors.

Best regards
Thomas

drm-misc-fixes-2021-07-15:
Short summary of fixes pull (less than what git shortlog provides):

 * 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
The following changes since commit 1e7b5812f4890ad84058bbb6c4a5deddfb2c5b25:

  Merge tag 'drm-misc-fixes-2021-07-13' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes (2021-07-13 15:15:17 +0200)

are available in the Git repository at:

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

for you to fetch changes up to 9e5c772954406829e928dbe59891d08938ead04b:

  drm/ttm: add a check against null pointer dereference (2021-07-14 17:16:16 +0200)

----------------------------------------------------------------
Short summary of fixes pull (less than what git shortlog provides):

 * 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

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

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

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

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/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 +++++-------
 5 files changed, 10 insertions(+), 9 deletions(-)

--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer