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

Commit a8120bc2 authored by Daniele Ceraolo Spurio's avatar Daniele Ceraolo Spurio Committed by Chris Wilson
Browse files

drm/i915/uc: kill <g,h>uc_to_i915 



Get rid of them to avoid more users being added while the guc code
transitions to use gt more than i915.

Signed-off-by: default avatarDaniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Acked-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190713100016.8026-11-chris@chris-wilson.co.uk


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

drivers/gpu/drm/i915/gt/uc/intel_guc.c

+4 −4
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ void intel_guc_init_send_regs(struct intel_guc *guc) 


void intel_guc_init_early(struct intel_guc *guc)

{

	struct drm_i915_private *i915 = guc_to_i915(guc);

	struct drm_i915_private *i915 = guc_to_gt(guc)->i915;



	intel_guc_fw_init_early(guc);

	intel_guc_ct_init_early(&guc->ct);
@@ -204,7 +204,7 @@ static u32 guc_ctl_feature_flags(struct intel_guc *guc) 
{

	u32 flags = 0;



	if (!USES_GUC_SUBMISSION(guc_to_i915(guc)))

	if (!intel_uc_is_using_guc_submission(&guc_to_gt(guc)->uc))

		flags |= GUC_CTL_DISABLE_SCHEDULER;



	return flags;
@@ -214,7 +214,7 @@ static u32 guc_ctl_ctxinfo_flags(struct intel_guc *guc) 
{

	u32 flags = 0;



	if (USES_GUC_SUBMISSION(guc_to_i915(guc))) {

	if (intel_uc_is_using_guc_submission(&guc_to_gt(guc)->uc)) {

		u32 ctxnum, base;



		base = intel_guc_ggtt_offset(guc, guc->stage_desc_pool);
@@ -414,7 +414,7 @@ int intel_guc_to_host_process_recv_msg(struct intel_guc *guc, 


int intel_guc_sample_forcewake(struct intel_guc *guc)

{

	struct drm_i915_private *dev_priv = guc_to_i915(guc);

	struct drm_i915_private *dev_priv = guc_to_gt(guc)->i915;

	u32 action[2];



	action[0] = INTEL_GUC_ACTION_SAMPLE_FORCEWAKE;

drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c

+2 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
 *

 */



#include "gt/intel_gt.h"

#include "intel_guc_ads.h"

#include "intel_uc.h"

#include "i915_drv.h"
@@ -85,7 +86,7 @@ struct __guc_ads_blob { 


static void __guc_ads_init(struct intel_guc *guc)

{

	struct drm_i915_private *dev_priv = guc_to_i915(guc);

	struct drm_i915_private *dev_priv = guc_to_gt(guc)->i915;

	struct __guc_ads_blob *blob = guc->ads_blob;

	const u32 skipped_size = LRC_PPHWSP_SZ * PAGE_SIZE + LR_HW_CONTEXT_SIZE;

	u32 base;

drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ MODULE_FIRMWARE(ICL_GUC_FIRMWARE_PATH); 
static void guc_fw_select(struct intel_uc_fw *guc_fw)

{

	struct intel_guc *guc = container_of(guc_fw, struct intel_guc, fw);

	struct drm_i915_private *i915 = guc_to_i915(guc);

	struct drm_i915_private *i915 = guc_to_gt(guc)->i915;



	GEM_BUG_ON(guc_fw->type != INTEL_UC_FW_TYPE_GUC);

drivers/gpu/drm/i915/gt/uc/intel_guc_log.c

+7 −6
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 


#include <linux/debugfs.h>



#include "gt/intel_gt.h"

#include "intel_guc_log.h"

#include "i915_drv.h"
@@ -209,7 +210,7 @@ static bool guc_check_log_buf_overflow(struct intel_guc_log *log, 
			log->stats[type].sampled_overflow += 16;

		}



		dev_notice_ratelimited(guc_to_i915(log_to_guc(log))->drm.dev,

		dev_notice_ratelimited(guc_to_gt(log_to_guc(log))->i915->drm.dev,

				       "GuC log buffer overflow\n");

	}
@@ -383,7 +384,7 @@ void intel_guc_log_init_early(struct intel_guc_log *log) 
static int guc_log_relay_create(struct intel_guc_log *log)

{

	struct intel_guc *guc = log_to_guc(log);

	struct drm_i915_private *dev_priv = guc_to_i915(guc);

	struct drm_i915_private *dev_priv = guc_to_gt(guc)->i915;

	struct rchan *guc_log_relay_chan;

	size_t n_subbufs, subbuf_size;

	int ret;
@@ -429,7 +430,7 @@ static void guc_log_relay_destroy(struct intel_guc_log *log) 
static void guc_log_capture_logs(struct intel_guc_log *log)

{

	struct intel_guc *guc = log_to_guc(log);

	struct drm_i915_private *dev_priv = guc_to_i915(guc);

	struct drm_i915_private *dev_priv = guc_to_gt(guc)->i915;

	intel_wakeref_t wakeref;



	guc_read_update_log_buffer(log);
@@ -498,7 +499,7 @@ void intel_guc_log_destroy(struct intel_guc_log *log) 
int intel_guc_log_set_level(struct intel_guc_log *log, u32 level)

{

	struct intel_guc *guc = log_to_guc(log);

	struct drm_i915_private *dev_priv = guc_to_i915(guc);

	struct drm_i915_private *dev_priv = guc_to_gt(guc)->i915;

	intel_wakeref_t wakeref;

	int ret = 0;
@@ -593,7 +594,7 @@ int intel_guc_log_relay_open(struct intel_guc_log *log) 
void intel_guc_log_relay_flush(struct intel_guc_log *log)

{

	struct intel_guc *guc = log_to_guc(log);

	struct drm_i915_private *i915 = guc_to_i915(guc);

	struct drm_i915_private *i915 = guc_to_gt(guc)->i915;

	intel_wakeref_t wakeref;



	/*
@@ -612,7 +613,7 @@ void intel_guc_log_relay_flush(struct intel_guc_log *log) 
void intel_guc_log_relay_close(struct intel_guc_log *log)

{

	struct intel_guc *guc = log_to_guc(log);

	struct drm_i915_private *i915 = guc_to_i915(guc);

	struct drm_i915_private *i915 = guc_to_gt(guc)->i915;



	guc_log_disable_flush_events(log);

	intel_synchronize_irq(i915);

drivers/gpu/drm/i915/gt/uc/intel_huc.c

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 


void intel_huc_init_early(struct intel_huc *huc)

{

	struct drm_i915_private *i915 = huc_to_i915(huc);

	struct drm_i915_private *i915 = huc_to_gt(huc)->i915;



	intel_huc_fw_init_early(huc);