Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp478351ybl; Fri, 10 Jan 2020 01:47:50 -0800 (PST) X-Google-Smtp-Source: APXvYqx7hj016PZfkH+NkhjigAHdSJ0Je6tCBQnLpxcVWf6mIIPf3P4sK1CcBvbSfUipnbBg9C4Z X-Received: by 2002:a9d:7e8a:: with SMTP id m10mr1696104otp.27.1578649670687; Fri, 10 Jan 2020 01:47:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1578649670; cv=none; d=google.com; s=arc-20160816; b=CHS8bpvmU2EbnL/PNbnMMKN0xQd+kieIhsQ89QOMGNhAx8nMnZTy/imD5ytobkFGgB xSkxnxkCUgCrCUqvmd/E8ZxiUBINzJn6sT0xVYNvSi18YEHeP7aPi+NJxniVvfK5GCl1 tzaJfUMRhJyCxqeU2hLjZ0fnOOYh/1zbfjEaASTcQBQ+0KWk2LX57n5hHMVwhUK7Xer/ 3tdTQuEilhmhGehi2gglKb5a3e5x5fnXINfFytGhJwTAcjDWt/xt9UxSZRhV7V2Nk1o9 flrwmKKwNGBDe3KPzKlorzdxi1ic16N8aWpIVCmt16o3gznuz8btfOxkRzBkf5jOh16h nLvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature; bh=3Bjxye7nXEN8DZWgb9uCaUhoYDYYa6n7XP6x/kFHIr4=; b=KTFNeKTrBPU104VSABxX/ZoGPl1zauBZ1i7L5UvhiABRMNAYzXTxaD9I98HLc+Rxoj IZuQEIJGmYG1HVrkeT0ZsLKjyKRq5dChVrLWdnUB5tyf7ZFB6kiyDiVZ3dAy74DIeJHj MirTJ4JpLBjHdSgifqJUev3rBp0zeX6pOjjrr0H20HWE6on7T0Gltx4RC/PqZY54If9Y 48dvmNWFFxwywIY1fzXNJLhUTmzOJsouzcRuvwGkFb2blQeRa+Dvz5er91Z8PitJCRHP fylOijZhWBMqCDmvdgi5XhSi0zNZgZK++40RZVBTW/u9tymksmdKNbo7e4rSIVnrpB9R yiDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=ZJGLF1Q1; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g14si919658otl.258.2020.01.10.01.47.39; Fri, 10 Jan 2020 01:47:50 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=ZJGLF1Q1; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727297AbgAJJpr (ORCPT + 99 others); Fri, 10 Jan 2020 04:45:47 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:43045 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727273AbgAJJpr (ORCPT ); Fri, 10 Jan 2020 04:45:47 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578649545; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc; bh=3Bjxye7nXEN8DZWgb9uCaUhoYDYYa6n7XP6x/kFHIr4=; b=ZJGLF1Q1Wzpa0s97PSKK48wVARPbs2hCwDM1RT823RqQQPDJHdGDl9rm2lUm57VXCISJut UhtuUS1tLh8fCNXIuOk9sLwGxE4toIQTODhauAK/UA9D/LSmmghsUwbPszBe+7NAyFLqao d+wnstN8jhBPVPo6DHQ0OxyRD609ANs= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-412-meg9DrUpPZmOGRGq3eT1tA-1; Fri, 10 Jan 2020 04:45:41 -0500 X-MC-Unique: meg9DrUpPZmOGRGq3eT1tA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4FA36800D41; Fri, 10 Jan 2020 09:45:39 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-98.ams2.redhat.com [10.36.116.98]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6A9715C1B5; Fri, 10 Jan 2020 09:45:36 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 773F048E0; Fri, 10 Jan 2020 10:45:35 +0100 (CET) From: Gerd Hoffmann To: dri-devel@lists.freedesktop.org Cc: gurchetansingh@chromium.org, olvaffe@gmail.com, jannh@google.com, Gerd Hoffmann , David Airlie , Daniel Vetter , virtualization@lists.linux-foundation.org (open list:VIRTIO GPU DRIVER), linux-kernel@vger.kernel.org (open list) Subject: [PATCH] drm/virtio: add missing virtio_gpu_array_lock_resv call Date: Fri, 10 Jan 2020 10:45:35 +0100 Message-Id: <20200110094535.23472-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When submitting a fenced command we must lock the object reservations because virtio_gpu_queue_fenced_ctrl_buffer() unlocks after adding the fence. Reported-by: Jann Horn Signed-off-by: Gerd Hoffmann --- drivers/gpu/drm/virtio/virtgpu_plane.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/virtio/virtgpu_plane.c b/drivers/gpu/drm/virtio/virtgpu_plane.c index 390524143139..1635a9ff4794 100644 --- a/drivers/gpu/drm/virtio/virtgpu_plane.c +++ b/drivers/gpu/drm/virtio/virtgpu_plane.c @@ -232,6 +232,7 @@ static void virtio_gpu_cursor_plane_update(struct drm_plane *plane, if (!objs) return; virtio_gpu_array_add_obj(objs, vgfb->base.obj[0]); + virtio_gpu_array_lock_resv(objs); virtio_gpu_cmd_transfer_to_host_2d (vgdev, 0, plane->state->crtc_w, -- 2.18.1