Op 12-05-15 om 11:03 schreef Daniel Vetter:
> On Mon, May 11, 2015 at 04:24:56PM +0200, Maarten Lankhorst wrote:
>> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxxxx>
>> ---
>> drivers/gpu/drm/i915/intel_atomic.c | 10 +++-------
>> drivers/gpu/drm/i915/intel_sprite.c | 4 ++--
>> 2 files changed, 5 insertions(+), 9 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/intel_atomic.c b/drivers/gpu/drm/i915/intel_atomic.c
>> index 7ed8033aae60..ace6aeeb1359 100644
>> --- a/drivers/gpu/drm/i915/intel_atomic.c
>> +++ b/drivers/gpu/drm/i915/intel_atomic.c
>> @@ -176,7 +176,7 @@ int intel_atomic_commit(struct drm_device *dev,
>> continue;
>> }
>>
>> - to_intel_crtc(crtc)->config->scaler_state =
>> + to_intel_crtc_state(crtc->state)->scaler_state =
>> to_intel_crtc_state(state->crtc_states[i])->scaler_state;
>>
>> if (INTEL_INFO(dev)->gen >= 9)
>> @@ -241,14 +241,10 @@ intel_connector_atomic_get_property(struct drm_connector *connector,
>> struct drm_crtc_state *
>> intel_crtc_duplicate_state(struct drm_crtc *crtc)
>> {
>> - struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
>> struct intel_crtc_state *crtc_state;
>>
>> - if (WARN_ON(!intel_crtc->config))
>> - crtc_state = kzalloc(sizeof(*crtc_state), GFP_KERNEL);
>> - else
>> - crtc_state = kmemdup(intel_crtc->config,
>> - sizeof(*intel_crtc->config), GFP_KERNEL);
>> + crtc_state = kmemdup(crtc->state,
>> + sizeof(*crtc_state), GFP_KERNEL);
> Separate patch for this hunk please.
> -Daniel
>
Ok.
~Maarten
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
