Received: by 2002:a05:6358:a55:b0:ec:fcf4:3ecf with SMTP id 21csp6255327rwb; Wed, 18 Jan 2023 03:09:39 -0800 (PST) X-Google-Smtp-Source: AMrXdXuW3P5EdBC8/sWytalfwFKY2Rkk04DzuTLtUTzfRqDRQBAjw/hJFsU3LNmsOeQX90rmnKOO X-Received: by 2002:a17:902:b60b:b0:192:b6af:415 with SMTP id b11-20020a170902b60b00b00192b6af0415mr28646205pls.14.1674040178813; Wed, 18 Jan 2023 03:09:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674040178; cv=none; d=google.com; s=arc-20160816; b=PpVmAQAZ2MU1qKPLZD6/tSUmt2HNXOOFs1I7LVBW31vazo0CxQUUJAfvX9hX8dQc38 kEXhcgDfUpNmQ/e1k2SqSctwPQNbxnkTqZ9zH6hyPBj9lTW6JBj3eoygO5fqnpNfsK3x UhizmJav8+R3bXVD98dlWOcyapTNftmlWtmhbC07AcgJE53d9rMAjMkhAD8AR10J6JO8 If14ptWKUiyDOSVnvgv0aQRRk1KFnL9+N6HgHnvNCcWpYwp0Ra+JiT6QD0xn4TcrYkg3 +pYF66AxPHTXfxGczn+AL4j5/lTfV5BMYNhHXCZoi/etF2yIriWtPfK1XBUdwZEfmffL lOoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=pk0S9RSnoFwNVlH3hAIhA1yyX2joxEfao/hXdhQZMXU=; b=UBV+SpdKnpoiJA2Bsx8lOeNy43SdMYzRmdSqxcBKMgmnjKlddqgJEJ5azrechgLnBu y9gW+3edL3YfS9ie92RD1T7uAW2sCnAQLE/FKnYPwVe+VGU/GCP++bcYbttJg5s+JAN0 ywoEhFdi9MRR7+S7hdxKXqjPhDAKpBp+rryQd/RHmfxtoduiGYdvASR+gFUUEFhxtQdw Sqxp/ursR+fclu+9lP3a7wH5oXXlSPNmIWVtYkBBjsQbyKHep06Ifd+qqqi0OPU/5Wcv C/xzugpyBfJyxsf4ghusofmP8x5bVqNM5vFEHk/8SlDqSekTHY0cTKBBWLt+eXwdYUWA N/GQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Bwsk2Ta5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a21-20020a63e855000000b004791644f520si35114378pgk.437.2023.01.18.03.09.33; Wed, 18 Jan 2023 03:09:38 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Bwsk2Ta5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229630AbjARJ7B (ORCPT + 45 others); Wed, 18 Jan 2023 04:59:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40600 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230023AbjARJ5y (ORCPT ); Wed, 18 Jan 2023 04:57:54 -0500 Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6FFAA44BE1 for ; Wed, 18 Jan 2023 01:07:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1674032856; x=1705568856; h=date:from:to:cc:subject:message-id:references: mime-version:in-reply-to; bh=DlLu1kd3RdoRwJ5tOhQx3lXAUHxd4RmhAiLGWWt9q9E=; b=Bwsk2Ta53FvOV/1dOq/DJZ1TL9JPP8TSN29mn+Z7hnud2m1oHGMhS8c3 IdRQC7OoI3C7XrkkQDfZ3HB3RuU/V51QcXSBkog+4WxcnCvXsdgN/a5YH 4D3gCU77VaGZ9pX67yLfwqCwPyWd/ToJ+2vHQwsGxjgIvafrslOH4YayR j8AqMyPjPh80Lj9apf5hkYXP9GW3OeqEAeY/dM0AWbIxzZXjsV8QmpwWE C0TlwXFV6gAwrRUC2oWZPZ1zHz7nQV/fxseMZs5CLOFPEG4E0RCEftTVX GW/w/0xZlPt7+c2T+EJ764gA3hoFWP8/Y4cajr5tXwiqnialO/oj3U337 Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10593"; a="387287295" X-IronPort-AV: E=Sophos;i="5.97,224,1669104000"; d="scan'208";a="387287295" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jan 2023 01:07:32 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10593"; a="767666271" X-IronPort-AV: E=Sophos;i="5.97,224,1669104000"; d="scan'208";a="767666271" Received: from tpalli-mobl.ger.corp.intel.com (HELO intel.com) ([10.252.54.209]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jan 2023 01:07:27 -0800 Date: Wed, 18 Jan 2023 10:07:24 +0100 From: Andi Shyti To: Arnd Bergmann Cc: Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , Arnd Bergmann , intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Daniel Vetter , David Airlie Subject: Re: [Intel-gfx] [PATCH] drm/i915/selftest: fix intel_selftest_modify_policy argument types Message-ID: References: <20230117163743.1003219-1-arnd@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230117163743.1003219-1-arnd@kernel.org> X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Jan 17, 2023 at 05:37:29PM +0100, Arnd Bergmann wrote: > From: Arnd Bergmann > > The definition of intel_selftest_modify_policy() does not match the > declaration, as gcc-13 points out: > > drivers/gpu/drm/i915/selftests/intel_scheduler_helpers.c:29:5: error: conflicting types for 'intel_selftest_modify_policy' due to enum/integer mismatch; have 'int(struct intel_engine_cs *, struct intel_selftest_saved_policy *, u32)' {aka 'int(struct intel_engine_cs *, struct intel_selftest_saved_policy *, unsigned int)'} [-Werror=enum-int-mismatch] > 29 | int intel_selftest_modify_policy(struct intel_engine_cs *engine, > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ > In file included from drivers/gpu/drm/i915/selftests/intel_scheduler_helpers.c:11: > drivers/gpu/drm/i915/selftests/intel_scheduler_helpers.h:28:5: note: previous declaration of 'intel_selftest_modify_policy' with type 'int(struct intel_engine_cs *, struct intel_selftest_saved_policy *, enum selftest_scheduler_modify)' > 28 | int intel_selftest_modify_policy(struct intel_engine_cs *engine, > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ > > Change the type in the definition to match. > > Fixes: 617e87c05c72 ("drm/i915/selftest: Fix hangcheck self test for GuC submission") > Signed-off-by: Arnd Bergmann Reviewed-by: Andi Shyti Andi > --- > drivers/gpu/drm/i915/selftests/intel_scheduler_helpers.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/selftests/intel_scheduler_helpers.c b/drivers/gpu/drm/i915/selftests/intel_scheduler_helpers.c > index 310fb83c527e..2990dd4d4a0d 100644 > --- a/drivers/gpu/drm/i915/selftests/intel_scheduler_helpers.c > +++ b/drivers/gpu/drm/i915/selftests/intel_scheduler_helpers.c > @@ -28,8 +28,7 @@ struct intel_engine_cs *intel_selftest_find_any_engine(struct intel_gt *gt) > > int intel_selftest_modify_policy(struct intel_engine_cs *engine, > struct intel_selftest_saved_policy *saved, > - u32 modify_type) > - > + enum selftest_scheduler_modify modify_type) > { > int err; > > -- > 2.39.0