Attachment 78812 Details for Bug 64178 – Imre's patch modified.

[patch] Imre's patch modified.

imre_modified.patch (text/plain), 1.58 KB, created by Egbert Eich on 2013-05-03 15:14:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Egbert Eich

Created: 2013-05-03 15:14:32 UTC

Size: 1.58 KB

patch

obsolete

>diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
>index 1b2c744..54a2b6d 100644
>--- a/drivers/gpu/drm/i915/intel_display.c
>+++ b/drivers/gpu/drm/i915/intel_display.c
>@@ -8000,6 +8000,21 @@ static void intel_set_config_restore_state(struct drm_device *dev,
> 	}
> }
> 
>+static bool
>+connector_off(struct drm_crtc *crtc, struct drm_connector *connectors,
>+	      int num_connectors)
>+{
>+	int i;
>+
>+	for (i = 0; i < num_connectors; i++)
>+		if (connectors[i].encoder &&
>+		    connectors[i].encoder->crtc == crtc &&
>+		    connectors[i].dpms != DRM_MODE_DPMS_ON)
>+			return true;
>+
>+	return false;
>+}
>+
> static void
> intel_set_config_compute_mode_changes(struct drm_mode_set *set,
> 				      struct intel_set_config *config)
>@@ -8007,7 +8022,10 @@ intel_set_config_compute_mode_changes(struct drm_mode_set *set,
> 
> 	/* We should be able to check here if the fb has the same properties
> 	 * and then just flip_or_move it */
>-	if (set->crtc->fb != set->fb) {
>+	if (connector_off(set->crtc, *set->connectors,
>+			  set->num_connectors)) {
>+			config->mode_changed = true;
>+	} else if (set->crtc->fb != set->fb) {
> 		/* If we have no fb then treat it as a full mode set */
> 		if (set->crtc->fb == NULL) {
> 			DRM_DEBUG_KMS("crtc has no fb, full mode set\n");
>@@ -8017,8 +8035,9 @@ intel_set_config_compute_mode_changes(struct drm_mode_set *set,
> 		} else if (set->fb->pixel_format !=
> 			   set->crtc->fb->pixel_format) {
> 			config->mode_changed = true;
>-		} else
>+		} else {
> 			config->fb_changed = true;
>+		}
> 	}
> 
> 	if (set->fb && (set->x != set->crtc->x || set->y != set->crtc->y))

Actions: View | Splinter Review

Attachments on bug 64178: 78802 | 78812 | 78813

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.