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

Commit c033666a authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Store a i915 backpointer from engine, and use it 



   text	   data	    bss	    dec	    hex	filename
6309351	3578714	 696320	10584385	 a18141	vmlinux
6308391	3578714	 696320	10583425	 a17d81	vmlinux

Almost 1KiB of code reduction.

v2: More s/INTEL_INFO()->gen/INTEL_GEN()/ and IS_GENx() conversions

   text	   data	    bss	    dec	    hex	filename
6304579	3578778	 696320	10579677	 a16edd	vmlinux
6303427	3578778	 696320	10578525	 a16a5d	vmlinux

Now over 1KiB!

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1462545621-30125-3-git-send-email-chris@chris-wilson.co.uk
parent e1382efb

drivers/gpu/drm/i915/i915_cmd_parser.c

+6 −6
Original line number Diff line number Diff line
@@ -751,12 +751,12 @@ int i915_cmd_parser_init_ring(struct intel_engine_cs *engine) 
	int cmd_table_count;

	int ret;



	if (!IS_GEN7(engine->dev))

	if (!IS_GEN7(engine->i915))

		return 0;



	switch (engine->id) {

	case RCS:

		if (IS_HASWELL(engine->dev)) {

		if (IS_HASWELL(engine->i915)) {

			cmd_tables = hsw_render_ring_cmds;

			cmd_table_count =

				ARRAY_SIZE(hsw_render_ring_cmds);
@@ -765,7 +765,7 @@ int i915_cmd_parser_init_ring(struct intel_engine_cs *engine) 
			cmd_table_count = ARRAY_SIZE(gen7_render_cmds);

		}



		if (IS_HASWELL(engine->dev)) {

		if (IS_HASWELL(engine->i915)) {

			engine->reg_tables = hsw_render_reg_tables;

			engine->reg_table_count = ARRAY_SIZE(hsw_render_reg_tables);

		} else {
@@ -781,7 +781,7 @@ int i915_cmd_parser_init_ring(struct intel_engine_cs *engine) 
		engine->get_cmd_length_mask = gen7_bsd_get_cmd_length_mask;

		break;

	case BCS:

		if (IS_HASWELL(engine->dev)) {

		if (IS_HASWELL(engine->i915)) {

			cmd_tables = hsw_blt_ring_cmds;

			cmd_table_count = ARRAY_SIZE(hsw_blt_ring_cmds);

		} else {
@@ -789,7 +789,7 @@ int i915_cmd_parser_init_ring(struct intel_engine_cs *engine) 
			cmd_table_count = ARRAY_SIZE(gen7_blt_cmds);

		}



		if (IS_HASWELL(engine->dev)) {

		if (IS_HASWELL(engine->i915)) {

			engine->reg_tables = hsw_blt_reg_tables;

			engine->reg_table_count = ARRAY_SIZE(hsw_blt_reg_tables);

		} else {
@@ -1036,7 +1036,7 @@ bool i915_needs_cmd_parser(struct intel_engine_cs *engine) 
	if (!engine->needs_cmd_parser)

		return false;



	if (!USES_PPGTT(engine->dev))

	if (!USES_PPGTT(engine->i915))

		return false;



	return (i915.enable_cmd_parser == 1);

drivers/gpu/drm/i915/i915_debugfs.c

+4 −4
Original line number Diff line number Diff line
@@ -1380,7 +1380,7 @@ static int i915_hangcheck_info(struct seq_file *m, void *unused) 
		seqno[id] = engine->get_seqno(engine);

	}



	i915_get_extra_instdone(dev, instdone);

	i915_get_extra_instdone(dev_priv, instdone);



	intel_runtime_pm_put(dev_priv);
@@ -3157,7 +3157,7 @@ static int i915_semaphore_status(struct seq_file *m, void *unused) 
	enum intel_engine_id id;

	int j, ret;



	if (!i915_semaphore_is_enabled(dev)) {

	if (!i915_semaphore_is_enabled(dev_priv)) {

		seq_puts(m, "Semaphores are disabled\n");

		return 0;

	}
@@ -4757,7 +4757,7 @@ i915_wedged_set(void *data, u64 val) 


	intel_runtime_pm_get(dev_priv);



	i915_handle_error(dev, val,

	i915_handle_error(dev_priv, val,

			  "Manually setting wedged to %llu", val);



	intel_runtime_pm_put(dev_priv);
@@ -4907,7 +4907,7 @@ i915_drop_caches_set(void *data, u64 val) 
	}



	if (val & (DROP_RETIRE | DROP_ACTIVE))

		i915_gem_retire_requests(dev);

		i915_gem_retire_requests(dev_priv);



	if (val & DROP_BOUND)

		i915_gem_shrink(dev_priv, LONG_MAX, I915_SHRINK_BOUND);

drivers/gpu/drm/i915/i915_dma.c

+5 −4
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ static int i915_getparam(struct drm_device *dev, void *data, 
		value = 1;

		break;

	case I915_PARAM_HAS_SEMAPHORES:

		value = i915_semaphore_is_enabled(dev);

		value = i915_semaphore_is_enabled(dev_priv);

		break;

	case I915_PARAM_HAS_PRIME_VMAP_FLUSH:

		value = 1;
@@ -970,7 +970,8 @@ static void intel_device_info_runtime_init(struct drm_device *dev) 
			 info->has_eu_pg ? "y" : "n");



	i915.enable_execlists =

		intel_sanitize_enable_execlists(dev, i915.enable_execlists);

		intel_sanitize_enable_execlists(dev_priv,

					       	i915.enable_execlists);



	/*

	 * i915.enable_ppgtt is read-only, so do an early pass to validate the
@@ -979,7 +980,7 @@ static void intel_device_info_runtime_init(struct drm_device *dev) 
	 * than every time we check intel_enable_ppgtt().

	 */

	i915.enable_ppgtt =

		intel_sanitize_enable_ppgtt(dev, i915.enable_ppgtt);

		intel_sanitize_enable_ppgtt(dev_priv, i915.enable_ppgtt);

	DRM_DEBUG_DRIVER("ppgtt mode: %i\n", i915.enable_ppgtt);

}
@@ -1345,7 +1346,7 @@ static void i915_driver_register(struct drm_i915_private *dev_priv) 
	 * Notify a valid surface after modesetting,

	 * when running inside a VM.

	 */

	if (intel_vgpu_active(dev))

	if (intel_vgpu_active(dev_priv))

		I915_WRITE(vgtif_reg(display_ready), VGT_DRV_DISPLAY_READY);



	i915_setup_sysfs(dev);

drivers/gpu/drm/i915/i915_drv.c

+5 −5
Original line number Diff line number Diff line
@@ -530,9 +530,9 @@ void intel_detect_pch(struct drm_device *dev) 
	pci_dev_put(pch);

}



bool i915_semaphore_is_enabled(struct drm_device *dev)

bool i915_semaphore_is_enabled(struct drm_i915_private *dev_priv)

{

	if (INTEL_INFO(dev)->gen < 6)

	if (INTEL_GEN(dev_priv) < 6)

		return false;



	if (i915.semaphores >= 0)
@@ -544,7 +544,7 @@ bool i915_semaphore_is_enabled(struct drm_device *dev) 


#ifdef CONFIG_INTEL_IOMMU

	/* Enable semaphores on SNB when IO remapping is off */

	if (INTEL_INFO(dev)->gen == 6 && intel_iommu_gfx_mapped)

	if (IS_GEN6(dev_priv) && intel_iommu_gfx_mapped)

		return false;

#endif
@@ -914,9 +914,9 @@ int i915_resume_switcheroo(struct drm_device *dev) 
 *   - re-init interrupt state

 *   - re-init display

 */

int i915_reset(struct drm_device *dev)

int i915_reset(struct drm_i915_private *dev_priv)

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct drm_device *dev = dev_priv->dev;

	struct i915_gpu_error *error = &dev_priv->gpu_error;

	unsigned reset_counter;

	int ret;

drivers/gpu/drm/i915/i915_drv.h

+20 −15
Original line number Diff line number Diff line
@@ -2754,7 +2754,8 @@ extern int i915_max_ioctl; 
extern int i915_suspend_switcheroo(struct drm_device *dev, pm_message_t state);

extern int i915_resume_switcheroo(struct drm_device *dev);



int intel_sanitize_enable_ppgtt(struct drm_device *dev, int enable_ppgtt);

int intel_sanitize_enable_ppgtt(struct drm_i915_private *dev_priv,

			       	int enable_ppgtt);



/* i915_dma.c */

void __printf(3, 4)
@@ -2778,7 +2779,7 @@ extern long i915_compat_ioctl(struct file *filp, unsigned int cmd, 
#endif

extern int intel_gpu_reset(struct drm_device *dev, u32 engine_mask);

extern bool intel_has_gpu_reset(struct drm_device *dev);

extern int i915_reset(struct drm_device *dev);

extern int i915_reset(struct drm_i915_private *dev_priv);

extern int intel_guc_reset(struct drm_i915_private *dev_priv);

extern void intel_engine_init_hangcheck(struct intel_engine_cs *engine);

extern unsigned long i915_chipset_val(struct drm_i915_private *dev_priv);
@@ -2796,9 +2797,10 @@ void intel_hpd_cancel_work(struct drm_i915_private *dev_priv); 
bool intel_hpd_pin_to_port(enum hpd_pin pin, enum port *port);



/* i915_irq.c */

void i915_queue_hangcheck(struct drm_device *dev);

void i915_queue_hangcheck(struct drm_i915_private *dev_priv);

__printf(3, 4)

void i915_handle_error(struct drm_device *dev, u32 engine_mask,

void i915_handle_error(struct drm_i915_private *dev_priv,

		       u32 engine_mask,

		       const char *fmt, ...);



extern void intel_irq_init(struct drm_i915_private *dev_priv);
@@ -2828,9 +2830,9 @@ void intel_uncore_forcewake_put__locked(struct drm_i915_private *dev_priv, 
u64 intel_uncore_edram_size(struct drm_i915_private *dev_priv);



void assert_forcewakes_inactive(struct drm_i915_private *dev_priv);

static inline bool intel_vgpu_active(struct drm_device *dev)

static inline bool intel_vgpu_active(struct drm_i915_private *dev_priv)

{

	return to_i915(dev)->vgpu.active;

	return dev_priv->vgpu.active;

}



void
@@ -3098,13 +3100,13 @@ static inline bool i915_gem_request_completed(struct drm_i915_gem_request *req, 
				 req->seqno);

}



int __must_check i915_gem_get_seqno(struct drm_device *dev, u32 *seqno);

int __must_check i915_gem_get_seqno(struct drm_i915_private *dev_priv, u32 *seqno);

int __must_check i915_gem_set_seqno(struct drm_device *dev, u32 seqno);



struct drm_i915_gem_request *

i915_gem_find_active_request(struct intel_engine_cs *engine);



bool i915_gem_retire_requests(struct drm_device *dev);

bool i915_gem_retire_requests(struct drm_i915_private *dev_priv);

void i915_gem_retire_requests_ring(struct intel_engine_cs *engine);



static inline u32 i915_reset_counter(struct i915_gpu_error *error)
@@ -3351,9 +3353,9 @@ int __must_check i915_gem_evict_for_vma(struct i915_vma *target); 
int i915_gem_evict_vm(struct i915_address_space *vm, bool do_idle);



/* belongs in i915_gem_gtt.h */

static inline void i915_gem_chipset_flush(struct drm_device *dev)

static inline void i915_gem_chipset_flush(struct drm_i915_private *dev_priv)

{

	if (INTEL_INFO(dev)->gen < 6)

	if (INTEL_GEN(dev_priv) < 6)

		intel_gtt_chipset_flush();

}
@@ -3432,14 +3434,15 @@ static inline void i915_error_state_buf_release( 
{

	kfree(eb->buf);

}

void i915_capture_error_state(struct drm_device *dev, u32 engine_mask,

void i915_capture_error_state(struct drm_i915_private *dev_priv,

			      u32 engine_mask,

			      const char *error_msg);

void i915_error_state_get(struct drm_device *dev,

			  struct i915_error_state_file_priv *error_priv);

void i915_error_state_put(struct i915_error_state_file_priv *error_priv);

void i915_destroy_error_state(struct drm_device *dev);



void i915_get_extra_instdone(struct drm_device *dev, uint32_t *instdone);

void i915_get_extra_instdone(struct drm_i915_private *dev_priv, uint32_t *instdone);

const char *i915_cache_level_str(struct drm_i915_private *i915, int type);



/* i915_cmd_parser.c */
@@ -3550,18 +3553,20 @@ extern void intel_set_memory_cxsr(struct drm_i915_private *dev_priv, 
extern void intel_detect_pch(struct drm_device *dev);

extern int intel_enable_rc6(const struct drm_device *dev);



extern bool i915_semaphore_is_enabled(struct drm_device *dev);

extern bool i915_semaphore_is_enabled(struct drm_i915_private *dev_priv);

int i915_reg_read_ioctl(struct drm_device *dev, void *data,

			struct drm_file *file);

int i915_get_reset_stats_ioctl(struct drm_device *dev, void *data,

			       struct drm_file *file);



/* overlay */

extern struct intel_overlay_error_state *intel_overlay_capture_error_state(struct drm_device *dev);

extern struct intel_overlay_error_state *

intel_overlay_capture_error_state(struct drm_i915_private *dev_priv);

extern void intel_overlay_print_error_state(struct drm_i915_error_state_buf *e,

					    struct intel_overlay_error_state *error);



extern struct intel_display_error_state *intel_display_capture_error_state(struct drm_device *dev);

extern struct intel_display_error_state *

intel_display_capture_error_state(struct drm_i915_private *dev_priv);

extern void intel_display_print_error_state(struct drm_i915_error_state_buf *e,

					    struct drm_device *dev,

					    struct intel_display_error_state *error);