From 9d83f4bf008f5d9ee488c4b35f89dc7acd8030ee Mon Sep 17 00:00:00 2001 From: Jesse Barnes Date: Wed, 6 Apr 2011 14:54:44 -0700 Subject: [PATCH] --- yaml --- r: 250623 b: refs/heads/master c: 65d3eb1e065c5e558a584fabe583daa5fdd63b75 h: refs/heads/master i: 250621: bade723a76ef2634d074f0b7b34ed9e9b0ea2c12 250619: f5c9726cdbdc595b2f8dbec871afbdc9e3cc2dbb 250615: 671649e89ea6813c3f4a57fed24f123e583146c2 250607: 13a7879d67f4bbc7e71d94bf407dfe2a366a353e 250591: fffce6aab987f259733ed013d6baa631c39126ca 250559: 86a3885901105241535b495c3c79109027a75a3f 250495: 768805a9b89e151665a1c1b48abd7228424b0e6c 250367: e7aa42553260ac18cf40b878b4f512968961f5ac v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_ringbuffer.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index c2218c0e388b..1a736083abfe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 51d56126a25280c2dfca6bd7f68a4e8183b679b1 +refs/heads/master: 65d3eb1e065c5e558a584fabe583daa5fdd63b75 diff --git a/trunk/drivers/gpu/drm/i915/intel_ringbuffer.c b/trunk/drivers/gpu/drm/i915/intel_ringbuffer.c index bf63869f6a07..12c168f0cb77 100644 --- a/trunk/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/trunk/drivers/gpu/drm/i915/intel_ringbuffer.c @@ -286,7 +286,7 @@ static int init_render_ring(struct intel_ring_buffer *ring) if (INTEL_INFO(dev)->gen > 3) { int mode = VS_TIMER_DISPATCH << 16 | VS_TIMER_DISPATCH; - if (IS_GEN6(dev)) + if (IS_GEN6(dev) || IS_GEN7(dev)) mode |= MI_FLUSH_ENABLE << 16 | MI_FLUSH_ENABLE; I915_WRITE(MI_MODE, mode); } @@ -552,7 +552,7 @@ render_ring_put_irq(struct intel_ring_buffer *ring) void intel_ring_setup_status_page(struct intel_ring_buffer *ring) { drm_i915_private_t *dev_priv = ring->dev->dev_private; - u32 mmio = IS_GEN6(ring->dev) ? + u32 mmio = (IS_GEN6(ring->dev) || IS_GEN7(ring->dev)) ? RING_HWS_PGA_GEN6(ring->mmio_base) : RING_HWS_PGA(ring->mmio_base); I915_WRITE(mmio, (u32)ring->status_page.gfx_addr); @@ -1334,7 +1334,7 @@ int intel_init_bsd_ring_buffer(struct drm_device *dev) drm_i915_private_t *dev_priv = dev->dev_private; struct intel_ring_buffer *ring = &dev_priv->ring[VCS]; - if (IS_GEN6(dev)) + if (IS_GEN6(dev) || IS_GEN7(dev)) *ring = gen6_bsd_ring; else *ring = bsd_ring;