From nobody Wed Dec 31 12:27:29 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9B205C4332F for ; Fri, 3 Nov 2023 20:18:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378204AbjKCUSu (ORCPT ); Fri, 3 Nov 2023 16:18:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53754 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1378157AbjKCUSo (ORCPT ); Fri, 3 Nov 2023 16:18:44 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D541AB8 for ; Fri, 3 Nov 2023 13:18:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1699042722; x=1730578722; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=sOlXPhm2EWggWgC9auNPoDBOg8jjBU+Gm+8lS7rVTqE=; b=IkpdHUWJcGPhV1GsaDpr1vNs6H0XE7sjGWzktP5Peitnxz4BqgERDAlq EdSaZkGdCb0xuhrN6FqnZqWKcEcq4nD5zerU9WC4MCSAQTpcPa2juAODG a5GEK7FkdiLJIkzRfaQznkXrjBkR8LGgbt4e4X3FRUOlv/9s0zkEUBPB9 hICbL1mOLZTJvaM+Vwd1wYjcdkmbQBFL7upMKJVyvPe2ZdaJzacpWsiPg 7IjFw3RqXd1q6Oj1DLOnTpzempw42/cJpIz9WQROxYdQxEnGyGBHH7ORh Tt6uaR3qI54CVKJmwZcb+bwFSnaSGd+zYo4QZaW2aWRTwhwJT03DDMk6a g==; X-IronPort-AV: E=McAfee;i="6600,9927,10883"; a="1896050" X-IronPort-AV: E=Sophos;i="6.03,275,1694761200"; d="scan'208";a="1896050" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Nov 2023 13:18:38 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10883"; a="832131118" X-IronPort-AV: E=Sophos;i="6.03,275,1694761200"; d="scan'208";a="832131118" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga004.fm.intel.com with ESMTP; 03 Nov 2023 13:18:34 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id B80685F9; Fri, 3 Nov 2023 22:18:33 +0200 (EET) From: Andy Shevchenko To: Jani Nikula , Andy Shevchenko , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , David Airlie , Daniel Vetter , Hans de Goede Subject: [PATCH v4 03/16] drm/i915/dsi: clarify GPIO exec sequence Date: Fri, 3 Nov 2023 22:18:18 +0200 Message-Id: <20231103201831.1037416-4-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20231103201831.1037416-1-andriy.shevchenko@linux.intel.com> References: <20231103201831.1037416-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Jani Nikula With the various sequence versions and pointer increments interleaved, it's a bit hard to decipher what's going on. Add separate paths for different sequence versions. Cc: Andy Shevchenko Cc: Hans de Goede Signed-off-by: Jani Nikula Signed-off-by: Andy Shevchenko --- drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 31 +++++++++++--------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c b/drivers/gpu/drm= /i915/display/intel_dsi_vbt.c index 8b962f2ac475..11073efe26c0 100644 --- a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c +++ b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c @@ -456,26 +456,29 @@ static const u8 *mipi_exec_gpio(struct intel_dsi *int= el_dsi, const u8 *data) struct drm_device *dev =3D intel_dsi->base.base.dev; struct drm_i915_private *i915 =3D to_i915(dev); struct intel_connector *connector =3D intel_dsi->attached_connector; - u8 gpio_source, gpio_index =3D 0, gpio_number; + u8 gpio_source =3D 0, gpio_index =3D 0, gpio_number; bool value; + int size; bool native =3D DISPLAY_VER(i915) >=3D 11; =20 - if (connector->panel.vbt.dsi.seq_version >=3D 3) - gpio_index =3D *data++; + if (connector->panel.vbt.dsi.seq_version >=3D 3) { + size =3D 3; =20 - gpio_number =3D *data++; + gpio_index =3D data[0]; + gpio_number =3D data[1]; + value =3D data[2] & BIT(0); =20 - /* gpio source in sequence v2 only */ - if (connector->panel.vbt.dsi.seq_version =3D=3D 2) - gpio_source =3D (*data >> 1) & 3; - else - gpio_source =3D 0; + if (connector->panel.vbt.dsi.seq_version >=3D 4 && data[2] & BIT(1)) + native =3D false; + } else { + size =3D 2; =20 - if (connector->panel.vbt.dsi.seq_version >=3D 4 && *data & BIT(1)) - native =3D false; + gpio_number =3D data[0]; + value =3D data[1] & BIT(0); =20 - /* pull up/down */ - value =3D *data++ & 1; + if (connector->panel.vbt.dsi.seq_version =3D=3D 2) + gpio_source =3D (data[1] >> 1) & 3; + } =20 drm_dbg_kms(&i915->drm, "GPIO index %u, number %u, source %u, native %s, = set to %s\n", gpio_index, gpio_number, gpio_source, str_yes_no(native), str_on_off= (value)); @@ -491,7 +494,7 @@ static const u8 *mipi_exec_gpio(struct intel_dsi *intel= _dsi, const u8 *data) else bxt_exec_gpio(connector, gpio_source, gpio_index, value); =20 - return data; + return data + size; } =20 #ifdef CONFIG_ACPI --=20 2.40.0.1.gaa8946217a0b