drm/radeon/kms: fix suspend on rv530 asics
Apparently only rv515 asics need the workaround
added in f24d86f1a4
(drm/radeon/kms: fix resume regression for some r5xx laptops).
Fixes:
https://bugs.freedesktop.org/show_bug.cgi?id=34709
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Cc: stable@kernel.org
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
parent
92656d707e
commit
71e16bfbd2
|
@ -32,6 +32,7 @@
|
||||||
#include "atom.h"
|
#include "atom.h"
|
||||||
#include "atom-names.h"
|
#include "atom-names.h"
|
||||||
#include "atom-bits.h"
|
#include "atom-bits.h"
|
||||||
|
#include "radeon.h"
|
||||||
|
|
||||||
#define ATOM_COND_ABOVE 0
|
#define ATOM_COND_ABOVE 0
|
||||||
#define ATOM_COND_ABOVEOREQUAL 1
|
#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,
|
static uint32_t atom_iio_execute(struct atom_context *ctx, int base,
|
||||||
uint32_t index, uint32_t data)
|
uint32_t index, uint32_t data)
|
||||||
{
|
{
|
||||||
|
struct radeon_device *rdev = ctx->card->dev->dev_private;
|
||||||
uint32_t temp = 0xCDCDCDCD;
|
uint32_t temp = 0xCDCDCDCD;
|
||||||
|
|
||||||
while (1)
|
while (1)
|
||||||
switch (CU8(base)) {
|
switch (CU8(base)) {
|
||||||
case ATOM_IIO_NOP:
|
case ATOM_IIO_NOP:
|
||||||
|
@ -112,7 +115,8 @@ static uint32_t atom_iio_execute(struct atom_context *ctx, int base,
|
||||||
base += 3;
|
base += 3;
|
||||||
break;
|
break;
|
||||||
case ATOM_IIO_WRITE:
|
case ATOM_IIO_WRITE:
|
||||||
(void)ctx->card->ioreg_read(ctx->card, CU16(base + 1));
|
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);
|
ctx->card->ioreg_write(ctx->card, CU16(base + 1), temp);
|
||||||
base += 3;
|
base += 3;
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in a new issue