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 8D8E3E6FE2F for ; Fri, 6 Sep 2024 16:30:26 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 072A910E975; Fri, 6 Sep 2024 16:30:26 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="klt3wK+/"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.13]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2BD8610EA6F for ; Fri, 6 Sep 2024 16:30:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1725640225; x=1757176225; h=date:from:to:cc:subject:message-id:references: mime-version:content-transfer-encoding:in-reply-to; bh=b2hPYUKAb409EeDk60ZPRM8W9+41pQOaPQaSq8A1zIQ=; b=klt3wK+/JLay6fVuKhXRgRKE+ZD9+qEcFG/o0lW2jrlQlwTdnsDNGr5Z OVwTMWyYFUmuCie7ua3cjHjBTuLJizPYALGgrCnxxyq06OSiEP3BYJFKv fLEe3RDQMlUs7Ep7KTCh502OtJYZaDiO0ixV4uAR+BhKXCUk6bjcJ6jeB 7jqCeXVLKdIy04SFJFshUbS4R2PBJwBt49aVNfE0d0mkg3N2SG4V0Qqkz y4OHoL8+u0ObQnz6RCn3l+lmaForp1xTThCenpCmeXEYD5Qd9GXA3cC2/ gmgYPctZ/OFpef0GulKfDe+7x66t3qeC5mAN5JfSP4d7nU9hGav35mK9O A==; X-CSE-ConnectionGUID: LNKQjWxYRe+q+SeQ7pSekQ== X-CSE-MsgGUID: akK1aTwESmqePNt4enaWKQ== X-IronPort-AV: E=McAfee;i="6700,10204,11187"; a="27331796" X-IronPort-AV: E=Sophos;i="6.10,208,1719903600"; d="scan'208";a="27331796" Received: from fmviesa008.fm.intel.com ([10.60.135.148]) by fmvoesa107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Sep 2024 09:30:25 -0700 X-CSE-ConnectionGUID: ehQgedg0RPyZ67+MR5zn5Q== X-CSE-MsgGUID: jmfvfziiQDCzZBkP9SwC7g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,208,1719903600"; d="scan'208";a="66041075" Received: from stinkpipe.fi.intel.com (HELO stinkbox) ([10.237.72.74]) by fmviesa008.fm.intel.com with SMTP; 06 Sep 2024 09:30:17 -0700 Received: by stinkbox (sSMTP sendmail emulation); Fri, 06 Sep 2024 19:30:16 +0300 Date: Fri, 6 Sep 2024 19:30:16 +0300 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Ankit Nautiyal Cc: intel-gfx@lists.freedesktop.org, jani.saarinen@intel.com Subject: Re: [PATCH 10/14] drm/i915/display/vdsc: Add ultrajoiner support with DSC Message-ID: References: <20240906125807.3960642-1-ankit.k.nautiyal@intel.com> <20240906125807.3960642-11-ankit.k.nautiyal@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20240906125807.3960642-11-ankit.k.nautiyal@intel.com> X-Patchwork-Hint: comment 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" On Fri, Sep 06, 2024 at 06:28:03PM +0530, Ankit Nautiyal wrote: > From: Stanislav Lisovskiy > > Add changes to DSC which are required for Ultrajoiner. > > v2: > -Use correct helper for setting bits for bigjoiner secondary. (Ankit) > -Use enum for joiner pipe count instead magic numbers. (Suraj) > -Use primary/secondary instead of master/slave. (Suraj) > > Signed-off-by: Stanislav Lisovskiy > Signed-off-by: Ankit Nautiyal > --- > drivers/gpu/drm/i915/display/intel_vdsc.c | 26 +++++++++++++++++++++-- > 1 file changed, 24 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_vdsc.c b/drivers/gpu/drm/i915/display/intel_vdsc.c > index 8158e3702ed5..66e810c8de68 100644 > --- a/drivers/gpu/drm/i915/display/intel_vdsc.c > +++ b/drivers/gpu/drm/i915/display/intel_vdsc.c > @@ -379,9 +379,11 @@ static int intel_dsc_get_vdsc_per_pipe(const struct intel_crtc_state *crtc_state > int intel_dsc_get_num_vdsc_instances(const struct intel_crtc_state *crtc_state) > { > int num_vdsc_instances = intel_dsc_get_vdsc_per_pipe(crtc_state); > + int joined_pipes = intel_joiner_num_pipes(crtc_state); > > - if (crtc_state->joiner_pipes) > - num_vdsc_instances *= 2; > + if (joined_pipes == INTEL_BIG_JOINER_PIPES || > + joined_pipes == INTEL_ULTRA_JOINER_PIPES) > + num_vdsc_instances *= joined_pipes; > > return num_vdsc_instances; > } > @@ -751,6 +753,14 @@ void intel_uncompressed_joiner_enable(const struct intel_crtc_state *crtc_state) > } > } > > +static bool intel_crtc_ultrajoiner_enable_needed(const struct intel_crtc_state *crtc_state) > +{ > + struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc); > + > + return intel_joiner_num_pipes(crtc_state) == INTEL_ULTRA_JOINER_PIPES && > + crtc->pipe != PIPE_D; > +} > + > void intel_dsc_enable(const struct intel_crtc_state *crtc_state) > { > struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc); > @@ -770,7 +780,19 @@ void intel_dsc_enable(const struct intel_crtc_state *crtc_state) > dss_ctl1_val |= JOINER_ENABLE; > } > if (crtc_state->joiner_pipes) { > + /* > + * This bit doesn't seem to follow primary/secondary logic or > + * any other logic, so lets just add helper function to > + * at least hide this hassle.. > + */ > + if (intel_crtc_ultrajoiner_enable_needed(crtc_state)) What is this crazyness? This would throw a big wrench into the works, eg. the ultrajoiner readout would not work as intended. > + dss_ctl1_val |= ULTRA_JOINER_ENABLE; > + > + if (intel_crtc_is_ultrajoiner_primary(crtc_state)) > + dss_ctl1_val |= PRIMARY_ULTRA_JOINER_ENABLE; > + > dss_ctl1_val |= BIG_JOINER_ENABLE; > + > if (intel_crtc_is_bigjoiner_primary(crtc_state)) > dss_ctl1_val |= PRIMARY_BIG_JOINER_ENABLE; > } > -- > 2.45.2 -- Ville Syrjälä Intel