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

drm/i915: Don't use staged config in check_digital_port_conflicts()

Browse Source 
Reduce dependency on the staged config by using the atomic state
instead.

Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Ander Conselvan de Oliveira 2015-04-02 14:47:59 +03:00 committed by Daniel Vetter
parent d69ba09b68
commit 5448a00d3f
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10658,23 +10658,30 @@ static bool check_encoder_cloning(struct intel_crtc *crtc)
return true; return true;
} }
static bool check_digital_port_conflicts(struct drm_device *dev) static bool check_digital_port_conflicts(struct drm_atomic_state *state)
{ {
struct intel_connector *connector; struct drm_device *dev = state->dev;
struct intel_encoder *encoder;
struct drm_connector_state *connector_state;
unsigned int used_ports = 0; unsigned int used_ports = 0;
int i;
/* /*
* Walk the connector list instead of the encoder * Walk the connector list instead of the encoder
* list to detect the problem on ddi platforms * list to detect the problem on ddi platforms
* where there's just one encoder per digital port. * where there's just one encoder per digital port.
*/ */
for_each_intel_connector(dev, connector) { for (i = 0; i < state->num_connector; i++) {
struct intel_encoder *encoder = connector->new_encoder; if (!state->connectors[i])
if (!encoder)
continue; continue;
WARN_ON(!encoder->new_crtc); connector_state = state->connector_states[i];
if (!connector_state->best_encoder)
continue;
encoder = to_intel_encoder(connector_state->best_encoder);
WARN_ON(!connector_state->crtc);
switch (encoder->type) { switch (encoder->type) {
unsigned int port_mask; unsigned int port_mask;
@ -10716,7 +10723,6 @@ 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 drm_device *dev = crtc->dev;
struct intel_encoder *encoder; struct intel_encoder *encoder;
struct intel_connector *connector; struct intel_connector *connector;
struct drm_connector_state *connector_state; struct drm_connector_state *connector_state;
@ -10730,7 +10736,7 @@ intel_modeset_pipe_config(struct drm_crtc *crtc,
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
} }
if (!check_digital_port_conflicts(dev)) { 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 ERR_PTR(-EINVAL);
} }