[PATCH 1/2] drm/atomic: use helper to get crtc state

2016-03-15 Thread Ville Syrjälä
On Tue, Mar 15, 2016 at 01:46:00PM +0100, Andrzej Hajda wrote:
> DRM core provide helper to access crtc state.
> 
> Signed-off-by: Andrzej Hajda 

Reviewed-by: Ville Syrjälä 

> ---
>  drivers/gpu/drm/drm_atomic_helper.c | 14 --
>  1 file changed, 8 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/gpu/drm/drm_atomic_helper.c 
> b/drivers/gpu/drm/drm_atomic_helper.c
> index 2b430b0..e1cbba6 100644
> --- a/drivers/gpu/drm/drm_atomic_helper.c
> +++ b/drivers/gpu/drm/drm_atomic_helper.c
> @@ -67,7 +67,8 @@ drm_atomic_helper_plane_changed(struct drm_atomic_state 
> *state,
>   struct drm_crtc_state *crtc_state;
>  
>   if (plane->state->crtc) {
> - crtc_state = 
> state->crtc_states[drm_crtc_index(plane->state->crtc)];
> + crtc_state = drm_atomic_get_existing_crtc_state(state,
> + 
> plane->state->crtc);
>  
>   if (WARN_ON(!crtc_state))
>   return;
> @@ -76,8 +77,8 @@ drm_atomic_helper_plane_changed(struct drm_atomic_state 
> *state,
>   }
>  
>   if (plane_state->crtc) {
> - crtc_state =
> - state->crtc_states[drm_crtc_index(plane_state->crtc)];
> + crtc_state = drm_atomic_get_existing_crtc_state(state,
> + 
> plane_state->crtc);
>  
>   if (WARN_ON(!crtc_state))
>   return;
> @@ -366,8 +367,8 @@ mode_fixup(struct drm_atomic_state *state)
>   if (!conn_state->crtc || !conn_state->best_encoder)
>   continue;
>  
> - crtc_state =
> - state->crtc_states[drm_crtc_index(conn_state->crtc)];
> + crtc_state = drm_atomic_get_existing_crtc_state(state,
> + 
> conn_state->crtc);
>  
>   /*
>* Each encoder has at most one connector (since we always steal
> @@ -666,7 +667,8 @@ disable_outputs(struct drm_device *dev, struct 
> drm_atomic_state *old_state)
>   if (!old_conn_state->crtc)
>   continue;
>  
> - old_crtc_state = 
> old_state->crtc_states[drm_crtc_index(old_conn_state->crtc)];
> + old_crtc_state = drm_atomic_get_existing_crtc_state(old_state,
> + 
> old_conn_state->crtc);
>  
>   if (!old_crtc_state->active ||
>   !drm_atomic_crtc_needs_modeset(old_conn_state->crtc->state))
> -- 
> 1.9.1
> 
> ___
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

-- 
Ville Syrjälä
Intel OTC


[PATCH 1/2] drm/atomic: use helper to get crtc state

2016-03-15 Thread Andrzej Hajda
DRM core provide helper to access crtc state.

Signed-off-by: Andrzej Hajda 
---
 drivers/gpu/drm/drm_atomic_helper.c | 14 --
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/drm_atomic_helper.c 
b/drivers/gpu/drm/drm_atomic_helper.c
index 2b430b0..e1cbba6 100644
--- a/drivers/gpu/drm/drm_atomic_helper.c
+++ b/drivers/gpu/drm/drm_atomic_helper.c
@@ -67,7 +67,8 @@ drm_atomic_helper_plane_changed(struct drm_atomic_state 
*state,
struct drm_crtc_state *crtc_state;

if (plane->state->crtc) {
-   crtc_state = 
state->crtc_states[drm_crtc_index(plane->state->crtc)];
+   crtc_state = drm_atomic_get_existing_crtc_state(state,
+   
plane->state->crtc);

if (WARN_ON(!crtc_state))
return;
@@ -76,8 +77,8 @@ drm_atomic_helper_plane_changed(struct drm_atomic_state 
*state,
}

if (plane_state->crtc) {
-   crtc_state =
-   state->crtc_states[drm_crtc_index(plane_state->crtc)];
+   crtc_state = drm_atomic_get_existing_crtc_state(state,
+   
plane_state->crtc);

if (WARN_ON(!crtc_state))
return;
@@ -366,8 +367,8 @@ mode_fixup(struct drm_atomic_state *state)
if (!conn_state->crtc || !conn_state->best_encoder)
continue;

-   crtc_state =
-   state->crtc_states[drm_crtc_index(conn_state->crtc)];
+   crtc_state = drm_atomic_get_existing_crtc_state(state,
+   
conn_state->crtc);

/*
 * Each encoder has at most one connector (since we always steal
@@ -666,7 +667,8 @@ disable_outputs(struct drm_device *dev, struct 
drm_atomic_state *old_state)
if (!old_conn_state->crtc)
continue;

-   old_crtc_state = 
old_state->crtc_states[drm_crtc_index(old_conn_state->crtc)];
+   old_crtc_state = drm_atomic_get_existing_crtc_state(old_state,
+   
old_conn_state->crtc);

if (!old_crtc_state->active ||
!drm_atomic_crtc_needs_modeset(old_conn_state->crtc->state))
-- 
1.9.1