UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Acked-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190713100016.8026-11-chris@chris-wilson.co.uk
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Daniele Ceraolo Spurio 2019-07-13 11:00:16 +01:00 committed by Chris Wilson
parent 2239e6dff2
commit a8120bc23e
8 changed files with 18 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/gpu/drm/i915/gt/uc/intel_guc.c
View File

@ -77,7 +77,7 @@ void intel_guc_init_send_regs(struct intel_guc *guc)
void intel_guc_init_early(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_fw_init_early(guc);
intel_guc_ct_init_early(&guc->ct); intel_guc_ct_init_early(&guc->ct);
@ -204,7 +204,7 @@ static u32 guc_ctl_feature_flags(struct intel_guc *guc)
{ {
u32 flags = 0; 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; flags |= GUC_CTL_DISABLE_SCHEDULER;
return flags; return flags;
@ -214,7 +214,7 @@ static u32 guc_ctl_ctxinfo_flags(struct intel_guc *guc)
{ {
u32 flags = 0; 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; u32 ctxnum, base;
base = intel_guc_ggtt_offset(guc, guc->stage_desc_pool); 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) 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]; u32 action[2];
action[0] = INTEL_GUC_ACTION_SAMPLE_FORCEWAKE; action[0] = INTEL_GUC_ACTION_SAMPLE_FORCEWAKE;

3
drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c
View File

@ -22,6 +22,7 @@
* *
*/ */
#include "gt/intel_gt.h"
#include "intel_guc_ads.h" #include "intel_guc_ads.h"
#include "intel_uc.h" #include "intel_uc.h"
#include "i915_drv.h" #include "i915_drv.h"
@ -85,7 +86,7 @@ struct __guc_ads_blob {
static void __guc_ads_init(struct intel_guc *guc) 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; struct __guc_ads_blob *blob = guc->ads_blob;
const u32 skipped_size = LRC_PPHWSP_SZ * PAGE_SIZE + LR_HW_CONTEXT_SIZE; const u32 skipped_size = LRC_PPHWSP_SZ * PAGE_SIZE + LR_HW_CONTEXT_SIZE;
u32 base; u32 base;

2
drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c
View File

@ -76,7 +76,7 @@ MODULE_FIRMWARE(ICL_GUC_FIRMWARE_PATH);
static void guc_fw_select(struct intel_uc_fw *guc_fw) static void guc_fw_select(struct intel_uc_fw *guc_fw)
{ {
struct intel_guc *guc = container_of(guc_fw, struct intel_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); GEM_BUG_ON(guc_fw->type != INTEL_UC_FW_TYPE_GUC);

13
drivers/gpu/drm/i915/gt/uc/intel_guc_log.c
View File

@ -24,6 +24,7 @@
#include <linux/debugfs.h> #include <linux/debugfs.h>
#include "gt/intel_gt.h"
#include "intel_guc_log.h" #include "intel_guc_log.h"
#include "i915_drv.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; 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"); "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) static int guc_log_relay_create(struct intel_guc_log *log)
{ {
struct intel_guc *guc = log_to_guc(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; struct rchan *guc_log_relay_chan;
size_t n_subbufs, subbuf_size; size_t n_subbufs, subbuf_size;
int ret; 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) static void guc_log_capture_logs(struct intel_guc_log *log)
{ {
struct intel_guc *guc = log_to_guc(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; intel_wakeref_t wakeref;
guc_read_update_log_buffer(log); 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) int intel_guc_log_set_level(struct intel_guc_log *log, u32 level)
{ {
struct intel_guc *guc = log_to_guc(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; intel_wakeref_t wakeref;
int ret = 0; int ret = 0;
@ -593,7 +594,7 @@ out_unlock:
void intel_guc_log_relay_flush(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 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; 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) void intel_guc_log_relay_close(struct intel_guc_log *log)
{ {
struct intel_guc *guc = log_to_guc(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); guc_log_disable_flush_events(log);
intel_synchronize_irq(i915); intel_synchronize_irq(i915);

2
drivers/gpu/drm/i915/gt/uc/intel_huc.c
View File

@ -30,7 +30,7 @@
void intel_huc_init_early(struct intel_huc *huc) 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); intel_huc_fw_init_early(huc);

2
drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
View File

@ -70,7 +70,7 @@ MODULE_FIRMWARE(I915_ICL_HUC_UCODE);
static void huc_fw_select(struct intel_uc_fw *huc_fw) static void huc_fw_select(struct intel_uc_fw *huc_fw)
{ {
struct intel_huc *huc = container_of(huc_fw, struct intel_huc, fw); struct intel_huc *huc = container_of(huc_fw, struct intel_huc, fw);
struct drm_i915_private *dev_priv = huc_to_i915(huc); struct drm_i915_private *dev_priv = huc_to_gt(huc)->i915;
GEM_BUG_ON(huc_fw->type != INTEL_UC_FW_TYPE_HUC); GEM_BUG_ON(huc_fw->type != INTEL_UC_FW_TYPE_HUC);

4
drivers/gpu/drm/i915/gt/uc/intel_uc.c
View File

@ -252,7 +252,7 @@ static void guc_get_mmio_msg(struct intel_guc *guc)
static void guc_handle_mmio_msg(struct intel_guc *guc) static void guc_handle_mmio_msg(struct intel_guc *guc)
{ {
struct drm_i915_private *i915 = guc_to_i915(guc); struct drm_i915_private *i915 = guc_to_gt(guc)->i915;
/* we need communication to be enabled to reply to GuC */ /* we need communication to be enabled to reply to GuC */
GEM_BUG_ON(guc->handler == intel_guc_to_host_event_handler_nop); GEM_BUG_ON(guc->handler == intel_guc_to_host_event_handler_nop);
@ -284,7 +284,7 @@ static void guc_disable_interrupts(struct intel_guc *guc)
static int guc_enable_communication(struct intel_guc *guc) static int guc_enable_communication(struct intel_guc *guc)
{ {
struct drm_i915_private *i915 = guc_to_i915(guc); struct drm_i915_private *i915 = guc_to_gt(guc)->i915;
int ret; int ret;
ret = intel_guc_ct_enable(&guc->ct); ret = intel_guc_ct_enable(&guc->ct);

10
drivers/gpu/drm/i915/i915_drv.h
View File

@ -1902,16 +1902,6 @@ static inline struct drm_i915_private *wopcm_to_i915(struct intel_wopcm *wopcm)
return container_of(wopcm, struct drm_i915_private, wopcm); return container_of(wopcm, struct drm_i915_private, wopcm);
} }
static inline struct drm_i915_private *guc_to_i915(struct intel_guc *guc)
{
return container_of(guc, struct drm_i915_private, gt.uc.guc);
}
static inline struct drm_i915_private *huc_to_i915(struct intel_huc *huc)
{
return container_of(huc, struct drm_i915_private, gt.uc.huc);
}
/* Simple iterator over all initialised engines */ /* Simple iterator over all initialised engines */
#define for_each_engine(engine__, dev_priv__, id__) \ #define for_each_engine(engine__, dev_priv__, id__) \
for ((id__) = 0; \ for ((id__) = 0; \