Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09422b2e authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915: move LP_RING&friends to i915_dma.c 



Wohoo!

Now we only need to move all the gem/kms stuff that accidentally
landed in i915_dma.c out of it, and this will be our legacy dri1
grave-yard.

Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Acked-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent d05c617e

drivers/gpu/drm/i915/i915_dma.c

+26 −0
Original line number Diff line number Diff line
@@ -47,6 +47,32 @@ 
#include <acpi/video.h>

#include <asm/pat.h>



#define LP_RING(d) (&((struct drm_i915_private *)(d))->ring[RCS])



#define BEGIN_LP_RING(n) \

	intel_ring_begin(LP_RING(dev_priv), (n))



#define OUT_RING(x) \

	intel_ring_emit(LP_RING(dev_priv), x)



#define ADVANCE_LP_RING() \

	intel_ring_advance(LP_RING(dev_priv))



/**

 * Lock test for when it's just for synchronization of ring access.

 *

 * In that case, we don't need to do it when GEM is initialized as nobody else

 * has access to the ring.

 */

#define RING_LOCK_TEST_WITH_RETURN(dev, file) do {			\

	if (LP_RING(dev->dev_private)->obj == NULL)			\

		LOCK_TEST_WITH_RETURN(dev, file);			\

} while (0)



#define READ_HWSP(dev_priv, reg) intel_read_status_page(LP_RING(dev_priv), reg)

#define READ_BREADCRUMB(dev_priv) READ_HWSP(dev_priv, I915_BREADCRUMB_INDEX)

#define I915_BREADCRUMB_INDEX		0x21



void i915_update_dri1_breadcrumb(struct drm_device *dev)

{

	drm_i915_private_t *dev_priv = dev->dev_private;

drivers/gpu/drm/i915/i915_drv.h

+0 −22
Original line number Diff line number Diff line
@@ -1471,28 +1471,6 @@ extern void intel_display_print_error_state(struct seq_file *m, 
					    struct intel_display_error_state *error);

#endif



#define LP_RING(d) (&((struct drm_i915_private *)(d))->ring[RCS])



#define BEGIN_LP_RING(n) \

	intel_ring_begin(LP_RING(dev_priv), (n))



#define OUT_RING(x) \

	intel_ring_emit(LP_RING(dev_priv), x)



#define ADVANCE_LP_RING() \

	intel_ring_advance(LP_RING(dev_priv))



/**

 * Lock test for when it's just for synchronization of ring access.

 *

 * In that case, we don't need to do it when GEM is initialized as nobody else

 * has access to the ring.

 */

#define RING_LOCK_TEST_WITH_RETURN(dev, file) do {			\

	if (LP_RING(dev->dev_private)->obj == NULL)			\

		LOCK_TEST_WITH_RETURN(dev, file);			\

} while (0)



/* On SNB platform, before reading ring registers forcewake bit

 * must be set to prevent GT core from power down and stale values being

 * returned.

drivers/gpu/drm/i915/intel_ringbuffer.h

+0 −3
Original line number Diff line number Diff line
@@ -167,10 +167,7 @@ intel_read_status_page(struct intel_ring_buffer *ring, 
 *

 * The area from dword 0x20 to 0x3ff is available for driver usage.

 */

#define READ_HWSP(dev_priv, reg) intel_read_status_page(LP_RING(dev_priv), reg)

#define READ_BREADCRUMB(dev_priv) READ_HWSP(dev_priv, I915_BREADCRUMB_INDEX)

#define I915_GEM_HWS_INDEX		0x20

#define I915_BREADCRUMB_INDEX		0x21



void intel_cleanup_ring_buffer(struct intel_ring_buffer *ring);