From patchwork Wed Nov 15 13:15:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Martinez Canillas X-Patchwork-Id: 165348 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp2528838vqg; Wed, 15 Nov 2023 05:16:44 -0800 (PST) X-Google-Smtp-Source: AGHT+IHWyjsqUq/2nsLJ66Ub8SihL7R0wnFey3luBdC++moadP/ZtztiIaQvLS++Q+nLn440gSfo X-Received: by 2002:a17:902:e88e:b0:1c5:6157:f073 with SMTP id w14-20020a170902e88e00b001c56157f073mr5796598plg.11.1700054204356; Wed, 15 Nov 2023 05:16:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700054204; cv=none; d=google.com; s=arc-20160816; b=yICiMtbJ5d2udFX7+alAilqb9RrK/IiaqVkDM27C08q7Lefk5M4JYHpColbVNd9xHv Kh8Kt0ysn2xZzHm7Je5jD7kroH7LNEO3g07FIRg7/Ow7dD4FvpIjRNpbIwivI0+YkGnX 8phudGpUOkSGhxtL9LLlntaVNn8VOKpzfuS3TPv1V8aNEc1/f0nOfF0gbEF36TXZ/YIu o2+fdvcGCJFZ1RvnDDd1J8hMxKagPkZkaXQ162xMKX3zH7Sn9HkNWwOioF/GahPztRWJ CdqolM4L/Ga0nb5xanJxVkxQpPQ9UPS1QPIHrombntDNVbou3iPWCZJ1a7lWM94bHWwE gsug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=B8baLtlzsuyZcOKODOHaJ6HAGilgrqHGy9qmPbinQNI=; fh=gQH0gtQq4Wco3BHMNJntyI4cForNBL6LoHgScR6cMTc=; b=BB5VECXOTdidxMZYHh9bQIblBKmdW57FWVedc90Uhnk8y4wPGdy6AotqWtkberzKn8 nDA254WlWZ4Q7c7IB0pZ7Vy+3Nd77xm/p+StkFInU8PskuHtCuSRWMj6z/i7z132dRXP 5OxWTO0EqDcmq92lpp1lHnQ/roLci13Iew8z0ASUhUClfVZkPzNsJkE4OaC2Jp0mFIlo g/bpvrEVsRWmF/7LJ2nXGkF1HSv/AuXbXEgIKTAVeg5/HWJa40OX+5f1opzOogSwwGyg k6nB+TZ+ynMlpz0DZl/7b/Rb8FcVVfQCMS4hGe+P5QFbKoyHPEJZLSpYW4E7yZnQHuxt V6+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=O86MNo8X; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id p8-20020a170902bd0800b001cc41020674si9820497pls.518.2023.11.15.05.16.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Nov 2023 05:16:44 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=O86MNo8X; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 195008028F98; Wed, 15 Nov 2023 05:16:38 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343913AbjKONQJ (ORCPT + 28 others); Wed, 15 Nov 2023 08:16:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44852 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343852AbjKONQE (ORCPT ); Wed, 15 Nov 2023 08:16:04 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 42B6A121 for ; Wed, 15 Nov 2023 05:16:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700054160; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=B8baLtlzsuyZcOKODOHaJ6HAGilgrqHGy9qmPbinQNI=; b=O86MNo8XLmmMSWx7rTO83xbBvLRLPbDHCnqHqvFN/SUx75ZRwMFmX06T4YdBPnRzTI4S+L LqbdyVwtt+Rx0sW6Ohl5GsRKOBAFJbxdGpo5AbbSZI2n0c/eEep5PVUHuhuuFhDT85JJ+W uIlNo8+FAwGtqjYQt9zgbCKakpC/7Ro= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-404-fkBQZ8oZPQq7uZijr4kYDw-1; Wed, 15 Nov 2023 08:15:59 -0500 X-MC-Unique: fkBQZ8oZPQq7uZijr4kYDw-1 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-3314bd215ceso1455734f8f.2 for ; Wed, 15 Nov 2023 05:15:59 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700054157; x=1700658957; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=B8baLtlzsuyZcOKODOHaJ6HAGilgrqHGy9qmPbinQNI=; b=mC9YcX02cLfCw0xyZbwrxEJVu1hNY68fxzHREbZ5xyrzz6ZyNuJtubhpDCipcjwLAs uqqBQJzl0lFXyxSzVXvHdDgRFB62cL8y9zgZS3d31+KnuxT8nM/4Y0iOopsANC/c6wXO tbn82YAmSW61UkE0vv+GY7IT2yg8wXqNG1x5sWA9hjQJ6vhouo8ANRszLytyfWSbK+mv jDJ/NmCHDdn67y2sUFtJK+M4PwdtRR9FOqSJSNMgqr+AfoA6Jo1vsHtTFqM7eoKae7Ka MqjugzCOhQqiYWSrRntg39lva0Bl7KRfCWyMw3Yu66d5svF9wZfo+AWLm5l5MfWk+kpa AuDQ== X-Gm-Message-State: AOJu0YwFBF6bfzJfKNOGSb2hSxA8F/Iy8xJ46J0nOUfnpKcTybdW2N1o ST2WtGDyHEETZtPr8gvOtttz4NmPVzTaQv+u9Bly+NEM1n8i1y48Oo9+1DiPP9VcCei5JNMeUoT Zf3XipzdlVlPZ+hZZt0NRbXq1axM8wvXmiBDyd7kCs6MkT3rqrZdi2herB48hyf34kt23K/Vuir TfQhLntes= X-Received: by 2002:a5d:6d89:0:b0:32f:7b14:89d9 with SMTP id l9-20020a5d6d89000000b0032f7b1489d9mr10958302wrs.9.1700054157156; Wed, 15 Nov 2023 05:15:57 -0800 (PST) X-Received: by 2002:a5d:6d89:0:b0:32f:7b14:89d9 with SMTP id l9-20020a5d6d89000000b0032f7b1489d9mr10958258wrs.9.1700054156678; Wed, 15 Nov 2023 05:15:56 -0800 (PST) Received: from localhost (205.pool92-176-231.dynamic.orange.es. [92.176.231.205]) by smtp.gmail.com with ESMTPSA id h15-20020a5d548f000000b0032fbe5b1e45sm10507123wrv.61.2023.11.15.05.15.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Nov 2023 05:15:55 -0800 (PST) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Maxime Ripard , Bilal Elmoussaoui , Simon Ser , Erico Nunes , Pekka Paalanen , Thomas Zimmermann , Sima Vetter , Javier Martinez Canillas , stable@vger.kernel.org, nerdopolis , Chia-I Wu , Daniel Vetter , David Airlie , Gerd Hoffmann , Gurchetan Singh , Maarten Lankhorst , dri-devel@lists.freedesktop.org, virtualization@lists.linux.dev Subject: [PATCH v2 2/5] drm/virtio: Disable damage clipping if FB changed since last page-flip Date: Wed, 15 Nov 2023 14:15:41 +0100 Message-ID: <20231115131549.2191589-3-javierm@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231115131549.2191589-1-javierm@redhat.com> References: <20231115131549.2191589-1-javierm@redhat.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.0 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Wed, 15 Nov 2023 05:16:38 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782636037144939397 X-GMAIL-MSGID: 1782636037144939397 The driver does per-buffer uploads and needs to force a full plane update if the plane's attached framebuffer has change since the last page-flip. Fixes: 01f05940a9a7 ("drm/virtio: Enable fb damage clips property for the primary plane") Cc: # v6.4+ Reported-by: nerdopolis Closes: https://bugzilla.kernel.org/show_bug.cgi?id=218115 Suggested-by: Sima Vetter Signed-off-by: Javier Martinez Canillas --- Changes in v2: - Set struct drm_plane_state .ignore_damage_clips in virtio-gpu plane's .atomic_check instead of using a different helpers (Thomas Zimmermann). drivers/gpu/drm/virtio/virtgpu_plane.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/gpu/drm/virtio/virtgpu_plane.c b/drivers/gpu/drm/virtio/virtgpu_plane.c index a2e045f3a000..a1ef657eba07 100644 --- a/drivers/gpu/drm/virtio/virtgpu_plane.c +++ b/drivers/gpu/drm/virtio/virtgpu_plane.c @@ -79,6 +79,8 @@ static int virtio_gpu_plane_atomic_check(struct drm_plane *plane, { struct drm_plane_state *new_plane_state = drm_atomic_get_new_plane_state(state, plane); + struct drm_plane_state *old_plane_state = drm_atomic_get_old_plane_state(state, + plane); bool is_cursor = plane->type == DRM_PLANE_TYPE_CURSOR; struct drm_crtc_state *crtc_state; int ret; @@ -86,6 +88,14 @@ static int virtio_gpu_plane_atomic_check(struct drm_plane *plane, if (!new_plane_state->fb || WARN_ON(!new_plane_state->crtc)) return 0; + /* + * Ignore damage clips if the framebuffer attached to the plane's state + * has changed since the last plane update (page-flip). In this case, a + * full plane update should happen because uploads are done per-buffer. + */ + if (old_plane_state->fb != new_plane_state->fb) + new_plane_state->ignore_damage_clips = true; + crtc_state = drm_atomic_get_crtc_state(state, new_plane_state->crtc); if (IS_ERR(crtc_state))