leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/i915: Allocate a crtc_state also when the crtc is being disabled

Browse Source 
For consistency, allocate a new crtc_state for a crtc that is being
disabled. Previously only the enabled value of the current state would
change.

v2: Rebase on v5 of previous patch. (Ander)

Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
[danvet: Resolve rebase conflict.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Ander Conselvan de Oliveira 2015-03-20 16:18:04 +02:00 committed by Daniel Vetter
parent 83a57153f5
commit db7542dd40
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/gpu/drm/i915/intel_display.c
View File

@ -11291,13 +11291,20 @@ intel_modeset_compute_config(struct drm_crtc *crtc,
unsigned *prepare_pipes, unsigned *prepare_pipes,
unsigned *disable_pipes) unsigned *disable_pipes)
{ {
struct drm_device *dev = crtc->dev;
struct intel_crtc_state *pipe_config = NULL; struct intel_crtc_state *pipe_config = NULL;
struct intel_crtc *intel_crtc;
intel_modeset_affected_pipes(crtc, modeset_pipes, intel_modeset_affected_pipes(crtc, modeset_pipes,
prepare_pipes, disable_pipes); prepare_pipes, disable_pipes);
if ((*modeset_pipes) == 0) for_each_intel_crtc_masked(dev, *disable_pipes, intel_crtc) {
return NULL; pipe_config = intel_atomic_get_crtc_state(state, intel_crtc);
if (IS_ERR(pipe_config))
return pipe_config;
pipe_config->base.enable = false;
}
/* /*
* Note this needs changes when we start tracking multiple modes * Note this needs changes when we start tracking multiple modes
@ -11305,14 +11312,21 @@ intel_modeset_compute_config(struct drm_crtc *crtc,
* (i.e. one pipe_config for each crtc) rather than just the one * (i.e. one pipe_config for each crtc) rather than just the one
* for this crtc. * for this crtc.
*/ */
pipe_config = intel_modeset_pipe_config(crtc, fb, mode, state); for_each_intel_crtc_masked(dev, *modeset_pipes, intel_crtc) {
if (IS_ERR(pipe_config)) /* FIXME: For now we still expect modeset_pipes has at most
return pipe_config; * one bit set. */
if (WARN_ON(&intel_crtc->base != crtc))
continue;
intel_dump_pipe_config(to_intel_crtc(crtc), pipe_config, pipe_config = intel_modeset_pipe_config(crtc, fb, mode, state);
"[modeset]"); if (IS_ERR(pipe_config))
return pipe_config;
return pipe_config; intel_dump_pipe_config(to_intel_crtc(crtc), pipe_config,
"[modeset]");
}
return intel_atomic_get_crtc_state(state, to_intel_crtc(crtc));;
} }
static int __intel_set_mode_setup_plls(struct drm_device *dev, static int __intel_set_mode_setup_plls(struct drm_device *dev,