.. | .. |
---|
5844 | 5844 | num_encoders++; |
---|
5845 | 5845 | } |
---|
5846 | 5846 | |
---|
5847 | | - drm_WARN(encoder->base.dev, num_encoders != 1, |
---|
| 5847 | + drm_WARN(state->base.dev, num_encoders != 1, |
---|
5848 | 5848 | "%d encoders for pipe %c\n", |
---|
5849 | 5849 | num_encoders, pipe_name(crtc->pipe)); |
---|
5850 | 5850 | |
---|
.. | .. |
---|
13335 | 13335 | * only fields that are know to not cause problems are preserved. */ |
---|
13336 | 13336 | |
---|
13337 | 13337 | saved_state->uapi = crtc_state->uapi; |
---|
| 13338 | + saved_state->inherited = crtc_state->inherited; |
---|
13338 | 13339 | saved_state->scaler_state = crtc_state->scaler_state; |
---|
13339 | 13340 | saved_state->shared_dpll = crtc_state->shared_dpll; |
---|
13340 | 13341 | saved_state->dpll_hw_state = crtc_state->dpll_hw_state; |
---|