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

Commit 85f9e50d authored by Daniel Vetter's avatar Daniel Vetter Committed by Dave Airlie
Browse files

drm/i915: move i915_get_extra_insdone out of CONFIG_DEBUG_FS block 



Otherwise it just won't compile ...

Reported-by: default avatarFengguang Wu <fengguang.wu@intel.com>
Reviewed-by: default avatarBen Widawsky <ben@bwidawsk.net>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarDave Airlie <airlied@gmail.com>
parent 65983bd6

drivers/gpu/drm/i915/i915_irq.c

+29 −30
Original line number Diff line number Diff line
@@ -853,6 +853,35 @@ static void i915_error_work_func(struct work_struct *work) 
	}

}



/* NB: please notice the memset */

static void i915_get_extra_instdone(struct drm_device *dev,

				    uint32_t *instdone)

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	memset(instdone, 0, sizeof(*instdone) * I915_NUM_INSTDONE_REG);



	switch(INTEL_INFO(dev)->gen) {

	case 2:

	case 3:

		instdone[0] = I915_READ(INSTDONE);

		break;

	case 4:

	case 5:

	case 6:

		instdone[0] = I915_READ(INSTDONE_I965);

		instdone[1] = I915_READ(INSTDONE1);

		break;

	default:

		WARN_ONCE(1, "Unsupported platform\n");

	case 7:

		instdone[0] = I915_READ(GEN7_INSTDONE_1);

		instdone[1] = I915_READ(GEN7_SC_INSTDONE);

		instdone[2] = I915_READ(GEN7_SAMPLER_INSTDONE);

		instdone[3] = I915_READ(GEN7_ROW_INSTDONE);

		break;

	}

}



#ifdef CONFIG_DEBUG_FS

static struct drm_i915_error_object *

i915_error_object_create(struct drm_i915_private *dev_priv,
@@ -1070,36 +1099,6 @@ i915_error_first_batchbuffer(struct drm_i915_private *dev_priv, 
	return NULL;

}



/* NB: please notice the memset */

static void i915_get_extra_instdone(struct drm_device *dev,

				    uint32_t *instdone)

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	memset(instdone, 0, sizeof(*instdone) * I915_NUM_INSTDONE_REG);



	switch(INTEL_INFO(dev)->gen) {

	case 2:

	case 3:

		instdone[0] = I915_READ(INSTDONE);

		break;

	case 4:

	case 5:

	case 6:

		instdone[0] = I915_READ(INSTDONE_I965);

		instdone[1] = I915_READ(INSTDONE1);

		break;

	default:

		WARN_ONCE(1, "Unsupported platform\n");

	case 7:

		instdone[0] = I915_READ(GEN7_INSTDONE_1);

		instdone[1] = I915_READ(GEN7_SC_INSTDONE);

		instdone[2] = I915_READ(GEN7_SAMPLER_INSTDONE);

		instdone[3] = I915_READ(GEN7_ROW_INSTDONE);

		break;

	}

}





static void i915_record_ring_state(struct drm_device *dev,

				   struct drm_i915_error_state *error,

				   struct intel_ring_buffer *ring)