Re: [Intel-gfx] [CI v3 1/3] drm/i915: Introduce encoder->compute_config_late()

2020-02-20 Thread Shankar, Uma


> -Original Message-
> From: Intel-gfx  On Behalf Of Manasi
> Navare
> Sent: Friday, February 14, 2020 5:11 PM
> To: intel-gfx@lists.freedesktop.org
> Subject: [Intel-gfx] [CI v3 1/3] drm/i915: Introduce 
> encoder->compute_config_late()
> 
> From: Ville Syrjälä 
> 
> Add an optional secondary encoder state compute hook. This gets called after 
> the
> normak .compute_config() has been called for all the encoders in the state. 
> Thus in
> the new hook we can rely on all derived state populated by .compute_config() 
> to be
> already set up. Should be useful for MST and port sync master/slave transcoder
> selection.

Pushed the series to dinq. Thanks for the patches and review.

> Signed-off-by: Ville Syrjälä 
> Reviewed-by: Manasi Navare 
> ---
>  drivers/gpu/drm/i915/display/intel_display.c  | 39 +++
>  .../drm/i915/display/intel_display_types.h|  3 ++
>  2 files changed, 42 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c
> b/drivers/gpu/drm/i915/display/intel_display.c
> index e09d3c93c52b..ce72551ba16a 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -13549,6 +13549,35 @@ intel_modeset_pipe_config(struct intel_crtc_state
> *pipe_config)
>   return 0;
>  }
> 
> +static int
> +intel_modeset_pipe_config_late(struct intel_crtc_state *crtc_state) {
> + struct intel_atomic_state *state =
> + to_intel_atomic_state(crtc_state->uapi.state);
> + struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
> + struct drm_connector_state *conn_state;
> + struct drm_connector *connector;
> + int i;
> +
> + for_each_new_connector_in_state(>base, connector,
> + conn_state, i) {
> + struct intel_encoder *encoder =
> + to_intel_encoder(conn_state->best_encoder);
> + int ret;
> +
> + if (conn_state->crtc != >base ||
> + !encoder->compute_config_late)
> + continue;
> +
> + ret = encoder->compute_config_late(encoder, crtc_state,
> +conn_state);
> + if (ret)
> + return ret;
> + }
> +
> + return 0;
> +}
> +
>  bool intel_fuzzy_clock_check(int clock1, int clock2)  {
>   int diff;
> @@ -14954,6 +14983,16 @@ static int intel_atomic_check(struct drm_device *dev,
>   ret = intel_modeset_pipe_config(new_crtc_state);
>   if (ret)
>   goto fail;
> + }
> +
> + for_each_oldnew_intel_crtc_in_state(state, crtc, old_crtc_state,
> + new_crtc_state, i) {
> + if (!needs_modeset(new_crtc_state))
> + continue;
> +
> + ret = intel_modeset_pipe_config_late(new_crtc_state);
> + if (ret)
> + goto fail;
> 
>   intel_crtc_check_fastset(old_crtc_state, new_crtc_state);
>   }
> diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h
> b/drivers/gpu/drm/i915/display/intel_display_types.h
> index 283c622f8ba1..0d8a64305464 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_types.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_types.h
> @@ -141,6 +141,9 @@ struct intel_encoder {
>   int (*compute_config)(struct intel_encoder *,
> struct intel_crtc_state *,
> struct drm_connector_state *);
> + int (*compute_config_late)(struct intel_encoder *,
> +struct intel_crtc_state *,
> +struct drm_connector_state *);
>   void (*update_prepare)(struct intel_atomic_state *,
>  struct intel_encoder *,
>  struct intel_crtc *);
> --
> 2.19.1
> 
> ___
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx


[Intel-gfx] [CI v3 1/3] drm/i915: Introduce encoder->compute_config_late()

2020-02-14 Thread Manasi Navare
From: Ville Syrjälä 

Add an optional secondary encoder state compute hook. This gets
called after the normak .compute_config() has been called for
all the encoders in the state. Thus in the new hook we can rely
on all derived state populated by .compute_config() to be already
set up. Should be useful for MST and port sync master/slave
transcoder selection.

Signed-off-by: Ville Syrjälä 
Reviewed-by: Manasi Navare 
---
 drivers/gpu/drm/i915/display/intel_display.c  | 39 +++
 .../drm/i915/display/intel_display_types.h|  3 ++
 2 files changed, 42 insertions(+)

diff --git a/drivers/gpu/drm/i915/display/intel_display.c 
b/drivers/gpu/drm/i915/display/intel_display.c
index e09d3c93c52b..ce72551ba16a 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -13549,6 +13549,35 @@ intel_modeset_pipe_config(struct intel_crtc_state 
*pipe_config)
return 0;
 }
 
+static int
+intel_modeset_pipe_config_late(struct intel_crtc_state *crtc_state)
+{
+   struct intel_atomic_state *state =
+   to_intel_atomic_state(crtc_state->uapi.state);
+   struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
+   struct drm_connector_state *conn_state;
+   struct drm_connector *connector;
+   int i;
+
+   for_each_new_connector_in_state(>base, connector,
+   conn_state, i) {
+   struct intel_encoder *encoder =
+   to_intel_encoder(conn_state->best_encoder);
+   int ret;
+
+   if (conn_state->crtc != >base ||
+   !encoder->compute_config_late)
+   continue;
+
+   ret = encoder->compute_config_late(encoder, crtc_state,
+  conn_state);
+   if (ret)
+   return ret;
+   }
+
+   return 0;
+}
+
 bool intel_fuzzy_clock_check(int clock1, int clock2)
 {
int diff;
@@ -14954,6 +14983,16 @@ static int intel_atomic_check(struct drm_device *dev,
ret = intel_modeset_pipe_config(new_crtc_state);
if (ret)
goto fail;
+   }
+
+   for_each_oldnew_intel_crtc_in_state(state, crtc, old_crtc_state,
+   new_crtc_state, i) {
+   if (!needs_modeset(new_crtc_state))
+   continue;
+
+   ret = intel_modeset_pipe_config_late(new_crtc_state);
+   if (ret)
+   goto fail;
 
intel_crtc_check_fastset(old_crtc_state, new_crtc_state);
}
diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h 
b/drivers/gpu/drm/i915/display/intel_display_types.h
index 283c622f8ba1..0d8a64305464 100644
--- a/drivers/gpu/drm/i915/display/intel_display_types.h
+++ b/drivers/gpu/drm/i915/display/intel_display_types.h
@@ -141,6 +141,9 @@ struct intel_encoder {
int (*compute_config)(struct intel_encoder *,
  struct intel_crtc_state *,
  struct drm_connector_state *);
+   int (*compute_config_late)(struct intel_encoder *,
+  struct intel_crtc_state *,
+  struct drm_connector_state *);
void (*update_prepare)(struct intel_atomic_state *,
   struct intel_encoder *,
   struct intel_crtc *);
-- 
2.19.1

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx