evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

drm/i915: Don't use staged config to calculate mode_changed flags

Browse source 
Use the atomic state instead.

Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Ander Conselvan de Oliveira 2015-04-21 17:13:12 +03:00 • committed by Daniel Vetter
parent 8d8c9b5197
commit 41227c8c52
1 changed files with 26 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
drivers/gpu/drm/i915/intel_display.c
View file

@ -12638,10 +12638,12 @@ static void
intel_set_config_compute_mode_changes(struct drm_mode_set *set, intel_set_config_compute_mode_changes(struct drm_mode_set *set,
struct intel_crtc_state *pipe_config) struct intel_crtc_state *pipe_config)
{ {
struct drm_device *dev = set->crtc->dev; struct drm_atomic_state *state;
struct intel_connector *connector; struct drm_connector *connector;
struct intel_encoder *encoder; struct drm_connector_state *connector_state;
struct intel_crtc *crtc; struct drm_crtc *crtc;
struct drm_crtc_state *crtc_state;
int i;
/* We should be able to check here if the fb has the same properties /* We should be able to check here if the fb has the same properties
* and then just flip_or_move it */ * and then just flip_or_move it */
@ -12685,33 +12687,32 @@ intel_set_config_compute_mode_changes(struct drm_mode_set *set,
pipe_config->base.mode_changed = true; pipe_config->base.mode_changed = true;
} }
for_each_intel_connector(dev, connector) { state = pipe_config->base.state;
if (&connector->new_encoder->base == connector->base.encoder)
continue;
pipe_config->base.mode_changed = true; for_each_connector_in_state(state, connector, connector_state, i) {
DRM_DEBUG_KMS("[CONNECTOR:%d:%s] encoder changed, full mode switch\n", if (connector_state->best_encoder !=
connector->base.base.id, connector->state->best_encoder) {
connector->base.name); DRM_DEBUG_KMS("[CONNECTOR:%d:%s] encoder changed, full mode switch\n",
connector->base.id,
connector->name);
pipe_config->base.mode_changed = true;
}
if (connector_state->crtc != connector->state->crtc) {
DRM_DEBUG_KMS("[CONNECTOR:%d:%s] crtc changed, full mode switch\n",
connector->base.id,
connector->name);
pipe_config->base.mode_changed = true;
}
} }
for_each_intel_encoder(dev, encoder) { for_each_crtc_in_state(state, crtc, crtc_state, i) {
if (&encoder->new_crtc->base == encoder->base.crtc) if (crtc_state->enable == crtc->state->enable)
continue;
DRM_DEBUG_KMS("[ENCODER:%d:%s] crtc changed, full mode switch\n",
encoder->base.base.id,
encoder->base.name);
pipe_config->base.mode_changed = true;
}
for_each_intel_crtc(dev, crtc) {
if (crtc->new_enabled == crtc->base.state->enable)
continue; continue;
DRM_DEBUG_KMS("[CRTC:%d] %sabled, full mode switch\n", DRM_DEBUG_KMS("[CRTC:%d] %sabled, full mode switch\n",
crtc->base.base.id, crtc->base.id,
crtc->new_enabled ? "en" : "dis"); crtc_state->enable ? "en" : "dis");
pipe_config->base.mode_changed = true; pipe_config->base.mode_changed = true;
} }