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=-11.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 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 C8FE6C433DF for ; Wed, 14 Oct 2020 19:07:42 +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 562C920691 for ; Wed, 14 Oct 2020 19:07:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 562C920691 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 708F46EAD6; Wed, 14 Oct 2020 19:07:41 +0000 (UTC) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id B4E066EAD6 for ; Wed, 14 Oct 2020 19:07:40 +0000 (UTC) IronPort-SDR: eIedkEfTYXeiF5iudrijg5fi7SlK4gJCLAjm/jI/0a/MDDUiRrLEN3ZbliNtn5L2QddrymoK3C 3EEivwVJZjhQ== X-IronPort-AV: E=McAfee;i="6000,8403,9774"; a="166234140" X-IronPort-AV: E=Sophos;i="5.77,375,1596524400"; d="scan'208";a="166234140" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Oct 2020 12:07:37 -0700 IronPort-SDR: 9oqivoSqjFLwIKYNInzb9zhbxJxj1p4wPltkKHT82SBPQEQa98u+cMycllGsQM8QAo+86TDDMV FHTCLGyY9kzA== X-IronPort-AV: E=Sophos;i="5.77,375,1596524400"; d="scan'208";a="521533542" Received: from labuser-z97x-ud5h.jf.intel.com (HELO labuser-Z97X-UD5H) ([10.165.21.211]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Oct 2020 12:07:36 -0700 Date: Wed, 14 Oct 2020 12:09:07 -0700 From: "Navare, Manasi" To: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Message-ID: <20201014190906.GA22971@labuser-Z97X-UD5H> References: <20201008214535.22942-1-manasi.d.navare@intel.com> <20201008214535.22942-5-manasi.d.navare@intel.com> <20201014113315.GH6112@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20201014113315.GH6112@intel.com> User-Agent: Mutt/1.5.24 (2015-08-30) Subject: Re: [Intel-gfx] [PATCH v10 05/11] drm/i915: Try to make bigjoiner work in atomic check 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: intel-gfx@lists.freedesktop.org Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Wed, Oct 14, 2020 at 02:33:15PM +0300, Ville Syrj=E4l=E4 wrote: > On Thu, Oct 08, 2020 at 02:45:29PM -0700, Manasi Navare wrote: > > From: Maarten Lankhorst > > = > > When the clock is higher than the dotclock, try with 2 pipes enabled. > > If we can enable 2, then we will go into big joiner mode, and steal > > the adjacent crtc. > > = > > This only links the crtc's in software, no hardware or plane > > programming is done yet. Blobs are also copied from the master's > > crtc_state, so it doesn't depend at commit time on the other > > crtc_state. > > = > > v4: > > * Fixes in intel_crtc_compute_config (Ville) > > v3: > > * Manual Rebase (Manasi) > > Changes since v1: > > - Rename pipe timings to transcoder timings, as they are now different. > > Changes since v2: > > - Rework bigjoiner checks; always disable slave when recalculating > > master. No need to have a separate bigjoiner pass any more. > > - Use pipe_mode instead of transcoder_mode, to clean up the code. > > = > > Signed-off-by: Maarten Lankhorst > > Signed-off-by: Manasi Navare > > --- > > drivers/gpu/drm/i915/display/intel_atomic.c | 9 +- > > drivers/gpu/drm/i915/display/intel_atomic.h | 3 +- > > drivers/gpu/drm/i915/display/intel_display.c | 202 ++++++++++++++++-- > > .../drm/i915/display/intel_display_types.h | 9 + > > drivers/gpu/drm/i915/display/intel_dp.c | 22 +- > > 5 files changed, 211 insertions(+), 34 deletions(-) > > = > > diff --git a/drivers/gpu/drm/i915/display/intel_atomic.c b/drivers/gpu/= drm/i915/display/intel_atomic.c > > index 86be032bcf96..e243ce97b534 100644 > > --- a/drivers/gpu/drm/i915/display/intel_atomic.c > > +++ b/drivers/gpu/drm/i915/display/intel_atomic.c > > @@ -270,14 +270,15 @@ void intel_crtc_free_hw_state(struct intel_crtc_s= tate *crtc_state) > > intel_crtc_put_color_blobs(crtc_state); > > } > > = > > -void intel_crtc_copy_color_blobs(struct intel_crtc_state *crtc_state) > > +void intel_crtc_copy_color_blobs(struct intel_crtc_state *crtc_state, > > + const struct intel_crtc_state *from_crtc_state) > > { > > drm_property_replace_blob(&crtc_state->hw.degamma_lut, > > - crtc_state->uapi.degamma_lut); > > + from_crtc_state->uapi.degamma_lut); > > drm_property_replace_blob(&crtc_state->hw.gamma_lut, > > - crtc_state->uapi.gamma_lut); > > + from_crtc_state->uapi.gamma_lut); > > drm_property_replace_blob(&crtc_state->hw.ctm, > > - crtc_state->uapi.ctm); > > + from_crtc_state->uapi.ctm); > > } > = > This thing could easily be its own patch. Yes probably have a separate patch that adds from_crtc_state, will do that > = > > = > > /** > > diff --git a/drivers/gpu/drm/i915/display/intel_atomic.h b/drivers/gpu/= drm/i915/display/intel_atomic.h > > index 285de07011dc..62a3365ed5e6 100644 > > --- a/drivers/gpu/drm/i915/display/intel_atomic.h > > +++ b/drivers/gpu/drm/i915/display/intel_atomic.h > > @@ -43,7 +43,8 @@ struct drm_crtc_state *intel_crtc_duplicate_state(str= uct drm_crtc *crtc); > > void intel_crtc_destroy_state(struct drm_crtc *crtc, > > struct drm_crtc_state *state); > > void intel_crtc_free_hw_state(struct intel_crtc_state *crtc_state); > > -void intel_crtc_copy_color_blobs(struct intel_crtc_state *crtc_state); > > +void intel_crtc_copy_color_blobs(struct intel_crtc_state *crtc_state, > > + const struct intel_crtc_state *from_crtc_state); > > struct drm_atomic_state *intel_atomic_state_alloc(struct drm_device *d= ev); > > void intel_atomic_state_free(struct drm_atomic_state *state); > > void intel_atomic_state_clear(struct drm_atomic_state *state); > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu= /drm/i915/display/intel_display.c > > index cc540c7b7dcd..37b56f4c2401 100644 > > --- a/drivers/gpu/drm/i915/display/intel_display.c > > +++ b/drivers/gpu/drm/i915/display/intel_display.c > > @@ -8130,9 +8130,24 @@ static int intel_crtc_compute_config(struct inte= l_crtc *crtc, > > struct intel_crtc_state *pipe_config) > > { > > struct drm_i915_private *dev_priv =3D to_i915(crtc->base.dev); > > - const struct drm_display_mode *pipe_mode =3D &pipe_config->hw.pipe_mo= de; > > + struct drm_display_mode *pipe_mode =3D &pipe_config->hw.pipe_mode; > > int clock_limit =3D dev_priv->max_dotclk_freq; > > = > > + *pipe_mode =3D pipe_config->hw.adjusted_mode; > > + > > + /* Adjust pipe_mode for bigjoiner, with half the horizontal mode */ > > + if (pipe_config->bigjoiner) { > > + pipe_mode->crtc_clock /=3D 2; > > + pipe_mode->crtc_hdisplay /=3D 2; > > + pipe_mode->crtc_hblank_start /=3D 2; > > + pipe_mode->crtc_hblank_end /=3D 2; > > + pipe_mode->crtc_hsync_start /=3D 2; > > + pipe_mode->crtc_hsync_end /=3D 2; > > + pipe_mode->crtc_htotal /=3D 2; > > + pipe_mode->crtc_hskew /=3D 2; > > + pipe_config->pipe_src_w /=3D 2; > > + } > > + > > if (INTEL_GEN(dev_priv) < 4) { > > clock_limit =3D dev_priv->max_cdclk_freq * 9 / 10; > > = > > @@ -8193,7 +8208,7 @@ static int intel_crtc_compute_config(struct intel= _crtc *crtc, > > * WaPruneModeWithIncorrectHsyncOffset:ctg,elk,ilk,snb,ivb,vlv,hsw. > > */ > > if ((INTEL_GEN(dev_priv) > 4 || IS_G4X(dev_priv)) && > > - pipe_mode->crtc_hsync_start =3D=3D pipe_mode->crtc_hdisplay) > > + pipe_mode->crtc_hsync_start =3D=3D pipe_mode->crtc_hdisplay) > > return -EINVAL; > > = > > intel_crtc_compute_pixel_rate(pipe_config); > > @@ -12559,7 +12574,7 @@ static bool encoders_cloneable(const struct int= el_encoder *a, > > b->cloneable & (1 << a->type)); > > } > > = > > -static bool check_single_encoder_cloning(struct drm_atomic_state *stat= e, > > +static bool check_single_encoder_cloning(struct intel_atomic_state *st= ate, > > struct intel_crtc *crtc, > > struct intel_encoder *encoder) > > { > = > These things should be split out. So split out changing drm_atomic_state to intel_atomic_state in a separate = patch? Okay will do.. and everything else in this patch? Manasi > = > > @@ -12568,7 +12583,7 @@ static bool check_single_encoder_cloning(struct= drm_atomic_state *state, > > struct drm_connector_state *connector_state; > > int i; > > = > > - for_each_new_connector_in_state(state, connector, connector_state, i)= { > > + for_each_new_connector_in_state(&state->base, connector, connector_st= ate, i) { > > if (connector_state->crtc !=3D &crtc->base) > > continue; > > = > > @@ -12808,6 +12823,7 @@ static int intel_crtc_atomic_check(struct intel= _atomic_state *state, > > = > > if (mode_changed && crtc_state->hw.enable && > > dev_priv->display.crtc_compute_clock && > > + !crtc_state->bigjoiner_slave && > > !drm_WARN_ON(&dev_priv->drm, crtc_state->shared_dpll)) { > > ret =3D dev_priv->display.crtc_compute_clock(crtc, crtc_state); > > if (ret) > > @@ -13341,19 +13357,32 @@ static bool check_digital_port_conflicts(stru= ct intel_atomic_state *state) > > } > > = > > static void > > -intel_crtc_copy_uapi_to_hw_state_nomodeset(struct intel_crtc_state *cr= tc_state) > > +intel_crtc_copy_uapi_to_hw_state_nomodeset(struct intel_atomic_state *= state, > > + struct intel_crtc_state *crtc_state) > > { > > - intel_crtc_copy_color_blobs(crtc_state); > > + const struct intel_crtc_state *from_crtc_state =3D crtc_state; > > + > > + if (crtc_state->bigjoiner_slave) { > > + from_crtc_state =3D intel_atomic_get_new_crtc_state(state, > > + crtc_state->bigjoiner_linked_crtc); > > + > > + /* No need to copy state if the master state is unchanged */ > > + if (!from_crtc_state) > > + return; > > + } > > + > > + intel_crtc_copy_color_blobs(crtc_state, from_crtc_state); > > } > > = > > static void > > -intel_crtc_copy_uapi_to_hw_state(struct intel_crtc_state *crtc_state) > > +intel_crtc_copy_uapi_to_hw_state(struct intel_atomic_state *state, > > + struct intel_crtc_state *crtc_state) > > { > > crtc_state->hw.enable =3D crtc_state->uapi.enable; > > crtc_state->hw.active =3D crtc_state->uapi.active; > > crtc_state->hw.mode =3D crtc_state->uapi.mode; > > crtc_state->hw.pipe_mode =3D crtc_state->hw.adjusted_mode =3D crtc_st= ate->uapi.adjusted_mode; > > - intel_crtc_copy_uapi_to_hw_state_nomodeset(crtc_state); > > + intel_crtc_copy_uapi_to_hw_state_nomodeset(state, crtc_state); > > } > > = > > static void intel_crtc_copy_hw_to_uapi_state(struct intel_crtc_state *= crtc_state) > > @@ -13375,7 +13404,49 @@ static void intel_crtc_copy_hw_to_uapi_state(s= truct intel_crtc_state *crtc_state > > } > > = > > static int > > -intel_crtc_prepare_cleared_state(struct intel_crtc_state *crtc_state) > > +copy_bigjoiner_crtc_state(struct intel_crtc_state *crtc_state, > > + const struct intel_crtc_state *from_crtc_state) > > +{ > > + struct intel_crtc_state *saved_state; > > + struct intel_crtc *crtc =3D to_intel_crtc(crtc_state->uapi.crtc); > > + > > + saved_state =3D kmemdup(from_crtc_state, sizeof(*saved_state), GFP_KE= RNEL); > > + if (!saved_state) > > + return -ENOMEM; > > + > > + saved_state->uapi =3D crtc_state->uapi; > > + saved_state->scaler_state =3D crtc_state->scaler_state; > > + saved_state->shared_dpll =3D crtc_state->shared_dpll; > > + saved_state->dpll_hw_state =3D crtc_state->dpll_hw_state; > > + saved_state->crc_enabled =3D crtc_state->crc_enabled; > > + > > + intel_crtc_free_hw_state(crtc_state); > > + memcpy(crtc_state, saved_state, sizeof(*crtc_state)); > > + kfree(saved_state); > > + > > + /* Re-init hw state */ > > + memset(&crtc_state->hw, 0, sizeof(saved_state->hw)); > > + crtc_state->hw.enable =3D from_crtc_state->hw.enable; > > + crtc_state->hw.active =3D from_crtc_state->hw.active; > > + crtc_state->hw.pipe_mode =3D from_crtc_state->hw.pipe_mode; > > + crtc_state->hw.adjusted_mode =3D from_crtc_state->hw.adjusted_mode; > > + > > + /* Some fixups */ > > + crtc_state->uapi.mode_changed =3D from_crtc_state->uapi.mode_changed; > > + crtc_state->uapi.connectors_changed =3D from_crtc_state->uapi.connect= ors_changed; > > + crtc_state->uapi.active_changed =3D from_crtc_state->uapi.active_chan= ged; > > + crtc_state->nv12_planes =3D crtc_state->c8_planes =3D crtc_state->upd= ate_planes =3D 0; > > + crtc_state->bigjoiner_linked_crtc =3D to_intel_crtc(from_crtc_state->= uapi.crtc); > > + crtc_state->bigjoiner_slave =3D true; > > + crtc_state->cpu_transcoder =3D (enum transcoder)crtc->pipe; > > + crtc_state->has_audio =3D false; > > + > > + return 0; > > +} > > + > > +static int > > +intel_crtc_prepare_cleared_state(struct intel_atomic_state *state, > > + struct intel_crtc_state *crtc_state) > > { > > struct intel_crtc *crtc =3D to_intel_crtc(crtc_state->uapi.crtc); > > struct drm_i915_private *dev_priv =3D to_i915(crtc->base.dev); > > @@ -13407,16 +13478,16 @@ intel_crtc_prepare_cleared_state(struct intel= _crtc_state *crtc_state) > > memcpy(crtc_state, saved_state, sizeof(*crtc_state)); > > kfree(saved_state); > > = > > - intel_crtc_copy_uapi_to_hw_state(crtc_state); > > + intel_crtc_copy_uapi_to_hw_state(state, crtc_state); > > = > > return 0; > > } > > = > > static int > > -intel_modeset_pipe_config(struct intel_crtc_state *pipe_config) > > +intel_modeset_pipe_config(struct intel_atomic_state *state, > > + struct intel_crtc_state *pipe_config) > > { > > struct drm_crtc *crtc =3D pipe_config->uapi.crtc; > > - struct drm_atomic_state *state =3D pipe_config->uapi.state; > > struct drm_i915_private *i915 =3D to_i915(pipe_config->uapi.crtc->dev= ); > > struct drm_connector *connector; > > struct drm_connector_state *connector_state; > > @@ -13458,7 +13529,7 @@ intel_modeset_pipe_config(struct intel_crtc_sta= te *pipe_config) > > &pipe_config->pipe_src_w, > > &pipe_config->pipe_src_h); > > = > > - for_each_new_connector_in_state(state, connector, connector_state, i)= { > > + for_each_new_connector_in_state(&state->base, connector, connector_st= ate, i) { > > struct intel_encoder *encoder =3D > > to_intel_encoder(connector_state->best_encoder); > > = > > @@ -13496,7 +13567,7 @@ intel_modeset_pipe_config(struct intel_crtc_sta= te *pipe_config) > > * adjust it according to limitations or connector properties, and al= so > > * a chance to reject the mode entirely. > > */ > > - for_each_new_connector_in_state(state, connector, connector_state, i)= { > > + for_each_new_connector_in_state(&state->base, connector, connector_st= ate, i) { > > struct intel_encoder *encoder =3D > > to_intel_encoder(connector_state->best_encoder); > > = > > @@ -13548,9 +13619,6 @@ intel_modeset_pipe_config(struct intel_crtc_sta= te *pipe_config) > > "hw max bpp: %i, pipe bpp: %i, dithering: %i\n", > > base_bpp, pipe_config->pipe_bpp, pipe_config->dither); > > = > > - /* without bigjoiner, pipe_mode =3D=3D adjusted_mode */ > > - pipe_config->hw.pipe_mode =3D pipe_config->hw.adjusted_mode; > > - > > return 0; > > } > > = > > @@ -14946,6 +15014,75 @@ static bool intel_cpu_transcoders_need_modeset= (struct intel_atomic_state *state, > > return false; > > } > > = > > +static int intel_atomic_check_bigjoiner(struct intel_atomic_state *sta= te, > > + struct intel_crtc *crtc, > > + struct intel_crtc_state *old_crtc_state, > > + struct intel_crtc_state *new_crtc_state) > > +{ > > + struct drm_i915_private *dev_priv =3D to_i915(state->base.dev); > > + struct intel_crtc_state *slave_crtc_state, *master_crtc_state; > > + struct intel_crtc *slave, *master; > > + > > + /* slave being enabled, is master is still claiming this crtc? */ > > + if (old_crtc_state->bigjoiner_slave) { > > + slave =3D crtc; > > + master =3D old_crtc_state->bigjoiner_linked_crtc; > > + master_crtc_state =3D intel_atomic_get_new_crtc_state(state, master); > > + if (!master_crtc_state || !needs_modeset(master_crtc_state)) > > + goto claimed; > > + } > > + > > + if (!new_crtc_state->bigjoiner) > > + return 0; > > + > > + if (1 + crtc->pipe >=3D INTEL_NUM_PIPES(dev_priv)) { > > + DRM_DEBUG_KMS("[CRTC:%d:%s] Big joiner configuration requires " > > + "CRTC + 1 to be used, doesn't exist\n", > > + crtc->base.base.id, crtc->base.name); > > + return -EINVAL; > > + } > > + > > + slave =3D new_crtc_state->bigjoiner_linked_crtc =3D > > + intel_get_crtc_for_pipe(dev_priv, crtc->pipe + 1); > > + slave_crtc_state =3D intel_atomic_get_crtc_state(&state->base, slave); > > + master =3D crtc; > > + if (IS_ERR(slave_crtc_state)) > > + return PTR_ERR(slave_crtc_state); > > + > > + /* master being enabled, slave was already configured? */ > > + if (slave_crtc_state->uapi.enable) > > + goto claimed; > > + > > + DRM_DEBUG_KMS("[CRTC:%d:%s] Used as slave for big joiner\n", > > + slave->base.base.id, slave->base.name); > > + > > + return copy_bigjoiner_crtc_state(slave_crtc_state, new_crtc_state); > > + > > +claimed: > > + DRM_DEBUG_KMS("[CRTC:%d:%s] Slave is enabled as normal CRTC, but " > > + "[CRTC:%d:%s] claiming this CRTC for bigjoiner.\n", > > + slave->base.base.id, slave->base.name, > > + master->base.base.id, master->base.name); > > + return -EINVAL; > > +} > > + > > +static int kill_bigjoiner_slave(struct intel_atomic_state *state, > > + struct intel_crtc_state *master_crtc_state) > > +{ > > + struct intel_crtc_state *slave_crtc_state =3D > > + intel_atomic_get_crtc_state(&state->base, > > + master_crtc_state->bigjoiner_linked_crtc); > > + > > + if (IS_ERR(slave_crtc_state)) > > + return PTR_ERR(slave_crtc_state); > > + > > + slave_crtc_state->bigjoiner =3D master_crtc_state->bigjoiner =3D fal= se; > > + slave_crtc_state->bigjoiner_slave =3D master_crtc_state->bigjoiner_s= lave =3D false; > > + slave_crtc_state->bigjoiner_linked_crtc =3D master_crtc_state->bigjo= iner_linked_crtc =3D NULL; > > + intel_crtc_copy_uapi_to_hw_state(state, slave_crtc_state); > > + return 0; > > +} > > + > > /** > > * DOC: asynchronous flip implementation > > * > > @@ -15108,19 +15245,36 @@ static int intel_atomic_check(struct drm_devi= ce *dev, > > new_crtc_state, i) { > > if (!needs_modeset(new_crtc_state)) { > > /* Light copy */ > > - intel_crtc_copy_uapi_to_hw_state_nomodeset(new_crtc_state); > > + intel_crtc_copy_uapi_to_hw_state_nomodeset(state, new_crtc_state); > > + > > + continue; > > + } > > = > > + /* Kill old bigjoiner link, we may re-establish afterwards */ > > + if (old_crtc_state->bigjoiner && !old_crtc_state->bigjoiner_slave) { > > + ret =3D kill_bigjoiner_slave(state, new_crtc_state); > > + if (ret) > > + goto fail; > > + } > > + > > + if (!new_crtc_state->uapi.enable) { > > + if (!new_crtc_state->bigjoiner_slave) { > > + intel_crtc_copy_uapi_to_hw_state(state, new_crtc_state); > > + any_ms =3D true; > > + } > > continue; > > } > > = > > - ret =3D intel_crtc_prepare_cleared_state(new_crtc_state); > > + ret =3D intel_crtc_prepare_cleared_state(state, new_crtc_state); > > if (ret) > > goto fail; > > = > > - if (!new_crtc_state->hw.enable) > > - continue; > > + ret =3D intel_modeset_pipe_config(state, new_crtc_state); > > + if (ret) > > + goto fail; > > = > > - ret =3D intel_modeset_pipe_config(new_crtc_state); > > + ret =3D intel_atomic_check_bigjoiner(state, crtc, old_crtc_state, > > + new_crtc_state); > > if (ret) > > goto fail; > > } > > @@ -15458,7 +15612,9 @@ static void intel_update_crtc(struct intel_atom= ic_state *state, > > = > > commit_pipe_config(state, crtc); > > = > > - if (INTEL_GEN(dev_priv) >=3D 9) > > + if (new_crtc_state->bigjoiner) { > > + /* Not supported yet */ > > + } else if (INTEL_GEN(dev_priv) >=3D 9) > > skl_update_planes_on_crtc(state, crtc); > > else > > i9xx_update_planes_on_crtc(state, crtc); > > diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drive= rs/gpu/drm/i915/display/intel_display_types.h > > index 513576217d14..c159f6a48bf0 100644 > > --- a/drivers/gpu/drm/i915/display/intel_display_types.h > > +++ b/drivers/gpu/drm/i915/display/intel_display_types.h > > @@ -1066,6 +1066,15 @@ struct intel_crtc_state { > > /* enable pipe csc? */ > > bool csc_enable; > > = > > + /* enable pipe big joiner? */ > > + bool bigjoiner; > > + > > + /* big joiner slave crtc? */ > > + bool bigjoiner_slave; > > + > > + /* linked crtc for bigjoiner, either slave or master */ > > + struct intel_crtc *bigjoiner_linked_crtc; > > + > > /* Display Stream compression state */ > > struct { > > bool compression_enable; > > diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/= i915/display/intel_dp.c > > index af2ff425e5d5..a627ad77dd3f 100644 > > --- a/drivers/gpu/drm/i915/display/intel_dp.c > > +++ b/drivers/gpu/drm/i915/display/intel_dp.c > > @@ -2386,6 +2386,15 @@ static int intel_dp_dsc_compute_config(struct in= tel_dp *intel_dp, > > pipe_config->port_clock =3D intel_dp->common_rates[limits->max_clock]; > > pipe_config->lane_count =3D limits->max_lane_count; > > = > > + if (adjusted_mode->crtc_clock > intel_dp_max_dotclock(intel_dp, false= )) { > > + if (adjusted_mode->crtc_clock > intel_dp_max_dotclock(intel_dp, true= )) { > > + DRM_DEBUG_KMS("Clock rate too high for big joiner\n"); > > + return -EINVAL; > > + } > > + pipe_config->bigjoiner =3D true; > > + DRM_DEBUG_KMS("Using bigjoiner configuration\n"); > > + } > > + > > if (intel_dp_is_edp(intel_dp)) { > > pipe_config->dsc.compressed_bpp =3D > > min_t(u16, drm_edp_dsc_sink_output_bpp(intel_dp->dsc_dpcd) >> 4, > > @@ -2403,12 +2412,12 @@ static int intel_dp_dsc_compute_config(struct i= ntel_dp *intel_dp, > > pipe_config->lane_count, > > adjusted_mode->crtc_clock, > > adjusted_mode->crtc_hdisplay, > > - false); > > + pipe_config->bigjoiner); > > dsc_dp_slice_count =3D > > intel_dp_dsc_get_slice_count(intel_dp, > > adjusted_mode->crtc_clock, > > adjusted_mode->crtc_hdisplay, > > - false); > > + pipe_config->bigjoiner); > > if (!dsc_max_output_bpp || !dsc_dp_slice_count) { > > drm_dbg_kms(&dev_priv->drm, > > "Compressed BPP/Slice Count not supported\n"); > > @@ -2424,14 +2433,15 @@ static int intel_dp_dsc_compute_config(struct i= ntel_dp *intel_dp, > > * is greater than the maximum Cdclock and if slice count is even > > * then we need to use 2 VDSC instances. > > */ > > - if (adjusted_mode->crtc_clock > dev_priv->max_cdclk_freq) { > > - if (pipe_config->dsc.slice_count > 1) { > > - pipe_config->dsc.dsc_split =3D true; > > - } else { > > + if (adjusted_mode->crtc_clock > dev_priv->max_cdclk_freq || > > + pipe_config->bigjoiner) { > > + if (pipe_config->dsc.slice_count < 2) { > > drm_dbg_kms(&dev_priv->drm, > > "Cannot split stream to use 2 VDSC instances\n"); > > return -EINVAL; > > } > > + > > + pipe_config->dsc.dsc_split =3D true; > > } > > = > > ret =3D intel_dp_dsc_compute_params(&dig_port->base, pipe_config); > > -- = > > 2.19.1 > > = > > _______________________________________________ > > Intel-gfx mailing list > > Intel-gfx@lists.freedesktop.org > > https://lists.freedesktop.org/mailman/listinfo/intel-gfx > = > -- = > Ville Syrj=E4l=E4 > Intel _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx