Răsfoiți Sursa

gma500: Fix regression on Oaktrail devices

The register map patches didn't set one value for the GMA600 which
means the Fujitsu Q550 dies on boot with the GMA500 driver enabled.

Add the map entry so we don't read from the device MMIO + 0 by mistake.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Cc: Horses <stable@vger.kernel.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Alan Cox 13 ani în urmă
părinte
comite
26df641eac
1 a modificat fișierele cu 2 adăugiri și 0 ștergeri
  1. 2 0
      drivers/gpu/drm/gma500/oaktrail_device.c

+ 2 - 0
drivers/gpu/drm/gma500/oaktrail_device.c

@@ -476,6 +476,7 @@ static const struct psb_offset oaktrail_regmap[2] = {
 		.pos = DSPAPOS,
 		.pos = DSPAPOS,
 		.surf = DSPASURF,
 		.surf = DSPASURF,
 		.addr = MRST_DSPABASE,
 		.addr = MRST_DSPABASE,
+		.base = MRST_DSPABASE,
 		.status = PIPEASTAT,
 		.status = PIPEASTAT,
 		.linoff = DSPALINOFF,
 		.linoff = DSPALINOFF,
 		.tileoff = DSPATILEOFF,
 		.tileoff = DSPATILEOFF,
@@ -499,6 +500,7 @@ static const struct psb_offset oaktrail_regmap[2] = {
 		.pos = DSPBPOS,
 		.pos = DSPBPOS,
 		.surf = DSPBSURF,
 		.surf = DSPBSURF,
 		.addr = DSPBBASE,
 		.addr = DSPBBASE,
+		.base = DSPBBASE,
 		.status = PIPEBSTAT,
 		.status = PIPEBSTAT,
 		.linoff = DSPBLINOFF,
 		.linoff = DSPBLINOFF,
 		.tileoff = DSPBTILEOFF,
 		.tileoff = DSPBTILEOFF,