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

Commit beffa517 authored by Dave Gordon's avatar Dave Gordon Committed by Tvrtko Ursulin
Browse files

drm/i915/guc: prefer 'dev_priv' to 'dev' for intra-module functions 



There are four non-static functions in i915_guc_submission.c that take a
'dev' parameter. All are called only from GuC loader code, and can be
easily converted to accept 'dev_priv' instead.

Signed-off-by: default avatarDave Gordon <david.s.gordon@intel.com>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1465579766-31595-1-git-send-email-david.s.gordon@intel.com
parent 0daf556c

drivers/gpu/drm/i915/i915_guc_submission.c

+5 −9
Original line number Diff line number Diff line
@@ -906,9 +906,8 @@ static void guc_create_ads(struct intel_guc *guc) 
 * Set up the memory resources to be shared with the GuC.  At this point,

 * we require just one object that can be mapped through the GGTT.

 */

int i915_guc_submission_init(struct drm_device *dev)

int i915_guc_submission_init(struct drm_i915_private *dev_priv)

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	const size_t ctxsize = sizeof(struct guc_context_desc);

	const size_t poolsize = GUC_MAX_GPU_CONTEXTS * ctxsize;

	const size_t gemsize = round_up(poolsize, PAGE_SIZE);
@@ -916,7 +915,7 @@ int i915_guc_submission_init(struct drm_device *dev) 


	/* Wipe bitmap & delete client in case of reinitialisation */

	bitmap_clear(guc->doorbell_bitmap, 0, GUC_MAX_DOORBELLS);

	i915_guc_submission_disable(dev);

	i915_guc_submission_disable(dev_priv);



	if (!i915.enable_guc_submission)

		return 0; /* not enabled  */
@@ -935,9 +934,8 @@ int i915_guc_submission_init(struct drm_device *dev) 
	return 0;

}



int i915_guc_submission_enable(struct drm_device *dev)

int i915_guc_submission_enable(struct drm_i915_private *dev_priv)

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct intel_guc *guc = &dev_priv->guc;

	struct i915_guc_client *client;
@@ -957,18 +955,16 @@ int i915_guc_submission_enable(struct drm_device *dev) 
	return 0;

}



void i915_guc_submission_disable(struct drm_device *dev)

void i915_guc_submission_disable(struct drm_i915_private *dev_priv)

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct intel_guc *guc = &dev_priv->guc;



	guc_client_free(dev_priv, guc->execbuf_client);

	guc->execbuf_client = NULL;

}



void i915_guc_submission_fini(struct drm_device *dev)

void i915_guc_submission_fini(struct drm_i915_private *dev_priv)

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct intel_guc *guc = &dev_priv->guc;



	gem_release_guc_obj(dev_priv->guc.ads_obj);

drivers/gpu/drm/i915/intel_guc.h

+4 −4
Original line number Diff line number Diff line
@@ -156,11 +156,11 @@ extern int intel_guc_suspend(struct drm_device *dev); 
extern int intel_guc_resume(struct drm_device *dev);



/* i915_guc_submission.c */

int i915_guc_submission_init(struct drm_device *dev);

int i915_guc_submission_enable(struct drm_device *dev);

int i915_guc_submission_init(struct drm_i915_private *dev_priv);

int i915_guc_submission_enable(struct drm_i915_private *dev_priv);

int i915_guc_wq_check_space(struct drm_i915_gem_request *rq);

int i915_guc_submit(struct drm_i915_gem_request *rq);

void i915_guc_submission_disable(struct drm_device *dev);

void i915_guc_submission_fini(struct drm_device *dev);

void i915_guc_submission_disable(struct drm_i915_private *dev_priv);

void i915_guc_submission_fini(struct drm_i915_private *dev_priv);



#endif

drivers/gpu/drm/i915/intel_guc_loader.c

+6 −6
Original line number Diff line number Diff line
@@ -453,7 +453,7 @@ int intel_guc_setup(struct drm_device *dev) 
		intel_guc_fw_status_repr(guc_fw->guc_fw_fetch_status),

		intel_guc_fw_status_repr(guc_fw->guc_fw_load_status));



	err = i915_guc_submission_init(dev);

	err = i915_guc_submission_init(dev_priv);

	if (err)

		goto fail;
@@ -492,7 +492,7 @@ int intel_guc_setup(struct drm_device *dev) 
		intel_guc_fw_status_repr(guc_fw->guc_fw_load_status));



	if (i915.enable_guc_submission) {

		err = i915_guc_submission_enable(dev);

		err = i915_guc_submission_enable(dev_priv);

		if (err)

			goto fail;

		direct_interrupts_to_guc(dev_priv);
@@ -505,8 +505,8 @@ int intel_guc_setup(struct drm_device *dev) 
		guc_fw->guc_fw_load_status = GUC_FIRMWARE_FAIL;



	direct_interrupts_to_host(dev_priv);

	i915_guc_submission_disable(dev);

	i915_guc_submission_fini(dev);

	i915_guc_submission_disable(dev_priv);

	i915_guc_submission_fini(dev_priv);



	/*

	 * We've failed to load the firmware :(
@@ -733,8 +733,8 @@ void intel_guc_fini(struct drm_device *dev) 


	mutex_lock(&dev->struct_mutex);

	direct_interrupts_to_host(dev_priv);

	i915_guc_submission_disable(dev);

	i915_guc_submission_fini(dev);

	i915_guc_submission_disable(dev_priv);

	i915_guc_submission_fini(dev_priv);



	if (guc_fw->guc_fw_obj)

		drm_gem_object_unreference(&guc_fw->guc_fw_obj->base);