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

Commit 6abafb78 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/radeon: fix typo in golden register setup on evergreen 

Fixes hangs on driver load on some cards.

bug:
https://bugs.freedesktop.org/show_bug.cgi?id=76998



Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent 9b7d786b

drivers/gpu/drm/radeon/evergreen.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -189,7 +189,7 @@ static const u32 evergreen_golden_registers[] = 
	0x8c1c, 0xffffffff, 0x00001010,

	0x8c1c, 0xffffffff, 0x00001010,

	0x28350, 0xffffffff, 0x00000000,

	0x28350, 0xffffffff, 0x00000000,

	0xa008, 0xffffffff, 0x00010000,

	0xa008, 0xffffffff, 0x00010000,

	0x5cc, 0xffffffff, 0x00000001,

	0x5c4, 0xffffffff, 0x00000001,

	0x9508, 0xffffffff, 0x00000002,

	0x9508, 0xffffffff, 0x00000002,

	0x913c, 0x0000000f, 0x0000000a

	0x913c, 0x0000000f, 0x0000000a

};

};
@@ -476,7 +476,7 @@ static const u32 cedar_golden_registers[] = 
	0x8c1c, 0xffffffff, 0x00001010,

	0x8c1c, 0xffffffff, 0x00001010,

	0x28350, 0xffffffff, 0x00000000,

	0x28350, 0xffffffff, 0x00000000,

	0xa008, 0xffffffff, 0x00010000,

	0xa008, 0xffffffff, 0x00010000,

	0x5cc, 0xffffffff, 0x00000001,

	0x5c4, 0xffffffff, 0x00000001,

	0x9508, 0xffffffff, 0x00000002

	0x9508, 0xffffffff, 0x00000002

};

};
@@ -635,7 +635,7 @@ static const u32 juniper_mgcg_init[] = 
static const u32 supersumo_golden_registers[] =

static const u32 supersumo_golden_registers[] =

{

{

	0x5eb4, 0xffffffff, 0x00000002,

	0x5eb4, 0xffffffff, 0x00000002,

	0x5cc, 0xffffffff, 0x00000001,

	0x5c4, 0xffffffff, 0x00000001,

	0x7030, 0xffffffff, 0x00000011,

	0x7030, 0xffffffff, 0x00000011,

	0x7c30, 0xffffffff, 0x00000011,

	0x7c30, 0xffffffff, 0x00000011,

	0x6104, 0x01000300, 0x00000000,

	0x6104, 0x01000300, 0x00000000,
@@ -719,7 +719,7 @@ static const u32 sumo_golden_registers[] = 
static const u32 wrestler_golden_registers[] =

static const u32 wrestler_golden_registers[] =

{

{

	0x5eb4, 0xffffffff, 0x00000002,

	0x5eb4, 0xffffffff, 0x00000002,

	0x5cc, 0xffffffff, 0x00000001,

	0x5c4, 0xffffffff, 0x00000001,

	0x7030, 0xffffffff, 0x00000011,

	0x7030, 0xffffffff, 0x00000011,

	0x7c30, 0xffffffff, 0x00000011,

	0x7c30, 0xffffffff, 0x00000011,

	0x6104, 0x01000300, 0x00000000,

	0x6104, 0x01000300, 0x00000000,