From patchwork Mon May 29 14:34:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Zhi A" X-Patchwork-Id: 13258674 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 86135C77B7E for ; Mon, 29 May 2023 14:35:05 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BC4FD10E05E; Mon, 29 May 2023 14:35:04 +0000 (UTC) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id D276210E04F; Mon, 29 May 2023 14:35:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1685370901; x=1716906901; h=message-id:date:to:cc:from:subject: content-transfer-encoding:mime-version; bh=d7vh+s1sSYl3QzxgBv1RoebUjjZmoqE+hcOn+Gy4MG8=; b=X3lcALnYrqntXvDbfXcS3XaMga/Dw/6WTFqGipYHP7iMMaJyUwBR60fj SV05oBWkpXcU4e61O0r3mTk6TLZVef1Z0rX0o9vBM4bNZO0MPp9jiQIgC TyDSo9tKodxlPr1S9RF5Hy5Hi4RdsQAK0NaSfKFa9WNZQ2Ct8jQ62iDPX 9iOr+t2U4Y8SMxtZEngmRwI6sfIQcY+S6ylZo48Xpf59spPZWR4yMNxRu ZslM+VyFFTaNWuMilOEb6WdC8J/9Ui7rZaUkFt6BZOejGBkwpBqe/a0+b m2bOD1Wz3vtdAY3+9XUveSALc8m5COURwTerAp5ZhBquLmFWPwYLexg8p g==; X-IronPort-AV: E=McAfee;i="6600,9927,10725"; a="354732207" X-IronPort-AV: E=Sophos;i="6.00,201,1681196400"; d="scan'208";a="354732207" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 May 2023 07:35:00 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10725"; a="656503736" X-IronPort-AV: E=Sophos;i="6.00,201,1681196400"; d="scan'208";a="656503736" Received: from fmsmsx601.amr.corp.intel.com ([10.18.126.81]) by orsmga003.jf.intel.com with ESMTP; 29 May 2023 07:35:00 -0700 Received: from fmsmsx612.amr.corp.intel.com (10.18.126.92) by fmsmsx601.amr.corp.intel.com (10.18.126.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Mon, 29 May 2023 07:34:59 -0700 Received: from fmsedg601.ED.cps.intel.com (10.1.192.135) by fmsmsx612.amr.corp.intel.com (10.18.126.92) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23 via Frontend Transport; Mon, 29 May 2023 07:34:59 -0700 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (104.47.57.45) by edgegateway.intel.com (192.55.55.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.23; Mon, 29 May 2023 07:34:59 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Bu0M2IfjePpp6JWrPuZylANG2EPi3sxOuGHL+3La1fMApfmfAvORGBNmlESMtwrBwocTczbDnMOyndIlYIX35Mihb7HgTDWls4rsU5KA5BSc6nLmi0Rurq14FE2dlVFkpKmLa9W6UcG8g/KJ4JoND1IQpk6x/hRkDCKgICeC/0hKOMimBlyoFT8eRoCZmEoHLM2JuRk67YtS5P3n6DSc7hL++ErTFh2VwOI+DGkhHAQtBgLDrDQU+8ar26HBA5aTrGikauq5PNI+V8mz5haH20ezLvjcgx0WUTxn1oRM5Cis3MOr172oSB1TqJb95UdFiZUK9YpxYuIWPkLEXFewig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=/pUlPyru0sG3whs/zDZnErKbNstiIqSd1nXeGXXw3/A=; b=fFXyUdBfdy/aAXv7tLZKWpVKzGRiT+DpjQnjlYsoIPk421IbJoatFKFeCC8qFb76rEyns5wOaxc3+aEnjxzAK60cH8kpZUdapFd0IbgnNtvQrdK1NNh7XTvoXWhtkSoPcAsnUXLlX/kT4OxOVbavomTgrAsc/kJMZYNB9uhH3Lq1gxb5ZT17Y/d+s4+TJGjvs6zC/GCRkzilRCEDeCJxsbk3v/cD20JA4KXO9fcwR9LJaUDxPrjgeX++zQP3NAfBT6spqy+5r+Qzg72ZCbewVRka4zwXb8hGXL+ieKPS070s40nFDzphmrfz9nTkhL223tJYKSXeZJz02xNskrc+Dw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; Received: from DM4PR11MB5549.namprd11.prod.outlook.com (2603:10b6:5:388::7) by DM4PR11MB5295.namprd11.prod.outlook.com (2603:10b6:5:392::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.22; Mon, 29 May 2023 14:34:58 +0000 Received: from DM4PR11MB5549.namprd11.prod.outlook.com ([fe80::1fb5:ca10:6240:e80]) by DM4PR11MB5549.namprd11.prod.outlook.com ([fe80::1fb5:ca10:6240:e80%3]) with mapi id 15.20.6433.022; Mon, 29 May 2023 14:34:58 +0000 Message-ID: <7bb5f792-dbda-791c-fc52-0131b5dcd9fd@intel.com> Date: Mon, 29 May 2023 22:34:48 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.11.0 Content-Language: en-US To: From: "Wang, Zhi A" X-ClientProxiedBy: SI2PR01CA0043.apcprd01.prod.exchangelabs.com (2603:1096:4:193::12) To DM4PR11MB5549.namprd11.prod.outlook.com (2603:10b6:5:388::7) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM4PR11MB5549:EE_|DM4PR11MB5295:EE_ X-MS-Office365-Filtering-Correlation-Id: edceb2b4-5de4-41b7-ebf7-08db6051e0aa X-LD-Processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CpOxsJL7m/ViXv/gDSR2ggP1STsTJtn4Jyg6R3Drcl1sv3JlXURQx70q3zQiU42ZL/oMSejSx4kwrPfKEZZ2Clkn+2DEPo/a4LRCYgQIVaIoERKITb7FWwOqSI8NI+rJ96hZi+qRt0p1rxgQvWUWQITcuE+zXHMIIPQwoMpjbmtFIhFH1RtkTikMhj/5CxqKy9UjN6FMP2d+u6dzDyJf/jpUn1toNp86oSq2CZeckM2eleT2upO2qVYs2WXIFN/m1ju5VH/8Nsvp+G8ikcv9PN/Bs78bQbYvcSpNsRnOXToldAuuiNHgJkGnOQkNdDBrPraU8wLgSh+YAqGfW88v/qL9UO2uL7aHwf/OcpdlJUPVvLb/vmJNd4YQqmyWVhK/0+QBOrI/l2WPQoh8UaypTmZWW1C2Uol7PTbIz5SbyeRQrr1NmOGS7oyRj/f9JXcUp/4RxByaIsO3cD504Ko2zo3Ofu/Cogo24FRXLRQZUb4sYICxtCNTjJ+edhcCU16sYLbN+JG9Et9vScJrQBFFR/aRxw0EQ6wHh4qi/VH69qjzdpSTAHHgfXjcIvE4/ikBMKbWqg0dPLSuWCNNS2h9tNRnYOOOsYnXqAwPe3aFzR3R0qKNrboRDxTiWMUtNq1BDkQkXsEBI99sn0hr4ii/PA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM4PR11MB5549.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(136003)(39860400002)(346002)(376002)(396003)(366004)(451199021)(31696002)(86362001)(6486002)(41300700001)(6916009)(4326008)(6666004)(316002)(66556008)(66476007)(66946007)(36756003)(5660300002)(186003)(478600001)(2906002)(31686004)(6506007)(6512007)(26005)(2616005)(83380400001)(8676002)(8936002)(82960400001)(38100700002)(45980500001)(43740500002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?jMfB91YurDhOFrVBm20nobMS3o2a?= =?utf-8?q?Yv0wFBTfJ1RrCe0zZqEgNWhgFnePPyOhwyFWkTpu8fZwdGq8L/HW4oNDBSX4ah+4I?= =?utf-8?q?X/gEiF2N1QoSysYB9+opexcfd1w9riGWF+6j5D7kz/KtnaBF0zbESvx7XOTHSE76W?= =?utf-8?q?smhyu34O5rXwgbTa8ZvK5XY8zlsbh0orFMbcR5cHszBiw8YxxSc4pVMN1yo1MRQxp?= =?utf-8?q?aQPTZ+TzNGjGVIuID7/xW/pVRoDuH5f1BO4Mbj86nerR1DXF/9C35+3dEdW6VqGGz?= =?utf-8?q?LKoO2Gifo+m333Yl3XJlUc00NxLz4Bt3XpT1kf4JlumWFSoZgEBnAK4GuDyg5QSLt?= =?utf-8?q?hnKBSZbid2GeM5CKPgA5qOcaZupqkrzNjiELZaprbchgN27Ss0A4lqROu2a4K5903?= =?utf-8?q?lROdmL6ntG2zjlti9D0Pyee+1XxswoDyYsRMW7tTB50qnSjb+LWAF3p+viR1QkWAZ?= =?utf-8?q?jbi2p3TRm2CIVC25cX5eBVHVTzch9DvtJe2CCMPejv4/AtS5GugLInHS4TZADqD1u?= =?utf-8?q?KOUiiK3aLiPeG8WFeKuXenEL15wyfwCJ+o+g91MdCSd/8jocaxVwE4RjY+CZNEW3i?= =?utf-8?q?Zp5NMK7M48l12ceKG6zPCyLdSpXlqQGSSctantpzo/PfFFP5EFd2ArrbjyT+mOolY?= =?utf-8?q?XUuzyn6VFrmxeckW/aj0V5/ahIE6wbAQug+0fF/qz2n6fXPtyrVquHSOFJ3bjDGAf?= =?utf-8?q?ngdw9kNyUhsjiNSiDqDKNy+C8/yZvRdWE4in3aOf2hIGHIxUwzqKrVoQOCeyj6PEu?= =?utf-8?q?wwardCgAAb+qIH6MdgCSn7VgoC8asPkyOZ6IFyN6L4PJ0ubBTeuSIz/ScVTh10e1N?= =?utf-8?q?QxYTj6F9bhTM30pFWtJMlCo3GCCC3QfDFCuA2eMlTOUW815OfdERhp0lRuN4mBSYx?= =?utf-8?q?qLF25g2453wjYyd7AZC8eFdI6shwmLP984SeQBegzsMuEowJwpCzYJ6EeMDNSaU1I?= =?utf-8?q?6L6J52I1btS+04i6/5OjK5CNetVZYtk+t//Eu2K4yrEAE8prWBihmrRn5p96pvu6R?= =?utf-8?q?p9YuFqbC2Z2g3Uru4rU8dM3oQe0CHH4qmp5WfC9LRiPISK5aXqlo6B8rhWb/lFgUX?= =?utf-8?q?PHg8slNPL2pj32+zPIqBuXX2u+7n8CE0an+UpjDEhJfHJOTwh9Ily78uBDPOs7diK?= =?utf-8?q?+ibk7x51Av8MhFc60IqHhDxp1zzmyd59mP+hwY12LkPRT0moDV4FD3nIKG7OZQgAY?= =?utf-8?q?LAUM6S1OZahrvzo3JZqBGir2NU3ysFak/xSQ2fR79fkF5JmI0o4Obl7OxoXHMYZGw?= =?utf-8?q?pgd3EnlM8+ieu34oOASPLlcJRNJFP4ddnkflmJVKTu5qZZYmsD13saqCH5H2ys9JG?= =?utf-8?q?KvaeJYFNOYcU9huCE0MB3tVOgi1nUBdcgfhCroFNU93CuLJmMjz3B8G0r4fI9idKd?= =?utf-8?q?G43X/Yq5owqilhG+kAQvz3Gw+xet7fOe9E68QHe+SuLt6lxHHey2hAAqt73a4GZsh?= =?utf-8?q?ZqjZSX3WgBLRDukWqTBw26L60S4wuweWEDOcbBzj2tuTy5lKv1UfHI1OPLpuB6lRr?= =?utf-8?q?2uWqVa3nZ3rN?= X-MS-Exchange-CrossTenant-Network-Message-Id: edceb2b4-5de4-41b7-ebf7-08db6051e0aa X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5549.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 May 2023 14:34:58.4651 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: pcXbENJmtXHIyNKCPV2UQTixKKuAar79zAuAU5cp0eakmRMzX1tnoLhMqeYVCnO0TgP3bdtP1m5O31KL0KTV6A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR11MB5295 X-OriginatorOrg: intel.com Subject: [Intel-gfx] [PATCH] drm/i915/gvt: remove unused variable gma_bottom in command parser X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jani.nikula@intel.com, intel-gvt-dev@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Remove unused variable gma_bottom in scan_workload() and scan_wa_ctx(). commit be1da7070aea ("drm/i915/gvt: vGPU command scanner") introduces gma_bottom in several functions to calculate the size of the command buffer. However, some of them are set but actually unused. When compiling the code with ccflags -Wunused-but-set-variable, gcc throws warnings. Remove unused variables to avoid the gcc warnings. Tested via compiling the code with ccflags -Wunused-but-set-variable. Fixes: be1da7070aea ("drm/i915/gvt: vGPU command scanner") Suggested-by: Jani Nikula Cc: Zhenyu Wang Cc: intel-gvt-dev@lists.freedesktop.org Signed-off-by: Zhi Wang --- drivers/gpu/drm/i915/gvt/cmd_parser.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) s.buf_addr_type = GTT_BUFFER; @@ -2874,7 +2873,7 @@ static int scan_workload(struct intel_vgpu_workload *workload) static int scan_wa_ctx(struct intel_shadow_wa_ctx *wa_ctx) { - unsigned long gma_head, gma_tail, gma_bottom, ring_size, ring_tail; + unsigned long gma_head, gma_tail, ring_size, ring_tail; struct parser_exec_state s; int ret = 0; struct intel_vgpu_workload *workload = container_of(wa_ctx, @@ -2891,7 +2890,6 @@ static int scan_wa_ctx(struct intel_shadow_wa_ctx *wa_ctx) PAGE_SIZE); gma_head = wa_ctx->indirect_ctx.guest_gma; gma_tail = wa_ctx->indirect_ctx.guest_gma + ring_tail; - gma_bottom = wa_ctx->indirect_ctx.guest_gma + ring_size; s.buf_type = RING_BUFFER_INSTRUCTION; s.buf_addr_type = GTT_BUFFER; diff --git a/drivers/gpu/drm/i915/gvt/cmd_parser.c b/drivers/gpu/drm/i915/gvt/cmd_parser.c index 3c4ae1da0d41..05f9348b7a9d 100644 --- a/drivers/gpu/drm/i915/gvt/cmd_parser.c +++ b/drivers/gpu/drm/i915/gvt/cmd_parser.c @@ -2833,7 +2833,7 @@ static int command_scan(struct parser_exec_state *s, static int scan_workload(struct intel_vgpu_workload *workload) { - unsigned long gma_head, gma_tail, gma_bottom; + unsigned long gma_head, gma_tail; struct parser_exec_state s; int ret = 0; @@ -2843,7 +2843,6 @@ static int scan_workload(struct intel_vgpu_workload *workload) gma_head = workload->rb_start + workload->rb_head; gma_tail = workload->rb_start + workload->rb_tail; - gma_bottom = workload->rb_start + _RING_CTL_BUF_SIZE(workload->rb_ctl); s.buf_type = RING_BUFFER_INSTRUCTION;