From patchwork Thu Nov 9 17:24:37 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: 163525 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b129:0:b0:403:3b70:6f57 with SMTP id q9csp588987vqs; Thu, 9 Nov 2023 09:26:51 -0800 (PST) X-Google-Smtp-Source: AGHT+IHlttbwodIcHVt0MV6XDMNTRBXn03L+ztcX8q2mg6iR9diQn0tH6G7LUlXCMynCNsmVHX6y X-Received: by 2002:a05:6a21:a581:b0:180:7df:76a4 with SMTP id gd1-20020a056a21a58100b0018007df76a4mr5398652pzc.45.1699550811499; Thu, 09 Nov 2023 09:26:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699550811; cv=none; d=google.com; s=arc-20160816; b=0HmPDyVthrdchBPJdVP5gmTZ6hWQOCJOEUuJ+rEA6lfedjoIIW7Z38XX/Eh94yHT7J MSsg7nPk20TFksbgMQtxlaXH33V29mx9GIqVmUxyyOChMoxKFAoUVip17pOO0WQCsgDW I45eNRnqqmZ3x4i3DoRl84W61i2RdhRyYMZK0OmQR5EG5qLnBV4K+r/3j9XlxXblpwoF Qaje1gqllrG0F3xQYmyYfFE7deW1u+zacXnexYBaLW4Ddailast+MPB+OIKos4V1TXOX 8vAFokEbkmworWEAy08+gFJpGcAmY9JK2SGGqZH5E7UruKyQYvRqgR7+hrXqqF/zUZWy 8NGA== 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=Y0steN0/ACKFTtJOvpHMkiOMUe7bddz5OgwOILeHxPA=; fh=olY/imv5iLuThp9ORbG7b2DqjjbrwsfOkG1dic5JhFY=; b=ONwtHcF2LmpOBQco0BbvzOc0Y7SeNqFrroEBvDfk3TyRfp2jK8B9xvc+8tgSl6fVeT WInTzzy7vgIIGF1aX9wrT13nztASMvmY8mdfFKTwSOZtEGgL5PEoitnWCZVHiU9zUiU6 zP/lQlIuA+raP5efxbKjSG4N96KEElyM4h/IzLuQnNwGOVOJfvBj6atfsAtDnTkqQu1A /OqcWyz3CJNHbwg2ne+RnunrVcuDDgPTlzAqrvdJOmk0qtP25CuBmu3g79VwPxteZ4aw c9Ubo+iy6zrcoyBf/3QpPPdUg/rNeyG8xiSoJlKjppoSNV4fN6YJrMn4H9UpqOesYkSE aORQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=LZutde8n; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 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 lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id in7-20020a17090b438700b002773af24826si2124161pjb.123.2023.11.09.09.26.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Nov 2023 09:26:51 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=LZutde8n; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 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 lipwig.vger.email (Postfix) with ESMTP id 2EEC2819CC15; Thu, 9 Nov 2023 09:26:45 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344256AbjKIR0L (ORCPT + 31 others); Thu, 9 Nov 2023 12:26:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43714 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344556AbjKIR0A (ORCPT ); Thu, 9 Nov 2023 12:26:00 -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 18C4235BC for ; Thu, 9 Nov 2023 09:25:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1699550716; 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=Y0steN0/ACKFTtJOvpHMkiOMUe7bddz5OgwOILeHxPA=; b=LZutde8nifGetZOoGaJyDm42ry3qHT2mwHdnmjQtynnXKrvWeUHcvrFBL0jLk7R+gwaZuc /EJFpLVc6xE9g8aUNrNmPxyv706CICodU/WFtFmmdg2mh2UZ47th0TZcm4AqW72UhZN/nW /RrdSR02s5CMW3g91yZZ/XZDRR8z338= Received: from mail-lf1-f70.google.com (mail-lf1-f70.google.com [209.85.167.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-592-LzTXkVDwMW60EJV4my14Iw-1; Thu, 09 Nov 2023 12:25:14 -0500 X-MC-Unique: LzTXkVDwMW60EJV4my14Iw-1 Received: by mail-lf1-f70.google.com with SMTP id 2adb3069b0e04-5079c865541so1062148e87.3 for ; Thu, 09 Nov 2023 09:25:13 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699550712; x=1700155512; 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=Y0steN0/ACKFTtJOvpHMkiOMUe7bddz5OgwOILeHxPA=; b=RZCBPlinFfAhcIzNRMxw/w2s/f3Ht1rPifcg61xsePvplRiFJNQt/tw8MOkJTmazRp hYrhuUWoVkOeuzb6e393kFzUc99AtjDW1bwKye4COULYl+ug4pDR454PTIZ28zxTO6FW 81ARI3m8mQtaontKTvx8DfbKiH2R4a9OKAoHzHqLbGYNnR3a27tD5fQOd0+9HfvCiAgE yPTUVplW9twoCj53Tek+H49kF9SGbnjkzdnhq3pMq76AfUA8vkb279Zh25ht2tZL8NNl rtnotI/xyPuAX7anS/3IpS6NSoQQ0BboJZoD/z9hu1v6CbMn41NzHp2hZL9H6Ug/5ueE behA== X-Gm-Message-State: AOJu0YxtCOptIksOwHAjAQFwpuJnQOVdpyTqV54vMscN3oddbsLpoAt7 3yWfxqcvzADGaVx8TNYEqD/FIvNq+IsFoeaTRs6JDm5806erk1Zd76F33NkqHi6fZBL1k3tAtj0 No45yFUbzHOENHaKq+CEgangdR1plV5z4EZxgCRWqO4bmK+kNw9fWl4KVGtS0LT2TVRLITAmga2 W8H03cEMs= X-Received: by 2002:a19:e007:0:b0:507:b935:9f5f with SMTP id x7-20020a19e007000000b00507b9359f5fmr1877882lfg.24.1699550712376; Thu, 09 Nov 2023 09:25:12 -0800 (PST) X-Received: by 2002:a19:e007:0:b0:507:b935:9f5f with SMTP id x7-20020a19e007000000b00507b9359f5fmr1877857lfg.24.1699550712088; Thu, 09 Nov 2023 09:25:12 -0800 (PST) Received: from localhost (205.pool92-176-231.dynamic.orange.es. [92.176.231.205]) by smtp.gmail.com with ESMTPSA id f15-20020a056000128f00b00323293bd023sm135806wrx.6.2023.11.09.09.25.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Nov 2023 09:25:11 -0800 (PST) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Simon Ser , Sima Vetter , Pekka Paalanen , Maxime Ripard , Bilal Elmoussaoui , Erico Nunes , Javier Martinez Canillas , stable@vger.kernel.org, nerdopolis , Chia-I Wu , Daniel Vetter , David Airlie , Gerd Hoffmann , Gurchetan Singh , Maarten Lankhorst , Thomas Zimmermann , dri-devel@lists.freedesktop.org, virtualization@lists.linux-foundation.org Subject: [PATCH 3/6] drm/virtio: Use drm_atomic_helper_buffer_damage_merged() for buffer damage Date: Thu, 9 Nov 2023 18:24:37 +0100 Message-ID: <20231109172449.1599262-4-javierm@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231109172449.1599262-1-javierm@redhat.com> References: <20231109172449.1599262-1-javierm@redhat.com> MIME-Version: 1.0 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 (lipwig.vger.email [0.0.0.0]); Thu, 09 Nov 2023 09:26:45 -0800 (PST) X-Spam-Status: No, score=-0.9 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 lipwig.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782108191814192399 X-GMAIL-MSGID: 1782108191814192399 The driver does per-buffer uploads. It needs to use the damage helper that handles buffer damages, rather than the helper that handles frame damages. 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 --- drivers/gpu/drm/virtio/virtgpu_plane.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/virtio/virtgpu_plane.c b/drivers/gpu/drm/virtio/virtgpu_plane.c index a2e045f3a000..1adfd9813cde 100644 --- a/drivers/gpu/drm/virtio/virtgpu_plane.c +++ b/drivers/gpu/drm/virtio/virtgpu_plane.c @@ -183,7 +183,7 @@ static void virtio_gpu_primary_plane_update(struct drm_plane *plane, return; } - if (!drm_atomic_helper_damage_merged(old_state, plane->state, &rect)) + if (!drm_atomic_helper_buffer_damage_merged(old_state, plane->state, &rect)) return; bo = gem_to_virtio_gpu_obj(plane->state->fb->obj[0]);