Received: by 2002:a05:6358:a55:b0:ec:fcf4:3ecf with SMTP id 21csp2502779rwb; Fri, 20 Jan 2023 03:57:22 -0800 (PST) X-Google-Smtp-Source: AMrXdXu04dFpyOu6Cufyoxg/zv33FZYcLmlsXuovaCYlHh6WHOOSNVjeP+3FlttcDIeSZSUSurb+ X-Received: by 2002:a05:6a20:b914:b0:b8:537a:5525 with SMTP id fe20-20020a056a20b91400b000b8537a5525mr15320403pzb.51.1674215842510; Fri, 20 Jan 2023 03:57:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674215842; cv=none; d=google.com; s=arc-20160816; b=SntlhvLbxMX9krpERpDH5x2S7QQ0yK7e2gujYnDmfSoJrg6OycH3/QogG5nBrfAqBp cPgGa1oC+E2u10phKDxNWlshELJiSOnfBUJC1vnoSyEBKGko/TmzPqGrFFBNaVP4GeiE rSCAvK+8Of+w/PUY9fRuJdiAmRs4/l8tNGAmJNl7cCTsBsspOl+5WmfdBfIy8vQ9En2O RNuNW3ifBjtayYGzpEE2oVBy+glQVpiajyszQuDchwVgLc6oz9Z/5jZ4OnNSPlGDyZ0r ZOOrNs3eqhfKePNxFo019mPTJsHnRg1oSo3rMdj6OH0v9ZJpuYzqPRMf4CY50tPIgJH7 vdiQ== 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=YjsLSAjN7wkmisTOi254HPVFIPXtTI068jFeb681chA=; b=oz/pMm5vrBG03x+EnNC+tJ+nzHBktrin1vwJ7tMT9t9/vr1iBjJ2Nerez1um9PhCPZ teAUR3thA37vqarwVts19Bo1uktt0t2j3KOAB2ehyUbFGvteWsoPcBzH2l4jdneEDeSb VFWstjthiPZMTqYuzM+8eMpjsZ+bwUEomxoUnndholJK7y3bZTOSqrcVfjvhGEqdDxZp dQnafw0ncy6B8u0QJiHKElW4hbPreEURjLUi8nMuUrn/xdkFhICp0UHtqUGFfszzs/48 M6s8ypG0b9NteHJCU/5TExdsAGh8G0AVfi5Fpzk5ox6Y/xCUaMezedzv9fa6cd4Pa/BC kWag== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Hu9HcD4b; 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 e26-20020a63545a000000b0049b37046fbcsi40034084pgm.391.2023.01.20.03.57.16; Fri, 20 Jan 2023 03:57:22 -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=Hu9HcD4b; 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 S229609AbjATLcV (ORCPT + 49 others); Fri, 20 Jan 2023 06:32:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49742 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229560AbjATLcT (ORCPT ); Fri, 20 Jan 2023 06:32:19 -0500 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4CE8245F46 for ; Fri, 20 Jan 2023 03:32:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1674214338; x=1705750338; h=date:from:to:cc:subject:message-id:references: mime-version:in-reply-to; bh=qONkOFP8DnyyZBcwCooPKjF7KSBVfCQkJzSd5SQ/tIY=; b=Hu9HcD4bpt5phsAJABS6k2zOC5PE4llHGGMJ/9FdZmkguikrT+8aSAA2 KKDvxpQHYBTgLdFHDquKs1jNYZ90VZY8W9pZu+9PyMMxPNTojvA5RSXZN eUSUnhDNW3PqSMoozxbFo5U6l+X3hXLHTZn+lzqopuIsD+zBxlQtDKqSl mJE7QFyIQRli5HPQgfot5+UQ5OaeXJieSMJx5jobpFFMJVNZs8jWU9pZ2 wBe91ZoPWhNOkBbcWcs0m+UUZqi/Vwsa6j0gCjDww7kKdj3+O8nAJ8Oad 6lVYSCSYgavnofjlJ+SIVUAT/HTM1Y+ntJOM7iGXcCzmGWNR/eG01Bakc Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10595"; a="327654578" X-IronPort-AV: E=Sophos;i="5.97,232,1669104000"; d="scan'208";a="327654578" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Jan 2023 03:32:17 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10595"; a="638136969" X-IronPort-AV: E=Sophos;i="5.97,232,1669104000"; d="scan'208";a="638136969" Received: from melsaid-mobl.ger.corp.intel.com (HELO intel.com) ([10.251.222.199]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Jan 2023 03:32:13 -0800 Date: Fri, 20 Jan 2023 12:32:10 +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 Hi Arnd, 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 Pushed to drm-intel-gt-next. Thanks, 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