From mboxrd@z Thu Jan 1 00:00:00 1970 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 7A463C54E64 for ; Mon, 25 Mar 2024 16:33:31 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 31CE910E9A1; Mon, 25 Mar 2024 16:33:31 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="VySUKgDk"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.18]) by gabe.freedesktop.org (Postfix) with ESMTPS id B07F410E14E for ; Mon, 25 Mar 2024 16:33:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1711384411; x=1742920411; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=B43Bfohc04tEmZ9XQo58Y6AD/15SIUntcDZdeGrh1jw=; b=VySUKgDkDmb9+/lrAtIYtws/fRfw2cP+FMx4mtsZb3TYHLvo1/Ej38j7 Fa5hzEuI9xVb66w9XbGGE3PPsh1Sc/0AyeupDLaZKA/taS2aZIExRcVzN QqbntYciKqulgt06pSDrTy6kfOQRqefS/PTAGv6nLKbwi8vyvabYuI3Gg mkqSDiiK56Ci6i3+h7xcZoF49CqxjMM9XKMq2Rmy821ifr6J5ELhluOoU JUB2xu4b3ykqx00YTLaF4KmMWu3kp0zuHR0WEWcHdG67pIBIXfaXXjcqi /GZJKz7pviBcP4RcqNpwqkEm1gcvSEt/LyriUHUCZaZcHWkdrYAitnfoq A==; X-IronPort-AV: E=McAfee;i="6600,9927,11024"; a="6526340" X-IronPort-AV: E=Sophos;i="6.07,153,1708416000"; d="scan'208";a="6526340" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orvoesa110.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Mar 2024 09:33:31 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,11024"; a="827784753" X-IronPort-AV: E=Sophos;i="6.07,153,1708416000"; d="scan'208";a="827784753" Received: from stinkpipe.fi.intel.com (HELO stinkbox) ([10.237.72.74]) by orsmga001.jf.intel.com with SMTP; 25 Mar 2024 09:33:27 -0700 Received: by stinkbox (sSMTP sendmail emulation); Mon, 25 Mar 2024 18:33:27 +0200 From: Ville Syrjala To: igt-dev@lists.freedesktop.org Cc: Jani Nikula Subject: [PATCH i-g-t v2 4/5] tools/intel_vbt_decode: Also dump the second panel (panel_type2) Date: Mon, 25 Mar 2024 18:33:27 +0200 Message-ID: <20240325163327.22757-1-ville.syrjala@linux.intel.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240322163251.11102-5-ville.syrjala@linux.intel.com> References: <20240322163251.11102-5-ville.syrjala@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: igt-dev@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development mailing list for IGT GPU Tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" From: Ville Syrjälä Modern VBTs can declare two panel types in order to support dual panel systems. Dump the panel information for the second panel as well. Since panel_type2 could also be declared as 255 (== match pnpid to EDID) we also add a new command line knob to select panel_type2 by hand. Data for the second panel will be indicated by "(2)", as opposed to "(1)" for the first panel. We can also end up in a situation where panel_type==panel_type2. The reasons being a dodgy VBT, or the VBT might declare panel_type==255 and panel_type2=0, and if we can't determine which panel the 255 refers to (via pnpid) then we just default to panel_type==0. v2: Break the ?: into separate ifs (Jani) Clarify why we can end up with panel_type==panel_type2 (Jani) Reviewed-by: Jani Nikula Signed-off-by: Ville Syrjälä --- tools/intel_vbt_decode.c | 45 ++++++++++++++++++++++++++++++++++------ 1 file changed, 39 insertions(+), 6 deletions(-) diff --git a/tools/intel_vbt_decode.c b/tools/intel_vbt_decode.c index 98f64d0822c6..788c2903e4a1 100644 --- a/tools/intel_vbt_decode.c +++ b/tools/intel_vbt_decode.c @@ -79,7 +79,7 @@ struct context { int size; uint32_t devid; - int panel_type; + int panel_type, panel_type2; bool dump_all_panel_types; bool hexdump; }; @@ -87,12 +87,23 @@ struct context { static bool dump_panel(const struct context *context, int panel_type) { return panel_type == context->panel_type || + panel_type == context->panel_type2 || context->dump_all_panel_types; } static const char *panel_str(const struct context *context, int panel_type) { - return panel_type == context->panel_type ? " (1)" : ""; + if (panel_type == context->panel_type && + panel_type == context->panel_type2) + return " (1)(2)"; + + if (panel_type == context->panel_type) + return " (1)"; + + if (panel_type == context->panel_type2) + return " (2)"; + + return ""; } /* Get BDB block size given a pointer to Block ID. */ @@ -2503,18 +2514,21 @@ static void dump_compression_parameters(struct context *context, } /* get panel type from lvds options block, or -1 if block not found */ -static int get_panel_type(struct context *context) +static int get_panel_type(struct context *context, bool is_panel_type2) { struct bdb_block *block; const struct bdb_lvds_options *options; - int panel_type; + int panel_type = -1; block = find_section(context, BDB_LVDS_OPTIONS); if (!block) return -1; options = block_data(block); - panel_type = options->panel_type; + if (!is_panel_type2) + panel_type = options->panel_type; + else if (context->bdb->version >= 212) + panel_type = options->panel_type2; free(block); @@ -2776,6 +2790,7 @@ enum opt { OPT_FILE, OPT_DEVID, OPT_PANEL_TYPE, + OPT_PANEL_TYPE2, OPT_ALL_PANELS, OPT_HEXDUMP, OPT_BLOCK, @@ -2812,6 +2827,7 @@ int main(int argc, char **argv) int size; struct context context = { .panel_type = -1, + .panel_type2 = -1, }; char *endp; int block_number = -1; @@ -2821,6 +2837,7 @@ int main(int argc, char **argv) { "file", required_argument, NULL, OPT_FILE }, { "devid", required_argument, NULL, OPT_DEVID }, { "panel-type", required_argument, NULL, OPT_PANEL_TYPE }, + { "panel-type2", required_argument, NULL, OPT_PANEL_TYPE2 }, { "all-panels", no_argument, NULL, OPT_ALL_PANELS }, { "hexdump", no_argument, NULL, OPT_HEXDUMP }, { "block", required_argument, NULL, OPT_BLOCK }, @@ -2852,6 +2869,14 @@ int main(int argc, char **argv) return EXIT_FAILURE; } break; + case OPT_PANEL_TYPE2: + context.panel_type2 = strtoul(optarg, &endp, 0); + if (*endp || context.panel_type2 > 15) { + fprintf(stderr, "invalid panel type2 '%s'\n", + optarg); + return EXIT_FAILURE; + } + break; case OPT_ALL_PANELS: context.dump_all_panel_types = true; break; @@ -2969,12 +2994,20 @@ int main(int argc, char **argv) fprintf(stderr, "Warning: could not find PCI device ID!\n"); if (context.panel_type == -1) - context.panel_type = get_panel_type(&context); + context.panel_type = get_panel_type(&context, false); if (context.panel_type == -1) { fprintf(stderr, "Warning: panel type not set, using 0\n"); context.panel_type = 0; } + if (context.panel_type2 == -1) + context.panel_type2 = get_panel_type(&context, true); + if (context.panel_type2 != -1 && context.bdb->version < 212) { + fprintf(stderr, "Warning: panel type2 not valid for BDB version %d\n", + context.bdb->version); + context.panel_type2 = -1; + } + if (describe) { print_description(&context); } else if (header_only) { -- 2.43.2