Merge tag 'drm-misc-next-fixes-2021-11-10' of git://anongit.freedesktop.org/drm/drm...

Removed the TTM Huge Page functionnality to address a crash, a timeout
fix for udl, CONFIG_FB dependency improvements, a fix for a circular
locking depency in imx, a NULL pointer dereference fix for virtio, and a
naming collision fix for drm/locking.

Signed-off-by: Dave Airlie <[email protected]>
From: Maxime Ripard <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/20211110082114.vfpkpnecwdfg27lk@gilmour

diff --combined MAINTAINERS
index e8f3dd46c7da546051cbbce4e817c7e4294ec773,bfda0f80dbff646041fc904f9cf04ca9cd8dfcb1..33e6637150cf85b0194ee9045d0b9bd9aa28a6e2
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -414,8 -414,7 +414,8 @@@ T: git git://git.kernel.org/pub/scm/lin
  F:    drivers/acpi/pmic/
  
  ACPI THERMAL DRIVER
 -M:    Zhang Rui <[email protected]>
 +M:    Rafael J. Wysocki <[email protected]>
 +R:    Zhang Rui <[email protected]>
  L:    [email protected]
  S:    Supported
  W:    https://01.org/linux-acpi
@@@ -811,7 -810,7 +811,7 @@@ F: Documentation/devicetree/bindings/dm
  F:    drivers/dma/altera-msgdma.c
  
  ALTERA PIO DRIVER
 -M:    Joyce Ooi <joyce.ooi@intel.com>
 +M:    Mun Yew Tham <mun.yew.tham@intel.com>
  L:    [email protected]
  S:    Maintained
  F:    drivers/gpio/gpio-altera.c
@@@ -903,7 -902,6 +903,7 @@@ F: include/uapi/linux/psp-sev.
  AMD DISPLAY CORE
  M:    Harry Wentland <[email protected]>
  M:    Leo Li <[email protected]>
 +M:    Rodrigo Siqueira <[email protected]>
  L:    [email protected]
  S:    Supported
  T:    git https://gitlab.freedesktop.org/agd5f/linux.git
@@@ -979,12 -977,12 +979,12 @@@ L:      [email protected]
  S:    Maintained
  F:    drivers/platform/x86/amd-pmc.*
  
 -AMD POWERPLAY
 +AMD POWERPLAY AND SWSMU
  M:    Evan Quan <[email protected]>
  L:    [email protected]
  S:    Supported
  T:    git https://gitlab.freedesktop.org/agd5f/linux.git
 -F:    drivers/gpu/drm/amd/pm/powerplay/
 +F:    drivers/gpu/drm/amd/pm/
  
  AMD PTDMA DRIVER
  M:    Sanjay R Mehta <[email protected]>
@@@ -1277,7 -1275,6 +1277,7 @@@ F:      drivers/input/mouse/bcm5974.
  
  APPLE DART IOMMU DRIVER
  M:    Sven Peter <[email protected]>
 +R:    Alyssa Rosenzweig <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/iommu/apple,dart.yaml
@@@ -1714,8 -1711,6 +1714,8 @@@ F:      drivers/*/*alpine
  
  ARM/APPLE MACHINE SUPPORT
  M:    Hector Martin <[email protected]>
 +M:    Sven Peter <[email protected]>
 +R:    Alyssa Rosenzweig <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  W:    https://asahilinux.org
@@@ -2241,7 -2236,6 +2241,7 @@@ F:      arch/arm/mach-pxa/mioa701.
  
  ARM/MStar/Sigmastar Armv7 SoC support
  M:    Daniel Palmer <[email protected]>
 +M:    Romain Perier <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  W:    http://linux-chenxing.org/
@@@ -2718,7 -2712,6 +2718,7 @@@ F:      drivers/power/reset/keystone-reset.
  
  ARM/TEXAS INSTRUMENTS K3 ARCHITECTURE
  M:    Nishanth Menon <[email protected]>
 +M:    Vignesh Raghavendra <[email protected]>
  M:    Tero Kristo <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
@@@ -2811,8 -2804,9 +2811,8 @@@ F:      arch/arm/mach-pxa/include/mach/vpac2
  F:    arch/arm/mach-pxa/vpac270.c
  
  ARM/VT8500 ARM ARCHITECTURE
 -M:    Tony Prisk <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 +S:    Orphan
  F:    Documentation/devicetree/bindings/i2c/i2c-wmt.txt
  F:    arch/arm/mach-vt8500/
  F:    drivers/clocksource/timer-vt8500.c
@@@ -2968,7 -2962,7 +2968,7 @@@ F:      crypto/async_tx
  F:    include/linux/async_tx.h
  
  AT24 EEPROM DRIVER
 -M:    Bartosz Golaszewski <b[email protected]>
 +M:    Bartosz Golaszewski <b[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git
@@@ -3391,11 -3385,9 +3391,11 @@@ F:    Documentation/networking/filter.rs
  F:    Documentation/userspace-api/ebpf/
  F:    arch/*/net/*
  F:    include/linux/bpf*
 +F:    include/linux/btf*
  F:    include/linux/filter.h
  F:    include/trace/events/xdp.h
  F:    include/uapi/linux/bpf*
 +F:    include/uapi/linux/btf*
  F:    include/uapi/linux/filter.h
  F:    kernel/bpf/
  F:    kernel/trace/bpf_trace.c
@@@ -3829,6 -3821,7 +3829,6 @@@ F:      drivers/scsi/mpi3mr
  
  BROADCOM NETXTREME-E ROCE DRIVER
  M:    Selvin Xavier <[email protected]>
 -M:    Naresh Kumar PBS <[email protected]>
  L:    [email protected]
  S:    Supported
  W:    http://www.broadcom.com
@@@ -4663,7 -4656,7 +4663,7 @@@ W:      http://linux-cifs.samba.org
  T:    git git://git.samba.org/sfrench/cifs-2.6.git
  F:    Documentation/admin-guide/cifs/
  F:    fs/cifs/
 -F:    fs/cifs_common/
 +F:    fs/smbfs_common/
  
  COMPACTPCI HOTPLUG CORE
  M:    Scott Murray <[email protected]>
@@@ -6154,8 -6147,7 +6154,7 @@@ T:      git git://anongit.freedesktop.org/dr
  F:    Documentation/devicetree/bindings/display/
  F:    Documentation/devicetree/bindings/gpu/
  F:    Documentation/gpu/
- F:    drivers/gpu/drm/
- F:    drivers/gpu/vga/
+ F:    drivers/gpu/
  F:    include/drm/
  F:    include/linux/vga*
  F:    include/uapi/drm/
@@@ -7358,11 -7350,10 +7357,11 @@@ F:   include/uapi/linux/fpga-dfl.
  
  FPGA MANAGER FRAMEWORK
  M:    Moritz Fischer <[email protected]>
 +M:    Wu Hao <[email protected]>
 +M:    Xu Yilun <[email protected]>
  R:    Tom Rix <[email protected]>
  L:    [email protected]
  S:    Maintained
 -W:    http://www.rocketboards.org
  Q:    http://patchwork.kernel.org/project/linux-fpga/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git
  F:    Documentation/devicetree/bindings/fpga/
@@@ -7456,7 -7447,7 +7455,7 @@@ FREESCALE IMX / MXC FEC DRIVE
  M:    Joakim Zhang <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/devicetree/bindings/net/fsl-fec.txt
 +F:    Documentation/devicetree/bindings/net/fsl,fec.yaml
  F:    drivers/net/ethernet/freescale/fec.h
  F:    drivers/net/ethernet/freescale/fec_main.c
  F:    drivers/net/ethernet/freescale/fec_ptp.c
@@@ -8008,7 -7999,7 +8007,7 @@@ F:      include/linux/gpio/regmap.
  
  GPIO SUBSYSTEM
  M:    Linus Walleij <[email protected]>
 -M:    Bartosz Golaszewski <b[email protected]>
 +M:    Bartosz Golaszewski <b[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git
@@@ -8630,8 -8621,9 +8629,8 @@@ F:      Documentation/devicetree/bindings/ii
  F:    drivers/iio/humidity/hts221*
  
  HUAWEI ETHERNET DRIVER
 -M:    Bin Luo <[email protected]>
  L:    [email protected]
 -S:    Supported
 +S:    Orphan
  F:    Documentation/networking/device_drivers/ethernet/huawei/hinic.rst
  F:    drivers/net/ethernet/huawei/hinic/
  
@@@ -9323,7 -9315,7 +9322,7 @@@ S:      Maintaine
  F:    drivers/platform/x86/intel/atomisp2/led.c
  
  INTEL BIOS SAR INT1092 DRIVER
 -M:    Shravan S <[email protected]>
 +M:    Shravan Sudhakar <[email protected]>
  M:    Intel Corporation <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -9645,7 -9637,7 +9644,7 @@@ F:      include/uapi/linux/isst_if.
  F:    tools/power/x86/intel-speed-select/
  
  INTEL STRATIX10 FIRMWARE DRIVERS
 -M:    Richard Gong <[email protected]>
 +M:    Dinh Nguyen <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/ABI/testing/sysfs-devices-platform-stratix10-rsu
@@@ -10215,8 -10207,8 +10214,8 @@@ M:   Hyunchul Lee <[email protected]
  L:    [email protected]
  S:    Maintained
  T:    git git://git.samba.org/ksmbd.git
 -F:    fs/cifs_common/
  F:    fs/ksmbd/
 +F:    fs/smbfs_common/
  
  KERNEL UNIT TESTING FRAMEWORK (KUnit)
  M:    Brendan Higgins <[email protected]>
@@@ -10295,6 -10287,7 +10294,6 @@@ KERNEL VIRTUAL MACHINE for s390 (KVM/s3
  M:    Christian Borntraeger <[email protected]>
  M:    Janosch Frank <[email protected]>
  R:    David Hildenbrand <[email protected]>
 -R:    Cornelia Huck <[email protected]>
  R:    Claudio Imbrenda <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -11168,7 -11161,6 +11167,7 @@@ S:   Maintaine
  F:    Documentation/devicetree/bindings/net/dsa/marvell.txt
  F:    Documentation/networking/devlink/mv88e6xxx.rst
  F:    drivers/net/dsa/mv88e6xxx/
 +F:    include/linux/dsa/mv88e6xxx.h
  F:    include/linux/platform_data/mv88e6xxx.h
  
  MARVELL ARMADA 3700 PHY DRIVERS
@@@ -11388,7 -11380,7 +11387,7 @@@ F:   Documentation/devicetree/bindings/ii
  F:    drivers/iio/proximity/mb1232.c
  
  MAXIM MAX77650 PMIC MFD DRIVER
 -M:    Bartosz Golaszewski <b[email protected]>
 +M:    Bartosz Golaszewski <b[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/*/*max77650.yaml
@@@ -13276,9 -13268,9 +13275,9 @@@ F:   Documentation/scsi/NinjaSCSI.rs
  F:    drivers/scsi/nsp32*
  
  NIOS2 ARCHITECTURE
 -M:    Ley Foon Tan <[email protected]>
 +M:    Dinh Nguyen <[email protected]>
  S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux.git
  F:    arch/nios2/
  
  NITRO ENCLAVES (NE)
@@@ -14363,8 -14355,7 +14362,8 @@@ F:   Documentation/devicetree/bindings/pc
  F:    drivers/pci/controller/pci-ixp4xx.c
  
  PCI DRIVER FOR INTEL VOLUME MANAGEMENT DEVICE (VMD)
 -M:    Jonathan Derrick <[email protected]>
 +M:    Nirmal Patel <[email protected]>
 +R:    Jonathan Derrick <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/pci/controller/vmd.c
@@@ -16317,7 -16308,6 +16316,7 @@@ S39
  M:    Heiko Carstens <[email protected]>
  M:    Vasily Gorbik <[email protected]>
  M:    Christian Borntraeger <[email protected]>
 +R:    Alexander Gordeev <[email protected]>
  L:    [email protected]
  S:    Supported
  W:    http://www.ibm.com/developerworks/linux/linux390/
@@@ -16396,6 -16386,7 +16395,6 @@@ F:   drivers/s390/crypto/vfio_ap_ops.
  F:    drivers/s390/crypto/vfio_ap_private.h
  
  S390 VFIO-CCW DRIVER
 -M:    Cornelia Huck <[email protected]>
  M:    Eric Farman <[email protected]>
  M:    Matthew Rosato <[email protected]>
  R:    Halil Pasic <[email protected]>
@@@ -16672,6 -16663,13 +16671,6 @@@ M:  Lubomir Rintel <[email protected]
  S:    Supported
  F:    drivers/char/pcmcia/scr24x_cs.c
  
 -SCSI CDROM DRIVER
 -M:    Jens Axboe <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -W:    http://www.kernel.dk
 -F:    drivers/scsi/sr*
 -
  SCSI RDMA PROTOCOL (SRP) INITIATOR
  M:    Bart Van Assche <[email protected]>
  L:    [email protected]
@@@ -16970,6 -16968,7 +16969,6 @@@ F:   drivers/misc/sgi-xp
  
  SHARED MEMORY COMMUNICATIONS (SMC) SOCKETS
  M:    Karsten Graul <[email protected]>
 -M:    Guvenc Gulce <[email protected]>
  L:    [email protected]
  S:    Supported
  W:    http://www.ibm.com/developerworks/linux/linux390/
@@@ -17814,6 -17813,7 +17813,6 @@@ F:   drivers/staging/nvec
  
  STAGING - OLPC SECONDARY DISPLAY CONTROLLER (DCON)
  M:    Jens Frederich <[email protected]>
 -M:    Daniel Drake <[email protected]>
  M:    Jon Nettleton <[email protected]>
  S:    Maintained
  W:    http://wiki.laptop.org/go/DCON
@@@ -17904,8 -17904,7 +17903,8 @@@ M:   Olivier Moysan <olivier.moysan@foss.
  M:    Arnaud Pouliquen <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
 -F:    Documentation/devicetree/bindings/iio/adc/st,stm32-*.yaml
 +F:    Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.yaml
 +F:    Documentation/devicetree/bindings/sound/st,stm32-*.yaml
  F:    sound/soc/stm/
  
  STM32 TIMER/LPTIMER DRIVERS
@@@ -17982,11 -17981,10 +17981,11 @@@ F:        Documentation/admin-guide/svga.rs
  F:    arch/x86/boot/video*
  
  SWIOTLB SUBSYSTEM
 -M:    Konrad Rzeszutek Wilk <[email protected]>
 +M:    Christoph Hellwig <[email protected]>
  L:    [email protected]
  S:    Supported
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git
 +W:    http://git.infradead.org/users/hch/dma-mapping.git
 +T:    git git://git.infradead.org/users/hch/dma-mapping.git
  F:    arch/*/kernel/pci-swiotlb.c
  F:    include/linux/swiotlb.h
  F:    kernel/dma/swiotlb.c
@@@ -18002,7 -18000,7 +18001,7 @@@ F:   net/switchdev
  SY8106A REGULATOR DRIVER
  M:    Icenowy Zheng <[email protected]>
  S:    Maintained
 -F:    Documentation/devicetree/bindings/regulator/sy8106a-regulator.txt
 +F:    Documentation/devicetree/bindings/regulator/silergy,sy8106a.yaml
  F:    drivers/regulator/sy8106a-regulator.c
  
  SYNC FILE FRAMEWORK
@@@ -18569,14 -18567,13 +18568,14 @@@ T:        git git://linuxtv.org/media_tree.gi
  F:    drivers/media/radio/radio-raremono.c
  
  THERMAL
 -M:    Zhang Rui <[email protected]>
 +M:    Rafael J. Wysocki <[email protected]>
  M:    Daniel Lezcano <[email protected]>
  R:    Amit Kucheria <[email protected]>
 +R:    Zhang Rui <[email protected]>
  L:    [email protected]
  S:    Supported
  Q:    https://patchwork.kernel.org/project/linux-pm/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git thermal
  F:    Documentation/devicetree/bindings/thermal/
  F:    drivers/thermal/
  F:    include/linux/cpu_cooling.h
@@@ -18705,7 -18702,7 +18704,7 @@@ F:   include/linux/clk/ti.
  
  TI DAVINCI MACHINE SUPPORT
  M:    Sekhar Nori <[email protected]>
 -R:    Bartosz Golaszewski <b[email protected]>
 +R:    Bartosz Golaszewski <b[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci.git
@@@ -19304,12 -19301,13 +19303,12 @@@ S:        Maintaine
  F:    drivers/usb/misc/chaoskey.c
  
  USB CYPRESS C67X00 DRIVER
 -M:    Peter Korsgaard <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  F:    drivers/usb/c67x00/
  
  USB DAVICOM DM9601 DRIVER
 -M:    Peter Korsgaard <[email protected]>
 +M:    Peter Korsgaard <[email protected]>
  L:    [email protected]
  S:    Maintained
  W:    http://www.linux-usb.org/usbnet
@@@ -20351,7 -20349,6 +20350,7 @@@ X86 ARCHITECTURE (32-BIT AND 64-BIT
  M:    Thomas Gleixner <[email protected]>
  M:    Ingo Molnar <[email protected]>
  M:    Borislav Petkov <[email protected]>
 +M:    Dave Hansen <[email protected]>
  M:    [email protected]
  R:    "H. Peter Anvin" <[email protected]>
  L:    [email protected]
@@@ -20490,6 -20487,7 +20489,6 @@@ F:   samples/bpf/xdpsock
  F:    tools/lib/bpf/xsk*
  
  XEN BLOCK SUBSYSTEM
 -M:    Konrad Rzeszutek Wilk <[email protected]>
  M:    Roger Pau Monné <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
@@@ -20537,7 -20535,7 +20536,7 @@@ S:   Supporte
  F:    drivers/net/xen-netback/*
  
  XEN PCI SUBSYSTEM
 -M:    Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
 +M:    Juergen Gross <jgross@suse.com>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  F:    arch/x86/pci/*xen*
@@@ -20560,8 -20558,7 +20559,8 @@@ S:   Supporte
  F:    sound/xen/*
  
  XEN SWIOTLB SUBSYSTEM
 -M:    Konrad Rzeszutek Wilk <[email protected]>
 +M:    Juergen Gross <[email protected]>
 +M:    Stefano Stabellini <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
  S:    Supported
@@@ -20720,6 -20717,7 +20719,6 @@@ S:   Maintaine
  F:    mm/zbud.c
  
  ZD1211RW WIRELESS DRIVER
 -M:    Daniel Drake <[email protected]>
  M:    Ulrich Kunitz <[email protected]>
  L:    [email protected]
  L:    [email protected] (subscribers-only)

diff --combined drivers/gpu/drm/drm_modeset_lock.c
index 4d32b61fa1fdc862cb4524518a903da93e8ee897,83cf0bc64eb9932a3e03d10ac24356ce6b15a0a6..c97323365675c9e66b897a0ac7fbe51bf71ca69e
--- 1/drivers/gpu/drm/drm_modeset_lock.c
--- 2/drivers/gpu/drm/drm_modeset_lock.c
+++ b/drivers/gpu/drm/drm_modeset_lock.c
@@@ -79,7 -79,7 +79,7 @@@
  static DEFINE_WW_CLASS(crtc_ww_class);
  
  #if IS_ENABLED(CONFIG_DRM_DEBUG_MODESET_LOCK)
- static noinline depot_stack_handle_t __stack_depot_save(void)
+ static noinline depot_stack_handle_t __drm_stack_depot_save(void)
  {
        unsigned long entries[8];
        unsigned int n;
@@@ -89,7 -89,7 +89,7 @@@
        return stack_depot_save(entries, n, GFP_NOWAIT | __GFP_NOWARN);
  }
  
- static void __stack_depot_print(depot_stack_handle_t stack_depot)
+ static void __drm_stack_depot_print(depot_stack_handle_t stack_depot)
  {
        struct drm_printer p = drm_debug_printer("drm_modeset_lock");
        unsigned long *entries;
@@@ -108,11 -108,11 +108,11 @@@
        kfree(buf);
  }
  #else /* CONFIG_DRM_DEBUG_MODESET_LOCK */
- static depot_stack_handle_t __stack_depot_save(void)
+ static depot_stack_handle_t __drm_stack_depot_save(void)
  {
        return 0;
  }
- static void __stack_depot_print(depot_stack_handle_t stack_depot)
+ static void __drm_stack_depot_print(depot_stack_handle_t stack_depot)
  {
  }
  #endif /* CONFIG_DRM_DEBUG_MODESET_LOCK */
@@@ -266,7 -266,7 +266,7 @@@ EXPORT_SYMBOL(drm_modeset_acquire_fini)
  void drm_modeset_drop_locks(struct drm_modeset_acquire_ctx *ctx)
  {
        if (WARN_ON(ctx->contended))
-               __stack_depot_print(ctx->stack_depot);
+               __drm_stack_depot_print(ctx->stack_depot);
  
        while (!list_empty(&ctx->locked)) {
                struct drm_modeset_lock *lock;
@@@ -286,12 -286,12 +286,12 @@@ static inline int modeset_lock(struct d
        int ret;
  
        if (WARN_ON(ctx->contended))
-               __stack_depot_print(ctx->stack_depot);
+               __drm_stack_depot_print(ctx->stack_depot);
  
        if (ctx->trylock_only) {
                lockdep_assert_held(&ctx->ww_ctx);
  
 -              if (!ww_mutex_trylock(&lock->mutex))
 +              if (!ww_mutex_trylock(&lock->mutex, NULL))
                        return -EBUSY;
                else
                        return 0;
@@@ -317,7 -317,7 +317,7 @@@
                ret = 0;
        } else if (ret == -EDEADLK) {
                ctx->contended = lock;
-               ctx->stack_depot = __stack_depot_save();
+               ctx->stack_depot = __drm_stack_depot_save();
        }
  
        return ret;

diff --combined drivers/gpu/drm/nouveau/nouveau_gem.c
index b3210e9b2cd8d1cd6b54acfeefdfbbee6fcdd100,beeafb3bb26699e28a1464437569e51c6e492c00..9416bee921410092d357f88f91b6016c8dcb142f
--- 1/drivers/gpu/drm/nouveau/nouveau_gem.c
--- 2/drivers/gpu/drm/nouveau/nouveau_gem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_gem.c
@@@ -56,7 -56,7 +56,7 @@@ static vm_fault_t nouveau_ttm_fault(str
  
        nouveau_bo_del_io_reserve_lru(bo);
        prot = vm_get_page_prot(vma->vm_flags);
-       ret = ttm_bo_vm_fault_reserved(vmf, prot, TTM_BO_VM_NUM_PREFAULT, 1);
+       ret = ttm_bo_vm_fault_reserved(vmf, prot, TTM_BO_VM_NUM_PREFAULT);
        nouveau_bo_add_io_reserve_lru(bo);
        if (ret == VM_FAULT_RETRY && !(vmf->flags & FAULT_FLAG_RETRY_NOWAIT))
                return ret;
@@@ -247,8 -247,10 +247,8 @@@ nouveau_gem_new(struct nouveau_cli *cli
        }
  
        ret = nouveau_bo_init(nvbo, size, align, domain, NULL, NULL);
 -      if (ret) {
 -              nouveau_bo_ref(NULL, &nvbo);
 +      if (ret)
                return ret;
 -      }
  
        /* we restrict allowed domains on nv50+ to only the types
         * that were requested at creation time.  not possibly on