Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5a28747b authored by Dave Airlie's avatar Dave Airlie
Browse files

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

two suspend/resume regression fixes.

* 'drm-fixes-4.14' of git://people.freedesktop.org/~agd5f/linux:
  drm/amd/amdgpu: Remove workaround check for UVD6 on APUs
  drm/amd/powerplay: fix uninitialized variable
parents bb176f67 d3daa2c7

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

+5 −11
Original line number Diff line number Diff line
@@ -225,11 +225,7 @@ static int uvd_v6_0_suspend(void *handle) 
	if (r)

		return r;



	/* Skip this for APU for now */

	if (!(adev->flags & AMD_IS_APU))

		r = amdgpu_uvd_suspend(adev);



	return r;

	return amdgpu_uvd_suspend(adev);

}



static int uvd_v6_0_resume(void *handle)
@@ -237,12 +233,10 @@ static int uvd_v6_0_resume(void *handle) 
	int r;

	struct amdgpu_device *adev = (struct amdgpu_device *)handle;



	/* Skip this for APU for now */

	if (!(adev->flags & AMD_IS_APU)) {

	r = amdgpu_uvd_resume(adev);

	if (r)

		return r;

	}



	return uvd_v6_0_hw_init(adev);

}

drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c

+3 −3
Original line number Diff line number Diff line
@@ -830,7 +830,7 @@ uint32_t smu7_get_xclk(struct pp_hwmgr *hwmgr) 
{

	uint32_t reference_clock, tmp;

	struct cgs_display_info info = {0};

	struct cgs_mode_info mode_info;

	struct cgs_mode_info mode_info = {0};



	info.mode_info = &mode_info;
@@ -3948,10 +3948,9 @@ static int smu7_program_display_gap(struct pp_hwmgr *hwmgr) 
	uint32_t ref_clock;

	uint32_t refresh_rate = 0;

	struct cgs_display_info info = {0};

	struct cgs_mode_info mode_info;

	struct cgs_mode_info mode_info = {0};



	info.mode_info = &mode_info;



	cgs_get_active_displays_info(hwmgr->device, &info);

	num_active_displays = info.display_count;
@@ -3967,6 +3966,7 @@ static int smu7_program_display_gap(struct pp_hwmgr *hwmgr) 
	frame_time_in_us = 1000000 / refresh_rate;



	pre_vbi_time_in_us = frame_time_in_us - 200 - mode_info.vblank_time_us;



	data->frame_time_x2 = frame_time_in_us * 2 / 100;



	display_gap2 = pre_vbi_time_in_us * (ref_clock / 100);