From patchwork Thu Aug 9 11:46:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liran Alon X-Patchwork-Id: 10561291 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C0B13139A for ; Thu, 9 Aug 2018 11:57:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ABC7B2AED5 for ; Thu, 9 Aug 2018 11:57:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9DFAF2AEE1; Thu, 9 Aug 2018 11:57:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 414772AED5 for ; Thu, 9 Aug 2018 11:57:50 +0000 (UTC) Received: from localhost ([::1]:50065 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fnjZd-00053f-Gk for patchwork-qemu-devel@patchwork.kernel.org; Thu, 09 Aug 2018 07:57:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56250) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fnjPS-0004on-O1 for qemu-devel@nongnu.org; Thu, 09 Aug 2018 07:47:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fnjPQ-00077n-5n for qemu-devel@nongnu.org; Thu, 09 Aug 2018 07:47:18 -0400 Received: from userp2120.oracle.com ([156.151.31.85]:60642) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fnjPP-00077R-Sh for qemu-devel@nongnu.org; Thu, 09 Aug 2018 07:47:16 -0400 Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.22/8.16.0.22) with SMTP id w79BiXDE138057; Thu, 9 Aug 2018 11:47:15 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=corp-2018-07-02; bh=tnnKiaYxQJ3FobGzvwKVT/VVwhdhxQYZjcrw61UQA/M=; b=XlzSSmSY+Z+sN1n5P1lvLUPqsTPHqMlsFdUCKRC2crQSHNeioOthgB1Esq9BgJ2Y2m96 wwvVbsSzuXfslfrfEYXoxQJgMlun0fpmbgd7DZWBcM0P1mRjXvkDEZlW0wu2jtduN3go PJry0xuidmQ9eb4GR3hfjBpcuqHvvEL09FUlNCSmmc7jQwfcONOkt1GPTFpmRFq/KR5j ZZPCTzbi9PzaCqnEcGV6yQhkrhleowAYCQI1u8bOvMvqAyyAUb8BvAs/io/Lont64/BW D+j+XK9tJt2vlodstuc/33pIMLNQpp7kzyFTmVZwsd+FW+qbUFgYuhoEGPqreIZzFq2H tg== Received: from userv0022.oracle.com (userv0022.oracle.com [156.151.31.74]) by userp2120.oracle.com with ESMTP id 2kn4sq2s76-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 09 Aug 2018 11:47:14 +0000 Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by userv0022.oracle.com (8.14.4/8.14.4) with ESMTP id w79BlEAk006146 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 9 Aug 2018 11:47:14 GMT Received: from abhmp0014.oracle.com (abhmp0014.oracle.com [141.146.116.20]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id w79BlEVe032729; Thu, 9 Aug 2018 11:47:14 GMT Received: from liran-pc.ravello.local (/213.57.127.2) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 09 Aug 2018 04:47:13 -0700 From: Liran Alon To: qemu-devel@nongnu.org Date: Thu, 9 Aug 2018 14:46:19 +0300 Message-Id: <1533815202-11967-7-git-send-email-liran.alon@oracle.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1533815202-11967-1-git-send-email-liran.alon@oracle.com> References: <1533815202-11967-1-git-send-email-liran.alon@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8979 signatures=668707 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=1 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1807170000 definitions=main-1808090123 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 156.151.31.85 Subject: [Qemu-devel] [PATCH 06/29] vmsvga: Fix parse of SVGA_CMD_UPDATE_VERBOSE to consider additional opaque cookie X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: habkost@redhat.com, mtosatti@redhat.com, Liran Alon , kraxel@redhat.com, pbonzini@redhat.com, rth@twiddle.net, Leonid Shatz Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Leonid Shatz SVGA_CMD_UPDATE_VERBOSE has one more extra argument to fetch from command fifo, as compared to SVGA_CMD_UPDATE command. From Linux kernel drivers/gpu/drm/vmwgfx/device_include/svga_reg.h: "Just like SVGA_CMD_UPDATE, but also provide a per-rectangle 'reason' value, an opaque cookie which is used by internal debugging tools. Third party drivers should not use this command." Signed-off-by: Leonid Shatz Reviewed-by: Darren Kenny Signed-off-by: Liran Alon --- hw/display/vmware_vga.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c index 2fbb9e7f6c9f..d3a78809673d 100644 --- a/hw/display/vmware_vga.c +++ b/hw/display/vmware_vga.c @@ -611,8 +611,11 @@ static void vmsvga_fifo_run(struct vmsvga_state_s *s) switch (cmd = vmsvga_fifo_read(s)) { /* Implemented commands */ - case SVGA_CMD_UPDATE: case SVGA_CMD_UPDATE_VERBOSE: + /* One extra word: an opaque cookie which is used for debugging */ + len -= 1; + /* fall through */ + case SVGA_CMD_UPDATE: len -= 5; if (len < 0) { goto rewind; @@ -622,6 +625,8 @@ static void vmsvga_fifo_run(struct vmsvga_state_s *s) y = vmsvga_fifo_read(s); width = vmsvga_fifo_read(s); height = vmsvga_fifo_read(s); + if (cmd == SVGA_CMD_UPDATE_VERBOSE) + vmsvga_fifo_read(s); vmsvga_update_rect_delayed(s, x, y, width, height); break;