p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

drm/i915: Don't pretend we can calculate multiple pipe_configs 

The code in intel_modeset_pipe_config() still needs changes before it
can calculate more than just one pipe_config, and pretending it can will
only make those changes more difficult.

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:02 +03:00 committed by Daniel Vetter
parent 4be0731786
commit 548ee15b38
1 changed files with 19 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11398,33 +11398,29 @@ clear_intel_crtc_state(struct intel_crtc_state *crtc_state)
crtc_state->scaler_state = scaler_state; crtc_state->scaler_state = scaler_state;
} }
static struct intel_crtc_state * static int
intel_modeset_pipe_config(struct drm_crtc *crtc, intel_modeset_pipe_config(struct drm_crtc *crtc,
struct drm_display_mode *mode, struct drm_display_mode *mode,
struct drm_atomic_state *state) struct drm_atomic_state *state,
struct intel_crtc_state *pipe_config)
{ {
struct intel_encoder *encoder; struct intel_encoder *encoder;
struct drm_connector *connector; struct drm_connector *connector;
struct drm_connector_state *connector_state; struct drm_connector_state *connector_state;
struct intel_crtc_state *pipe_config;
int base_bpp, ret = -EINVAL; int base_bpp, ret = -EINVAL;
int i; int i;
bool retry = true; bool retry = true;
if (!check_encoder_cloning(state, to_intel_crtc(crtc))) { if (!check_encoder_cloning(state, to_intel_crtc(crtc))) {
DRM_DEBUG_KMS("rejecting invalid cloning configuration\n"); DRM_DEBUG_KMS("rejecting invalid cloning configuration\n");
return ERR_PTR(-EINVAL); return -EINVAL;
} }
if (!check_digital_port_conflicts(state)) { if (!check_digital_port_conflicts(state)) {
DRM_DEBUG_KMS("rejecting conflicting digital port configuration\n"); DRM_DEBUG_KMS("rejecting conflicting digital port configuration\n");
return ERR_PTR(-EINVAL); return -EINVAL;
} }
pipe_config = intel_atomic_get_crtc_state(state, to_intel_crtc(crtc));
if (IS_ERR(pipe_config))
return pipe_config;
clear_intel_crtc_state(pipe_config); clear_intel_crtc_state(pipe_config);
pipe_config->base.crtc = crtc; pipe_config->base.crtc = crtc;
@ -11521,9 +11517,9 @@ intel_modeset_pipe_config(struct drm_crtc *crtc,
DRM_DEBUG_KMS("plane bpp: %i, pipe bpp: %i, dithering: %i\n", DRM_DEBUG_KMS("plane bpp: %i, pipe bpp: %i, dithering: %i\n",
base_bpp, pipe_config->pipe_bpp, pipe_config->dither); base_bpp, pipe_config->pipe_bpp, pipe_config->dither);
return pipe_config; return 0;
fail: fail:
return ERR_PTR(ret); return ret;
} }
/* Computes which crtcs are affected and sets the relevant bits in the mask. For /* Computes which crtcs are affected and sets the relevant bits in the mask. For
@ -12204,9 +12200,7 @@ 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;
struct intel_crtc_state *pipe_config = NULL;
struct intel_crtc *intel_crtc;
int ret = 0; int ret = 0;
ret = drm_atomic_add_affected_connectors(state, crtc); ret = drm_atomic_add_affected_connectors(state, crtc);
@ -12222,21 +12216,20 @@ 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.
*/ */
for_each_intel_crtc_masked(dev, *modeset_pipes, intel_crtc) { pipe_config = intel_atomic_get_crtc_state(state, to_intel_crtc(crtc));
/* FIXME: For now we still expect modeset_pipes has at most if (IS_ERR(pipe_config))
* one bit set. */ return pipe_config;
if (WARN_ON(&intel_crtc->base != crtc))
continue;
pipe_config = intel_modeset_pipe_config(crtc, mode, state); if (!(*modeset_pipes & (1 << to_intel_crtc(crtc)->pipe)))
if (IS_ERR(pipe_config)) return pipe_config;
return pipe_config;
intel_dump_pipe_config(to_intel_crtc(crtc), pipe_config, ret = intel_modeset_pipe_config(crtc, mode, state, pipe_config);
"[modeset]"); if (ret)
} return ERR_PTR(ret);
return intel_atomic_get_crtc_state(state, to_intel_crtc(crtc));; intel_dump_pipe_config(to_intel_crtc(crtc), pipe_config,"[modeset]");
return pipe_config;
} }
static int __intel_set_mode_setup_plls(struct drm_atomic_state *state, static int __intel_set_mode_setup_plls(struct drm_atomic_state *state,