From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jesse Barnes <jbarnes@virtuousgeek.org>
Subject: Re: [PATCH 1/2] drm/i915: fixup pageflip ringbuffer
 commands for i8xx
Date: Wed, 4 Aug 2010 12:48:25 -0700
Message-ID: <20100804124825.3ef2386e@virtuousgeek.org>
References: <1280949730-5288-1-git-send-email-daniel.vetter@ffwll.ch>
	<1280949730-5288-2-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 cpoproxy3-pub.bluehost.com (cpoproxy3-pub.bluehost.com
	[67.222.54.6])
	by gabe.freedesktop.org (Postfix) with SMTP id 34AF09E779
	for <intel-gfx@lists.freedesktop.org>;
	Wed,  4 Aug 2010 12:48:29 -0700 (PDT)
In-Reply-To: <1280949730-5288-2-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-gfx@lists.freedesktop.org, stable@kernel.org
List-Id: intel-gfx@lists.freedesktop.org

On Wed,  4 Aug 2010 21:22:09 +0200
Daniel Vetter <daniel.vetter@ffwll.ch> wrote:

> Add a new path for 2nd gen chips that uses the commands for i81x
> chips (where public docs do exist) augmented with the plane bits
> from i915. It seems to work and doesn't result in a black screen
> like before.
> 
> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> Cc: stable@kernel.org
> ---
>  drivers/gpu/drm/i915/intel_display.c |    8 +++++++-
>  1 files changed, 7 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 8359c50..8135ee0 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -4933,12 +4933,18 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
>  		OUT_RING(obj_priv->gtt_offset | obj_priv->tiling_mode);
>  		pipesrc = I915_READ(pipesrc_reg); 
>  		OUT_RING(pipesrc & 0x0fff0fff);
> -	} else {
> +	} else if (IS_GEN3(dev)) {
>  		OUT_RING(MI_DISPLAY_FLIP_I915 |
>  			 MI_DISPLAY_FLIP_PLANE(intel_crtc->plane));
>  		OUT_RING(fb->pitch);
>  		OUT_RING(obj_priv->gtt_offset);
>  		OUT_RING(MI_NOOP);
> +	} else {
> +		OUT_RING(MI_DISPLAY_FLIP |
> +			 MI_DISPLAY_FLIP_PLANE(intel_crtc->plane));
> +		OUT_RING(fb->pitch);
> +		OUT_RING(obj_priv->gtt_offset);
> +		OUT_RING(MI_NOOP);
>  	}
>  	ADVANCE_LP_RING();

Yep, looks fine.

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

-- 
Jesse Barnes, Intel Open Source Technology Center