Re: [Intel-gfx] [PATCH 4/6] drm/i915: s/intel_state/state/ in intel_{prepare, cleanup}_plane_fb()

[Chris Wilson]

Quoting Ville Syrjala (2020-01-10 18:32:26)
> From: Ville Syrjälä 
> 
> Drop the redundant intel_ prefix from our atomic state variable.
> 
> Signed-off-by: Ville Syrjälä 
> ---
>  drivers/gpu/drm/i915/display/intel_display.c | 22 ++--
>  1 file changed, 11 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c 
> b/drivers/gpu/drm/i915/display/intel_display.c
> index 0df0719b0ac3..27b43822344b 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -15755,18 +15755,18 @@ intel_prepare_plane_fb(struct drm_plane *_plane,
> struct intel_plane *plane = to_intel_plane(_plane);
> struct intel_plane_state *new_plane_state =
> to_intel_plane_state(_new_plane_state);
> -   struct intel_atomic_state *intel_state =
> +   struct intel_atomic_state *state =

Ah, 3&4
Reviewed-by: Chris Wilson 
-Chris
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [PATCH 4/6] drm/i915: s/intel_state/state/ in intel_{prepare, cleanup}_plane_fb()

[Ville Syrjala]

From: Ville Syrjälä 

Drop the redundant intel_ prefix from our atomic state variable.

Signed-off-by: Ville Syrjälä 
---
 drivers/gpu/drm/i915/display/intel_display.c | 22 ++--
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display.c 
b/drivers/gpu/drm/i915/display/intel_display.c
index 0df0719b0ac3..27b43822344b 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -15755,18 +15755,18 @@ intel_prepare_plane_fb(struct drm_plane *_plane,
struct intel_plane *plane = to_intel_plane(_plane);
struct intel_plane_state *new_plane_state =
to_intel_plane_state(_new_plane_state);
-   struct intel_atomic_state *intel_state =
+   struct intel_atomic_state *state =
to_intel_atomic_state(new_plane_state->uapi.state);
struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
const struct intel_plane_state *old_plane_state =
-   intel_atomic_get_old_plane_state(intel_state, plane);
+   intel_atomic_get_old_plane_state(state, plane);
struct drm_i915_gem_object *obj = intel_fb_obj(new_plane_state->hw.fb);
struct drm_i915_gem_object *old_obj = 
intel_fb_obj(old_plane_state->hw.fb);
int ret;
 
if (old_obj) {
const struct intel_crtc_state *crtc_state =
-   intel_atomic_get_new_crtc_state(intel_state,
+   intel_atomic_get_new_crtc_state(state,

to_intel_crtc(old_plane_state->hw.crtc));
 
/* Big Hammer, we also need to ensure that any pending
@@ -15781,7 +15781,7 @@ intel_prepare_plane_fb(struct drm_plane *_plane,
 * can safely continue.
 */
if (needs_modeset(crtc_state)) {
-   ret = 
i915_sw_fence_await_reservation(_state->commit_ready,
+   ret = 
i915_sw_fence_await_reservation(>commit_ready,
  
old_obj->base.resv, NULL,
  false, 0,
  GFP_KERNEL);
@@ -15791,7 +15791,7 @@ intel_prepare_plane_fb(struct drm_plane *_plane,
}
 
if (new_plane_state->uapi.fence) { /* explicit fencing */
-   ret = i915_sw_fence_await_dma_fence(_state->commit_ready,
+   ret = i915_sw_fence_await_dma_fence(>commit_ready,
new_plane_state->uapi.fence,
I915_FENCE_TIMEOUT,
GFP_KERNEL);
@@ -15818,7 +15818,7 @@ intel_prepare_plane_fb(struct drm_plane *_plane,
if (!new_plane_state->uapi.fence) { /* implicit fencing */
struct dma_fence *fence;
 
-   ret = 
i915_sw_fence_await_reservation(_state->commit_ready,
+   ret = i915_sw_fence_await_reservation(>commit_ready,
  obj->base.resv, NULL,
  false, I915_FENCE_TIMEOUT,
  GFP_KERNEL);
@@ -15844,9 +15844,9 @@ intel_prepare_plane_fb(struct drm_plane *_plane,
 * that are not quite steady state without resorting to forcing
 * maximum clocks following a vblank miss (see do_rps_boost()).
 */
-   if (!intel_state->rps_interactive) {
+   if (!state->rps_interactive) {
intel_rps_mark_interactive(_priv->gt.rps, true);
-   intel_state->rps_interactive = true;
+   state->rps_interactive = true;
}
 
return 0;
@@ -15865,13 +15865,13 @@ intel_cleanup_plane_fb(struct drm_plane *plane,
 {
struct intel_plane_state *old_plane_state =
to_intel_plane_state(_old_plane_state);
-   struct intel_atomic_state *intel_state =
+   struct intel_atomic_state *state =
to_intel_atomic_state(old_plane_state->uapi.state);
struct drm_i915_private *dev_priv = to_i915(plane->dev);
 
-   if (intel_state->rps_interactive) {
+   if (state->rps_interactive) {
intel_rps_mark_interactive(_priv->gt.rps, false);
-   intel_state->rps_interactive = false;
+   state->rps_interactive = false;
}
 
/* Should only be called after a successful intel_prepare_plane_fb()! */
-- 
2.24.1

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