From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id B77A06E1F7 for ; Tue, 25 Feb 2020 11:32:03 +0000 (UTC) Date: Tue, 25 Feb 2020 13:32:01 +0200 From: Petri Latvala Message-ID: <20200225113201.GF3839@platvala-desk.ger.corp.intel.com> References: <20200225112218.1532204-1-lionel.g.landwerlin@intel.com> <946a3b80-a9f5-99c6-cad5-946f8cf909d7@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <946a3b80-a9f5-99c6-cad5-946f8cf909d7@intel.com> Subject: Re: [igt-dev] [PATCH i-g-t] lib/i915/perf: return NULL when platform is not supported List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" To: Lionel Landwerlin Cc: "igt-dev@lists.freedesktop.org" List-ID: On Tue, Feb 25, 2020 at 01:26:16PM +0200, Lionel Landwerlin wrote: > On 25/02/2020 13:22, Lionel Landwerlin wrote: > > Instead of asserting. > > > > Signed-off-by: Lionel Landwerlin > > > This deserves a > > Fixes: 5f7e4ae6a91e ("tests/perf: reuse the new i915-perf library") And a Reviewed-by: Petri Latvala > > > > --- > > lib/i915/perf.c | 15 +++++++++++---- > > 1 file changed, 11 insertions(+), 4 deletions(-) > > > > diff --git a/lib/i915/perf.c b/lib/i915/perf.c > > index 5b5b7f90..a5dd3eab 100644 > > --- a/lib/i915/perf.c > > +++ b/lib/i915/perf.c > > @@ -116,6 +116,13 @@ eu_available(const struct > > drm_i915_query_topology_info *topo, > > eu / 8] >> (eu % 8)) & 1; > > } > > +static struct intel_perf * > > +unsupported_i915_perf_platform(struct intel_perf *perf) > > +{ > > + intel_perf_free(perf); > > + return NULL; > > +} > > + > > struct intel_perf * > > intel_perf_for_devinfo(uint32_t device_id, > > uint32_t revision, > > @@ -193,7 +200,7 @@ intel_perf_for_devinfo(uint32_t device_id, > > intel_perf_load_metrics_sklgt4(perf); > > break; > > default: > > - assert(0); /* unreachable */ > > + return unsupported_i915_perf_platform(perf); > > } > > } else if (devinfo->is_broxton) { > > perf->devinfo.eu_threads_count = 6; > > @@ -207,7 +214,7 @@ intel_perf_for_devinfo(uint32_t device_id, > > intel_perf_load_metrics_kblgt3(perf); > > break; > > default: > > - assert(0); /* unreachable */ > > + return unsupported_i915_perf_platform(perf); > > } > > } else if (devinfo->is_geminilake) { > > perf->devinfo.eu_threads_count = 6; > > @@ -221,7 +228,7 @@ intel_perf_for_devinfo(uint32_t device_id, > > intel_perf_load_metrics_cflgt3(perf); > > break; > > default: > > - assert(0); /* unreachable */ > > + return unsupported_i915_perf_platform(perf); > > } > > } else if (devinfo->is_cannonlake) { > > intel_perf_load_metrics_cnl(perf); > > @@ -232,7 +239,7 @@ intel_perf_for_devinfo(uint32_t device_id, > > } else if (devinfo->is_tigerlake) { > > intel_perf_load_metrics_tgl(perf); > > } else { > > - assert(0); /* unreachable */ > > + return unsupported_i915_perf_platform(perf); > > } > > return perf; > > > > _______________________________________________ > igt-dev mailing list > igt-dev@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/igt-dev _______________________________________________ igt-dev mailing list igt-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev