diff options
| -rw-r--r-- | bcm283x-vc4-fix-vblank.patch | 165 | ||||
| -rw-r--r-- | kernel.spec | 7 |
2 files changed, 172 insertions, 0 deletions
diff --git a/bcm283x-vc4-fix-vblank.patch b/bcm283x-vc4-fix-vblank.patch new file mode 100644 index 000000000..fc0d033b1 --- /dev/null +++ b/bcm283x-vc4-fix-vblank.patch @@ -0,0 +1,165 @@ +From e487709ee89a572a3a8068f33e9275479fde9bf4 Mon Sep 17 00:00:00 2001 +From: Boris Brezillon <boris.brezillon@free-electrons.com> +Date: Fri, 16 Jun 2017 10:30:33 +0200 +Subject: [PATCH 1/2] drm/vc4: Send a VBLANK event when disabling a CRTC + +VBLANK events are missed when the CRTC is being disabled because the +driver does not wait till the end of the frame before stopping the +HVS and PV blocks. In this case, we should explicitly issue a VBLANK +event if there's one waiting. + +Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com> +--- + drivers/gpu/drm/vc4/vc4_crtc.c | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c +index 9fcf05ca492b..66cffc548af2 100644 +--- a/drivers/gpu/drm/vc4/vc4_crtc.c ++++ b/drivers/gpu/drm/vc4/vc4_crtc.c +@@ -526,6 +526,19 @@ static void vc4_crtc_disable(struct drm_crtc *crtc) + WARN_ON_ONCE((HVS_READ(SCALER_DISPSTATX(chan)) & + (SCALER_DISPSTATX_FULL | SCALER_DISPSTATX_EMPTY)) != + SCALER_DISPSTATX_EMPTY); ++ ++ /* ++ * Make sure we issue a vblank event after disabling the CRTC if ++ * someone was waiting it. ++ */ ++ if (crtc->state->event) { ++ unsigned long flags; ++ ++ spin_lock_irqsave(&dev->event_lock, flags); ++ drm_crtc_send_vblank_event(crtc, crtc->state->event); ++ crtc->state->event = NULL; ++ spin_unlock_irqrestore(&dev->event_lock, flags); ++ } + } + + static void vc4_crtc_enable(struct drm_crtc *crtc) +-- +2.13.0 + +From 6c9d1ad4c10657d7d6f8455088686abee1805102 Mon Sep 17 00:00:00 2001 +From: Peter Robinson <pbrobinson@gmail.com> +Date: Mon, 26 Jun 2017 09:03:28 +0100 +Subject: [PATCH 2/2] drm/vc4: Fix VBLANK handling in crtc->enable() path + +When we are enabling a CRTC, drm_crtc_vblank_get() is called before +drm_crtc_vblank_on(), which is not supposed to happen (hence the +WARN_ON() in the code). To solve the problem, we delay the 'update +display list' operation after the CRTC is actually enabled. + +Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com> +--- + drivers/gpu/drm/vc4/vc4_crtc.c | 66 +++++++++++++++++++++++++++--------------- + 1 file changed, 43 insertions(+), 23 deletions(-) + +diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c +index 66cffc548af2..47a8ef0a755d 100644 +--- a/drivers/gpu/drm/vc4/vc4_crtc.c ++++ b/drivers/gpu/drm/vc4/vc4_crtc.c +@@ -541,6 +541,34 @@ static void vc4_crtc_disable(struct drm_crtc *crtc) + } + } + ++static void vc4_crtc_update_dlist(struct drm_crtc *crtc) ++{ ++ struct drm_device *dev = crtc->dev; ++ struct vc4_dev *vc4 = to_vc4_dev(dev); ++ struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc); ++ struct vc4_crtc_state *vc4_state = to_vc4_crtc_state(crtc->state); ++ ++ if (crtc->state->event) { ++ unsigned long flags; ++ ++ crtc->state->event->pipe = drm_crtc_index(crtc); ++ ++ WARN_ON(drm_crtc_vblank_get(crtc) != 0); ++ ++ spin_lock_irqsave(&dev->event_lock, flags); ++ vc4_crtc->event = crtc->state->event; ++ crtc->state->event = NULL; ++ ++ HVS_WRITE(SCALER_DISPLISTX(vc4_crtc->channel), ++ vc4_state->mm.start); ++ ++ spin_unlock_irqrestore(&dev->event_lock, flags); ++ } else { ++ HVS_WRITE(SCALER_DISPLISTX(vc4_crtc->channel), ++ vc4_state->mm.start); ++ } ++} ++ + static void vc4_crtc_enable(struct drm_crtc *crtc) + { + struct drm_device *dev = crtc->dev; +@@ -551,6 +579,12 @@ static void vc4_crtc_enable(struct drm_crtc *crtc) + + require_hvs_enabled(dev); + ++ /* Enable vblank irq handling before crtc is started otherwise ++ * drm_crtc_get_vblank() fails in vc4_crtc_update_dlist(). ++ */ ++ drm_crtc_vblank_on(crtc); ++ vc4_crtc_update_dlist(crtc); ++ + /* Turn on the scaler, which will wait for vstart to start + * compositing. + */ +@@ -562,9 +596,6 @@ static void vc4_crtc_enable(struct drm_crtc *crtc) + /* Turn on the pixel valve, which will emit the vstart signal. */ + CRTC_WRITE(PV_V_CONTROL, + CRTC_READ(PV_V_CONTROL) | PV_VCONTROL_VIDEN); +- +- /* Enable vblank irq handling after crtc is started. */ +- drm_crtc_vblank_on(crtc); + } + + static bool vc4_crtc_mode_fixup(struct drm_crtc *crtc, +@@ -619,7 +650,6 @@ static void vc4_crtc_atomic_flush(struct drm_crtc *crtc, + { + struct drm_device *dev = crtc->dev; + struct vc4_dev *vc4 = to_vc4_dev(dev); +- struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc); + struct vc4_crtc_state *vc4_state = to_vc4_crtc_state(crtc->state); + struct drm_plane *plane; + bool debug_dump_regs = false; +@@ -641,25 +671,15 @@ static void vc4_crtc_atomic_flush(struct drm_crtc *crtc, + + WARN_ON_ONCE(dlist_next - dlist_start != vc4_state->mm.size); + +- if (crtc->state->event) { +- unsigned long flags; +- +- crtc->state->event->pipe = drm_crtc_index(crtc); +- +- WARN_ON(drm_crtc_vblank_get(crtc) != 0); +- +- spin_lock_irqsave(&dev->event_lock, flags); +- vc4_crtc->event = crtc->state->event; +- crtc->state->event = NULL; +- +- HVS_WRITE(SCALER_DISPLISTX(vc4_crtc->channel), +- vc4_state->mm.start); +- +- spin_unlock_irqrestore(&dev->event_lock, flags); +- } else { +- HVS_WRITE(SCALER_DISPLISTX(vc4_crtc->channel), +- vc4_state->mm.start); +- } ++ /* Only update DISPLIST if the CRTC was already running and is not ++ * being disabled. ++ * vc4_crtc_enable() takes care of updating the dlist just after ++ * re-enabling VBLANK interrupts and before enabling the engine. ++ * If the CRTC is being disabled, there's no point in updating this ++ * information. ++ */ ++ if (crtc->state->active && old_state->active) ++ vc4_crtc_update_dlist(crtc); + + if (debug_dump_regs) { + DRM_INFO("CRTC %d HVS after:\n", drm_crtc_index(crtc)); +-- +2.13.0 + diff --git a/kernel.spec b/kernel.spec index 481c0f68c..94631b10d 100644 --- a/kernel.spec +++ b/kernel.spec @@ -605,6 +605,10 @@ Patch312: arm64-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch Patch313: bcm2835-clk-audio-jitter-issues.patch Patch314: bcm2835-fix-potential-null-pointer-dereferences.patch +# https://patchwork.freedesktop.org/patch/163300/ +# https://patchwork.freedesktop.org/patch/161978/ +Patch315: bcm283x-vc4-fix-vblank.patch + # 400 - IBM (ppc/s390x) patches # 500 - Temp fixes/CVEs etc @@ -2189,6 +2193,9 @@ fi # # %changelog +* Mon Jun 26 2017 Peter Robinson <pbrobinson@fedoraproject.org> +- vc4: hopefully improve the vblank crash issues + * Fri Jun 23 2017 Hans de Goede <jwrdegoede@fedoraproject.org> - Enable AXP288 PMIC support on x86_64 for battery charging and monitoring support on Bay and Cherry Trail tablets and laptops |