| From cad68ea70d649cff90102022c5d161bf84e4ed16 Mon Sep 17 00:00:00 2001 |
| From: Phil Elwell <phil@raspberrypi.org> |
| Date: Fri, 19 Jul 2019 14:29:28 +0100 |
| Subject: [PATCH] drm/vc4: Ignore HVS unless initialised |
| |
| An upstream commit to report HVS underruns causes VC4 in firmware KMS |
| mode to cross into the HVS side, where it crashes due to a NULL hvs |
| pointer. |
| |
| Make the underrun masking conditional on the hvs pointer being |
| initialised. |
| |
| Fixes: 531a1b622da9 ("drm/vc4: Report HVS underrun errors") |
| |
| Signed-off-by: Phil Elwell <phil@raspberrypi.org> |
| --- |
| drivers/gpu/drm/vc4/vc4_crtc.c | 3 ++- |
| drivers/gpu/drm/vc4/vc4_kms.c | 2 +- |
| 2 files changed, 3 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/gpu/drm/vc4/vc4_crtc.c |
| +++ b/drivers/gpu/drm/vc4/vc4_crtc.c |
| @@ -801,7 +801,8 @@ static void vc4_crtc_handle_page_flip(st |
| * the CRTC and encoder already reconfigured, leading to |
| * underruns. This can be seen when reconfiguring the CRTC. |
| */ |
| - vc4_hvs_unmask_underrun(dev, vc4_crtc->channel); |
| + if (vc4->hvs) |
| + vc4_hvs_unmask_underrun(dev, vc4_crtc->channel); |
| } |
| spin_unlock_irqrestore(&dev->event_lock, flags); |
| } |
| --- a/drivers/gpu/drm/vc4/vc4_kms.c |
| +++ b/drivers/gpu/drm/vc4/vc4_kms.c |
| @@ -156,7 +156,7 @@ vc4_atomic_complete_commit(struct drm_at |
| struct vc4_crtc *vc4_crtc; |
| int i; |
| |
| - for (i = 0; i < dev->mode_config.num_crtc; i++) { |
| + for (i = 0; vc4->hvs && i < dev->mode_config.num_crtc; i++) { |
| if (!state->crtcs[i].ptr || !state->crtcs[i].commit) |
| continue; |
| |