From mboxrd@z Thu Jan  1 00:00:00 1970
From: Daniel Vetter <daniel@ffwll.ch>
Subject: Re: [PATCH 4/4] drm/i915: update dpms property in
 set_mode
Date: Fri, 14 Sep 2012 23:38:59 +0200
Message-ID: <20120914213859.GI5799@phenom.ffwll.local>
References: <1346962115-7267-1-git-send-email-daniel.vetter@ffwll.ch>
	<1346962115-7267-5-git-send-email-daniel.vetter@ffwll.ch>
	<20120913134201.2ac50cc3@jbarnes-desktop>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org>
Received: from mail-wg0-f43.google.com (mail-wg0-f43.google.com [74.125.82.43])
	by gabe.freedesktop.org (Postfix) with ESMTP id 84CDD9E7D0
	for <intel-gfx@lists.freedesktop.org>;
	Fri, 14 Sep 2012 14:38:25 -0700 (PDT)
Received: by wgbdq11 with SMTP id dq11so880884wgb.12
	for <intel-gfx@lists.freedesktop.org>;
	Fri, 14 Sep 2012 14:38:24 -0700 (PDT)
Content-Disposition: inline
In-Reply-To: <20120913134201.2ac50cc3@jbarnes-desktop>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org
Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org
To: Jesse Barnes <jbarnes@virtuousgeek.org>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>, Intel Graphics Development <intel-gfx@lists.freedesktop.org>
List-Id: intel-gfx@lists.freedesktop.org

On Thu, Sep 13, 2012 at 01:42:01PM -0700, Jesse Barnes wrote:
> On Thu,  6 Sep 2012 22:08:35 +0200
> Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> 
> > Hopefully this makes userspace slightly less confused about us
> > frobbing the dpms state behind its back. Yeah, it would be better
> > to be more careful with not changing the dpms state, but that is
> > quite more invasive.
> > 
> > Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> > ---
> >  drivers/gpu/drm/i915/intel_display.c | 6 ++++++
> >  1 file changed, 6 insertions(+)
> > 
> > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> > index 805324d..bff0936 100644
> > --- a/drivers/gpu/drm/i915/intel_display.c
> > +++ b/drivers/gpu/drm/i915/intel_display.c
> > @@ -6806,7 +6806,13 @@ intel_modeset_update_state(struct drm_device *dev, unsigned prepare_pipes)
> >  		intel_crtc = to_intel_crtc(connector->encoder->crtc);
> >  
> >  		if (prepare_pipes & (1 << intel_crtc->pipe)) {
> > +			struct drm_property *dpms_property =
> > +				dev->mode_config.dpms_property;
> > +
> >  			connector->dpms = DRM_MODE_DPMS_ON;
> > +			drm_connector_property_set_value(connector,
> > +							 dpms_property,
> > +							 DRM_MODE_DPMS_ON);
> >  
> >  			intel_encoder = to_intel_encoder(connector->encoder);
> >  			intel_encoder->connectors_active = true;
> 
> Both this and the last one need lots of testing coming from different
> DPMS states between fbcon and X, especially across different heads and
> connectors.
> 
> Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>

I've merged all four patches for -next, thanks for the review.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch