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 X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D9B23C433EF for ; Thu, 23 Sep 2021 16:50:41 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 7B02260F43 for ; Thu, 23 Sep 2021 16:50:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 7B02260F43 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=semihalf.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 39F4E6ED92; Thu, 23 Sep 2021 16:50:40 +0000 (UTC) Received: from mail-lj1-x22e.google.com (mail-lj1-x22e.google.com [IPv6:2a00:1450:4864:20::22e]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8EA326ED92 for ; Thu, 23 Sep 2021 16:50:39 +0000 (UTC) Received: by mail-lj1-x22e.google.com with SMTP id b19so471814ljf.10 for ; Thu, 23 Sep 2021 09:50:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=hSnUQM8sl78ryfmqSBi52ERznQImFEzj9TPjadBrRO8=; b=EuE1JuVXY8ucbySjkYYk4i9UdFC4wI38D+nwRRAmiSqwwTXIoq3PGI3RXuoqaG1XAw Nmaq7bz56FuYPLBRV84Y+q8byg/5rfDs9j//qttcnAtUUYpBv/HRL5c+2iEfnx1fZJrT /rNFtq0BMff2DvdS9VCAZ1oAGJs3kKmDkn5w3ViJVunddT4qKyj5ONPj5MWjirKSV4Cn shnxXtutM1tiRGjbD4aE1cnFk7C44VmQAZWHBpcLu9jideaI/+CAcoVWvFfNpJqFbkLy rCUqubZyT3jYabT3+ZZ6tFC4By60b2Hm5ucZ6bny560ZuELlWIv4ZZ+0B5JFyvxwTa3N Sw6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=hSnUQM8sl78ryfmqSBi52ERznQImFEzj9TPjadBrRO8=; b=Oy8BaYMueXJ8tk/r4A2PnWxvOEROnZKPtr1NQ1vNZwxZlJKlXPkbEtSS/9IFyQ6KcY COXQ++2GJ4m5t+64glX5AElbrHnxE+GT/HDYm9ikMazg9wtZod5GZWRW3q+k1ndnRvmA lSrmswA+r7YGPcmjFhNbcf2UZuHLUBfoX0rPR7fj6tXNhWQjUAxnu/WXY0kB/Dp7JgwI kHzcy3/sRUAEbYtX59x+A7JTdVerphKeCcLPuJIJzZpLtfV8fJ/IB8PtoMoJpIWJk7q/ MZyrGQ0wfbxVxPHALe+9jqbQIZWX33zJtaK9Uqvh+fjnNbMCcsdlhVV7T41QIxjFZoVp oVSA== X-Gm-Message-State: AOAM531tTXv/rGVhbOddJhXVdjZqbjRw9XVrBTzk55DxUSZDItYrZlfV 9sL7MOTOr+y9j2uj1N8oL+OwvQ== X-Google-Smtp-Source: ABdhPJwsQAWFAW+h+ueroqe2kcduCUtyYnCtvW8owkj4LrRGKweIUwDL4iejWG8nFir0aUP6p9tXew== X-Received: by 2002:a05:651c:4ca:: with SMTP id e10mr6460033lji.259.1632415837742; Thu, 23 Sep 2021 09:50:37 -0700 (PDT) Received: from lmajczak1-l.roam.corp.google.com (89-70-221-122.dynamic.chello.pl. [89.70.221.122]) by smtp.gmail.com with ESMTPSA id g18sm455972lfh.235.2021.09.23.09.50.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Sep 2021 09:50:37 -0700 (PDT) From: Lukasz Majczak To: Jose Roberto de Souza , Shawn C Lee Cc: Jani Nikula , Joonas Lahtinen , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, upstream@semihalf.com, Lukasz Majczak Subject: [PATCH v2] drm/i915/bdb: Fix version check Date: Thu, 23 Sep 2021 18:49:27 +0200 Message-Id: <20210923164927.55896-1-lma@semihalf.com> X-Mailer: git-send-email 2.33.0.464.g1972c5931b-goog MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" With patch "drm/i915/vbt: Fix backlight parsing for VBT 234+" the size of bdb_lfp_backlight_data structure has been increased, causing if-statement in the parse_lfp_backlight function that comapres this structure size to the one retrieved from BDB, always to fail for older revisions. This patch calculates expected size of the structure for a given BDB version and compares it with the value gathered from BDB. Tested on Chromebook Pixelbook (Nocturne) (reports bdb->version = 221) Tested-by: Lukasz Majczak Signed-off-by: Lukasz Majczak --- drivers/gpu/drm/i915/display/intel_bios.c | 11 +++++++++-- drivers/gpu/drm/i915/display/intel_vbt_defs.h | 5 +++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c index 3c25926092de..90eae6da12e0 100644 --- a/drivers/gpu/drm/i915/display/intel_bios.c +++ b/drivers/gpu/drm/i915/display/intel_bios.c @@ -428,6 +428,7 @@ parse_lfp_backlight(struct drm_i915_private *i915, const struct lfp_backlight_data_entry *entry; int panel_type = i915->vbt.panel_type; u16 level; + size_t exp_size; backlight_data = find_section(bdb, BDB_LVDS_BACKLIGHT); if (!backlight_data) @@ -450,9 +451,15 @@ parse_lfp_backlight(struct drm_i915_private *i915, return; } + if (bdb->version <= 234) + exp_size = EXP_BDB_LFP_BL_DATA_SIZE_REV_234; + else if (bdb->version > 234 && bdb->version <= 236) + exp_size = EXP_BDB_LFP_BL_DATA_SIZE_REV_236; + else + exp_size = sizeof(struct bdb_lfp_backlight_data); + i915->vbt.backlight.type = INTEL_BACKLIGHT_DISPLAY_DDI; - if (bdb->version >= 191 && - get_blocksize(backlight_data) >= sizeof(*backlight_data)) { + if (bdb->version >= 191 && get_blocksize(backlight_data) >= exp_size) { const struct lfp_backlight_control_method *method; method = &backlight_data->backlight_control[panel_type]; diff --git a/drivers/gpu/drm/i915/display/intel_vbt_defs.h b/drivers/gpu/drm/i915/display/intel_vbt_defs.h index 330077c2e588..ba9990e5983c 100644 --- a/drivers/gpu/drm/i915/display/intel_vbt_defs.h +++ b/drivers/gpu/drm/i915/display/intel_vbt_defs.h @@ -814,6 +814,11 @@ struct lfp_brightness_level { u16 reserved; } __packed; +#define EXP_BDB_LFP_BL_DATA_SIZE_REV_234 \ + offsetof(struct bdb_lfp_backlight_data, brightness_level) +#define EXP_BDB_LFP_BL_DATA_SIZE_REV_236 \ + offsetof(struct bdb_lfp_backlight_data, brightness_precision_bits) + struct bdb_lfp_backlight_data { u8 entry_size; struct lfp_backlight_data_entry data[16]; -- 2.33.0.464.g1972c5931b-goog