From: Dave Airlie <airlied@redhat.com>
Date: Wed, 9 Jan 2019 19:53:51 +0000 (+1000)
Subject: Merge tag 'drm-misc-next-2019-01-07-1' of git://anongit.freedesktop.org/drm/drm-misc... 
X-Git-Tag: v5.4-rc1~1388^2~33
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8c1a765bc62c93be2803f4541363a1c06355243e;p=platform%2Fkernel%2Flinux-rpi.git

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

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 <airlied@redhat.com>

[airlied: applied amdgpu merge fixup]
From: Maxime Ripard <maxime.ripard@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190107180333.amklwycudbsub3s5@flea
---

8c1a765bc62c93be2803f4541363a1c06355243e
diff --cc drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index a9a28db,d8d0b20..8a626d1
--- a/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_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->dm.atomic_obj,
++	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/i915/i915_gem.c
index 216f52b,b70de1a..7399ac7
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@@ -3306,9 -3309,19 +3306,9 @@@ void i915_gem_reset_finish(struct drm_i
  
  static void nop_submit_request(struct i915_request *request)
  {
 -	GEM_TRACE("%s fence %llx:%d -> -EIO\n",
 -		  request->engine->name,
 -		  request->fence.context, request->fence.seqno);
 -	dma_fence_set_error(&request->fence, -EIO);
 -
 -	i915_request_submit(request);
 -}
 -
 -static void nop_complete_submit_request(struct i915_request *request)
 -{
  	unsigned long flags;
  
- 	GEM_TRACE("%s fence %llx:%d -> -EIO\n",
+ 	GEM_TRACE("%s fence %llx:%lld -> -EIO\n",
  		  request->engine->name,
  		  request->fence.context, request->fence.seqno);
  	dma_fence_set_error(&request->fence, -EIO);