Skip to content

Commit

Permalink
drm/i915: Get rid of unused transitional members.
Browse files Browse the repository at this point in the history 
The previous commit converted hw readout to atomic, all the new_*
members were used for restoring the old state, but with the
conversion of suspend to atomic there's no use left for them.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  • Loading branch information
Maarten Lankhorst authored and Daniel Vetter committed Jul 14, 2015
1 parent 043e9bd commit ad3c558
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 74 deletions.
80 changes: 18 additions & 62 deletions drivers/gpu/drm/i915/intel_display.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10247,7 +10247,7 @@ bool intel_get_load_detect_pipe(struct drm_connector *connector,
retry:
ret = drm_modeset_lock(&config->connection_mutex, ctx);
if (ret)
goto fail_unlock;
goto fail;

/*
* Algorithm gets a little messy:
Expand All @@ -10265,10 +10265,10 @@ bool intel_get_load_detect_pipe(struct drm_connector *connector,

ret = drm_modeset_lock(&crtc->mutex, ctx);
if (ret)
goto fail_unlock;
goto fail;
ret = drm_modeset_lock(&crtc->primary->mutex, ctx);
if (ret)
goto fail_unlock;
goto fail;

old->dpms_mode = connector->dpms;
old->load_detect_temp = false;
Expand All @@ -10287,9 +10287,6 @@ bool intel_get_load_detect_pipe(struct drm_connector *connector,
continue;
if (possible_crtc->state->enable)
continue;
/* This can occur when applying the pipe A quirk on resume. */
if (to_intel_crtc(possible_crtc)->new_enabled)
continue;

crtc = possible_crtc;
break;
Expand All @@ -10300,20 +10297,17 @@ bool intel_get_load_detect_pipe(struct drm_connector *connector,
*/
if (!crtc) {
DRM_DEBUG_KMS("no pipe available for load-detect\n");
goto fail_unlock;
goto fail;
}

ret = drm_modeset_lock(&crtc->mutex, ctx);
if (ret)
goto fail_unlock;
goto fail;
ret = drm_modeset_lock(&crtc->primary->mutex, ctx);
if (ret)
goto fail_unlock;
intel_encoder->new_crtc = to_intel_crtc(crtc);
to_intel_connector(connector)->new_encoder = intel_encoder;
goto fail;

intel_crtc = to_intel_crtc(crtc);
intel_crtc->new_enabled = true;
old->dpms_mode = connector->dpms;
old->load_detect_temp = true;
old->release_fb = NULL;
Expand Down Expand Up @@ -10381,9 +10375,7 @@ bool intel_get_load_detect_pipe(struct drm_connector *connector,
intel_wait_for_vblank(dev, intel_crtc->pipe);
return true;

fail:
intel_crtc->new_enabled = crtc->state->enable;
fail_unlock:
fail:
drm_atomic_state_free(state);
state = NULL;

Expand Down Expand Up @@ -10429,10 +10421,6 @@ void intel_release_load_detect_pipe(struct drm_connector *connector,
if (IS_ERR(crtc_state))
goto fail;

to_intel_connector(connector)->new_encoder = NULL;
intel_encoder->new_crtc = NULL;
intel_crtc->new_enabled = false;

connector_state->best_encoder = NULL;
connector_state->crtc = NULL;

Expand Down Expand Up @@ -11836,37 +11824,6 @@ static const struct drm_crtc_helper_funcs intel_helper_funcs = {
.atomic_check = intel_crtc_atomic_check,
};

/**
* intel_modeset_update_staged_output_state
*
* Updates the staged output configuration state, e.g. after we've read out the
* current hw state.
*/
static void intel_modeset_update_staged_output_state(struct drm_device *dev)
{
struct intel_crtc *crtc;
struct intel_encoder *encoder;
struct intel_connector *connector;

for_each_intel_connector(dev, connector) {
connector->new_encoder =
to_intel_encoder(connector->base.encoder);
}

for_each_intel_encoder(dev, encoder) {
encoder->new_crtc =
to_intel_crtc(encoder->base.crtc);
}

for_each_intel_crtc(dev, crtc) {
crtc->new_enabled = crtc->base.state->enable;
}
}

/* Transitional helper to copy current connector/encoder state to
* connector->state. This is needed so that code that is partially
* converted to atomic does the right thing.
*/
static void intel_modeset_update_connector_atomic_state(struct drm_device *dev)
{
struct intel_connector *connector;
Expand Down Expand Up @@ -12307,7 +12264,6 @@ intel_modeset_update_state(struct drm_atomic_state *state)
}

drm_atomic_helper_update_legacy_modeset_state(state->dev, state);
intel_modeset_update_staged_output_state(state->dev);

/* Double check state. */
for_each_crtc_in_state(state, crtc, crtc_state, i) {
Expand Down Expand Up @@ -12707,11 +12663,14 @@ check_connector_state(struct drm_device *dev)
struct intel_connector *connector;

for_each_intel_connector(dev, connector) {
struct drm_encoder *encoder = connector->base.encoder;
struct drm_connector_state *state = connector->base.state;

/* This also checks the encoder/connector hw state with the
* ->get_hw_state callbacks. */
intel_connector_check_state(connector);

I915_STATE_WARN(&connector->new_encoder->base != connector->base.encoder,
I915_STATE_WARN(state->best_encoder != encoder,
"connector's staged encoder doesn't match current encoder\n");
}
}
Expand All @@ -12731,8 +12690,6 @@ check_encoder_state(struct drm_device *dev)
encoder->base.base.id,
encoder->base.name);

I915_STATE_WARN(&encoder->new_crtc->base != encoder->base.crtc,
"encoder's stage crtc doesn't match current crtc\n");
I915_STATE_WARN(encoder->connectors_active && !encoder->base.crtc,
"encoder's active_connectors set, but no crtc\n");

Expand All @@ -12742,6 +12699,10 @@ check_encoder_state(struct drm_device *dev)
enabled = true;
if (connector->base.dpms != DRM_MODE_DPMS_OFF)
active = true;

I915_STATE_WARN(connector->base.state->crtc !=
encoder->base.crtc,
"connector's crtc doesn't match encoder crtc\n");
}
/*
* for MST connectors if we unplug the connector is gone
Expand Down Expand Up @@ -13312,11 +13273,12 @@ void intel_crtc_restore_mode(struct drm_crtc *crtc)
* need to copy the staged config to the atomic state, otherwise the
* mode set will just reapply the state the HW is already in. */
for_each_intel_encoder(dev, encoder) {
if (&encoder->new_crtc->base != crtc)
if (encoder->base.crtc != crtc)
continue;

for_each_intel_connector(dev, connector) {
if (connector->new_encoder != encoder)
if (connector->base.state->best_encoder !=
&encoder->base)
continue;

connector_state = drm_atomic_get_connector_state(state, &connector->base);
Expand All @@ -13329,7 +13291,6 @@ void intel_crtc_restore_mode(struct drm_crtc *crtc)
}

connector_state->crtc = crtc;
connector_state->best_encoder = &encoder->base;
}
}

Expand All @@ -13341,9 +13302,6 @@ void intel_crtc_restore_mode(struct drm_crtc *crtc)
return;
}

crtc_state->base.active = crtc_state->base.enable =
to_intel_crtc(crtc)->new_enabled;

drm_mode_copy(&crtc_state->base.mode, &crtc->mode);

intel_modeset_setup_plane_state(state, crtc, &crtc->mode,
Expand Down Expand Up @@ -15601,8 +15559,6 @@ intel_modeset_setup_hw_state(struct drm_device *dev)
skl_wm_get_hw_state(dev);
else if (HAS_PCH_SPLIT(dev))
ilk_wm_get_hw_state(dev);

intel_modeset_update_staged_output_state(dev);
}

void intel_display_resume(struct drm_device *dev)
Expand Down
12 changes: 0 additions & 12 deletions drivers/gpu/drm/i915/intel_drv.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,11 +130,6 @@ struct intel_fbdev {

struct intel_encoder {
struct drm_encoder base;
/*
* The new crtc this encoder will be driven from. Only differs from
* base->crtc while a modeset is in progress.
*/
struct intel_crtc *new_crtc;

enum intel_output_type type;
unsigned int cloneable;
Expand Down Expand Up @@ -195,12 +190,6 @@ struct intel_connector {
*/
struct intel_encoder *encoder;

/*
* The new encoder this connector will be driven. Only differs from
* encoder while a modeset is in progress.
*/
struct intel_encoder *new_encoder;

/* Reads out the current hw, returning true if the connector is enabled
* and active (i.e. dpms ON state). */
bool (*get_hw_state)(struct intel_connector *);
Expand Down Expand Up @@ -550,7 +539,6 @@ struct intel_crtc {
uint32_t cursor_base;

struct intel_crtc_state *config;
bool new_enabled;

/* reset counter value when the last flip was submitted */
unsigned int reset_counter;
Expand Down

0 comments on commit ad3c558

Please sign in to comment.