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

Commit d05c617e authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915: extract dri1 breadcrumb update from irq handler 



... and hide it in i915_dma.c.

This way all the legacy stuff dealing with READ_BREADCRUMB and
LP_RING and friends is in i915_dma.c.

v2: Rebase on top of Chris Wilson's rework irq handling code.

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 9488867a

drivers/gpu/drm/i915/i915_dma.c

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

#include <asm/pat.h>



void i915_update_dri1_breadcrumb(struct drm_device *dev)

{

	drm_i915_private_t *dev_priv = dev->dev_private;

	struct drm_i915_master_private *master_priv;



	if (dev->primary->master) {

		master_priv = dev->primary->master->driver_priv;

		if (master_priv->sarea_priv)

			master_priv->sarea_priv->last_dispatch =

				READ_BREADCRUMB(dev_priv);

	}

}



static void i915_write_hws_pga(struct drm_device *dev)

{

	drm_i915_private_t *dev_priv = dev->dev_private;

drivers/gpu/drm/i915/i915_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -1129,6 +1129,7 @@ extern int i915_master_create(struct drm_device *dev, struct drm_master *master) 
extern void i915_master_destroy(struct drm_device *dev, struct drm_master *master);



				/* i915_dma.c */

void i915_update_dri1_breadcrumb(struct drm_device *dev);

extern void i915_kernel_lost_context(struct drm_device * dev);

extern int i915_driver_load(struct drm_device *, unsigned long flags);

extern int i915_driver_unload(struct drm_device *);

drivers/gpu/drm/i915/i915_irq.c

+3 −21
Original line number Diff line number Diff line
@@ -2015,7 +2015,6 @@ static irqreturn_t i8xx_irq_handler(DRM_IRQ_ARGS) 
{

	struct drm_device *dev = (struct drm_device *) arg;

	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;

	struct drm_i915_master_private *master_priv;

	u16 iir, new_iir;

	u32 pipe_stats[2];

	unsigned long irqflags;
@@ -2061,12 +2060,7 @@ static irqreturn_t i8xx_irq_handler(DRM_IRQ_ARGS) 
		I915_WRITE16(IIR, iir & ~flip_mask);

		new_iir = I915_READ16(IIR); /* Flush posted writes */



		if (dev->primary->master) {

			master_priv = dev->primary->master->driver_priv;

			if (master_priv->sarea_priv)

				master_priv->sarea_priv->last_dispatch =

					READ_BREADCRUMB(dev_priv);

		}

		i915_update_dri1_breadcrumb(dev);



		if (iir & I915_USER_INTERRUPT)

			notify_ring(dev, &dev_priv->ring[RCS]);
@@ -2199,7 +2193,6 @@ static irqreturn_t i915_irq_handler(DRM_IRQ_ARGS) 
{

	struct drm_device *dev = (struct drm_device *) arg;

	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;

	struct drm_i915_master_private *master_priv;

	u32 iir, new_iir, pipe_stats[I915_MAX_PIPES];

	unsigned long irqflags;

	u32 flip_mask =
@@ -2305,12 +2298,7 @@ static irqreturn_t i915_irq_handler(DRM_IRQ_ARGS) 
		iir = new_iir;

	} while (iir & ~flip_mask);



	if (dev->primary->master) {

		master_priv = dev->primary->master->driver_priv;

		if (master_priv->sarea_priv)

			master_priv->sarea_priv->last_dispatch =

				READ_BREADCRUMB(dev_priv);

	}

	i915_update_dri1_breadcrumb(dev);



	return ret;

}
@@ -2446,7 +2434,6 @@ static irqreturn_t i965_irq_handler(DRM_IRQ_ARGS) 
{

	struct drm_device *dev = (struct drm_device *) arg;

	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;

	struct drm_i915_master_private *master_priv;

	u32 iir, new_iir;

	u32 pipe_stats[I915_MAX_PIPES];

	unsigned long irqflags;
@@ -2555,12 +2542,7 @@ static irqreturn_t i965_irq_handler(DRM_IRQ_ARGS) 
		iir = new_iir;

	}



	if (dev->primary->master) {

		master_priv = dev->primary->master->driver_priv;

		if (master_priv->sarea_priv)

			master_priv->sarea_priv->last_dispatch =

				READ_BREADCRUMB(dev_priv);

	}

	i915_update_dri1_breadcrumb(dev);



	return ret;

}