From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 10 Dec 2018 02:39:58 +0000 (+1100)
Subject: Merge remote-tracking branch 'drm/drm-next'
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=60a3b9fda5adc24998ae2cd7898582bfbd872f2c;p=users%2Fwilly%2Flinux.git

Merge remote-tracking branch 'drm/drm-next'
---

60a3b9fda5adc24998ae2cd7898582bfbd872f2c
diff --cc Documentation/gpu/drm-uapi.rst
index f2f079e91b4c,4b4bf2c5eac5..a752aa561ea4
--- a/Documentation/gpu/drm-uapi.rst
+++ b/Documentation/gpu/drm-uapi.rst
@@@ -194,9 -194,12 +194,12 @@@ EPERM/EACCES
          Returned for an operation that is valid, but needs more privileges.
          E.g. root-only or much more common, DRM master-only operations return
          this when when called by unpriviledged clients. There's no clear
 -        difference between EACCESS and EPERM.
 +        difference between EACCES and EPERM.
  
  ENODEV:
+         The device is not (yet) present or fully initialized.
+ 
+ EOPNOTSUPP:
          Feature (like PRIME, modesetting, GEM) is not supported by the driver.
  
  ENXIO:
diff --cc drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
index 322e09b5b448,c1a03505f956..4f8352044563
--- a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
@@@ -223,9 -214,9 +215,9 @@@ static int vcn_v1_0_hw_fini(void *handl
  	struct amdgpu_ring *ring = &adev->vcn.ring_dec;
  
  	if (RREG32_SOC15(VCN, 0, mmUVD_STATUS))
 -		vcn_v1_0_stop(adev);
 +		vcn_v1_0_set_powergating_state(adev, AMD_PG_STATE_GATE);
  
- 	ring->ready = false;
+ 	ring->sched.ready = false;
  
  	return 0;
  }
diff --cc drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 5a6edf65c9ea,32e791d9b9a8..1691864bf59b
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@@ -3063,8 -3234,7 +3235,8 @@@ amdgpu_dm_connector_atomic_duplicate_st
  	__drm_atomic_helper_connector_duplicate_state(connector, &new_state->base);
  
  	new_state->freesync_capable = state->freesync_capable;
- 	new_state->freesync_enable = state->freesync_enable;
 +	new_state->max_bpc = state->max_bpc;
+ 	new_state->abm_level = state->abm_level;
  
  	return &new_state->base;
  }
diff --cc drivers/gpu/drm/meson/meson_crtc.c
index 191b314f9e9e,d78168f979db..75d97f1b2e8f
--- a/drivers/gpu/drm/meson/meson_crtc.c
+++ b/drivers/gpu/drm/meson/meson_crtc.c
@@@ -126,8 -115,8 +131,10 @@@ static void meson_crtc_atomic_disable(s
  	struct meson_crtc *meson_crtc = to_meson_crtc(crtc);
  	struct meson_drm *priv = meson_crtc->priv;
  
+ 	DRM_DEBUG_DRIVER("\n");
+ 
 +	drm_crtc_vblank_off(crtc);
 +
  	priv->viu.osd1_enabled = false;
  	priv->viu.osd1_commit = false;