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

Commit 71e16bfb authored by Alex Deucher's avatar Alex Deucher Committed by Dave Airlie
Browse files

drm/radeon/kms: fix suspend on rv530 asics 

Apparently only rv515 asics need the workaround
added in f24d86f1
(drm/radeon/kms: fix resume regression for some r5xx laptops).

Fixes:
https://bugs.freedesktop.org/show_bug.cgi?id=34709



Signed-off-by: default avatarAlex Deucher <alexdeucher@gmail.com>
Cc: stable@kernel.org
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 92656d70

drivers/gpu/drm/radeon/atom.c

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

#include "atom-names.h"

#include "atom-bits.h"

#include "radeon.h"



#define ATOM_COND_ABOVE		0

#define ATOM_COND_ABOVEOREQUAL	1
@@ -101,7 +102,9 @@ static void debug_print_spaces(int n) 
static uint32_t atom_iio_execute(struct atom_context *ctx, int base,

				 uint32_t index, uint32_t data)

{

	struct radeon_device *rdev = ctx->card->dev->dev_private;

	uint32_t temp = 0xCDCDCDCD;



	while (1)

		switch (CU8(base)) {

		case ATOM_IIO_NOP:
@@ -112,6 +115,7 @@ static uint32_t atom_iio_execute(struct atom_context *ctx, int base, 
			base += 3;

			break;

		case ATOM_IIO_WRITE:

			if (rdev->family == CHIP_RV515)

				(void)ctx->card->ioreg_read(ctx->card, CU16(base + 1));

			ctx->card->ioreg_write(ctx->card, CU16(base + 1), temp);

			base += 3;