From: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
To: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH 05/13] drm/i915: Make skl_detach_scalers take crtc_state
Date: Wed, 3 Oct 2018 17:07:24 +0300 [thread overview]
Message-ID: <20181003140724.GX9144@intel.com> (raw)
In-Reply-To: <20181003133715.3713-6-maarten.lankhorst@linux.intel.com>
On Wed, Oct 03, 2018 at 03:37:07PM +0200, Maarten Lankhorst wrote:
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> ---
> drivers/gpu/drm/i915/intel_display.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 91574abafb65..56784ae26369 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -3502,13 +3502,13 @@ static void skl_detach_scaler(struct intel_crtc *intel_crtc, int id)
> /*
> * This function detaches (aka. unbinds) unused scalers in hardware
> */
> -static void skl_detach_scalers(struct intel_crtc *intel_crtc)
> +static void skl_detach_scalers(const struct intel_crtc_state *crtc_state)
> {
> - struct intel_crtc_scaler_state *scaler_state;
> + struct intel_crtc *intel_crtc = to_intel_crtc(crtc_state->base.crtc);
s/intel_crtc/crtc/ looks easy enough to sneak in again.
Commit msg missing.
Otherwise
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> + const struct intel_crtc_scaler_state *scaler_state =
> + &crtc_state->scaler_state;
> int i;
>
> - scaler_state = &intel_crtc->config->scaler_state;
> -
> /* loop through and disable scalers that aren't in use */
> for (i = 0; i < intel_crtc->num_scalers; i++) {
> if (!scaler_state->scalers[i].in_use)
> @@ -3916,7 +3916,7 @@ static void intel_update_pipe_config(const struct intel_crtc_state *old_crtc_sta
>
> /* on skylake this is done by detaching scalers */
> if (INTEL_GEN(dev_priv) >= 9) {
> - skl_detach_scalers(crtc);
> + skl_detach_scalers(new_crtc_state);
>
> if (new_crtc_state->pch_pfit.enabled)
> skylake_pfit_enable(new_crtc_state);
> @@ -13335,7 +13335,7 @@ static void intel_begin_crtc_commit(struct drm_crtc *crtc,
> if (intel_cstate->update_pipe)
> intel_update_pipe_config(old_intel_cstate, intel_cstate);
> else if (INTEL_GEN(dev_priv) >= 9)
> - skl_detach_scalers(intel_crtc);
> + skl_detach_scalers(intel_cstate);
>
> out:
> if (dev_priv->display.atomic_update_watermarks)
> --
> 2.19.0
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2018-10-03 14:07 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-03 13:37 [PATCH 00/13] drm/i915: First cleanup pass to get rid of more crtc->config users Maarten Lankhorst
2018-10-03 13:37 ` [PATCH 01/13] drm/i915: Remove dereferences of crtc->config in set_pipeconf/misc functions Maarten Lankhorst
2018-10-03 13:54 ` Ville Syrjälä
2018-10-03 13:37 ` [PATCH 02/13] drm/i915: Make panel fitter functions take state Maarten Lankhorst
2018-10-03 13:59 ` Ville Syrjälä
2018-10-03 13:37 ` [PATCH 03/13] drm/i915: Make intel_set_pipe_timings/src_size take a pointer to crtc_state Maarten Lankhorst
2018-10-03 14:01 ` Ville Syrjälä
2018-10-03 13:37 ` [PATCH 04/13] drm/i915: Use crtc_state in ironlake_enable_pch_transcoder Maarten Lankhorst
2018-10-03 14:05 ` Ville Syrjälä
2018-10-03 13:37 ` [PATCH 05/13] drm/i915: Make skl_detach_scalers take crtc_state Maarten Lankhorst
2018-10-03 14:07 ` Ville Syrjälä [this message]
2018-10-03 13:37 ` [PATCH 06/13] drm/i915: Make pll functions " Maarten Lankhorst
2018-10-03 14:11 ` Ville Syrjälä
2018-10-03 13:37 ` [PATCH 07/13] drm/i915: Make ironlake_pch_transcoder_set_timings " Maarten Lankhorst
2018-10-03 14:11 ` Ville Syrjälä
2018-10-03 13:37 ` [PATCH 08/13] drm/i915: Make shared dpll functions " Maarten Lankhorst
2018-10-03 14:15 ` Ville Syrjälä
2018-10-03 13:37 ` [PATCH 09/13] drm/i915: Get rid of crtc->config from icl_pll_to_ddi_pll_sel Maarten Lankhorst
2018-10-03 14:16 ` Ville Syrjälä
2018-10-03 13:37 ` [PATCH 10/13] drm/i915: Use crtc->state in intel_fbdev_init_bios Maarten Lankhorst
2018-10-03 14:18 ` Ville Syrjälä
2018-10-03 13:37 ` [PATCH 11/13] drm/i915: Get rid of crtc->config dereference in intel_dp_retrain_link Maarten Lankhorst
2018-10-03 14:21 ` Ville Syrjälä
2018-10-03 13:37 ` [PATCH 12/13] drm/i915: Get rid of crtc->config in chv_data_lane_soft_reset Maarten Lankhorst
2018-10-03 14:21 ` Ville Syrjälä
2018-10-03 13:37 ` [PATCH 13/13] drm/i915: Get rid of intel_crtc->config in crtc_enable/disable functions Maarten Lankhorst
2018-10-03 14:24 ` Ville Syrjälä
2018-10-03 14:41 ` ✗ Fi.CI.BAT: failure for drm/i915: First cleanup pass to get rid of more crtc->config users Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181003140724.GX9144@intel.com \
--to=ville.syrjala@linux.intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=maarten.lankhorst@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).