From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jesse Barnes <jbarnes@virtuousgeek.org>
Subject: Re: [PATCH 3/4] drm/i915: don't call dpms funcs after
 set_mode
Date: Thu, 13 Sep 2012 13:41:13 -0700
Message-ID: <20120913134113.368fe397@jbarnes-desktop>
References: <1346962115-7267-1-git-send-email-daniel.vetter@ffwll.ch>
	<1346962115-7267-4-git-send-email-daniel.vetter@ffwll.ch>
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 oproxy6-pub.bluehost.com (oproxy6-pub.bluehost.com
	[67.222.54.6])
	by gabe.freedesktop.org (Postfix) with SMTP id A1F469E732
	for <intel-gfx@lists.freedesktop.org>;
	Thu, 13 Sep 2012 13:40:59 -0700 (PDT)
In-Reply-To: <1346962115-7267-4-git-send-email-daniel.vetter@ffwll.ch>
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: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Intel Graphics Development <intel-gfx@lists.freedesktop.org>
List-Id: intel-gfx@lists.freedesktop.org

On Thu,  6 Sep 2012 22:08:34 +0200
Daniel Vetter <daniel.vetter@ffwll.ch> wrote:

> ... because our current set_mode implementation doesn't bother to adjust
> for the dpms state, we just forcefully update it. So stop pretending that
> we're better than we are and rip out this extranous call.
> 
> Note that this totally confuses userspace, because the exposed connector
> property isn't actually updated ...
> 
> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> ---
>  drivers/gpu/drm/i915/intel_display.c | 10 ----------
>  1 file changed, 10 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 0973797..805324d 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -7236,7 +7236,6 @@ static int intel_crtc_set_config(struct drm_mode_set *set)
>  	struct drm_mode_set save_set;
>  	struct intel_set_config *config;
>  	int ret;
> -	int i;
>  
>  	BUG_ON(!set);
>  	BUG_ON(!set->crtc);
> @@ -7300,15 +7299,6 @@ static int intel_crtc_set_config(struct drm_mode_set *set)
>  			ret = -EINVAL;
>  			goto fail;
>  		}
> -
> -		if (set->crtc->enabled) {
> -			DRM_DEBUG_KMS("Setting connector DPMS state to on\n");
> -			for (i = 0; i < set->num_connectors; i++) {
> -				DRM_DEBUG_KMS("\t[CONNECTOR:%d:%s] set DPMS on\n", set->connectors[i]->base.id,
> -					      drm_get_connector_name(set->connectors[i]));
> -				set->connectors[i]->funcs->dpms(set->connectors[i], DRM_MODE_DPMS_ON);
> -			}
> -		}
>  	} else if (config->fb_changed) {
>  		ret = intel_pipe_set_base(set->crtc,
>  					  set->x, set->y, set->fb);

Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>

-- 
Jesse Barnes, Intel Open Source Technology Center