diff options
| author | Eric Anholt <eric@anholt.net> | 2015-07-08 18:23:17 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2015-07-17 12:12:56 -0700 |
| commit | faa78c2a671b1eb94786c9c998b733e5d0d9de6a (patch) | |
| tree | 3c35e2af73fe70ad239cf2b1ce9cbf0f88b6cdae | |
| parent | 7419dc13de9825228d594148d14175c3a58a5d75 (diff) | |
| download | linux-faa78c2a671b1eb94786c9c998b733e5d0d9de6a.tar.gz | |
drm/vc4: Drop the PV_STAT check for PV running.
This appears to be something from another rev of hardware, that I'd
found and replicated.
Signed-off-by: Eric Anholt <eric@anholt.net>
| -rw-r--r-- | drivers/gpu/drm/vc4/vc4_crtc.c | 6 | ||||
| -rw-r--r-- | drivers/gpu/drm/vc4/vc4_regs.h | 2 |
2 files changed, 0 insertions, 8 deletions
diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c index d0021132822b..90a51b2f5323 100644 --- a/drivers/gpu/drm/vc4/vc4_crtc.c +++ b/drivers/gpu/drm/vc4/vc4_crtc.c @@ -177,12 +177,6 @@ static void vc4_crtc_disable(struct drm_crtc *crtc) */ msleep(30); - if (drm_crtc_index(crtc) == 0) { - do { - cpu_relax(); - } while (CRTC_READ(PV_STAT) & (PV_STAT_RUNNING_MASK)); - } - if (HVS_READ(SCALER_DISPCTRLX(vc4_crtc->channel)) & SCALER_DISPCTRLX_ENABLE) { HVS_WRITE(SCALER_DISPCTRLX(vc4_crtc->channel), diff --git a/drivers/gpu/drm/vc4/vc4_regs.h b/drivers/gpu/drm/vc4/vc4_regs.h index 2282804ae101..424da0525530 100644 --- a/drivers/gpu/drm/vc4/vc4_regs.h +++ b/drivers/gpu/drm/vc4/vc4_regs.h @@ -225,8 +225,6 @@ # define PV_INT_HSYNC_START (1 << 0) #define PV_STAT 0x2c -# define PV_STAT_IDLE (1 << 8) -# define PV_STAT_RUNNING_MASK VC4_MASK(7, 0) #define PV_HACT_ACT 0x30 |