From 855b25b6d5a96189634bfb4f51d42e59f0c8024c Mon Sep 17 00:00:00 2001 From: Forest Bond Date: Mon, 13 Aug 2012 16:31:24 +0000 Subject: [PATCH] --- yaml --- r: 322385 b: refs/heads/master c: 4a68a74ba04e7ccf798d45988f4f2d2131fb5063 h: refs/heads/master i: 322383: 297405592e200027e2bb971c23fe12eb12258dab v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/gma500/psb_intel_display.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 3e4a1e36bb9d..33daf2c8ed4f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 84f720ecba6716d198b21936d1bf6253e8ab42a1 +refs/heads/master: 4a68a74ba04e7ccf798d45988f4f2d2131fb5063 diff --git a/trunk/drivers/gpu/drm/gma500/psb_intel_display.c b/trunk/drivers/gpu/drm/gma500/psb_intel_display.c index 30dc22a7156c..8033526bb53b 100644 --- a/trunk/drivers/gpu/drm/gma500/psb_intel_display.c +++ b/trunk/drivers/gpu/drm/gma500/psb_intel_display.c @@ -1362,6 +1362,9 @@ void psb_intel_crtc_init(struct drm_device *dev, int pipe, (struct drm_connector **) (psb_intel_crtc + 1); psb_intel_crtc->mode_set.num_connectors = 0; psb_intel_cursor_init(dev, psb_intel_crtc); + + /* Set to true so that the pipe is forced off on initial config. */ + psb_intel_crtc->active = true; } int psb_intel_get_pipe_from_crtc_id(struct drm_device *dev, void *data,