From patchwork Tue Feb 25 18:37:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Lindgren X-Patchwork-Id: 11405493 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 373D4924 for ; Wed, 26 Feb 2020 08:09:04 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1FA5E20714 for ; Wed, 26 Feb 2020 08:09:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1FA5E20714 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=atomide.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8A7CB6E19A; Wed, 26 Feb 2020 08:08:29 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from muru.com (muru.com [72.249.23.125]) by gabe.freedesktop.org (Postfix) with ESMTP id 90CE46EB8B for ; Tue, 25 Feb 2020 18:37:41 +0000 (UTC) Received: from hillo.muru.com (localhost [127.0.0.1]) by muru.com (Postfix) with ESMTP id 9F06E810E; Tue, 25 Feb 2020 18:38:25 +0000 (UTC) From: Tony Lindgren To: Tomi Valkeinen Subject: [PATCH] drm/omap: Fix drm_handle_vblank() handling for command mode panels Date: Tue, 25 Feb 2020 10:37:33 -0800 Message-Id: <20200225183733.50875-1-tony@atomide.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Mailman-Approved-At: Wed, 26 Feb 2020 08:08:26 +0000 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ivaylo Dimitrov , Merlijn Wajer , Sebastian Reichel , dri-devel@lists.freedesktop.org, ruleh , Laurent Pinchart , linux-omap@vger.kernel.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" When trying to run weston on droid4 with the updated sgx blobs, the LCD is just black and not updating. Weston also displays the following on startup: Warning: computed repaint delay is insane: -205475 msec Weston runs fine on the HDMI alone though, and the issue was narrowed down to an issue with vblank as suggested by ruleh . Turns out that for command mode displays, we're not currently calling drm_handle_vblank() at all since omap_irq_handler() won't do it for us since we get no vblank interrupts. Let's fix the issue by calling drm_handle_vblank() and omap_crtc_vblank_irq() for command mode displays from omap_crtc_framedone_irq(). And we can now remove the old partial handling in omap_crtc_framedone_irq(). For reference, below is my current weston.ini. The repaint-window is maxed out to force immediate repaint instead of the default 7 ms. Otherwise it seems that the repaint is happening at about 60 fps with es2gears_wayland compared to about 130 fps where it seems to max out. [core] xwayland=true backend=drm-backend.so repaint-window=1000 pageflip-timeout=1000 [libinput] rotation=0 [output] name=DSI-1 transform=90 [output] name=HDMI-1 mode=1024x768@60 Fixes: 47103a80f55a ("drm/omap: add framedone interrupt support") Cc: Ivaylo Dimitrov Cc: Merlijn Wajer Cc: Sebastian Reichel Cc: ruleh Signed-off-by: Tony Lindgren --- Only lightly tested so far, please test. Also, I'm not sure if we should get the id from somewhere for drm_handle_vblank() instead of just using 0? --- drivers/gpu/drm/omapdrm/omap_crtc.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omapdrm/omap_crtc.c --- a/drivers/gpu/drm/omapdrm/omap_crtc.c +++ b/drivers/gpu/drm/omapdrm/omap_crtc.c @@ -326,21 +326,19 @@ void omap_crtc_vblank_irq(struct drm_crtc *crtc) void omap_crtc_framedone_irq(struct drm_crtc *crtc, uint32_t irqstatus) { + struct omap_crtc_state *omap_state = to_omap_crtc_state(crtc->state); struct omap_crtc *omap_crtc = to_omap_crtc(crtc); + struct drm_device *dev = crtc->dev; if (!omap_crtc->framedone_handler) return; - omap_crtc->framedone_handler(omap_crtc->framedone_handler_data); - - spin_lock(&crtc->dev->event_lock); - /* Send the vblank event if one has been requested. */ - if (omap_crtc->event) { - drm_crtc_send_vblank_event(crtc, omap_crtc->event); - omap_crtc->event = NULL; + if (omap_state->manually_updated) { + drm_handle_vblank(dev, 0); + omap_crtc_vblank_irq(crtc); } - omap_crtc->pending = false; - spin_unlock(&crtc->dev->event_lock); + + omap_crtc->framedone_handler(omap_crtc->framedone_handler_data); /* Wake up omap_atomic_complete. */ wake_up(&omap_crtc->pending_wait);