Merge tag 'drm-misc-fixes-2022-08-16' of git://anongit.freedesktop.org/drm/drm-misc...

One patch for imx/dcss to get rid of a warning message, one off-by-one
fix and GA103 support for nouveau, a refcounting fix for meson, a NULL
pointer dereference fix for ttm, a error check fix for lvds-codec, a
dt-binding schema fix and an underflow fix for sun4i

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

diff --combined drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
index 568182e68dd73bb7bb8268ed4fffc09ec5657b50,b7246b146e51d15f146974bd2bbcb78afd7e7495..d8cf71fb0512813f14732bf5d142a17cb17cfe60
--- 1/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
--- 2/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
@@@ -24,6 -24,7 +24,6 @@@
  #include "priv.h"
  #include "acpi.h"
  
 -#include <core/notify.h>
  #include <core/option.h>
  
  #include <subdev/bios.h>
@@@ -2604,6 -2605,27 +2604,27 @@@ nv172_chipset = 
        .fifo     = { 0x00000001, ga102_fifo_new },
  };
  
+ static const struct nvkm_device_chip
+ nv173_chipset = {
+       .name = "GA103",
+       .bar      = { 0x00000001, tu102_bar_new },
+       .bios     = { 0x00000001, nvkm_bios_new },
+       .devinit  = { 0x00000001, ga100_devinit_new },
+       .fb       = { 0x00000001, ga102_fb_new },
+       .gpio     = { 0x00000001, ga102_gpio_new },
+       .i2c      = { 0x00000001, gm200_i2c_new },
+       .imem     = { 0x00000001, nv50_instmem_new },
+       .mc       = { 0x00000001, ga100_mc_new },
+       .mmu      = { 0x00000001, tu102_mmu_new },
+       .pci      = { 0x00000001, gp100_pci_new },
+       .privring = { 0x00000001, gm200_privring_new },
+       .timer    = { 0x00000001, gk20a_timer_new },
+       .top      = { 0x00000001, ga100_top_new },
+       .disp     = { 0x00000001, ga102_disp_new },
+       .dma      = { 0x00000001, gv100_dma_new },
+       .fifo     = { 0x00000001, ga102_fifo_new },
+ };
+ 
  static const struct nvkm_device_chip
  nv174_chipset = {
        .name = "GA104",
@@@ -2667,6 -2689,24 +2688,6 @@@ nv177_chipset = 
        .fifo     = { 0x00000001, ga102_fifo_new },
  };
  
 -static int
 -nvkm_device_event_ctor(struct nvkm_object *object, void *data, u32 size,
 -                     struct nvkm_notify *notify)
 -{
 -      if (!WARN_ON(size != 0)) {
 -              notify->size  = 0;
 -              notify->types = 1;
 -              notify->index = 0;
 -              return 0;
 -      }
 -      return -EINVAL;
 -}
 -
 -static const struct nvkm_event_func
 -nvkm_device_event_func = {
 -      .ctor = nvkm_device_event_ctor,
 -};
 -
  struct nvkm_subdev *
  nvkm_device_subdev(struct nvkm_device *device, int type, int inst)
  {
@@@ -2819,6 -2859,8 +2840,6 @@@ nvkm_device_del(struct nvkm_device **pd
                list_for_each_entry_safe_reverse(subdev, subtmp, &device->subdev, head)
                        nvkm_subdev_del(&subdev);
  
 -              nvkm_event_fini(&device->event);
 -
                if (device->pri)
                        iounmap(device->pri);
                list_del(&device->head);
@@@ -2893,6 -2935,10 +2914,6 @@@ nvkm_device_ctor(const struct nvkm_devi
        device->debug = nvkm_dbgopt(device->dbgopt, "device");
        INIT_LIST_HEAD(&device->subdev);
  
 -      ret = nvkm_event_init(&nvkm_device_event_func, 1, 1, &device->event);
 -      if (ret)
 -              goto done;
 -
        mmio_base = device->func->resource_addr(device, 0);
        mmio_size = device->func->resource_size(device, 0);
  
@@@ -3067,6 -3113,7 +3088,7 @@@
                case 0x167: device->chip = &nv167_chipset; break;
                case 0x168: device->chip = &nv168_chipset; break;
                case 0x172: device->chip = &nv172_chipset; break;
+               case 0x173: device->chip = &nv173_chipset; break;
                case 0x174: device->chip = &nv174_chipset; break;
                case 0x176: device->chip = &nv176_chipset; break;
                case 0x177: device->chip = &nv177_chipset; break;

diff --combined drivers/gpu/drm/ttm/ttm_bo.c
index 0e210df65c305393477085e8cfcf6032587b2c8d,5bf7124ece96d64bd07de628a5d6d62d11d9cb2d..97184c33352662662bbd27de462eacb111045435
--- 1/drivers/gpu/drm/ttm/ttm_bo.c
--- 2/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@@ -44,6 -44,12 +44,6 @@@
  
  #include "ttm_module.h"
  
 -/* default destructor */
 -static void ttm_bo_default_destroy(struct ttm_buffer_object *bo)
 -{
 -      kfree(bo);
 -}
 -
  static void ttm_bo_mem_space_debug(struct ttm_buffer_object *bo,
                                        struct ttm_placement *placement)
  {
@@@ -912,7 -918,7 +912,7 @@@ int ttm_bo_validate(struct ttm_buffer_o
        /*
         * We might need to add a TTM.
         */
-       if (bo->resource->mem_type == TTM_PL_SYSTEM) {
+       if (!bo->resource || bo->resource->mem_type == TTM_PL_SYSTEM) {
                ret = ttm_tt_create(bo, true);
                if (ret)
                        return ret;
@@@ -936,7 -942,8 +936,7 @@@ int ttm_bo_init_reserved(struct ttm_dev
        bool locked;
        int ret;
  
 -      bo->destroy = destroy ? destroy : ttm_bo_default_destroy;
 -
 +      bo->destroy = destroy;
        kref_init(&bo->kref);
        INIT_LIST_HEAD(&bo->ddestroy);
        bo->bdev = bdev;