Commit edaf6901 authored by Dave Airlie's avatar Dave Airlie
Browse files

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



- Overclock fix for vega10
- Hybrid gfx laptop fix

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190123231004.3111-1-alexander.deucher@amd.com
parents dc15159a 6d87dc97

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

+1 −0
Original line number Diff line number Diff line
@@ -576,6 +576,7 @@ static const struct amdgpu_px_quirk amdgpu_px_quirk_list[] = { 
	{ 0x1002, 0x6900, 0x1028, 0x0812, AMDGPU_PX_QUIRK_FORCE_ATPX },

	{ 0x1002, 0x6900, 0x1028, 0x0813, AMDGPU_PX_QUIRK_FORCE_ATPX },

	{ 0x1002, 0x6900, 0x1025, 0x125A, AMDGPU_PX_QUIRK_FORCE_ATPX },

	{ 0x1002, 0x6900, 0x17AA, 0x3806, AMDGPU_PX_QUIRK_FORCE_ATPX },

	{ 0, 0, 0, 0, 0 },

};

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

+21 −1
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include "vega10_pptable.h"



#define NUM_DSPCLK_LEVELS 8

#define VEGA10_ENGINECLOCK_HARDMAX 198000



static void set_hw_cap(struct pp_hwmgr *hwmgr, bool enable,

		enum phm_platform_caps cap)
@@ -258,6 +259,25 @@ static int init_over_drive_limits( 
		struct pp_hwmgr *hwmgr,

		const ATOM_Vega10_POWERPLAYTABLE *powerplay_table)

{

	const ATOM_Vega10_GFXCLK_Dependency_Table *gfxclk_dep_table =

			(const ATOM_Vega10_GFXCLK_Dependency_Table *)

			(((unsigned long) powerplay_table) +

			le16_to_cpu(powerplay_table->usGfxclkDependencyTableOffset));

	bool is_acg_enabled = false;

	ATOM_Vega10_GFXCLK_Dependency_Record_V2 *patom_record_v2;



	if (gfxclk_dep_table->ucRevId == 1) {

		patom_record_v2 =

			(ATOM_Vega10_GFXCLK_Dependency_Record_V2 *)gfxclk_dep_table->entries;

		is_acg_enabled =

			(bool)patom_record_v2[gfxclk_dep_table->ucNumEntries-1].ucACGEnable;

	}



	if (powerplay_table->ulMaxODEngineClock > VEGA10_ENGINECLOCK_HARDMAX &&

		!is_acg_enabled)

		hwmgr->platform_descriptor.overdriveLimit.engineClock =

			VEGA10_ENGINECLOCK_HARDMAX;

	else

		hwmgr->platform_descriptor.overdriveLimit.engineClock =

			le32_to_cpu(powerplay_table->ulMaxODEngineClock);

	hwmgr->platform_descriptor.overdriveLimit.memoryClock =

CRA Git | Maintained and supported by SUSTech CRA and CCSE