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

Commit 4b9de737 authored by Daniel Vetter's avatar Daniel Vetter Committed by Keith Packard
Browse files

drm/i915: add constants to size fence arrays and fields 



In preparation of to support 32 fences on Ivybdrigde.

Signed-Off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarKeith Packard <keithp@keithp.com>
parent 775d17b6

drivers/gpu/drm/i915/i915_drv.h

+8 −7
Original line number Diff line number Diff line
@@ -126,6 +126,9 @@ struct drm_i915_master_private { 
	struct _drm_i915_sarea *sarea_priv;

};

#define I915_FENCE_REG_NONE -1

#define I915_MAX_NUM_FENCES 16

/* 16 fences + sign bit for FENCE_REG_NONE */

#define I915_MAX_NUM_FENCE_BITS 5



struct drm_i915_fence_reg {

	struct list_head lru_list;
@@ -168,7 +171,7 @@ struct drm_i915_error_state { 
	u32 instdone1;

	u32 seqno;

	u64 bbaddr;

	u64 fence[16];

	u64 fence[I915_MAX_NUM_FENCES];

	struct timeval time;

	struct drm_i915_error_object {

		int page_count;
@@ -182,7 +185,7 @@ struct drm_i915_error_state { 
		u32 gtt_offset;

		u32 read_domains;

		u32 write_domain;

		s32 fence_reg:5;

		s32 fence_reg:I915_MAX_NUM_FENCE_BITS;

		s32 pinned:2;

		u32 tiling:2;

		u32 dirty:1;
@@ -375,7 +378,7 @@ typedef struct drm_i915_private { 
	struct notifier_block lid_notifier;



	int crt_ddc_pin;

	struct drm_i915_fence_reg fence_regs[16]; /* assume 965 */

	struct drm_i915_fence_reg fence_regs[I915_MAX_NUM_FENCES]; /* assume 965 */

	int fence_reg_start; /* 4 if userland hasn't ioctl'd us yet */

	int num_fence_regs; /* 8 on pre-965, 16 otherwise */
@@ -506,7 +509,7 @@ typedef struct drm_i915_private { 
	u8 saveAR[21];

	u8 saveDACMASK;

	u8 saveCR[37];

	uint64_t saveFENCE[16];

	uint64_t saveFENCE[I915_MAX_NUM_FENCES];

	u32 saveCURACNTR;

	u32 saveCURAPOS;

	u32 saveCURABASE;
@@ -777,10 +780,8 @@ struct drm_i915_gem_object { 
	 * Fence register bits (if any) for this object.  Will be set

	 * as needed when mapped into the GTT.

	 * Protected by dev->struct_mutex.

	 *

	 * Size: 4 bits for 16 fences + sign (for FENCE_REG_NONE)

	 */

	signed int fence_reg:5;

	signed int fence_reg:I915_MAX_NUM_FENCE_BITS;



	/**

	 * Advice: are the backing pages purgeable?

drivers/gpu/drm/i915/i915_gem.c

+2 −2
Original line number Diff line number Diff line
@@ -1745,7 +1745,7 @@ static void i915_gem_reset_fences(struct drm_device *dev) 
	struct drm_i915_private *dev_priv = dev->dev_private;

	int i;



	for (i = 0; i < 16; i++) {

	for (i = 0; i < dev_priv->num_fence_regs; i++) {

		struct drm_i915_fence_reg *reg = &dev_priv->fence_regs[i];

		struct drm_i915_gem_object *obj = reg->obj;
@@ -3877,7 +3877,7 @@ i915_gem_load(struct drm_device *dev) 
	INIT_LIST_HEAD(&dev_priv->mm.gtt_list);

	for (i = 0; i < I915_NUM_RINGS; i++)

		init_ring_lists(&dev_priv->ring[i]);

	for (i = 0; i < 16; i++)

	for (i = 0; i < I915_MAX_NUM_FENCES; i++)

		INIT_LIST_HEAD(&dev_priv->fence_regs[i].lru_list);

	INIT_DELAYED_WORK(&dev_priv->mm.retire_work,

			  i915_gem_retire_work_handler);