From: Chris Wilson <chris@chris-wilson.co.uk>
To: intel-gfx@lists.freedesktop.org
Subject: [PATCH] drm/i915: gen4 vs gen5 DISPLAY_FLIP discrepancy?
Date: Sun, 8 Aug 2010 12:50:44 +0100 [thread overview]
Message-ID: <1281268244-3710-1-git-send-email-chris@chris-wilson.co.uk> (raw)
In-Reply-To: <1281259225-23421-1-git-send-email-chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
drivers/gpu/drm/i915/intel_display.c | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index bdd04ae..cd606e5 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -5120,7 +5120,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
offset = crtc->y * fb->pitch + crtc->x * fb->bits_per_pixel/8;
BEGIN_LP_RING(4);
- if (IS_I965G(dev)) {
+ if (IS_GEN5(dev)) {
int pipe = intel_crtc->pipe;
u32 pf, pipesrc;
@@ -5136,6 +5136,18 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
pf = I915_READ(pipe == 0 ? PFA_CTL_1 : PFB_CTL_1) & PF_ENABLE;
pipesrc = I915_READ(pipe == 0 ? PIPEASRC : PIPEBSRC) & 0x0fff0fff;
OUT_RING(pf | pipesrc);
+ } else if (IS_I965G(dev)) {
+ int pipe = intel_crtc->pipe;
+ u32 pf, pipesrc;
+
+ OUT_RING(MI_DISPLAY_FLIP |
+ MI_DISPLAY_FLIP_PLANE(intel_crtc->plane));
+ OUT_RING(fb->pitch);
+ OUT_RING(obj_priv->gtt_offset| obj_priv->tiling_mode);
+
+ pf = I915_READ(pipe == 0 ? PFA_CTL_1 : PFB_CTL_1) & PF_ENABLE;
+ pipesrc = I915_READ(pipe == 0 ? PIPEASRC : PIPEBSRC) & 0x0fff0fff;
+ OUT_RING(pf | pipesrc);
} else if (IS_GEN3(dev)) {
OUT_RING(MI_DISPLAY_FLIP_I915 |
MI_DISPLAY_FLIP_PLANE(intel_crtc->plane));
--
1.7.1
next prev parent reply other threads:[~2010-08-08 11:51 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <4C5E04F9.5010005@comcast.net>
2010-08-08 9:20 ` [PATCH] drm/i915: Fix offset page-flips on i965+ Chris Wilson
2010-08-08 11:39 ` Chris Wilson
2010-08-08 12:24 ` Daniel Vetter
2010-08-08 14:50 ` Daniel Vetter
2010-08-08 11:50 ` Chris Wilson [this message]
2010-08-10 21:37 ` Jesse Barnes
2010-08-11 9:25 ` [PATCH 1/2] drm/i915: Include a generation number in the device info Chris Wilson
2010-08-11 14:14 ` Adam Jackson
2010-08-11 14:29 ` Chris Wilson
2010-08-11 9:25 ` [PATCH 2/2] drm/i915: Fix offset page-flips on i965+ Chris Wilson
2010-08-11 15:18 ` Jesse Barnes
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1281268244-3710-1-git-send-email-chris@chris-wilson.co.uk \
--to=chris@chris-wilson.co.uk \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.