Commit e14c5873 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

Merge branch 'drm-fixes-5.2' of git://people.freedesktop.org/~agd5f/linux into drm-fixes 



Fixes for 5.2:
- Extend previous vce fix for resume to uvd and vcn
- Fix bounds checking in ras debugfs interface
- Fix a regression on SI using amdgpu

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190613021856.3307-1-alexander.deucher@amd.com
parents 744ed8cb f3a5231c

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