raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 01:49:46 +00:00
Code Issues Projects Releases Wiki Activity

drm/vc4: Fix warning about vblank interrupts before DRM core is ready.

Browse Source 
The SMICS interrupt fires continuously, but since it's 1/100 the rate
of the USB interrupts, we don't really need a way to turn it off.  We
do need to make sure that we don't tell DRM about it until DRM has
asked for the interrupt at least once, because otherwise it will throw
a warning at boot time.

Signed-off-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Eric Anholt
2018-02-05 18:01:02 +00:00
committed by popcornmix
parent 51501fe8b4
commit 5bb42f7045
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gpu/drm/vc4/vc4_firmware_kms.c
View File

@@ -43,6 +43,7 @@ struct vc4_crtc {
struct drm_pending_vblank_event *event;
u32 overscan[4];
bool vblank_enabled;
};
static inline struct vc4_crtc *to_vc4_crtc(struct drm_crtc *crtc)
@@ -420,7 +421,8 @@ static irqreturn_t vc4_crtc_irq_handler(int irq, void *data)
if (stat & SMICS_INTERRUPTS) {
writel(0, vc4_crtc->regs + SMICS);
drm_crtc_handle_vblank(&vc4_crtc->base);
if (vc4_crtc->vblank_enabled)
drm_crtc_handle_vblank(&vc4_crtc->base);
vc4_crtc_handle_page_flip(vc4_crtc);
ret = IRQ_HANDLED;
}
@@ -443,9 +445,9 @@ static int vc4_page_flip(struct drm_crtc *crtc,
static int vc4_fkms_enable_vblank(struct drm_crtc *crtc)
{
/* XXX: Need a way to enable/disable the interrupt, to avoid
* DRM warnings at boot time.
*/
struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc);
vc4_crtc->vblank_enabled = true;
return 0;
}