| Message ID | 1464818821-5736-3-git-send-email-daniel.vetter@ffwll.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Op 02-06-16 om 00:06 schreef Daniel Vetter: > We want to encapsulate the drm_atomic_state internals. > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > --- > drivers/gpu/drm/i915/intel_atomic.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/intel_atomic.c b/drivers/gpu/drm/i915/intel_atomic.c > index 50ff90aea721..3e6d9ff8840a 100644 > --- a/drivers/gpu/drm/i915/intel_atomic.c > +++ b/drivers/gpu/drm/i915/intel_atomic.c > @@ -223,7 +223,9 @@ int intel_atomic_setup_scalers(struct drm_device *dev, > continue; > } > > - plane_state = to_intel_plane_state(drm_state->plane_states[i]); > + plane_state = to_intel_plane_state( > + drm_atomic_get_existing_plane_state(drm_state, > + plane)); > scaler_id = &plane_state->scaler_id; > } > intel_plane_get_atomic_state(drm_state, intel_plane); ? If fixed, Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
On Thu, Jun 02, 2016 at 01:25:46PM +0200, Maarten Lankhorst wrote: > Op 02-06-16 om 00:06 schreef Daniel Vetter: > > We want to encapsulate the drm_atomic_state internals. > > > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > > --- > > drivers/gpu/drm/i915/intel_atomic.c | 4 +++- > > 1 file changed, 3 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/i915/intel_atomic.c b/drivers/gpu/drm/i915/intel_atomic.c > > index 50ff90aea721..3e6d9ff8840a 100644 > > --- a/drivers/gpu/drm/i915/intel_atomic.c > > +++ b/drivers/gpu/drm/i915/intel_atomic.c > > @@ -223,7 +223,9 @@ int intel_atomic_setup_scalers(struct drm_device *dev, > > continue; > > } > > > > - plane_state = to_intel_plane_state(drm_state->plane_states[i]); > > + plane_state = to_intel_plane_state( > > + drm_atomic_get_existing_plane_state(drm_state, > > + plane)); > > scaler_id = &plane_state->scaler_id; > > } > > > intel_plane_get_atomic_state(drm_state, intel_plane); ? > > If fixed, > > Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Fixed&applied to drm-misc, thanks for the review. -Daniel
diff --git a/drivers/gpu/drm/i915/intel_atomic.c b/drivers/gpu/drm/i915/intel_atomic.c index 50ff90aea721..3e6d9ff8840a 100644 --- a/drivers/gpu/drm/i915/intel_atomic.c +++ b/drivers/gpu/drm/i915/intel_atomic.c @@ -223,7 +223,9 @@ int intel_atomic_setup_scalers(struct drm_device *dev, continue; } - plane_state = to_intel_plane_state(drm_state->plane_states[i]); + plane_state = to_intel_plane_state( + drm_atomic_get_existing_plane_state(drm_state, + plane)); scaler_id = &plane_state->scaler_id; }
We want to encapsulate the drm_atomic_state internals. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> --- drivers/gpu/drm/i915/intel_atomic.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)