kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

drm/i915: don't enable the gen6 bsd ring tail write enable on gen7

Browse source 
HW engineers have fixed this issue for ivb. Again, a nice cleanup
possible thanks to the more flexible ring initialization.

Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Daniel Vetter 2012-04-11 22:12:55 +02:00
parent e48d86347c
commit 0fd2c20148
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/gpu/drm/i915/intel_ringbuffer.c
View file

@ -1415,9 +1415,12 @@ int intel_init_bsd_ring_buffer(struct drm_device *dev)
ring->name = "bsd ring"; ring->name = "bsd ring";
ring->id = VCS; ring->id = VCS;
ring->write_tail = ring_write_tail;
if (IS_GEN6(dev) || IS_GEN7(dev)) { if (IS_GEN6(dev) || IS_GEN7(dev)) {
ring->mmio_base = GEN6_BSD_RING_BASE; ring->mmio_base = GEN6_BSD_RING_BASE;
ring->write_tail = gen6_bsd_ring_write_tail; /* gen6 bsd needs a special wa for tail updates */
if (IS_GEN6(dev))
ring->write_tail = gen6_bsd_ring_write_tail;
ring->flush = gen6_ring_flush; ring->flush = gen6_ring_flush;
ring->add_request = gen6_add_request; ring->add_request = gen6_add_request;
ring->get_seqno = gen6_ring_get_seqno; ring->get_seqno = gen6_ring_get_seqno;
@ -1433,7 +1436,6 @@ int intel_init_bsd_ring_buffer(struct drm_device *dev)
ring->signal_mbox[1] = GEN6_BVSYNC; ring->signal_mbox[1] = GEN6_BVSYNC;
} else { } else {
ring->mmio_base = BSD_RING_BASE; ring->mmio_base = BSD_RING_BASE;
ring->write_tail = ring_write_tail;
ring->flush = bsd_ring_flush; ring->flush = bsd_ring_flush;
ring->add_request = ring_add_request; ring->add_request = ring_add_request;
ring->get_seqno = ring_get_seqno; ring->get_seqno = ring_get_seqno;