[Intel-gfx] [PATCH] drm/i915: use compute_config in set_config v4

[Jesse Barnes]

This will allow us to consult more info before deciding whether to flip
or do a full mode set.

v2:
  - don't use uninitialized or incorrect pipe masks in set_config
failure path (Ander)
v3:
  - fixup for pipe_config changes in compute_config (Jesse)
v4:
  - drop spurious hunk in force restore path (Ander)

Signed-off-by: Jesse Barnes 
---
 drivers/gpu/drm/i915/intel_display.c | 20 ++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_display.c 
b/drivers/gpu/drm/i915/intel_display.c
index a3ebab8..72123e0 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -11178,6 +11178,8 @@ static int intel_crtc_set_config(struct drm_mode_set 
*set)
struct drm_device *dev;
struct drm_mode_set save_set;
struct intel_set_config *config;
+   struct intel_crtc_config *pipe_config;
+   unsigned modeset_pipes, prepare_pipes, disable_pipes;
int ret;
 
BUG_ON(!set);
@@ -11223,9 +11225,23 @@ static int intel_crtc_set_config(struct drm_mode_set 
*set)
if (ret)
goto fail;
 
+   pipe_config = intel_modeset_compute_config(set->crtc, set->mode,
+  set->fb,
+  &modeset_pipes,
+  &prepare_pipes,
+  &disable_pipes);
+   if (IS_ERR(pipe_config))
+   goto fail;
+
+   /* set_mode will free it in the mode_changed case */
+   if (!config->mode_changed)
+   kfree(pipe_config);
+
if (config->mode_changed) {
-   ret = intel_set_mode(set->crtc, set->mode,
-set->x, set->y, set->fb);
+   ret = intel_set_mode_pipes(set->crtc, set->mode,
+  set->x, set->y, set->fb, pipe_config,
+  modeset_pipes, prepare_pipes,
+  disable_pipes);
} else if (config->fb_changed) {
struct intel_crtc *intel_crtc = to_intel_crtc(set->crtc);
 
-- 
1.9.1

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

Re: [Intel-gfx] [PATCH] drm/i915: use compute_config in set_config v4

[Ander Conselvan de Oliveira]

Reviewed-by: Ander Conselvan de Oliveira 

On 11/07/2014 11:11 PM, Jesse Barnes wrote:
> This will allow us to consult more info before deciding whether to flip
> or do a full mode set.
> 
> v2:
>- don't use uninitialized or incorrect pipe masks in set_config
>  failure path (Ander)
> v3:
>- fixup for pipe_config changes in compute_config (Jesse)
> v4:
>- drop spurious hunk in force restore path (Ander)
> 
> Signed-off-by: Jesse Barnes 
> ---
>   drivers/gpu/drm/i915/intel_display.c | 20 ++--
>   1 file changed, 18 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_display.c 
> b/drivers/gpu/drm/i915/intel_display.c
> index a3ebab8..72123e0 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -11178,6 +11178,8 @@ static int intel_crtc_set_config(struct drm_mode_set 
> *set)
>   struct drm_device *dev;
>   struct drm_mode_set save_set;
>   struct intel_set_config *config;
> + struct intel_crtc_config *pipe_config;
> + unsigned modeset_pipes, prepare_pipes, disable_pipes;
>   int ret;
>   
>   BUG_ON(!set);
> @@ -11223,9 +11225,23 @@ static int intel_crtc_set_config(struct drm_mode_set 
> *set)
>   if (ret)
>   goto fail;
>   
> + pipe_config = intel_modeset_compute_config(set->crtc, set->mode,
> +set->fb,
> +&modeset_pipes,
> +&prepare_pipes,
> +&disable_pipes);
> + if (IS_ERR(pipe_config))
> + goto fail;
> +
> + /* set_mode will free it in the mode_changed case */
> + if (!config->mode_changed)
> + kfree(pipe_config);
> +
>   if (config->mode_changed) {
> - ret = intel_set_mode(set->crtc, set->mode,
> -  set->x, set->y, set->fb);
> + ret = intel_set_mode_pipes(set->crtc, set->mode,
> +set->x, set->y, set->fb, pipe_config,
> +modeset_pipes, prepare_pipes,
> +disable_pipes);
>   } else if (config->fb_changed) {
>   struct intel_crtc *intel_crtc = to_intel_crtc(set->crtc);
>   
> 

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