From mboxrd@z Thu Jan  1 00:00:00 1970
From: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Subject: Re: [PATCH] drm/i915: fix Haswell pfit power well check
	v2
Date: Fri, 03 May 2013 15:55:29 +0300
Message-ID: <877gjg5ike.fsf@gaia.fi.intel.com>
References: <1367533496-2909-1-git-send-email-jbarnes@virtuousgeek.org>
	<1367533847-2988-1-git-send-email-jbarnes@virtuousgeek.org>
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 mga02.intel.com (mga02.intel.com [134.134.136.20])
	by gabe.freedesktop.org (Postfix) with ESMTP id 0D2EAE64D9
	for <intel-gfx@lists.freedesktop.org>;
	Fri,  3 May 2013 05:55:46 -0700 (PDT)
In-Reply-To: <1367533847-2988-1-git-send-email-jbarnes@virtuousgeek.org>
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>, intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

Jesse Barnes <jbarnes@virtuousgeek.org> writes:

> We can't read the pfit regs if the power well is off, so use the cached
> value.
>
> v2: re-add lost comment (Jesse)
>     make sure the crtc using the fitter is actually enabled (Jesse)
>
> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
> ---
>  drivers/gpu/drm/i915/intel_display.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 6504337..6be34f2 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -5918,7 +5918,7 @@ static void haswell_modeset_global_resources(struct drm_device *dev)
>  		 * sequence that's not yet available. Just in case desktop eDP
>  		 * on PORT D is possible on haswell, too. */
>  		/* Even the eDP panel fitter is outside the always-on well. */
> -		if (I915_READ(PF_WIN_SZ(crtc->pipe)))
> +		if (crtc->config.pch_pfit.size && crtc->base.enabled)
>  			enable = true;
>  	}
>

Remove the now useless *dev_priv to remove compiler warning and then add

Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>