Skip to content

Commit

Permalink
drm/i915: Factor out intel_crtc_has_encoders()
Browse files Browse the repository at this point in the history
Make the code mode readable by pulling the "does this crtc have any
encoders?" deduction into a separate function.

Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  • Loading branch information
Ville Syrjälä authored and Daniel Vetter committed Sep 1, 2015
1 parent 0f64614 commit 02e93c3
Showing 1 changed file with 13 additions and 9 deletions.
22 changes: 13 additions & 9 deletions drivers/gpu/drm/i915/intel_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -14807,13 +14807,22 @@ intel_check_plane_mapping(struct intel_crtc *crtc)
return true;
}

static bool intel_crtc_has_encoders(struct intel_crtc *crtc)
{
struct drm_device *dev = crtc->base.dev;
struct intel_encoder *encoder;

for_each_encoder_on_crtc(dev, &crtc->base, encoder)
return true;

return false;
}

static void intel_sanitize_crtc(struct intel_crtc *crtc)
{
struct drm_device *dev = crtc->base.dev;
struct drm_i915_private *dev_priv = dev->dev_private;
struct intel_encoder *encoder;
u32 reg;
bool enable;

/* Clear any frame start delays used for debugging left by the BIOS */
reg = PIPECONF(crtc->config->cpu_transcoder);
Expand Down Expand Up @@ -14857,16 +14866,11 @@ static void intel_sanitize_crtc(struct intel_crtc *crtc)

/* Adjust the state of the output pipe according to whether we
* have active connectors/encoders. */
enable = false;
for_each_encoder_on_crtc(dev, &crtc->base, encoder) {
enable = true;
break;
}

if (!enable)
if (!intel_crtc_has_encoders(crtc))
intel_crtc_disable_noatomic(&crtc->base);

if (crtc->active != crtc->base.state->active) {
struct intel_encoder *encoder;

/* This can happen either due to bugs in the get_hw_state
* functions or because of calls to intel_crtc_disable_noatomic,
Expand Down

0 comments on commit 02e93c3

Please sign in to comment.