linux-toradex.git/drivers/gpu/drm/i915/intel_ringbuffer.c, branch v3.0.74

drm/i915: correctly order the ring init sequence

2012-08-26T22:12:11+00:00

commit 0d8957c8a90bbb5d34fab9a304459448a5131e06 upstream.

We may only start to set up the new register values after having
confirmed that the ring is truely off. Otherwise the hw might lose the
newly written register values. This is caught later on in the init
sequence, when we check whether the register writes have stuck.

Reviewed-by: Jani Nikula 
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=50522
Tested-by: Yang Guang 
Signed-off-by: Daniel Vetter 
Signed-off-by: Greg Kroah-Hartman

drm/i915/ringbuffer: Exclude last 2 cachlines of ring on 845g

2012-04-22T23:21:22+00:00

commit 27c1cbd06a7620b354cbb363834f3bb8df4f410d upstream.

The 845g shares the errata with i830 whereby executing a command
within 2 cachelines of the end of the ringbuffer may cause a GPU hang.

Signed-off-by: Chris Wilson 
Signed-off-by: Daniel Vetter 
Signed-off-by: Greg Kroah-Hartman

drm/i915: Initialize RCS ring status page address in intel_render_ring_init_dri

2011-08-16T01:31:35+00:00

commit f3234706a77bd6e1592ae71fb3268e04cb030dba upstream.

Physically-addressed hardware status pages are initialized early in
the driver load process by i915_init_phys_hws. For UMS environments,
the ring structure is not initialized until the X server starts. At
that point, the entire ring structure is re-initialized with all new
values. Any values set in the ring structure (including
ring->status_page.page_addr) will be lost when the ring is
re-initialized.

This patch moves the initialization of the status_page.page_addr value
to intel_render_ring_init_dri.

Signed-off-by: Keith Packard 
Signed-off-by: Greg Kroah-Hartman

drm/i915: clean up unused ring_get_irq/ring_put_irq functions

2011-05-16T19:54:16+00:00

This patch depends on patch "drm/i915: fix user irq miss in BSD ring on
g4x".
Once the previous patch apply, ring_get_irq/ring_put_irq become unused.
So simply remove them.

Signed-off-by: Feng, Boqun 
Reviewed-by: Xiang, Haihao 
Signed-off-by: Keith Packard

drm/i915: fix user irq miss in BSD ring on g4x

2011-05-16T19:54:05+00:00

On g4x, user interrupt in BSD ring is missed.
This is because though g4x and ironlake share the same bsd_ring,
their interrupt control interfaces have _two_ differences.

1.different irq enable/disable functions:
On g4x are i915_enable_irq and i915_disable_irq.
On ironlake are ironlake_enable_irq and ironlake_disable_irq.
2.different irq flag:
On g4x user interrupt flag in BSD ring on is I915_BSD_USER_INTERRUPT.
On ironlake is GT_BSD_USER_INTERRUPT

Old bsd_ring_get/put_irq call ring_get_irq and ring_get_irq.
ring_get_irq and ring_put_irq only call ironlake_enable/disable_irq.
So comes the irq miss on g4x.

To fix this, as other rings' code do, conditionally call different
functions(i915_enable/disable_irq and ironlake_enable/disable_irq)
and use different interrupt flags in bsd_ring_get/put_irq.

Signed-off-by: Feng, Boqun 
Reviewed-by: Xiang, Haihao 
Cc: stable@kernel.org
Signed-off-by: Keith Packard

drm/i915: Update the location of the ringbuffers' HWS_PGA registers for IVB.

2011-05-14T01:12:52+00:00

They have been moved from the ringbuffer groups to their own group it
looks like.  Fixes GPU hangs on gnome startup.

Signed-off-by: Eric Anholt 
Reviewed-by: Jesse Barnes 
Signed-off-by: Keith Packard

drm/i915: ring support for Ivy Bridge

2011-05-14T00:10:33+00:00

Use Sandy Bridge paths in a few places.

Signed-off-by: Jesse Barnes 
Reviewed-by: Keith Packard 
Signed-off-by: Keith Packard

drm/i915: Rename agp_type to cache_level

2011-05-10T20:56:43+00:00

... to clarify just how we use it inside the driver and remove the
confusion of the poorly matching agp_type names. We still need to
translate through agp_type for interface into the fake AGP driver.

Signed-off-by: Chris Wilson 
Signed-off-by: Eric Anholt 
Reviewed-by: Daniel Vetter 
Signed-off-by: Keith Packard

drm/1915: ringbuffer wait for idle function

2011-05-10T20:56:40+00:00

Added a new function which waits for the ringbuffer space to be equal to
(total - 8). This is the empty condition of the ringbuffer, and
equivalent to head==tail.

Also modified two users of this functionality elsewhere in the code.

Signed-off-by: Ben Widawsky 
Signed-off-by: Chris Wilson

drm/i915: Move the irq wait queue initialisation into the ring init

2011-05-10T20:19:12+00:00

Required so that we don't obliterate the queue if initialising the
rings after the global IRQ handler is installed.

[Jesse, you recently looked at refactoring the IRQ installation
routines, does moving the initialisation of ring buffer data structures away
from that routine make sense in your grand scheme?]

Signed-off-by: Chris Wilson 
Cc: Jesse Barnes 
Reviewed-by: Ben Widawsky 
Signed-off-by: Keith Packard