Merge v5.16-rc5 into drm-next

Thomas Zimmermann requested a fixes backmerge, specifically also for
96c5f82ef0a1 ("drm/vc4: fix error code in vc4_create_object()")

Just a bunch of adjacent changes conflicts, even the big pile of them
in vc4.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
index c5362c23e6875b3456852a6709f5f02537bbf22c,6348559608ce78bb5febda33b4cc69f9b99d9b12..5df89a29517761a27bf38a691bda7197f9c68caa
--- 1/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
--- 2/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
@@@ -1579,17 -1504,18 +1579,19 @@@ int amdgpu_amdkfd_gpuvm_alloc_memory_of
  
  allocate_init_user_pages_failed:
        remove_kgd_mem_from_kfd_bo_list(*mem, avm->process_info);
 +err_pin_bo:
        drm_vma_node_revoke(&gobj->vma_node, drm_priv);
  err_node_allow:
-       drm_gem_object_put(gobj);
        /* Don't unreserve system mem limit twice */
        goto err_reserve_limit;
  err_bo_create:
 -      unreserve_mem_limit(adev, size, alloc_domain, !!sg);
 +      unreserve_mem_limit(adev, size, flags);
  err_reserve_limit:
        mutex_destroy(&(*mem)->lock);
-       kfree(*mem);
+       if (gobj)
+               drm_gem_object_put(gobj);
+       else
+               kfree(*mem);
  err:
        if (sg) {
                sg_free_table(sg);

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdkfd/kfd_svm.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/dc/core/dc_link.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/dc/core/dc_resource.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/dc/dc.h
Simple merge

diff --cc drivers/gpu/drm/amd/display/dc/dc_link.h
Simple merge

diff --cc drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
Simple merge

diff --cc drivers/gpu/drm/drm_gem_shmem_helper.c
Simple merge

diff --cc drivers/gpu/drm/i915/display/intel_display_types.h
Simple merge

diff --cc drivers/gpu/drm/i915/display/intel_dp.c
Simple merge

diff --cc drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c
Simple merge

diff --cc drivers/gpu/drm/i915/gt/intel_gtt.c
index 0dd254cb1f69d75e291db2fae395f44372c6b697,b67f620c3d93cd1b6e85dacee3216a869f3e4ed1..9fee968d57db65e2dd64c9ccc4838a3f73a84da3
--- 1/drivers/gpu/drm/i915/gt/intel_gtt.c
--- 2/drivers/gpu/drm/i915/gt/intel_gtt.c
+++ b/drivers/gpu/drm/i915/gt/intel_gtt.c
@@@ -6,9 -6,8 +6,10 @@@
  #include <linux/slab.h> /* fault-inject.h is not standalone! */
  
  #include <linux/fault-inject.h>
+ #include <linux/sched/mm.h>
  
 +#include <drm/drm_cache.h>
 +
  #include "gem/i915_gem_lmem.h"
  #include "i915_trace.h"
  #include "intel_gt.h"

diff --cc drivers/gpu/drm/i915/i915_request.c
Simple merge

diff --cc drivers/gpu/drm/lima/lima_device.c
Simple merge

diff --cc drivers/gpu/drm/msm/dsi/dsi_host.c
Simple merge

diff --cc drivers/gpu/drm/msm/msm_gem.c
Simple merge

diff --cc drivers/gpu/drm/ttm/ttm_bo.c
Simple merge

diff --cc drivers/gpu/drm/vc4/vc4_bo.c
Simple merge

diff --cc drivers/gpu/drm/vc4/vc4_kms.c
index 79d4d9dd13948d370e53abb6a756bcef957e51fd,b61792d2aa65740db39b49f957dc41eda99c5824..bf3706f97ec7fb7d53451cb71ce441644bd8ed53
--- 1/drivers/gpu/drm/vc4/vc4_kms.c
--- 2/drivers/gpu/drm/vc4/vc4_kms.c
+++ b/drivers/gpu/drm/vc4/vc4_kms.c
@@@ -340,21 -337,12 +340,21 @@@ static void vc4_atomic_commit_tail(stru
        struct drm_device *dev = state->dev;
        struct vc4_dev *vc4 = to_vc4_dev(dev);
        struct vc4_hvs *hvs = vc4->hvs;
-       struct drm_crtc_state *old_crtc_state;
        struct drm_crtc_state *new_crtc_state;
 +      struct vc4_hvs_state *new_hvs_state;
        struct drm_crtc *crtc;
        struct vc4_hvs_state *old_hvs_state;
+       unsigned int channel;
        int i;
  
-       if (WARN_ON(!old_hvs_state))
 +      old_hvs_state = vc4_hvs_get_old_global_state(state);
-       if (WARN_ON(!new_hvs_state))
++      if (WARN_ON(IS_ERR(old_hvs_state)))
 +              return;
 +
 +      new_hvs_state = vc4_hvs_get_new_global_state(state);
++      if (WARN_ON(IS_ERR(new_hvs_state)))
 +              return;
 +
        for_each_new_crtc_in_state(state, crtc, new_crtc_state, i) {
                struct vc4_crtc_state *vc4_crtc_state;
  
@@@ -365,31 -353,32 +365,33 @@@
                vc4_hvs_mask_underrun(dev, vc4_crtc_state->assigned_channel);
        }
  
 -      old_hvs_state = vc4_hvs_get_old_global_state(state);
 -      if (IS_ERR(old_hvs_state))
 -              return;
 +      if (vc4->hvs->hvs5) {
 +              unsigned long core_rate = max_t(unsigned long,
 +                                              500000000,
 +                                              new_hvs_state->core_clock_rate);
 +
 +              clk_set_min_rate(hvs->core_clk, core_rate);
 +      }
  
-       for_each_old_crtc_in_state(state, crtc, old_crtc_state, i) {
-               struct vc4_crtc_state *vc4_crtc_state =
-                       to_vc4_crtc_state(old_crtc_state);
-               unsigned int channel = vc4_crtc_state->assigned_channel;
+       for (channel = 0; channel < HVS_NUM_CHANNELS; channel++) {
+               struct drm_crtc_commit *commit;
                int ret;
  
-               if (channel == VC4_HVS_CHANNEL_DISABLED)
+               if (!old_hvs_state->fifo_state[channel].in_use)
                        continue;
  
-               if (!old_hvs_state->fifo_state[channel].in_use)
+               commit = old_hvs_state->fifo_state[channel].pending_commit;
+               if (!commit)
                        continue;
  
-               ret = drm_crtc_commit_wait(old_hvs_state->fifo_state[channel].pending_commit);
+               ret = drm_crtc_commit_wait(commit);
                if (ret)
                        drm_err(dev, "Timed out waiting for commit\n");
+ 
+               drm_crtc_commit_put(commit);
+               old_hvs_state->fifo_state[channel].pending_commit = NULL;
        }
  
 -      if (vc4->hvs->hvs5)
 -              clk_set_min_rate(hvs->core_clk, 500000000);
 -
        drm_atomic_helper_commit_modeset_disables(dev, state);
  
        vc4_ctm_commit(vc4, state);
@@@ -673,19 -667,11 +675,13 @@@ vc4_hvs_channels_duplicate_state(struc
  
        __drm_atomic_helper_private_obj_duplicate_state(obj, &state->base);
  
 -
        for (i = 0; i < HVS_NUM_CHANNELS; i++) {
                state->fifo_state[i].in_use = old_state->fifo_state[i].in_use;
- 
-               if (!old_state->fifo_state[i].pending_commit)
-                       continue;
- 
-               state->fifo_state[i].pending_commit =
-                       drm_crtc_commit_get(old_state->fifo_state[i].pending_commit);
 +              state->fifo_state[i].fifo_load = old_state->fifo_state[i].fifo_load;
        }
  
 +      state->core_clock_rate = old_state->core_clock_rate;
 +
        return &state->base;
  }
  
@@@ -840,76 -826,6 +836,76 @@@ static int vc4_pv_muxing_atomic_check(s
        return 0;
  }
  
-       if (!hvs_new_state)
-               return -EINVAL;
 +static int
 +vc4_core_clock_atomic_check(struct drm_atomic_state *state)
 +{
 +      struct vc4_dev *vc4 = to_vc4_dev(state->dev);
 +      struct drm_private_state *priv_state;
 +      struct vc4_hvs_state *hvs_new_state;
 +      struct vc4_load_tracker_state *load_state;
 +      struct drm_crtc_state *old_crtc_state, *new_crtc_state;
 +      struct drm_crtc *crtc;
 +      unsigned int num_outputs;
 +      unsigned long pixel_rate;
 +      unsigned long cob_rate;
 +      unsigned int i;
 +
 +      priv_state = drm_atomic_get_private_obj_state(state,
 +                                                    &vc4->load_tracker);
 +      if (IS_ERR(priv_state))
 +              return PTR_ERR(priv_state);
 +
 +      load_state = to_vc4_load_tracker_state(priv_state);
 +
 +      hvs_new_state = vc4_hvs_get_global_state(state);
++      if (IS_ERR(hvs_new_state))
++              return PTR_ERR(hvs_new_state);
 +
 +      for_each_oldnew_crtc_in_state(state, crtc,
 +                                    old_crtc_state,
 +                                    new_crtc_state,
 +                                    i) {
 +              if (old_crtc_state->active) {
 +                      struct vc4_crtc_state *old_vc4_state =
 +                              to_vc4_crtc_state(old_crtc_state);
 +                      unsigned int channel = old_vc4_state->assigned_channel;
 +
 +                      hvs_new_state->fifo_state[channel].fifo_load = 0;
 +              }
 +
 +              if (new_crtc_state->active) {
 +                      struct vc4_crtc_state *new_vc4_state =
 +                              to_vc4_crtc_state(new_crtc_state);
 +                      unsigned int channel = new_vc4_state->assigned_channel;
 +
 +                      hvs_new_state->fifo_state[channel].fifo_load =
 +                              new_vc4_state->hvs_load;
 +              }
 +      }
 +
 +      cob_rate = 0;
 +      num_outputs = 0;
 +      for (i = 0; i < HVS_NUM_CHANNELS; i++) {
 +              if (!hvs_new_state->fifo_state[i].in_use)
 +                      continue;
 +
 +              num_outputs++;
 +              cob_rate += hvs_new_state->fifo_state[i].fifo_load;
 +      }
 +
 +      pixel_rate = load_state->hvs_load;
 +      if (num_outputs > 1) {
 +              pixel_rate = (pixel_rate * 40) / 100;
 +      } else {
 +              pixel_rate = (pixel_rate * 60) / 100;
 +      }
 +
 +      hvs_new_state->core_clock_rate = max(cob_rate, pixel_rate);
 +
 +      return 0;
 +}
 +
 +
  static int
  vc4_atomic_check(struct drm_device *dev, struct drm_atomic_state *state)
  {

diff --cc drivers/gpu/drm/virtio/virtgpu_drv.c
Simple merge

diff --cc drivers/gpu/drm/virtio/virtgpu_ioctl.c
Simple merge

diff --cc drivers/gpu/drm/xen/xen_drm_front.c
Simple merge

diff --cc drivers/platform/x86/thinkpad_acpi.c
Simple merge

diff --cc drivers/video/console/vgacon.c
Simple merge