From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4B72D10EA14 for ; Wed, 15 Feb 2023 00:47:04 +0000 (UTC) From: Umesh Nerlige Ramappa To: igt-dev@lists.freedesktop.org Date: Tue, 14 Feb 2023 16:46:47 -0800 Message-Id: <20230215004648.2100655-31-umesh.nerlige.ramappa@intel.com> In-Reply-To: <20230215004648.2100655-1-umesh.nerlige.ramappa@intel.com> References: <20230215004648.2100655-1-umesh.nerlige.ramappa@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [igt-dev] [PATCH i-g-t 30/31] tools/perf: Choose the right card List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lionel G Landwerlin Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" List-ID: Choose the right dri card to open for perf recorder. Signed-off-by: Umesh Nerlige Ramappa --- tools/i915-perf/i915_perf_recorder.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/tools/i915-perf/i915_perf_recorder.c b/tools/i915-perf/i915_perf_recorder.c index ee8a288d..9337da12 100644 --- a/tools/i915-perf/i915_perf_recorder.c +++ b/tools/i915-perf/i915_perf_recorder.c @@ -241,10 +241,10 @@ read_device_param(const char *stem, int id, const char *param) } static int -find_intel_render_node(void) +find_intel_card_node(void) { - for (int i = 128; i < (128 + 16); i++) { - if (read_device_param("renderD", i, "vendor") == 0x8086) + for (int i = 0; i < 128; i++) { + if (read_device_param("card", i, "vendor") == 0x8086) return i; } @@ -273,20 +273,18 @@ open_render_node(uint32_t *devid, int card) char *name; int ret; int fd; - int render; if (card < 0) { - render = find_intel_render_node(); - if (render < 0) + card = find_intel_card_node(); + + if (card < 0) return -1; - } else { - render = 128 + card; } - ret = asprintf(&name, "/dev/dri/renderD%u", render); + ret = asprintf(&name, "/dev/dri/card%u", card); assert(ret != -1); - *devid = read_device_param("renderD", render, "device"); + *devid = read_device_param("card", card, "device"); fd = open(name, O_RDWR); free(name); -- 2.36.1