Merge tag 'drm-misc-next-2019-06-14' of git://anongit.freedesktop.org/drm/drm-misc...

drm-misc-next for v5.3:

UAPI Changes:

Cross-subsystem Changes:
- Add code to signal all dma-fences when freed with pending signals.
- Annotate reservation object access in CONFIG_DEBUG_MUTEXES

Core Changes:
- Assorted documentation fixes.
- Use irqsave/restore spinlock to add crc entry.
- Move code around to drm_client, for internal modeset clients.
- Make drm_crtc.h and drm_debugfs.h self-contained.
- Remove drm_fb_helper_connector.
- Add bootsplash to todo.
- Fix lock ordering in pan_display_legacy.
- Support pinning buffers to current location in gem-vram.
- Remove the now unused locking functions from gem-vram.
- Remove the now unused kmap-object argument from vram helpers.
- Stop checking return value of debugfs_create.
- Add atomic encoder enable/disable helpers.
- pass drm_atomic_state to atomic connector check.
- Add atomic support for bridge enable/disable.
- Add self refresh helpers to core.

Driver Changes:
- Add extra delay to make MTP SDM845 work.
- Small fixes to virtio, vkms, sii902x, sii9234, ast, mcde, analogix, rockchip.
- Add zpos and ?BGR8888 support to meson.
- More removals of drm_os_linux and drmP headers for amd, radeon, sti, r128, r128, savage, sis.
- Allow synopsis to unwedge the i2c hdmi bus.
- Add orientation quirks for GPD panels.
- Edid cleanups and fixing handling for edid < 1.2.
- Add runtime pm to stm.
- Handle s/r in dw-hdmi.
- Add hooks for power on/off to dsi for stm.
- Remove virtio dirty tracking code, done in drm core.
- Rework BO handling in ast and mgag200.

Tiny conflict in drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c,
needed #include <linux/slab.h> to make it compile.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/0e01de30-9797-853c-732f-4a5bd6e61445@linux.intel.com

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

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
index 4af3989e4a755310a35d56ea28ebd13f91df10f8,822049a78e9f774fcaf534f95ebecfba5e777b5e..c8887a1c852abda54cb5072f203d573985c936b8
--- 1/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
--- 2/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
@@@ -22,13 -22,11 +22,13 @@@
  
  #include "amdgpu_amdkfd.h"
  #include "amd_shared.h"
- #include <drm/drmP.h>
+ 
  #include "amdgpu.h"
  #include "amdgpu_gfx.h"
 +#include "amdgpu_dma_buf.h"
  #include <linux/module.h>
  #include <linux/dma-buf.h>
 +#include "amdgpu_xgmi.h"
  
  static const unsigned int compute_vmid_bitmap = 0xFF00;
  

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c
index 41ccee49a2244a0db0d7d114dbffcb305e438742,19f8909e9647fd91962c55e69978b34b0d266299..4ff4cf5988eaa396a1a3fb34c8f4afd01c2e1ffa
--- 1/drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c
--- 2/drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c
@@@ -45,9 -45,9 +45,9 @@@
  
  #include <linux/firmware.h>
  #include <linux/module.h>
 -#include <linux/mmu_notifier.h>
 +#include <linux/hmm.h>
  #include <linux/interval_tree.h>
- #include <drm/drmP.h>
+ 
  #include <drm/drm.h>
  
  #include "amdgpu.h"

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

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

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

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index 7138dc1dd1f44b9e871984c5a724481e99df7422,a8a1fcab299bbbc5b8ba121b93fc9048e666fe35..d81bebf7631078087ac0169bed65fb80cb57054c
--- 1/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
--- 2/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@@ -29,21 -29,24 +29,26 @@@
   *    Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
   *    Dave Airlie
   */
+ 
+ #include <linux/dma-mapping.h>
+ #include <linux/iommu.h>
++#include <linux/hmm.h>
+ #include <linux/pagemap.h>
+ #include <linux/sched/task.h>
+ #include <linux/seq_file.h>
+ #include <linux/slab.h>
+ #include <linux/swap.h>
+ #include <linux/swiotlb.h>
+ 
  #include <drm/ttm/ttm_bo_api.h>
  #include <drm/ttm/ttm_bo_driver.h>
  #include <drm/ttm/ttm_placement.h>
  #include <drm/ttm/ttm_module.h>
  #include <drm/ttm/ttm_page_alloc.h>
- #include <drm/drmP.h>
+ 
+ #include <drm/drm_debugfs.h>
  #include <drm/amdgpu_drm.h>
- #include <linux/seq_file.h>
- #include <linux/slab.h>
- #include <linux/swiotlb.h>
- #include <linux/swap.h>
- #include <linux/pagemap.h>
- #include <linux/debugfs.h>
- #include <linux/iommu.h>
- #include <linux/hmm.h>
++
  #include "amdgpu.h"
  #include "amdgpu_object.h"
  #include "amdgpu_trace.h"

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --cc drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c
index eb2204d42337a593ecef77fb779072be84c21cca,0000000000000000000000000000000000000000..cb3f6a74d9e3610140c0bfd78fc2d35982ad735c
mode 100644,000000..100644
--- 1/drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c
--- /dev/null
+++ b/drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c
@@@ -1,134 -1,0 +1,136 @@@
 +/*
 + * Copyright 2012-16 Advanced Micro Devices, Inc.
 + *
 + * Permission is hereby granted, free of charge, to any person obtaining a
 + * copy of this software and associated documentation files (the "Software"),
 + * to deal in the Software without restriction, including without limitation
 + * the rights to use, copy, modify, merge, publish, distribute, sublicense,
 + * and/or sell copies of the Software, and to permit persons to whom the
 + * Software is furnished to do so, subject to the following conditions:
 + *
 + * The above copyright notice and this permission notice shall be included in
 + * all copies or substantial portions of the Software.
 + *
 + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
 + * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
 + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
 + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 + * OTHER DEALINGS IN THE SOFTWARE.
 + *
 + * Authors: AMD
 + *
 + */
 +
++#include <linux/slab.h>
++
 +#include "dal_asic_id.h"
 +#include "dc_types.h"
 +#include "dccg.h"
 +#include "clk_mgr_internal.h"
 +
 +#include "dce100/dce_clk_mgr.h"
 +#include "dce110/dce110_clk_mgr.h"
 +#include "dce112/dce112_clk_mgr.h"
 +#include "dce120/dce120_clk_mgr.h"
 +#include "dcn10/rv1_clk_mgr.h"
 +#include "dcn10/rv2_clk_mgr.h"
 +
 +
 +int clk_mgr_helper_get_active_display_cnt(
 +              struct dc *dc,
 +              struct dc_state *context)
 +{
 +      int i, display_count;
 +
 +      display_count = 0;
 +      for (i = 0; i < context->stream_count; i++) {
 +              const struct dc_stream_state *stream = context->streams[i];
 +
 +              /*
 +               * Only notify active stream or virtual stream.
 +               * Need to notify virtual stream to work around
 +               * headless case. HPD does not fire when system is in
 +               * S0i2.
 +               */
 +              if (!stream->dpms_off || stream->signal == SIGNAL_TYPE_VIRTUAL)
 +                      display_count++;
 +      }
 +
 +      return display_count;
 +}
 +
 +
 +struct clk_mgr *dc_clk_mgr_create(struct dc_context *ctx, struct pp_smu_funcs *pp_smu, struct dccg *dccg)
 +{
 +      struct hw_asic_id asic_id = ctx->asic_id;
 +
 +      struct clk_mgr_internal *clk_mgr = kzalloc(sizeof(*clk_mgr), GFP_KERNEL);
 +
 +      if (clk_mgr == NULL) {
 +              BREAK_TO_DEBUGGER();
 +              return NULL;
 +      }
 +
 +      switch (asic_id.chip_family) {
 +      case FAMILY_CI:
 +      case FAMILY_KV:
 +              dce_clk_mgr_construct(ctx, clk_mgr);
 +              break;
 +      case FAMILY_CZ:
 +              dce110_clk_mgr_construct(ctx, clk_mgr);
 +              break;
 +      case FAMILY_VI:
 +              if (ASIC_REV_IS_TONGA_P(asic_id.hw_internal_rev) ||
 +                              ASIC_REV_IS_FIJI_P(asic_id.hw_internal_rev)) {
 +                      dce_clk_mgr_construct(ctx, clk_mgr);
 +                      break;
 +              }
 +              if (ASIC_REV_IS_POLARIS10_P(asic_id.hw_internal_rev) ||
 +                              ASIC_REV_IS_POLARIS11_M(asic_id.hw_internal_rev) ||
 +                              ASIC_REV_IS_POLARIS12_V(asic_id.hw_internal_rev)) {
 +                      dce112_clk_mgr_construct(ctx, clk_mgr);
 +                      break;
 +              }
 +              if (ASIC_REV_IS_VEGAM(asic_id.hw_internal_rev)) {
 +                      dce112_clk_mgr_construct(ctx, clk_mgr);
 +                      break;
 +              }
 +              break;
 +      case FAMILY_AI:
 +              if (ASICREV_IS_VEGA20_P(asic_id.hw_internal_rev))
 +                      dce121_clk_mgr_construct(ctx, clk_mgr);
 +              else
 +                      dce120_clk_mgr_construct(ctx, clk_mgr);
 +              break;
 +
 +#if defined(CONFIG_DRM_AMD_DC_DCN1_0)
 +      case FAMILY_RV:
 +              if (ASICREV_IS_RAVEN2(asic_id.hw_internal_rev)) {
 +                      rv2_clk_mgr_construct(ctx, clk_mgr, pp_smu);
 +                      break;
 +              }
 +              if (ASICREV_IS_RAVEN(asic_id.hw_internal_rev) ||
 +                              ASICREV_IS_PICASSO(asic_id.hw_internal_rev)) {
 +                      rv1_clk_mgr_construct(ctx, clk_mgr, pp_smu);
 +                      break;
 +              }
 +              break;
 +#endif        /* Family RV */
 +
 +      default:
 +              ASSERT(0); /* Unknown Asic */
 +              break;
 +      }
 +
 +      return &clk_mgr->base;
 +}
 +
 +void dc_destroy_clk_mgr(struct clk_mgr *clk_mgr_base)
 +{
 +      struct clk_mgr_internal *clk_mgr = TO_CLK_MGR_INTERNAL(clk_mgr_base);
 +
 +      kfree(clk_mgr);
 +}
 +

diff --cc drivers/gpu/drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr.c
index 31db9b55e11ad59ecdfca827ecaee336e36ab5d4,98028fbf67f1c51e3340c4e318bb3a5f1ed54cce..04b12bb2243d0a4ad0dc340462374793a81a75e7
--- 1/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr.c
--- 2/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_clk_mgr.c
+++ b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr.c
@@@ -23,20 -23,34 +23,23 @@@
   *
   */
  
 -#include "dcn10_clk_mgr.h"
 -
+ #include <linux/slab.h>
+ 
+ #include "reg_helper.h"
  #include "core_types.h"
 -
 -#define TO_DCE_CLK_MGR(clocks)\
 -      container_of(clocks, struct dce_clk_mgr, base)
 -
 -#define REG(reg) \
 -      (clk_mgr_dce->regs->reg)
 -
 -#undef FN
 -#define FN(reg_name, field_name) \
 -      clk_mgr_dce->clk_mgr_shift->field_name, clk_mgr_dce->clk_mgr_mask->field_name
 -
 -#define CTX \
 -      clk_mgr_dce->base.ctx
 -#define DC_LOGGER \
 -      clk_mgr->ctx->logger
 -
 -static int dcn1_determine_dppclk_threshold(struct clk_mgr *clk_mgr, struct dc_clocks *new_clocks)
 +#include "clk_mgr_internal.h"
 +#include "rv1_clk_mgr.h"
 +#include "dce100/dce_clk_mgr.h"
 +#include "dce112/dce112_clk_mgr.h"
 +#include "rv1_clk_mgr_vbios_smu.h"
 +#include "rv1_clk_mgr_clk.h"
 +
 +static int rv1_determine_dppclk_threshold(struct clk_mgr_internal *clk_mgr, struct dc_clocks *new_clocks)
  {
        bool request_dpp_div = new_clocks->dispclk_khz > new_clocks->dppclk_khz;
 -      bool dispclk_increase = new_clocks->dispclk_khz > clk_mgr->clks.dispclk_khz;
 +      bool dispclk_increase = new_clocks->dispclk_khz > clk_mgr->base.clks.dispclk_khz;
        int disp_clk_threshold = new_clocks->max_supported_dppclk_khz;
 -      bool cur_dpp_div = clk_mgr->clks.dispclk_khz > clk_mgr->clks.dppclk_khz;
 +      bool cur_dpp_div = clk_mgr->base.clks.dispclk_khz > clk_mgr->base.clks.dppclk_khz;
  
        /* increase clock, looking for div is 0 for current, request div is 1*/
        if (dispclk_increase) {

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

diff --cc drivers/gpu/drm/amd/display/dc/core/dc_hw_sequencer.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_resource.c
Simple merge

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

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

diff --cc drivers/gpu/drm/amd/display/dc/dce/dce_abm.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/dc/dcn10/dcn10_link_encoder.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/dc/dcn10/dcn10_stream_encoder.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/modules/color/color_gamma.c
Simple merge

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

diff --cc drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
Simple merge

diff --cc drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c
Simple merge

diff --cc drivers/gpu/drm/amd/powerplay/hwmgr/vega10_processpptables.c
Simple merge

diff --cc drivers/gpu/drm/amd/powerplay/smu_v11_0.c
Simple merge

diff --cc drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c
Simple merge

diff --cc drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c
Simple merge

diff --cc drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c
Simple merge

diff --cc drivers/gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_gem.c
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_object.c
Simple merge

diff --cc drivers/gpu/drm/rcar-du/rcar_lvds.c
Simple merge

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

diff --cc include/drm/drm_bridge.h
Simple merge