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

Commit a2695744 authored by Sagar Arun Kamble's avatar Sagar Arun Kamble Committed by Chris Wilson
Browse files

drm/i915/guc: Rename i915_guc_submission.c|h to intel_guc_submission.c|h 



With all component structures and functions named appropriately, change
the names of GuC submission source files. There were bunch of style issues
in guc_submission.c that are highlighted now by checkpatch. Fix those.
Update name in Documentation/gpu. (Joonas)

v2: Rebase.

v3: Rebase.

Signed-off-by: default avatarSagar Arun Kamble <sagar.a.kamble@intel.com>
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Michal Winiarski <michal.winiarski@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Acked-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Acked-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Acked-by: default avatarOscar Mateo <oscar.mateo@intel.com>
Reviewed-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1510839162-25197-6-git-send-email-sagar.a.kamble@intel.com


Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent 5afc8b49

Documentation/gpu/i915.rst

+2 −2
Original line number Diff line number Diff line
@@ -350,10 +350,10 @@ GuC-specific firmware loader 
GuC-based command submission

----------------------------



.. kernel-doc:: drivers/gpu/drm/i915/i915_guc_submission.c

.. kernel-doc:: drivers/gpu/drm/i915/intel_guc_submission.c

   :doc: GuC-based command submission



.. kernel-doc:: drivers/gpu/drm/i915/i915_guc_submission.c

.. kernel-doc:: drivers/gpu/drm/i915/intel_guc_submission.c

   :internal:



GuC Firmware Layout

drivers/gpu/drm/i915/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -82,10 +82,10 @@ i915-y += intel_uc.o \ 
	  intel_uc_fw.o \

	  intel_guc.o \

	  intel_guc_ct.o \

	  intel_guc_log.o \

	  intel_guc_fw.o \

	  intel_huc.o \

	  i915_guc_submission.o

	  intel_guc_log.o \

	  intel_guc_submission.o \

	  intel_huc.o



# autogenerated null render state

i915-y += intel_renderstate_gen6.o \

drivers/gpu/drm/i915/i915_debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
#include <linux/sort.h>

#include <linux/sched/mm.h>

#include "intel_drv.h"

#include "i915_guc_submission.h"

#include "intel_guc_submission.h"



static inline struct drm_i915_private *node_to_i915(struct drm_info_node *node)

{

drivers/gpu/drm/i915/intel_guc.c

+1 −1
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ 
 */



#include "intel_guc.h"

#include "intel_guc_submission.h"

#include "i915_drv.h"

#include "i915_guc_submission.h"



static void gen8_guc_raise_irq(struct intel_guc *guc)

{

drivers/gpu/drm/i915/i915_guc_submission.c→drivers/gpu/drm/i915/intel_guc_submission.c

+36 −22
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
#include <linux/circ_buf.h>

#include <trace/events/dma_fence.h>



#include "i915_guc_submission.h"

#include "intel_guc_submission.h"

#include "i915_drv.h"



/**
@@ -221,7 +221,8 @@ static int __destroy_doorbell(struct intel_guc_client *client) 


	/* Doorbell release flow requires that we wait for GEN8_DRB_VALID bit

	 * to go to zero after updating db_status before we call the GuC to

	 * release the doorbell */

	 * release the doorbell

	 */

	if (wait_for_us(!(I915_READ(GEN8_DRBREGL(db_id)) & GEN8_DRB_VALID), 10))

		WARN_ONCE(true, "Doorbell never became invalid after disable\n");
@@ -367,7 +368,8 @@ static void guc_stage_desc_init(struct intel_guc *guc, 
	desc = __get_stage_desc(client);

	memset(desc, 0, sizeof(*desc));



	desc->attribute = GUC_STAGE_DESC_ATTR_ACTIVE | GUC_STAGE_DESC_ATTR_KERNEL;

	desc->attribute = GUC_STAGE_DESC_ATTR_ACTIVE |

			  GUC_STAGE_DESC_ATTR_KERNEL;

	if (is_high_priority(client))

		desc->attribute |= GUC_STAGE_DESC_ATTR_PREEMPT;

	desc->stage_id = client->stage_id;
@@ -403,7 +405,8 @@ static void guc_stage_desc_init(struct intel_guc *guc, 
			guc_ggtt_offset(ce->state) + LRC_STATE_PN * PAGE_SIZE;



		/* XXX: In direct submission, the GuC wants the HW context id

		 * here. In proxy submission, it wants the stage id */

		 * here. In proxy submission, it wants the stage id

		 */

		lrc->context_id = (client->stage_id << GUC_ELC_CTXID_OFFSET) |

				(guc_engine_id << GUC_ELC_ENGINE_OFFSET);
@@ -551,7 +554,8 @@ static void guc_add_request(struct intel_guc *guc, 
{

	struct intel_guc_client *client = guc->execbuf_client;

	struct intel_engine_cs *engine = rq->engine;

	u32 ctx_desc = lower_32_bits(intel_lr_context_descriptor(rq->ctx, engine));

	u32 ctx_desc = lower_32_bits(intel_lr_context_descriptor(rq->ctx,

								 engine));

	u32 ring_tail = intel_ring_set_tail(rq->ring, rq->tail) / sizeof(u64);



	spin_lock(&client->wq_lock);
@@ -777,7 +781,8 @@ static void guc_dequeue(struct intel_engine_cs *engine) 
			INIT_LIST_HEAD(&rq->priotree.link);



			__i915_gem_request_submit(rq);

			trace_i915_gem_request_in(rq, port_index(port, execlists));

			trace_i915_gem_request_in(rq,

						  port_index(port, execlists));

			last = rq;

			submit = true;

		}
@@ -910,7 +915,8 @@ static int guc_init_doorbell_hw(struct intel_guc *guc) 
	if (recreate_first_client) {

		ret = __reserve_doorbell(client);

		if (unlikely(ret)) {

			DRM_ERROR("Couldn't re-reserve first client db: %d\n", ret);

			DRM_ERROR("Couldn't re-reserve first client db: %d\n",

				  ret);

			return ret;

		}
@@ -918,7 +924,8 @@ static int guc_init_doorbell_hw(struct intel_guc *guc) 
	}



	/* Now for every client (and not only execbuf_client) make sure their

	 * doorbells are known by the GuC */

	 * doorbells are known by the GuC

	 */

	ret = __create_doorbell(guc->execbuf_client);

	if (ret)

		return ret;
@@ -1042,7 +1049,8 @@ static void guc_client_free(struct intel_guc_client *client) 


	/* FIXME: in many cases, by the time we get here the GuC has been

	 * reset, so we cannot destroy the doorbell properly. Ignore the

	 * error message for now */

	 * error message for now

	 */

	destroy_doorbell(client);

	guc_stage_desc_fini(client->guc, client);

	i915_gem_object_unpin_map(client->vma->obj);
@@ -1178,7 +1186,8 @@ static int guc_ads_create(struct intel_guc *guc) 
	 * because our GuC shared data is there.

	 */

	blob->ads.golden_context_lrca =

		guc_ggtt_offset(dev_priv->kernel_context->engine[RCS].state) + skipped_offset;

		guc_ggtt_offset(dev_priv->kernel_context->engine[RCS].state) +

		skipped_offset;



	/*

	 * The GuC expects us to exclude the portion of the context image that
@@ -1187,7 +1196,8 @@ static int guc_ads_create(struct intel_guc *guc) 
	 * dwords). Weird guc is weird.

	 */

	for_each_engine(engine, dev_priv, id)

		blob->ads.eng_state_size[engine->guc_id] = engine->context_size - skipped_size;

		blob->ads.eng_state_size[engine->guc_id] =

			engine->context_size - skipped_size;



	base = guc_ggtt_offset(vma);

	blob->ads.scheduler_policies = base + ptr_offset(blob, policies);
@@ -1317,7 +1327,9 @@ static void guc_interrupts_capture(struct drm_i915_private *dev_priv) 
	enum intel_engine_id id;

	int irqs;



	/* tell all command streamers to forward interrupts (but not vblank) to GuC */

	/* tell all command streamers to forward interrupts (but not vblank)

	 * to GuC

	 */

	irqs = _MASKED_BIT_ENABLE(GFX_INTERRUPT_STEERING);

	for_each_engine(engine, dev_priv, id)

		I915_WRITE(RING_MODE_GEN7(engine), irqs);
@@ -1435,7 +1447,9 @@ int intel_guc_submission_enable(struct intel_guc *guc) 
	guc_interrupts_capture(dev_priv);



	for_each_engine(engine, dev_priv, id) {

		struct intel_engine_execlists * const execlists = &engine->execlists;

		struct intel_engine_execlists * const execlists =

			&engine->execlists;



		execlists->tasklet.func = guc_submission_tasklet;

		engine->park = guc_submission_park;

		engine->unpark = guc_submission_unpark;