Re: [Intel-gfx] [PATCH 1/9] drm/i915: Pass intel_crtc_state to needs_modeset()
On Thu, Jun 20, 2019 at 11:46:05PM +0200, Maarten Lankhorst wrote:
Commit msg missing from some of these.
Apart from that:
Reviewed-by: Ville Syrjälä
> Signed-off-by: Maarten Lankhorst
> ---
> drivers/gpu/drm/i915/display/intel_display.c | 68 ++--
> 1 file changed, 34 insertions(+), 34 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c
> b/drivers/gpu/drm/i915/display/intel_display.c
> index 8592a7d422de..02565e97995a 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -515,9 +515,9 @@ icl_wa_scalerclkgating(struct drm_i915_private *dev_priv,
> enum pipe pipe,
> }
>
> static bool
> -needs_modeset(const struct drm_crtc_state *state)
> +needs_modeset(const struct intel_crtc_state *state)
> {
> - return drm_atomic_crtc_needs_modeset(state);
> + return drm_atomic_crtc_needs_modeset(>base);
> }
>
> /*
> @@ -5796,7 +5796,7 @@ static bool hsw_pre_update_disable_ips(const struct
> intel_crtc_state *old_crtc_s
> if (!old_crtc_state->ips_enabled)
> return false;
>
> - if (needs_modeset(_crtc_state->base))
> + if (needs_modeset(new_crtc_state))
> return true;
>
> /*
> @@ -5823,7 +5823,7 @@ static bool hsw_post_update_enable_ips(const struct
> intel_crtc_state *old_crtc_s
> if (!new_crtc_state->ips_enabled)
> return false;
>
> - if (needs_modeset(_crtc_state->base))
> + if (needs_modeset(new_crtc_state))
> return true;
>
> /*
> @@ -5900,7 +5900,7 @@ static void intel_post_plane_update(struct
> intel_crtc_state *old_crtc_state)
> intel_fbc_post_update(crtc);
>
> if (new_primary_state->visible &&
> - (needs_modeset(_config->base) ||
> + (needs_modeset(pipe_config) ||
>!old_primary_state->visible))
> intel_post_enable_primary(>base, pipe_config);
> }
> @@ -5924,7 +5924,7 @@ static void intel_pre_plane_update(struct
> intel_crtc_state *old_crtc_state,
> struct drm_plane *primary = crtc->base.primary;
> struct drm_plane_state *old_primary_state =
> drm_atomic_get_old_plane_state(old_state, primary);
> - bool modeset = needs_modeset(_config->base);
> + bool modeset = needs_modeset(pipe_config);
> struct intel_atomic_state *old_intel_state =
> to_intel_atomic_state(old_state);
>
> @@ -5984,7 +5984,7 @@ static void intel_pre_plane_update(struct
> intel_crtc_state *old_crtc_state,
>* If we're doing a modeset, we're done. No need to do any pre-vblank
>* watermark programming here.
>*/
> - if (needs_modeset(_config->base))
> + if (needs_modeset(pipe_config))
> return;
>
> /*
> @@ -11339,7 +11339,7 @@ int intel_plane_atomic_calc_changes(const struct
> intel_crtc_state *old_crtc_stat
> struct intel_plane *plane = to_intel_plane(plane_state->plane);
> struct drm_device *dev = crtc->dev;
> struct drm_i915_private *dev_priv = to_i915(dev);
> - bool mode_changed = needs_modeset(crtc_state);
> + bool mode_changed = needs_modeset(pipe_config);
> bool was_crtc_enabled = old_crtc_state->base.active;
> bool is_crtc_enabled = crtc_state->active;
> bool turn_off, turn_on, visible, was_visible;
> @@ -11608,7 +11608,7 @@ static int intel_crtc_atomic_check(struct drm_crtc
> *crtc,
> struct intel_crtc_state *pipe_config =
> to_intel_crtc_state(crtc_state);
> int ret;
> - bool mode_changed = needs_modeset(crtc_state);
> + bool mode_changed = needs_modeset(pipe_config);
>
> if (INTEL_GEN(dev_priv) < 5 && !IS_G4X(dev_priv) &&
> mode_changed && !crtc_state->active)
> @@ -13088,7 +13088,7 @@ intel_modeset_verify_crtc(struct drm_crtc *crtc,
> struct drm_crtc_state *old_state,
> struct drm_crtc_state *new_state)
> {
> - if (!needs_modeset(new_state) &&
> + if (!needs_modeset(to_intel_crtc_state(new_state)) &&
> !to_intel_crtc_state(new_state)->update_pipe)
> return;
>
> @@ -13180,7 +13180,7 @@ static void intel_modeset_clear_plls(struct
> intel_atomic_state *state)
> struct intel_shared_dpll *old_dpll =
> old_crtc_state->shared_dpll;
>
> - if (!needs_modeset(_crtc_state->base))
> + if (!needs_modeset(new_crtc_state))
> continue;
>
> new_crtc_state->shared_dpll = NULL;
> @@ -13210,7 +13210,7 @@ static int haswell_mode_set_planes_workaround(struct
> intel_atomic_state *state)
> /* look at all crtc's that are going to be enabled in during modeset */
> for_each_new_intel_crtc_in_state(state, crtc, crtc_state, i) {
> if (!crtc_state->base.active ||
> - !needs_modeset(_state->base))
>
[Intel-gfx] [PATCH 1/9] drm/i915: Pass intel_crtc_state to needs_modeset()
Signed-off-by: Maarten Lankhorst
---
drivers/gpu/drm/i915/display/intel_display.c | 68 ++--
1 file changed, 34 insertions(+), 34 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_display.c
b/drivers/gpu/drm/i915/display/intel_display.c
index 8592a7d422de..02565e97995a 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -515,9 +515,9 @@ icl_wa_scalerclkgating(struct drm_i915_private *dev_priv,
enum pipe pipe,
}
static bool
-needs_modeset(const struct drm_crtc_state *state)
+needs_modeset(const struct intel_crtc_state *state)
{
- return drm_atomic_crtc_needs_modeset(state);
+ return drm_atomic_crtc_needs_modeset(>base);
}
/*
@@ -5796,7 +5796,7 @@ static bool hsw_pre_update_disable_ips(const struct
intel_crtc_state *old_crtc_s
if (!old_crtc_state->ips_enabled)
return false;
- if (needs_modeset(_crtc_state->base))
+ if (needs_modeset(new_crtc_state))
return true;
/*
@@ -5823,7 +5823,7 @@ static bool hsw_post_update_enable_ips(const struct
intel_crtc_state *old_crtc_s
if (!new_crtc_state->ips_enabled)
return false;
- if (needs_modeset(_crtc_state->base))
+ if (needs_modeset(new_crtc_state))
return true;
/*
@@ -5900,7 +5900,7 @@ static void intel_post_plane_update(struct
intel_crtc_state *old_crtc_state)
intel_fbc_post_update(crtc);
if (new_primary_state->visible &&
- (needs_modeset(_config->base) ||
+ (needs_modeset(pipe_config) ||
!old_primary_state->visible))
intel_post_enable_primary(>base, pipe_config);
}
@@ -5924,7 +5924,7 @@ static void intel_pre_plane_update(struct
intel_crtc_state *old_crtc_state,
struct drm_plane *primary = crtc->base.primary;
struct drm_plane_state *old_primary_state =
drm_atomic_get_old_plane_state(old_state, primary);
- bool modeset = needs_modeset(_config->base);
+ bool modeset = needs_modeset(pipe_config);
struct intel_atomic_state *old_intel_state =
to_intel_atomic_state(old_state);
@@ -5984,7 +5984,7 @@ static void intel_pre_plane_update(struct
intel_crtc_state *old_crtc_state,
* If we're doing a modeset, we're done. No need to do any pre-vblank
* watermark programming here.
*/
- if (needs_modeset(_config->base))
+ if (needs_modeset(pipe_config))
return;
/*
@@ -11339,7 +11339,7 @@ int intel_plane_atomic_calc_changes(const struct
intel_crtc_state *old_crtc_stat
struct intel_plane *plane = to_intel_plane(plane_state->plane);
struct drm_device *dev = crtc->dev;
struct drm_i915_private *dev_priv = to_i915(dev);
- bool mode_changed = needs_modeset(crtc_state);
+ bool mode_changed = needs_modeset(pipe_config);
bool was_crtc_enabled = old_crtc_state->base.active;
bool is_crtc_enabled = crtc_state->active;
bool turn_off, turn_on, visible, was_visible;
@@ -11608,7 +11608,7 @@ static int intel_crtc_atomic_check(struct drm_crtc
*crtc,
struct intel_crtc_state *pipe_config =
to_intel_crtc_state(crtc_state);
int ret;
- bool mode_changed = needs_modeset(crtc_state);
+ bool mode_changed = needs_modeset(pipe_config);
if (INTEL_GEN(dev_priv) < 5 && !IS_G4X(dev_priv) &&
mode_changed && !crtc_state->active)
@@ -13088,7 +13088,7 @@ intel_modeset_verify_crtc(struct drm_crtc *crtc,
struct drm_crtc_state *old_state,
struct drm_crtc_state *new_state)
{
- if (!needs_modeset(new_state) &&
+ if (!needs_modeset(to_intel_crtc_state(new_state)) &&
!to_intel_crtc_state(new_state)->update_pipe)
return;
@@ -13180,7 +13180,7 @@ static void intel_modeset_clear_plls(struct
intel_atomic_state *state)
struct intel_shared_dpll *old_dpll =
old_crtc_state->shared_dpll;
- if (!needs_modeset(_crtc_state->base))
+ if (!needs_modeset(new_crtc_state))
continue;
new_crtc_state->shared_dpll = NULL;
@@ -13210,7 +13210,7 @@ static int haswell_mode_set_planes_workaround(struct
intel_atomic_state *state)
/* look at all crtc's that are going to be enabled in during modeset */
for_each_new_intel_crtc_in_state(state, crtc, crtc_state, i) {
if (!crtc_state->base.active ||
- !needs_modeset(_state->base))
+ !needs_modeset(crtc_state))
continue;
if (first_crtc_state) {
@@ -13235,7 +13235,7 @@ static int haswell_mode_set_planes_workaround(struct
intel_atomic_state *state)
