|
@@ -15460,6 +15460,17 @@ static bool intel_crtc_has_encoders(struct intel_crtc *crtc)
|
|
|
return false;
|
|
|
}
|
|
|
|
|
|
+static bool intel_encoder_has_connectors(struct intel_encoder *encoder)
|
|
|
+{
|
|
|
+ struct drm_device *dev = encoder->base.dev;
|
|
|
+ struct intel_connector *connector;
|
|
|
+
|
|
|
+ for_each_connector_on_encoder(dev, &encoder->base, connector)
|
|
|
+ return true;
|
|
|
+
|
|
|
+ return false;
|
|
|
+}
|
|
|
+
|
|
|
static void intel_sanitize_crtc(struct intel_crtc *crtc)
|
|
|
{
|
|
|
struct drm_device *dev = crtc->base.dev;
|
|
@@ -15570,7 +15581,6 @@ static void intel_sanitize_encoder(struct intel_encoder *encoder)
|
|
|
{
|
|
|
struct intel_connector *connector;
|
|
|
struct drm_device *dev = encoder->base.dev;
|
|
|
- bool active = false;
|
|
|
|
|
|
/* We need to check both for a crtc link (meaning that the
|
|
|
* encoder is active and trying to read from a pipe) and the
|
|
@@ -15578,15 +15588,7 @@ static void intel_sanitize_encoder(struct intel_encoder *encoder)
|
|
|
bool has_active_crtc = encoder->base.crtc &&
|
|
|
to_intel_crtc(encoder->base.crtc)->active;
|
|
|
|
|
|
- for_each_intel_connector(dev, connector) {
|
|
|
- if (connector->base.encoder != &encoder->base)
|
|
|
- continue;
|
|
|
-
|
|
|
- active = true;
|
|
|
- break;
|
|
|
- }
|
|
|
-
|
|
|
- if (active && !has_active_crtc) {
|
|
|
+ if (intel_encoder_has_connectors(encoder) && !has_active_crtc) {
|
|
|
DRM_DEBUG_KMS("[ENCODER:%d:%s] has active connectors but no active pipe!\n",
|
|
|
encoder->base.base.id,
|
|
|
encoder->base.name);
|