From patchwork Mon Sep 23 18:13:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Nautiyal, Ankit K" X-Patchwork-Id: 13809873 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 72610CF9C77 for ; Mon, 23 Sep 2024 18:12:07 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0C85210E45C; Mon, 23 Sep 2024 18:12:07 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="dobS8CeE"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.14]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6BC6D10E455; Mon, 23 Sep 2024 18:12:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1727115123; x=1758651123; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=CxrdZZSrsLn+JDJ0KXjzM4+cNOrys6BbKipEb/zdsFg=; b=dobS8CeEzBq6FfSL2js+Pbv5srb8xtRnXwdl5rtocZlBri+4oIzfpQEs lU0K/NR8g+PLXTxv3Idf9OujWHhCOoF/vTF9JQykAvfuT5wRpt0AH6kA9 Y/nCA06kTOPhuvm05pHp9BLwN+QgAwj7IwDMVh+/2kDG84kjdppzHNCMb T9fA30uWnLYiOEZQe5zOKTGNUPLiCFTcqjgGwR3qovBqubqu/6UekpqxS QZUuoHObHA78NlmRYTRMLO0OrbB0LRmFNSTr8hkjHfpu2zPdI0V/fzJ2a 5j66grpffXYpSZr+6TSUQQkkxquWBI//cR59v2BvS+xYp54RIleoxb/VF g==; X-CSE-ConnectionGUID: QBfyXmVzRySUQyMtAezvlA== X-CSE-MsgGUID: 1P+OBq/xRruBgKRELGV+4w== X-IronPort-AV: E=McAfee;i="6700,10204,11204"; a="29866271" X-IronPort-AV: E=Sophos;i="6.10,252,1719903600"; d="scan'208";a="29866271" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by orvoesa106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Sep 2024 11:12:03 -0700 X-CSE-ConnectionGUID: PyXxHstsQ96XstJk6QSYCA== X-CSE-MsgGUID: wbfPgSJoRX+4GCpsXwThuA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,252,1719903600"; d="scan'208";a="70734363" Received: from srr4-3-linux-103-aknautiy.iind.intel.com ([10.223.34.160]) by fmviesa007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Sep 2024 11:12:01 -0700 From: Ankit Nautiyal To: intel-gfx@lists.freedesktop.org Cc: intel-xe@lists.freedesktop.org, suraj.kandpal@intel.com, ville.syrjala@linux.intel.com Subject: [PATCH 10/16] drm/i915/display: Refactor enable_joiner_pipes Date: Mon, 23 Sep 2024 23:43:30 +0530 Message-ID: <20240923181336.3303940-11-ankit.k.nautiyal@intel.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240923181336.3303940-1-ankit.k.nautiyal@intel.com> References: <20240923181336.3303940-1-ankit.k.nautiyal@intel.com> MIME-Version: 1.0 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: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Pass the current pipe into enabled_joiner_pipes(), and let it figure out the proper bitmasks for us. v2: -Simplify helper get_joiner_primary_pipes. (Ville) -Nuke get_joiner_secondary_pipes. (Ville) -Add more drm_WARNs and checks for final primary/secondary pipes. (Ville) Signed-off-by: Ankit Nautiyal Suggested-by: Ville Syrjälä --- drivers/gpu/drm/i915/display/intel_display.c | 85 +++++++++++--------- 1 file changed, 48 insertions(+), 37 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index c42ba377d247..f35d1e1fdb8a 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -3706,7 +3706,14 @@ static void enabled_ultrajoiner_pipes(struct drm_i915_private *i915, } } -static void enabled_joiner_pipes(struct drm_i915_private *dev_priv, +static u8 get_joiner_primary_pipe(enum pipe pipe, u8 primary_pipes) +{ + primary_pipes &= GENMASK(pipe, 0); + + return primary_pipes ? BIT(fls(primary_pipes) - 1) : 0; +} + +static void enabled_joiner_pipes(struct drm_i915_private *dev_priv, enum pipe pipe, u8 *primary_pipes, u8 *secondary_pipes) { struct intel_display *display = to_intel_display(&dev_priv->drm); @@ -3774,41 +3781,47 @@ static void enabled_joiner_pipes(struct drm_i915_private *dev_priv, expected_ultrajoiner_secondary_pipes(primary_ultrajoiner_pipes), secondary_ultrajoiner_pipes); - *primary_pipes = primary_uncompressed_joiner_pipes | primary_bigjoiner_pipes | - primary_ultrajoiner_pipes; - *secondary_pipes = secondary_uncompressed_joiner_pipes | secondary_bigjoiner_pipes | - secondary_ultrajoiner_pipes; -} - -static enum pipe get_joiner_primary_pipe(enum pipe pipe, u8 primary_pipes, u8 secondary_pipes) -{ - if ((secondary_pipes & BIT(pipe)) == 0) - return pipe; - - /* ignore everything above our pipe */ - primary_pipes &= ~GENMASK(7, pipe); - - /* highest remaining bit should be our primary pipe */ - return fls(primary_pipes) - 1; -} + *primary_pipes = 0; + *secondary_pipes = 0; -static u8 get_joiner_secondary_pipes(enum pipe pipe, u8 primary_pipes, u8 secondary_pipes) -{ - enum pipe primary_pipe, next_primary_pipe; + if (ultrajoiner_pipes & BIT(pipe)) { + *primary_pipes = get_joiner_primary_pipe(pipe, primary_ultrajoiner_pipes); + *secondary_pipes = secondary_ultrajoiner_pipes & + expected_ultrajoiner_secondary_pipes(primary_ultrajoiner_pipes); + return; + } - primary_pipe = get_joiner_primary_pipe(pipe, primary_pipes, secondary_pipes); + if (uncompressed_joiner_pipes & BIT(pipe)) { + *primary_pipes = get_joiner_primary_pipe(pipe, primary_uncompressed_joiner_pipes); + *secondary_pipes = + secondary_uncompressed_joiner_pipes & + expected_uncompressed_joiner_secondary_pipes(primary_uncompressed_joiner_pipes); + } else if (bigjoiner_pipes & BIT(pipe)) { + *primary_pipes = get_joiner_primary_pipe(pipe, primary_bigjoiner_pipes); + *secondary_pipes = secondary_bigjoiner_pipes & + expected_bigjoiner_secondary_pipes(primary_bigjoiner_pipes); + } - if ((primary_pipes & BIT(primary_pipe)) == 0) - return 0; + drm_WARN(display->drm, + expected_bigjoiner_secondary_pipes(*primary_pipes) != *secondary_pipes, + "Wrong bigjoiner secondary pipes for primary_pipes %#x (expected %#x, current %#x for)\n", + *primary_pipes, + expected_bigjoiner_secondary_pipes(*primary_pipes), + *secondary_pipes); - /* ignore our primary pipe and everything below it */ - primary_pipes &= ~GENMASK(primary_pipe, 0); - /* make sure a high bit is set for the ffs() */ - primary_pipes |= BIT(7); - /* lowest remaining bit should be the next primary pipe */ - next_primary_pipe = ffs(primary_pipes) - 1; + drm_WARN(display->drm, + expected_uncompressed_joiner_secondary_pipes(*primary_pipes) != *secondary_pipes, + "Wrong uncompressed joiner secondary pipes for primary_pipes %#x (expected %#x, current %#x for)\n", + *primary_pipes, + expected_uncompressed_joiner_secondary_pipes(*primary_pipes), + *secondary_pipes); - return secondary_pipes & GENMASK(next_primary_pipe - 1, primary_pipe); + drm_WARN(display->drm, + expected_ultrajoiner_secondary_pipes(*primary_pipes) != *secondary_pipes, + "Wrong ultrajoiner secondary pipes for primary_pipes %#x (expected %#x, current %#x for)\n", + *primary_pipes, + expected_ultrajoiner_secondary_pipes(*primary_pipes), + *secondary_pipes); } static u8 hsw_panel_transcoders(struct drm_i915_private *i915) @@ -3880,10 +3893,10 @@ static u8 hsw_enabled_transcoders(struct intel_crtc *crtc) enabled_transcoders |= BIT(cpu_transcoder); /* joiner secondary -> consider the primary pipe's transcoder as well */ - enabled_joiner_pipes(dev_priv, &primary_pipes, &secondary_pipes); + enabled_joiner_pipes(dev_priv, crtc->pipe, &primary_pipes, &secondary_pipes); if (secondary_pipes & BIT(crtc->pipe)) { cpu_transcoder = (enum transcoder) - get_joiner_primary_pipe(crtc->pipe, primary_pipes, secondary_pipes); + ffs(get_joiner_primary_pipe(crtc->pipe, primary_pipes)) - 1; if (transcoder_ddi_func_is_enabled(dev_priv, cpu_transcoder)) enabled_transcoders |= BIT(cpu_transcoder); } @@ -4017,14 +4030,12 @@ static void intel_joiner_get_config(struct intel_crtc_state *crtc_state) u8 primary_pipes, secondary_pipes; enum pipe pipe = crtc->pipe; - enabled_joiner_pipes(i915, &primary_pipes, &secondary_pipes); + enabled_joiner_pipes(i915, pipe, &primary_pipes, &secondary_pipes); if (((primary_pipes | secondary_pipes) & BIT(pipe)) == 0) return; - crtc_state->joiner_pipes = - BIT(get_joiner_primary_pipe(pipe, primary_pipes, secondary_pipes)) | - get_joiner_secondary_pipes(pipe, primary_pipes, secondary_pipes); + crtc_state->joiner_pipes = primary_pipes | secondary_pipes; } static bool hsw_get_pipe_config(struct intel_crtc *crtc,