Commit 6aa7a22b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull drm fixes from Daniel Vetter:
 "Nothing unsettling here, also not aware of anything serious still
  pending.

  The edid override regression fix took a bit longer since this seems to
  be an area with an overabundance of bad options. But the fix we have
  now seems like a good path forward.

  Next week it should be back to Dave.

  Summary:

   - fix regression on amdgpu on SI

   - fix edid override regression

   - driver fixes: amdgpu, i915, mediatek, meson, panfrost

   - fix writecombine for vmap in gem-shmem helper (used by panfrost)

   - add more panel quirks"

* tag 'drm-fixes-2019-06-14' of git://anongit.freedesktop.org/drm/drm: (25 commits)
  drm/amdgpu: return 0 by default in amdgpu_pm_load_smu_firmware
  drm/amdgpu: Fix bounds checking in amdgpu_ras_is_supported()
  drm: add fallback override/firmware EDID modes workaround
  drm/edid: abstract override/firmware EDID retrieval
  drm/i915/perf: fix whitelist on Gen10+
  drm/i915/sdvo: Implement proper HDMI audio support for SDVO
  drm/i915: Fix per-pixel alpha with CCS
  drm/i915/dmc: protect against reading random memory
  drm/i915/dsi: Use a fuzzy check for burst mode clock check
  drm/amdgpu/{uvd,vcn}: fetch ring's read_ptr after alloc
  drm/panfrost: Require the simple_ondemand governor
  drm/panfrost: make devfreq optional again
  drm/gem_shmem: Use a writecombine mapping for ->vaddr
  drm: panel-orientation-quirks: Add quirk for GPD MicroPC
  drm: panel-orientation-quirks: Add quirk for GPD pocket2
  drm/meson: fix G12A primary plane disabling
  drm/meson: fix primary plane disabling
  drm/meson: fix G12A HDMI PLL settings for 4K60 1000/1001 variations
  drm/mediatek: call mtk_dsi_stop() after mtk_drm_crtc_atomic_disable()
  drm/mediatek: clear num_pipes when unbind driver
  ...
parents 40665244 e14c5873

drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c

+2 −2
Original line number Diff line number Diff line
@@ -2492,7 +2492,7 @@ void amdgpu_pm_print_power_states(struct amdgpu_device *adev) 


int amdgpu_pm_load_smu_firmware(struct amdgpu_device *adev, uint32_t *smu_version)

{

	int r = -EINVAL;

	int r;



	if (adev->powerplay.pp_funcs && adev->powerplay.pp_funcs->load_firmware) {

		r = adev->powerplay.pp_funcs->load_firmware(adev->powerplay.pp_handle);
@@ -2502,7 +2502,7 @@ int amdgpu_pm_load_smu_firmware(struct amdgpu_device *adev, uint32_t *smu_versio 
		}

		*smu_version = adev->pm.fw_version;

	}

	return r;

	return 0;

}



int amdgpu_pm_sysfs_init(struct amdgpu_device *adev)

drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h

+2 −0
Original line number Diff line number Diff line
@@ -172,6 +172,8 @@ static inline int amdgpu_ras_is_supported(struct amdgpu_device *adev, 
{

	struct amdgpu_ras *ras = amdgpu_ras_get_context(adev);



	if (block >= AMDGPU_RAS_BLOCK_COUNT)

		return 0;

	return ras && (ras->supported & (1 << block));

}

drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c

+3 −1
Original line number Diff line number Diff line
@@ -594,7 +594,7 @@ error: 
int amdgpu_vcn_enc_ring_test_ring(struct amdgpu_ring *ring)

{

	struct amdgpu_device *adev = ring->adev;

	uint32_t rptr = amdgpu_ring_get_rptr(ring);

	uint32_t rptr;

	unsigned i;

	int r;
@@ -602,6 +602,8 @@ int amdgpu_vcn_enc_ring_test_ring(struct amdgpu_ring *ring) 
	if (r)

		return r;



	rptr = amdgpu_ring_get_rptr(ring);



	amdgpu_ring_write(ring, VCN_ENC_CMD_END);

	amdgpu_ring_commit(ring);

drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c

+4 −1
Original line number Diff line number Diff line
@@ -170,13 +170,16 @@ static void uvd_v6_0_enc_ring_set_wptr(struct amdgpu_ring *ring) 
static int uvd_v6_0_enc_ring_test_ring(struct amdgpu_ring *ring)

{

	struct amdgpu_device *adev = ring->adev;

	uint32_t rptr = amdgpu_ring_get_rptr(ring);

	uint32_t rptr;

	unsigned i;

	int r;



	r = amdgpu_ring_alloc(ring, 16);

	if (r)

		return r;



	rptr = amdgpu_ring_get_rptr(ring);



	amdgpu_ring_write(ring, HEVC_ENC_CMD_END);

	amdgpu_ring_commit(ring);

drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c

+4 −1
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ static void uvd_v7_0_enc_ring_set_wptr(struct amdgpu_ring *ring) 
static int uvd_v7_0_enc_ring_test_ring(struct amdgpu_ring *ring)

{

	struct amdgpu_device *adev = ring->adev;

	uint32_t rptr = amdgpu_ring_get_rptr(ring);

	uint32_t rptr;

	unsigned i;

	int r;
@@ -185,6 +185,9 @@ static int uvd_v7_0_enc_ring_test_ring(struct amdgpu_ring *ring) 
	r = amdgpu_ring_alloc(ring, 16);

	if (r)

		return r;



	rptr = amdgpu_ring_get_rptr(ring);



	amdgpu_ring_write(ring, HEVC_ENC_CMD_END);

	amdgpu_ring_commit(ring);

CRA Git | Maintained and supported by SUSTech CRA and CCSE