From patchwork Fri Jan 20 19:34:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas De Marchi X-Patchwork-Id: 13110442 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 7EFE5C05027 for ; Fri, 20 Jan 2023 19:35:19 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9D84710E39E; Fri, 20 Jan 2023 19:35:18 +0000 (UTC) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 25E3110E39D; Fri, 20 Jan 2023 19:35:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1674243317; x=1705779317; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=JkJ/6DM+yJ+S9/cGDmr03heCuMLdJmi6DdGD4GNk6pU=; b=hzxhJ6DkMf07b7jIwTsDNlxaTWd9OYigbijVcl3UBD7WlFENINwrBhC4 uYkhcoYZw0pIvpQWClmLg+yyE4KAd8nLtz7I2GcZXBzP1Oob9qeP/dJzs Fpa8F3IyPtM91CdOIajp6Pkpd2sjOrd6MB56TxcVYUkzbFfftUC47p3ab SMRXGf8vapxBZrwRNXUAre3bjDRq2a3Bsdp9RQYw0WuA/IwOLX5cSi2A0 wjjq5c3qIUKQ0+O9h49WOL5lIlyQEOxh3RZpmRz1h2rfWS97iaSxIM2mv adAbIkdhUplhAwLuKDFFg1rjBBKSr4ko8aCa8sNbFqoVxoaXGG+D2suv+ A==; X-IronPort-AV: E=McAfee;i="6500,9779,10596"; a="411903527" X-IronPort-AV: E=Sophos;i="5.97,233,1669104000"; d="scan'208";a="411903527" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Jan 2023 11:35:16 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10596"; a="834518293" X-IronPort-AV: E=Sophos;i="5.97,233,1669104000"; d="scan'208";a="834518293" Received: from lucas-s2600cw.jf.intel.com ([10.165.21.196]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Jan 2023 11:35:16 -0800 From: Lucas De Marchi To: intel-gfx@lists.freedesktop.org Date: Fri, 20 Jan 2023 11:34:49 -0800 Message-Id: <20230120193457.3295977-1-lucas.demarchi@intel.com> X-Mailer: git-send-email 2.39.0 MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH v2 0/8] Add _PICK_EVEN_2RANGES X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lucas De Marchi , dri-devel@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Add a new macro, _PICK_EVEN_2RANGES, that supports using 2 address ranges. This can be considered a v2 of https://patchwork.freedesktop.org/series/109606/ I think I converted all the _PICK() uses that could be easily done without making it much harder to read. We do have some cases of 3 ranges: I left those alone. As commented in the original series and like Jani I think we may need something else to cover all the use cases in future. Right now I don't think we have a good alternative though. This new macro both improves the current code and can be used for cases the ranges change in new platforms, so I think it's good enough. In future I think just saving the reg during initialization and using different functions if the bitfields change may be an alternative. This was lightly tested on ADL-S and DG2. Lucas De Marchi (8): drm/i915: Add _PICK_EVEN_2RANGES() drm/i915: Fix coding style on DPLL*_ENABLE defines drm/i915: Convert pll macros to _PICK_EVEN_2RANGES drm/i915: Replace _MMIO_PHY3() with _PICK_EVEN_2RANGES() drm/i915: Convert PIPE3/PORT3 to _PICK_EVEN_2RANGES() drm/i915: Convert _FIA() to _PICK_EVEN_2RANGES() drm/i915: Convert MBUS_ABOX_CTL() to _PICK_EVEN_2RANGES() drm/i915: Convert PALETTE() to _PICK_EVEN_2RANGES() .../drm/i915/display/intel_display_reg_defs.h | 10 +- .../gpu/drm/i915/display/intel_mg_phy_regs.h | 4 +- drivers/gpu/drm/i915/i915_reg.h | 106 +++++++++--------- drivers/gpu/drm/i915/i915_reg_defs.h | 28 +++++ 4 files changed, 89 insertions(+), 59 deletions(-) Acked-by: Jani Nikula