diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2011-10-29 11:31:29 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2011-12-21 19:01:26 +1000 |
| commit | 020c6bf39488c4dd162bafed04b631b98f85d9f0 (patch) | |
| tree | ce550a8eacf137378b1f5918e09b6239f528be61 | |
| parent | 19fa224f8a91a73a39b35251ced04b59b2a171b4 (diff) | |
drm/nv50/disp: stricter check for evo being active on init
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Tested-by: Martin Peres <martin.peres@labri.fr>
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv50_display.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c index cfd7a827847..a59d0b923cc 100644 --- a/drivers/gpu/drm/nouveau/nv50_display.c +++ b/drivers/gpu/drm/nouveau/nv50_display.c @@ -54,13 +54,13 @@ static int evo_icmd(struct drm_device *dev, int ch, u32 mthd, u32 data) { int ret = 0; - if (nouveau_reg_debug & NOUVEAU_REG_DEBUG_EVO) - NV_INFO(dev, "EvoPIO: %d 0x%04x 0x%08x\n", ch, mthd, data); nv_mask(dev, 0x610300 + (ch * 0x08), 0x00000001, 0x00000001); nv_wr32(dev, 0x610304 + (ch * 0x08), data); nv_wr32(dev, 0x610300 + (ch * 0x08), 0x80000001 | mthd); if (!nv_wait(dev, 0x610300 + (ch * 0x08), 0x80000000, 0x00000000)) ret = -EBUSY; + if (ret || (nouveau_reg_debug & NOUVEAU_REG_DEBUG_EVO)) + NV_INFO(dev, "EvoPIO: %d 0x%04x 0x%08x\n", ch, mthd, data); nv_mask(dev, 0x610300 + (ch * 0x08), 0x00000001, 0x00000000); return ret; } @@ -68,13 +68,15 @@ evo_icmd(struct drm_device *dev, int ch, u32 mthd, u32 data) int nv50_display_early_init(struct drm_device *dev) { + u32 ctrl = nv_rd32(dev, 0x610200); int i; + /* check if master evo channel is already active, a good a sign as any * that the display engine is in a weird state (hibernate/kexec), if * it is, do our best to reset the display engine... */ - if (nv_rd32(dev, 0x610200) & 0x00000001) { - NV_INFO(dev, "PDISP: already active, attempting to reset...\n"); + if ((ctrl & 0x00000003) == 0x00000003) { + NV_INFO(dev, "PDISP: EVO(0) 0x%08x, resetting...\n", ctrl); /* deactivate both heads first, PDISP will disappear forever * (well, until you power cycle) on some boards as soon as @@ -94,6 +96,7 @@ nv50_display_early_init(struct drm_device *dev) nv_mask(dev, 0x000200, 0x40000000, 0x00000000); nv_mask(dev, 0x000200, 0x40000000, 0x40000000); } + return 0; } |