| From 6fa0682c7264586f8cca190221b00b2065288f0a Mon Sep 17 00:00:00 2001 |
| From: Chris Wilson <chris@chris-wilson.co.uk> |
| Date: Wed, 4 Sep 2013 10:54:30 +0100 |
| Subject: drm/i915: Confine page flips to BCS on Valleyview |
| |
| Once again we find that Valleyview is ever so subtlety different from |
| the rest of its gen7 brethen. In this case, Valleyview has no support |
| for pageflipping from the RCS ring. |
| |
| Fixes a regression from |
| |
| commit ffe74d75502e3a9b0791240b5562bcbecc6ab8dc |
| Author: Chris Wilson <chris@chris-wilson.co.uk> |
| Date: Mon Aug 26 20:58:12 2013 +0100 |
| |
| drm/i915: Use RCS flips on Ivybridge+ |
| |
| Reported-by: "Lee, Chon Ming" <chon.ming.lee@intel.com> |
| Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> |
| Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=68968 |
| Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> |
| (cherry picked from commit 1c5fd08520de35c7ac0d70e2ed3c3bb200830447) |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| 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 67b5e2799ec4..f68091d2078a 100644 |
| --- a/drivers/gpu/drm/i915/intel_display.c |
| +++ b/drivers/gpu/drm/i915/intel_display.c |
| @@ -7867,7 +7867,7 @@ static int intel_gen7_queue_flip(struct drm_device *dev, |
| int len, ret; |
| |
| ring = obj->ring; |
| - if (ring == NULL || ring->id != RCS) |
| + if (IS_VALLEYVIEW(dev) || ring == NULL || ring->id != RCS) |
| ring = &dev_priv->ring[BCS]; |
| |
| ret = intel_pin_and_fence_fb_obj(dev, obj, ring); |
| -- |
| 1.8.5.rc3 |
| |
