Re: [PATCH 1/8] drm/i915: Change use get_new_plane_state instead of existing plane state

Maarten Lankhorst
2017-08-01T07:56:16Z

Op 01-08-17 om 08:36 schreef Mahesh Kumar:
> Hi,
>
>
> On Thursday 20 July 2017 06:45 PM, Maarten Lankhorst wrote:
>> The get_existing macros are deprecated and should be replaced by
>> get_old/new_state for clarity.
>>
>> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
>> ---
>> drivers/gpu/drm/i915/intel_atomic.c | 4 ++--
>> drivers/gpu/drm/i915/intel_drv.h | 4 ++--
>> drivers/gpu/drm/i915/intel_pm.c | 5 ++---
>> 3 files changed, 6 insertions(+), 7 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/intel_atomic.c b/drivers/gpu/drm/i915/intel_atomic.c
>> index 36d4e635e4ce..5d9a26fa5f6d 100644
>> --- a/drivers/gpu/drm/i915/intel_atomic.c
>> +++ b/drivers/gpu/drm/i915/intel_atomic.c
>> @@ -301,8 +301,8 @@ int intel_atomic_setup_scalers(struct drm_i915_private *dev_priv,
>> continue;
>> }
>> - plane_state = intel_atomic_get_existing_plane_state(drm_state,
>> - intel_plane);
>> + plane_state = intel_atomic_get_new_plane_state(drm_state,
>> + intel_plane);
>> scaler_id = &plane_state->scaler_id;
>> }
>> diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
>> index 4f9775a05df7..f59507137347 100644
>> --- a/drivers/gpu/drm/i915/intel_drv.h
>> +++ b/drivers/gpu/drm/i915/intel_drv.h
>> @@ -1958,12 +1958,12 @@ intel_atomic_get_existing_crtc_state(struct drm_atomic_state *state,
>> }
>> static inline struct intel_plane_state *
>> -intel_atomic_get_existing_plane_state(struct drm_atomic_state *state,
>> +intel_atomic_get_new_plane_state(struct drm_atomic_state *state,
>> struct intel_plane *plane)
> please fix indentation of arguments as well.
>
>> {
>> struct drm_plane_state *plane_state;
>> - plane_state = drm_atomic_get_existing_plane_state(state, &plane->base);
>> + plane_state = drm_atomic_get_new_plane_state(state, &plane->base);
>> return to_intel_plane_state(plane_state);
>> }
>> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
>> index 48785ef75d33..0cdb9453e0e2 100644
>> --- a/drivers/gpu/drm/i915/intel_pm.c
>> +++ b/drivers/gpu/drm/i915/intel_pm.c
>> @@ -3028,8 +3028,7 @@ static int ilk_compute_pipe_wm(struct intel_crtc_state *cstate)
>> for_each_intel_plane_on_crtc(dev, intel_crtc, intel_plane) {
>> struct intel_plane_state *ps;
>> - ps = intel_atomic_get_existing_plane_state(state,
>> - intel_plane);
>> + ps = intel_atomic_get_new_plane_state(state, intel_plane);
>> if (!ps)
>> continue;
>> @@ -4766,7 +4765,7 @@ skl_ddb_add_affected_planes(struct intel_crtc_state *cstate)
>> struct drm_plane *plane;
>> enum pipe pipe = intel_crtc->pipe;
>> - WARN_ON(!drm_atomic_get_existing_crtc_state(state, crtc));
>> + WARN_ON(!drm_atomic_get_new_crtc_state(state, crtc));
> Patch talks about changing get_existing_plane_state, but you are changing get_existing_crtc_state here.
> IMO it should be part of different patch or patch subject should be changed.
Yeah ok, this hunk should be separate.