From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 22963C433B4 for ; Tue, 11 May 2021 16:44:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DB55C61182 for ; Tue, 11 May 2021 16:44:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231480AbhEKQp3 (ORCPT ); Tue, 11 May 2021 12:45:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51442 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230435AbhEKQp2 (ORCPT ); Tue, 11 May 2021 12:45:28 -0400 Received: from mail-ej1-x632.google.com (mail-ej1-x632.google.com [IPv6:2a00:1450:4864:20::632]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7C19FC061574 for ; Tue, 11 May 2021 09:44:21 -0700 (PDT) Received: by mail-ej1-x632.google.com with SMTP id l4so30734756ejc.10 for ; Tue, 11 May 2021 09:44:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=date:from:to:cc:subject:message-id:mail-followup-to:references :mime-version:content-disposition:in-reply-to; bh=vjV0mzX/OYYldhTKbCzFjmA9xLTAvy1tenKPQWA9cMY=; b=If8rh3oqxpTSWFl3K82m7bx4dXoQIZ7uG69gLBWBQd3/tmtaUu3UEMIAvpZIsXNbfR k90MyiKwtrYw3oHVZsH1OxWjEO9pSM7x5bvLniYANfIhgYInOGb1+XtpRnW+3nWHqbA8 76tkN2+LPcKr2nZR7xBw8jf+YEnhWhXtGG2m0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id :mail-followup-to:references:mime-version:content-disposition :in-reply-to; bh=vjV0mzX/OYYldhTKbCzFjmA9xLTAvy1tenKPQWA9cMY=; b=gJRcjhQYM/JuJqvz9VGFT2G+nTIk8jPlLm/EZT76HFZnbYdRMlPbbARy4kiNefBqWM WPAddB66RFo/WbB5C491kXEfzRHKOfoEhfJtnWb4LtWmsQ54noONIk7+Hy1ijRdQU2Nm T4iGCuXYsuZ/dV2nPlPWihXl3t8Xhpznirz4ZxOsFDA3VB1fiBklGOe1BvsIVe8Xsa3J Ira6tgv8NApjrT3r9IEqeNEpUsisHaj+Ai+80UjIrvcbUdbmTzkGXoec6hbeQsFDLe42 /YeZBCVg7271+kqCCRR+RcQ5cZgTrM+PfEH2GxH9xUbaG14tLPI8tHlQDh8OaMu3mpkc y2vQ== X-Gm-Message-State: AOAM533kf0gcZg4DGniop7Zk2iy8zsmgH00XDiAewyJi2VZAIYihiS0D UGcy1CYbqNBgSTp2llQSQV/VkQ== X-Google-Smtp-Source: ABdhPJwP216Ldhe6W79xvbaQ0XmCjn1UuS/CGKUBuXyfbl2GBz9n+tGkrQmJpVVndQrF/JY9mjdPPg== X-Received: by 2002:a17:907:3e28:: with SMTP id hp40mr9818965ejc.523.1620751459752; Tue, 11 May 2021 09:44:19 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id p18sm11919455ejb.19.2021.05.11.09.44.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 May 2021 09:44:19 -0700 (PDT) Date: Tue, 11 May 2021 18:44:17 +0200 From: Daniel Vetter To: Rob Clark Cc: Daniel Vetter , dri-devel , Rob Clark , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , open list Subject: Re: [PATCH 1/2] drm: Fix dirtyfb stalls Message-ID: Mail-Followup-To: Rob Clark , dri-devel , Rob Clark , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , open list References: <20210508195641.397198-1-robdclark@gmail.com> <20210508195641.397198-2-robdclark@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Operating-System: Linux phenom 5.10.32scarlett+ Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, May 10, 2021 at 12:06:05PM -0700, Rob Clark wrote: > On Mon, May 10, 2021 at 10:44 AM Daniel Vetter wrote: > > > > On Mon, May 10, 2021 at 6:51 PM Rob Clark wrote: > > > > > > On Mon, May 10, 2021 at 9:14 AM Daniel Vetter wrote: > > > > > > > > On Sat, May 08, 2021 at 12:56:38PM -0700, Rob Clark wrote: > > > > > From: Rob Clark > > > > > > > > > > drm_atomic_helper_dirtyfb() will end up stalling for vblank on "video > > > > > mode" type displays, which is pointless and unnecessary. Add an > > > > > optional helper vfunc to determine if a plane is attached to a CRTC > > > > > that actually needs dirtyfb, and skip over them. > > > > > > > > > > Signed-off-by: Rob Clark > > > > > > > > So this is a bit annoying because the idea of all these "remap legacy uapi > > > > to atomic constructs" helpers is that they shouldn't need/use anything > > > > beyond what userspace also has available. So adding hacks for them feels > > > > really bad. > > > > > > I suppose the root problem is that userspace doesn't know if dirtyfb > > > (or similar) is actually required or is a no-op. > > > > > > But it is perhaps less of a problem because this essentially boils > > > down to "x11 vs wayland", and it seems like wayland compositors for > > > non-vsync'd rendering just pageflips and throws away extra frames from > > > the app? > > > > Yeah it's about not adequately batching up rendering and syncing with > > hw. bare metal x11 is just especially stupid about it :-) > > > > > > Also I feel like it's not entirely the right thing to do here either. > > > > We've had this problem already on the fbcon emulation side (which also > > > > shouldn't be able to peek behind the atomic kms uapi curtain), and the fix > > > > there was to have a worker which batches up all the updates and avoids any > > > > stalls in bad places. > > > > > > I'm not too worried about fbcon not being able to render faster than > > > vblank. OTOH it is a pretty big problem for x11 > > > > That's why we'd let the worker get ahead at most one dirtyfb. We do > > the same with fbcon, which trivially can get ahead of vblank otherwise > > (if sometimes flushes each character, so you have to pile them up into > > a single update if that's still pending). > > > > > > Since this is for frontbuffer rendering userspace only we can probably get > > > > away with assuming there's only a single fb, so the implementation becomes > > > > pretty simple: > > > > > > > > - 1 worker, and we keep track of a single pending fb > > > > - if there's already a dirty fb pending on a different fb, we stall for > > > > the worker to start processing that one already (i.e. the fb we track is > > > > reset to NULL) > > > > - if it's pending on the same fb we just toss away all the updates and go > > > > with a full update, since merging the clip rects is too much work :-) I > > > > think there's helpers so you could be slightly more clever and just have > > > > an overall bounding box > > > > > > This doesn't really fix the problem, you still end up delaying sending > > > the next back-buffer to mesa > > > > With this the dirtyfb would never block. Also glorious frontbuffer > > tracking corruption is possible, but that's not the kernel's problem. > > So how would anything get held up in userspace. > > the part about stalling if a dirtyfb is pending was what I was worried > about.. but I suppose you meant the worker stalling, rather than > userspace stalling (where I had interpreted it the other way around). > As soon as userspace needs to stall, you're losing again. Nah, I did mean userspace stalling, so we can't pile up unlimited amounts of dirtyfb request in the kernel. But also I never expect userspace that uses dirtyfb to actually hit this stall point (otherwise we'd need to look at this again). It would really be only there as defense against abuse. > > > But we could re-work drm_framebuffer_funcs::dirty to operate on a > > > per-crtc basis and hoist the loop and check if dirtyfb is needed out > > > of drm_atomic_helper_dirtyfb() > > > > That's still using information that userspace doesn't have, which is a > > bit irky. We might as well go with your thing here then. > > arguably, this is something we should expose to userspace.. for DSI > command-mode panels, you probably want to make a different decision > with regard to how many buffers in your flip-chain.. > > Possibly we should add/remove the fb_damage_clips property depending > on the display type (ie. video/pull vs cmd/push mode)? I'm not sure whether atomic actually needs this exposed: - clients will do full flips for every frame anyway, I've not heard of anyone seriously doing frontbuffer rendering. - transporting the cliprects around and then tossing them if the driver doesn't need them in their flip is probably not a measurable win But yeah if I'm wrong and we have a need here and it's useful, then exposing this to userspace should be done. Meanwhile I think a "offload to worker like fbcon" trick for this legacy interface is probabyl the best option. Plus it will fix things not just for the case where you don't need dirty uploading, it will also fix things for the case where you _do_ need dirty uploading (since right now we stall in a few bad places for that I think). -Daniel > > BR, > -R > > > -Daniel > > > > > BR, > > > -R > > > > > > > > > > > Could probably steal most of the implementation. > > > > > > > > This approach here feels a tad too much in the hacky area ... > > > > > > > > Thoughts? > > > > -Daniel > > > > > > > > > --- > > > > > drivers/gpu/drm/drm_damage_helper.c | 8 ++++++++ > > > > > include/drm/drm_modeset_helper_vtables.h | 14 ++++++++++++++ > > > > > 2 files changed, 22 insertions(+) > > > > > > > > > > diff --git a/drivers/gpu/drm/drm_damage_helper.c b/drivers/gpu/drm/drm_damage_helper.c > > > > > index 3a4126dc2520..a0bed1a2c2dc 100644 > > > > > --- a/drivers/gpu/drm/drm_damage_helper.c > > > > > +++ b/drivers/gpu/drm/drm_damage_helper.c > > > > > @@ -211,6 +211,7 @@ int drm_atomic_helper_dirtyfb(struct drm_framebuffer *fb, > > > > > retry: > > > > > drm_for_each_plane(plane, fb->dev) { > > > > > struct drm_plane_state *plane_state; > > > > > + struct drm_crtc *crtc; > > > > > > > > > > ret = drm_modeset_lock(&plane->mutex, state->acquire_ctx); > > > > > if (ret) > > > > > @@ -221,6 +222,13 @@ int drm_atomic_helper_dirtyfb(struct drm_framebuffer *fb, > > > > > continue; > > > > > } > > > > > > > > > > + crtc = plane->state->crtc; > > > > > + if (crtc->helper_private->needs_dirtyfb && > > > > > + !crtc->helper_private->needs_dirtyfb(crtc)) { > > > > > + drm_modeset_unlock(&plane->mutex); > > > > > + continue; > > > > > + } > > > > > + > > > > > plane_state = drm_atomic_get_plane_state(state, plane); > > > > > if (IS_ERR(plane_state)) { > > > > > ret = PTR_ERR(plane_state); > > > > > diff --git a/include/drm/drm_modeset_helper_vtables.h b/include/drm/drm_modeset_helper_vtables.h > > > > > index eb706342861d..afa8ec5754e7 100644 > > > > > --- a/include/drm/drm_modeset_helper_vtables.h > > > > > +++ b/include/drm/drm_modeset_helper_vtables.h > > > > > @@ -487,6 +487,20 @@ struct drm_crtc_helper_funcs { > > > > > bool in_vblank_irq, int *vpos, int *hpos, > > > > > ktime_t *stime, ktime_t *etime, > > > > > const struct drm_display_mode *mode); > > > > > + > > > > > + /** > > > > > + * @needs_dirtyfb > > > > > + * > > > > > + * Optional callback used by damage helpers to determine if fb_damage_clips > > > > > + * update is needed. > > > > > + * > > > > > + * Returns: > > > > > + * > > > > > + * True if fb_damage_clips update is needed to handle DIRTYFB, False > > > > > + * otherwise. If this callback is not implemented, then True is > > > > > + * assumed. > > > > > + */ > > > > > + bool (*needs_dirtyfb)(struct drm_crtc *crtc); > > > > > }; > > > > > > > > > > /** > > > > > -- > > > > > 2.30.2 > > > > > > > > > > > > > -- > > > > Daniel Vetter > > > > Software Engineer, Intel Corporation > > > > http://blog.ffwll.ch > > > > > > > > -- > > Daniel Vetter > > Software Engineer, Intel Corporation > > http://blog.ffwll.ch -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8EA95C433ED for ; Tue, 11 May 2021 16:44:23 +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 239A361186 for ; Tue, 11 May 2021 16:44:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 239A361186 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch 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 785456E5B2; Tue, 11 May 2021 16:44:22 +0000 (UTC) Received: from mail-ej1-x635.google.com (mail-ej1-x635.google.com [IPv6:2a00:1450:4864:20::635]) by gabe.freedesktop.org (Postfix) with ESMTPS id 19A876E7D1 for ; Tue, 11 May 2021 16:44:21 +0000 (UTC) Received: by mail-ej1-x635.google.com with SMTP id s20so25227052ejr.9 for ; Tue, 11 May 2021 09:44:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=date:from:to:cc:subject:message-id:mail-followup-to:references :mime-version:content-disposition:in-reply-to; bh=vjV0mzX/OYYldhTKbCzFjmA9xLTAvy1tenKPQWA9cMY=; b=If8rh3oqxpTSWFl3K82m7bx4dXoQIZ7uG69gLBWBQd3/tmtaUu3UEMIAvpZIsXNbfR k90MyiKwtrYw3oHVZsH1OxWjEO9pSM7x5bvLniYANfIhgYInOGb1+XtpRnW+3nWHqbA8 76tkN2+LPcKr2nZR7xBw8jf+YEnhWhXtGG2m0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id :mail-followup-to:references:mime-version:content-disposition :in-reply-to; bh=vjV0mzX/OYYldhTKbCzFjmA9xLTAvy1tenKPQWA9cMY=; b=rf+tiZDzr+5zIxAIg7pIrMj4ISdsKcBuOI23pdYZUqC1lq5aoTs+VEKhvPnWlPdmBQ vD7T2UoJtsQaNCm473mCHMx2oEazLZc7af3u45UDINOTgON+HHh8LURcLEVJ6kPitVOw fwFmTyqgMRZ6QG3MsuhvvPgYjmV5IAmNDlJbiyaMG60fVXVNZ1APVljoQEf79KYkfElr +HajkjHE1FiWI8Nk0mJWIKST4zCB0YuLNAH7oN8n9mKfCLgrTDwLEPT3ERBGZz5RjrR1 5i5qJOgK5cpXNEpszlUaaOCiKxfdRACSgO6qQzPBMeZOyxybJFJ7c3Nvijxpy8F1O0Ah 8QBw== X-Gm-Message-State: AOAM530X6RiUMTLn+08ETQBKdgITjcsITfYB8Lvn+rP9/84PiMCAn3wP Q5FndqC01PCbu8QmaYxVLuWa+Q== X-Google-Smtp-Source: ABdhPJwP216Ldhe6W79xvbaQ0XmCjn1UuS/CGKUBuXyfbl2GBz9n+tGkrQmJpVVndQrF/JY9mjdPPg== X-Received: by 2002:a17:907:3e28:: with SMTP id hp40mr9818965ejc.523.1620751459752; Tue, 11 May 2021 09:44:19 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id p18sm11919455ejb.19.2021.05.11.09.44.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 May 2021 09:44:19 -0700 (PDT) Date: Tue, 11 May 2021 18:44:17 +0200 From: Daniel Vetter To: Rob Clark Subject: Re: [PATCH 1/2] drm: Fix dirtyfb stalls Message-ID: Mail-Followup-To: Rob Clark , dri-devel , Rob Clark , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , open list References: <20210508195641.397198-1-robdclark@gmail.com> <20210508195641.397198-2-robdclark@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Operating-System: Linux phenom 5.10.32scarlett+ 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: Rob Clark , David Airlie , open list , dri-devel , Thomas Zimmermann Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Mon, May 10, 2021 at 12:06:05PM -0700, Rob Clark wrote: > On Mon, May 10, 2021 at 10:44 AM Daniel Vetter wrote: > > > > On Mon, May 10, 2021 at 6:51 PM Rob Clark wrote: > > > > > > On Mon, May 10, 2021 at 9:14 AM Daniel Vetter wrote: > > > > > > > > On Sat, May 08, 2021 at 12:56:38PM -0700, Rob Clark wrote: > > > > > From: Rob Clark > > > > > > > > > > drm_atomic_helper_dirtyfb() will end up stalling for vblank on "video > > > > > mode" type displays, which is pointless and unnecessary. Add an > > > > > optional helper vfunc to determine if a plane is attached to a CRTC > > > > > that actually needs dirtyfb, and skip over them. > > > > > > > > > > Signed-off-by: Rob Clark > > > > > > > > So this is a bit annoying because the idea of all these "remap legacy uapi > > > > to atomic constructs" helpers is that they shouldn't need/use anything > > > > beyond what userspace also has available. So adding hacks for them feels > > > > really bad. > > > > > > I suppose the root problem is that userspace doesn't know if dirtyfb > > > (or similar) is actually required or is a no-op. > > > > > > But it is perhaps less of a problem because this essentially boils > > > down to "x11 vs wayland", and it seems like wayland compositors for > > > non-vsync'd rendering just pageflips and throws away extra frames from > > > the app? > > > > Yeah it's about not adequately batching up rendering and syncing with > > hw. bare metal x11 is just especially stupid about it :-) > > > > > > Also I feel like it's not entirely the right thing to do here either. > > > > We've had this problem already on the fbcon emulation side (which also > > > > shouldn't be able to peek behind the atomic kms uapi curtain), and the fix > > > > there was to have a worker which batches up all the updates and avoids any > > > > stalls in bad places. > > > > > > I'm not too worried about fbcon not being able to render faster than > > > vblank. OTOH it is a pretty big problem for x11 > > > > That's why we'd let the worker get ahead at most one dirtyfb. We do > > the same with fbcon, which trivially can get ahead of vblank otherwise > > (if sometimes flushes each character, so you have to pile them up into > > a single update if that's still pending). > > > > > > Since this is for frontbuffer rendering userspace only we can probably get > > > > away with assuming there's only a single fb, so the implementation becomes > > > > pretty simple: > > > > > > > > - 1 worker, and we keep track of a single pending fb > > > > - if there's already a dirty fb pending on a different fb, we stall for > > > > the worker to start processing that one already (i.e. the fb we track is > > > > reset to NULL) > > > > - if it's pending on the same fb we just toss away all the updates and go > > > > with a full update, since merging the clip rects is too much work :-) I > > > > think there's helpers so you could be slightly more clever and just have > > > > an overall bounding box > > > > > > This doesn't really fix the problem, you still end up delaying sending > > > the next back-buffer to mesa > > > > With this the dirtyfb would never block. Also glorious frontbuffer > > tracking corruption is possible, but that's not the kernel's problem. > > So how would anything get held up in userspace. > > the part about stalling if a dirtyfb is pending was what I was worried > about.. but I suppose you meant the worker stalling, rather than > userspace stalling (where I had interpreted it the other way around). > As soon as userspace needs to stall, you're losing again. Nah, I did mean userspace stalling, so we can't pile up unlimited amounts of dirtyfb request in the kernel. But also I never expect userspace that uses dirtyfb to actually hit this stall point (otherwise we'd need to look at this again). It would really be only there as defense against abuse. > > > But we could re-work drm_framebuffer_funcs::dirty to operate on a > > > per-crtc basis and hoist the loop and check if dirtyfb is needed out > > > of drm_atomic_helper_dirtyfb() > > > > That's still using information that userspace doesn't have, which is a > > bit irky. We might as well go with your thing here then. > > arguably, this is something we should expose to userspace.. for DSI > command-mode panels, you probably want to make a different decision > with regard to how many buffers in your flip-chain.. > > Possibly we should add/remove the fb_damage_clips property depending > on the display type (ie. video/pull vs cmd/push mode)? I'm not sure whether atomic actually needs this exposed: - clients will do full flips for every frame anyway, I've not heard of anyone seriously doing frontbuffer rendering. - transporting the cliprects around and then tossing them if the driver doesn't need them in their flip is probably not a measurable win But yeah if I'm wrong and we have a need here and it's useful, then exposing this to userspace should be done. Meanwhile I think a "offload to worker like fbcon" trick for this legacy interface is probabyl the best option. Plus it will fix things not just for the case where you don't need dirty uploading, it will also fix things for the case where you _do_ need dirty uploading (since right now we stall in a few bad places for that I think). -Daniel > > BR, > -R > > > -Daniel > > > > > BR, > > > -R > > > > > > > > > > > Could probably steal most of the implementation. > > > > > > > > This approach here feels a tad too much in the hacky area ... > > > > > > > > Thoughts? > > > > -Daniel > > > > > > > > > --- > > > > > drivers/gpu/drm/drm_damage_helper.c | 8 ++++++++ > > > > > include/drm/drm_modeset_helper_vtables.h | 14 ++++++++++++++ > > > > > 2 files changed, 22 insertions(+) > > > > > > > > > > diff --git a/drivers/gpu/drm/drm_damage_helper.c b/drivers/gpu/drm/drm_damage_helper.c > > > > > index 3a4126dc2520..a0bed1a2c2dc 100644 > > > > > --- a/drivers/gpu/drm/drm_damage_helper.c > > > > > +++ b/drivers/gpu/drm/drm_damage_helper.c > > > > > @@ -211,6 +211,7 @@ int drm_atomic_helper_dirtyfb(struct drm_framebuffer *fb, > > > > > retry: > > > > > drm_for_each_plane(plane, fb->dev) { > > > > > struct drm_plane_state *plane_state; > > > > > + struct drm_crtc *crtc; > > > > > > > > > > ret = drm_modeset_lock(&plane->mutex, state->acquire_ctx); > > > > > if (ret) > > > > > @@ -221,6 +222,13 @@ int drm_atomic_helper_dirtyfb(struct drm_framebuffer *fb, > > > > > continue; > > > > > } > > > > > > > > > > + crtc = plane->state->crtc; > > > > > + if (crtc->helper_private->needs_dirtyfb && > > > > > + !crtc->helper_private->needs_dirtyfb(crtc)) { > > > > > + drm_modeset_unlock(&plane->mutex); > > > > > + continue; > > > > > + } > > > > > + > > > > > plane_state = drm_atomic_get_plane_state(state, plane); > > > > > if (IS_ERR(plane_state)) { > > > > > ret = PTR_ERR(plane_state); > > > > > diff --git a/include/drm/drm_modeset_helper_vtables.h b/include/drm/drm_modeset_helper_vtables.h > > > > > index eb706342861d..afa8ec5754e7 100644 > > > > > --- a/include/drm/drm_modeset_helper_vtables.h > > > > > +++ b/include/drm/drm_modeset_helper_vtables.h > > > > > @@ -487,6 +487,20 @@ struct drm_crtc_helper_funcs { > > > > > bool in_vblank_irq, int *vpos, int *hpos, > > > > > ktime_t *stime, ktime_t *etime, > > > > > const struct drm_display_mode *mode); > > > > > + > > > > > + /** > > > > > + * @needs_dirtyfb > > > > > + * > > > > > + * Optional callback used by damage helpers to determine if fb_damage_clips > > > > > + * update is needed. > > > > > + * > > > > > + * Returns: > > > > > + * > > > > > + * True if fb_damage_clips update is needed to handle DIRTYFB, False > > > > > + * otherwise. If this callback is not implemented, then True is > > > > > + * assumed. > > > > > + */ > > > > > + bool (*needs_dirtyfb)(struct drm_crtc *crtc); > > > > > }; > > > > > > > > > > /** > > > > > -- > > > > > 2.30.2 > > > > > > > > > > > > > -- > > > > Daniel Vetter > > > > Software Engineer, Intel Corporation > > > > http://blog.ffwll.ch > > > > > > > > -- > > Daniel Vetter > > Software Engineer, Intel Corporation > > http://blog.ffwll.ch -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch