Skip to content

Commit

Permalink
drm/i915: improve modeset state checking after dpms calls
Browse files Browse the repository at this point in the history
Now that we have solid modeset state tracking and checking code in
place, we can do the Full Monty also after dpms calls.

Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  • Loading branch information
Daniel Vetter committed Sep 6, 2012
1 parent 8af6cf8 commit b980514
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 8 deletions.
2 changes: 1 addition & 1 deletion drivers/gpu/drm/i915/intel_crt.c
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ static void intel_crt_dpms(struct drm_connector *connector, int mode)
intel_crtc_update_dpms(crtc);
}

intel_connector_check_state(to_intel_connector(connector));
intel_modeset_check_state(connector->dev);
}

static int intel_crt_mode_valid(struct drm_connector *connector,
Expand Down
6 changes: 3 additions & 3 deletions drivers/gpu/drm/i915/intel_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -3585,7 +3585,7 @@ void intel_encoder_dpms(struct intel_encoder *encoder, int mode)

/* Cross check the actual hw state with our own modeset state tracking (and it's
* internal consistency). */
void intel_connector_check_state(struct intel_connector *connector)
static void intel_connector_check_state(struct intel_connector *connector)
{
if (connector->get_hw_state(connector)) {
struct intel_encoder *encoder = connector->encoder;
Expand Down Expand Up @@ -3639,7 +3639,7 @@ void intel_connector_dpms(struct drm_connector *connector, int mode)
else
WARN_ON(encoder->connectors_active != false);

intel_connector_check_state(to_intel_connector(connector));
intel_modeset_check_state(connector->dev);
}

/* Simple connector->get_hw_state implementation for encoders that support only
Expand Down Expand Up @@ -6872,7 +6872,7 @@ intel_modeset_update_state(struct drm_device *dev, unsigned prepare_pipes)
base.head) \
if (mask & (1 <<(intel_crtc)->pipe)) \

static void
void
intel_modeset_check_state(struct drm_device *dev)
{
struct intel_crtc *crtc;
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/i915/intel_dp.c
Original file line number Diff line number Diff line change
Expand Up @@ -1362,7 +1362,7 @@ intel_dp_dpms(struct drm_connector *connector, int mode)
intel_encoder_dpms(&intel_dp->base, mode);
}

intel_connector_check_state(to_intel_connector(connector));
intel_modeset_check_state(connector->dev);
}

/*
Expand Down
3 changes: 2 additions & 1 deletion drivers/gpu/drm/i915/intel_drv.h
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,8 @@ extern void intel_encoder_dpms(struct intel_encoder *encoder, int mode);
extern bool intel_encoder_check_is_cloned(struct intel_encoder *encoder);
extern void intel_connector_dpms(struct drm_connector *, int mode);
extern bool intel_connector_get_hw_state(struct intel_connector *connector);
extern void intel_connector_check_state(struct intel_connector *);
extern void intel_modeset_check_state(struct drm_device *dev);


static inline struct intel_encoder *intel_attached_encoder(struct drm_connector *connector)
{
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/i915/intel_dvo.c
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ static void intel_dvo_dpms(struct drm_connector *connector, int mode)
intel_crtc_update_dpms(crtc);
}

intel_connector_check_state(to_intel_connector(connector));
intel_modeset_check_state(connector->dev);
}

static int intel_dvo_mode_valid(struct drm_connector *connector,
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/i915/intel_sdvo.c
Original file line number Diff line number Diff line change
Expand Up @@ -1275,7 +1275,7 @@ static void intel_sdvo_dpms(struct drm_connector *connector, int mode)
intel_sdvo_set_active_outputs(intel_sdvo, intel_sdvo->attached_output);
}

intel_connector_check_state(to_intel_connector(connector));
intel_modeset_check_state(connector->dev);
}

static int intel_sdvo_mode_valid(struct drm_connector *connector,
Expand Down

0 comments on commit b980514

Please sign in to comment.