Merge tag 'drm-misc-next-2019-01-07-1' of git://anongit.freedesktop.org/drm/drm-misc...

drm-misc-next for 5.1:

UAPI Changes:

Cross-subsystem Changes:
  - Turn dma-buf fence sequence numbers into 64 bit numbers

Core Changes:
  - Move to a common helper for the DP MST hotplug for radeon, i915 and
    amdgpu
  - i2c improvements for drm_dp_mst
  - Removal of drm_syncobj_cb
  - Introduction of an helper to create and attach the TV margin properties

Driver Changes:
  - Improve cache flushes for v3d
  - Reflection support for vc4
  - HDMI overscan support for vc4
  - Add implicit fencing support for rockchip and sun4i
  - Switch to generic fbdev emulation for virtio

Signed-off-by: Dave Airlie <[email protected]>
[airlied: applied amdgpu merge fixup]
From: Maxime Ripard <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/20190107180333.amklwycudbsub3s5@flea

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index a9a28dbc3e2421e36468554a554d1987b7c4f46e,d8d0b206a79cb5f39b40f40b25ac26a180c9ef89..8a626d16e8e39b7481ba5c37f1e857752a9c7658
--- 1/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
--- 2/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@@ -1678,24 -1562,6 +1678,25 @@@ static int amdgpu_dm_mode_config_init(s
  
        adev->ddev->mode_config.fb_base = adev->gmc.aper_base;
  
-       drm_atomic_private_obj_init(&adev->dm.atomic_obj,
 +      drm_modeset_lock_init(&adev->dm.atomic_obj_lock);
 +
 +      state = kzalloc(sizeof(*state), GFP_KERNEL);
 +      if (!state)
 +              return -ENOMEM;
 +
 +      state->context = dc_create_state();
 +      if (!state->context) {
 +              kfree(state);
 +              return -ENOMEM;
 +      }
 +
 +      dc_resource_state_copy_construct_current(adev->dm.dc, state->context);
 +
++      drm_atomic_private_obj_init(adev->ddev,
++                                  &adev->dm.atomic_obj,
 +                                  &state->base,
 +                                  &dm_atomic_state_funcs);
 +
        r = amdgpu_display_modeset_create_props(adev);
        if (r)
                return r;

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

diff --cc drivers/gpu/drm/ast/ast_fb.c
Simple merge

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

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

diff --cc drivers/gpu/drm/drm_internal.h
Simple merge

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

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

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

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

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

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

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

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

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

diff --cc drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/dispnv50/disp.c
Simple merge

diff --cc drivers/gpu/drm/tegra/hub.c
Simple merge

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

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