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

Commit 50935ac7 authored by Piotr Piórkowski's avatar Piotr Piórkowski Committed by Chris Wilson
Browse files

drm/i915/guc: Don't store runtime GuC log level in modparam 



Currently we are using modparam as placeholder for GuC log level.
Stop doing this and keep runtime GuC level in intel_guc_log struct.

v2:
- rename functions intel_guc_log_level_[get|set] to
intel_guc_log_[get|set]_level (Michał Wajdeczko)
- remove GEM_BUG_ON from intel_guc_log_get_level() (Michał Wajdeczko)

Signed-off-by: default avatarPiotr Piórkowski <piotr.piorkowski@intel.com>
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Michał Winiarski <michal.winiarski@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20180604141947.8299-1-piotr.piorkowski@intel.com
parent a9ded785

drivers/gpu/drm/i915/i915_debugfs.c

+2 −2
Original line number Diff line number Diff line
@@ -2536,7 +2536,7 @@ static int i915_guc_log_level_get(void *data, u64 *val) 
	if (!USES_GUC(dev_priv))

		return -ENODEV;



	*val = intel_guc_log_level_get(&dev_priv->guc.log);

	*val = intel_guc_log_get_level(&dev_priv->guc.log);



	return 0;

}
@@ -2548,7 +2548,7 @@ static int i915_guc_log_level_set(void *data, u64 val) 
	if (!USES_GUC(dev_priv))

		return -ENODEV;



	return intel_guc_log_level_set(&dev_priv->guc.log, val);

	return intel_guc_log_set_level(&dev_priv->guc.log, val);

}



DEFINE_SIMPLE_ATTRIBUTE(i915_guc_log_level_fops,

drivers/gpu/drm/i915/intel_guc.c

+3 −5
Original line number Diff line number Diff line
@@ -203,13 +203,11 @@ void intel_guc_fini(struct intel_guc *guc) 
	guc_shared_data_destroy(guc);

}



static u32 get_log_control_flags(void)

static u32 guc_ctl_debug_flags(struct intel_guc *guc)

{

	u32 level = i915_modparams.guc_log_level;

	u32 level = intel_guc_log_get_level(&guc->log);

	u32 flags = 0;



	GEM_BUG_ON(level < 0);



	if (!GUC_LOG_LEVEL_IS_ENABLED(level))

		flags |= GUC_LOG_DEFAULT_DISABLED;
@@ -250,7 +248,7 @@ void intel_guc_init_params(struct intel_guc *guc) 


	params[GUC_CTL_LOG_PARAMS] = guc->log.flags;



	params[GUC_CTL_DEBUG] = get_log_control_flags();

	params[GUC_CTL_DEBUG] = guc_ctl_debug_flags(guc);



	/* If GuC submission is enabled, set up additional parameters here */

	if (USES_GUC_SUBMISSION(dev_priv)) {

drivers/gpu/drm/i915/intel_guc_log.c

+10 −18
Original line number Diff line number Diff line
@@ -475,11 +475,12 @@ int intel_guc_log_create(struct intel_guc_log *log) 
	offset = intel_guc_ggtt_offset(guc, vma) >> PAGE_SHIFT;

	log->flags = (offset << GUC_LOG_BUF_ADDR_SHIFT) | flags;



	log->level = i915_modparams.guc_log_level;



	return 0;



err:

	/* logging will be off */

	i915_modparams.guc_log_level = 0;

	DRM_ERROR("Failed to allocate GuC log buffer. %d\n", ret);

	return ret;

}
@@ -488,15 +489,7 @@ void intel_guc_log_destroy(struct intel_guc_log *log) 
	i915_vma_unpin_and_release(&log->vma);

}



int intel_guc_log_level_get(struct intel_guc_log *log)

{

	GEM_BUG_ON(!log->vma);

	GEM_BUG_ON(i915_modparams.guc_log_level < 0);



	return i915_modparams.guc_log_level;

}



int intel_guc_log_level_set(struct intel_guc_log *log, u64 val)

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);
@@ -504,33 +497,32 @@ int intel_guc_log_level_set(struct intel_guc_log *log, u64 val) 


	BUILD_BUG_ON(GUC_LOG_VERBOSITY_MIN != 0);

	GEM_BUG_ON(!log->vma);

	GEM_BUG_ON(i915_modparams.guc_log_level < 0);



	/*

	 * GuC is recognizing log levels starting from 0 to max, we're using 0

	 * as indication that logging should be disabled.

	 */

	if (val < GUC_LOG_LEVEL_DISABLED || val > GUC_LOG_LEVEL_MAX)

	if (level < GUC_LOG_LEVEL_DISABLED || level > GUC_LOG_LEVEL_MAX)

		return -EINVAL;



	mutex_lock(&dev_priv->drm.struct_mutex);



	if (i915_modparams.guc_log_level == val) {

	if (log->level == level) {

		ret = 0;

		goto out_unlock;

	}



	intel_runtime_pm_get(dev_priv);

	ret = guc_action_control_log(guc, GUC_LOG_LEVEL_IS_VERBOSE(val),

				     GUC_LOG_LEVEL_IS_ENABLED(val),

				     GUC_LOG_LEVEL_TO_VERBOSITY(val));

	ret = guc_action_control_log(guc, GUC_LOG_LEVEL_IS_VERBOSE(level),

				     GUC_LOG_LEVEL_IS_ENABLED(level),

				     GUC_LOG_LEVEL_TO_VERBOSITY(level));

	intel_runtime_pm_put(dev_priv);

	if (ret) {

		DRM_DEBUG_DRIVER("guc_log_control action failed %d\n", ret);

		goto out_unlock;

	}



	i915_modparams.guc_log_level = val;

	log->level = level;



out_unlock:

	mutex_unlock(&dev_priv->drm.struct_mutex);

drivers/gpu/drm/i915/intel_guc_log.h

+8 −2
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include <linux/workqueue.h>



#include "intel_guc_fwif.h"

#include "i915_gem.h"



struct intel_guc;
@@ -58,6 +59,7 @@ struct intel_guc; 
#define GUC_LOG_LEVEL_MAX GUC_VERBOSITY_TO_LOG_LEVEL(GUC_LOG_VERBOSITY_MAX)



struct intel_guc_log {

	u32 level;

	u32 flags;

	struct i915_vma *vma;

	struct {
@@ -80,8 +82,7 @@ void intel_guc_log_init_early(struct intel_guc_log *log); 
int intel_guc_log_create(struct intel_guc_log *log);

void intel_guc_log_destroy(struct intel_guc_log *log);



int intel_guc_log_level_get(struct intel_guc_log *log);

int intel_guc_log_level_set(struct intel_guc_log *log, u64 control_val);

int intel_guc_log_set_level(struct intel_guc_log *log, u32 level);

bool intel_guc_log_relay_enabled(const struct intel_guc_log *log);

int intel_guc_log_relay_open(struct intel_guc_log *log);

void intel_guc_log_relay_flush(struct intel_guc_log *log);
@@ -89,4 +90,9 @@ void intel_guc_log_relay_close(struct intel_guc_log *log); 


void intel_guc_log_handle_flush_event(struct intel_guc_log *log);



static inline u32 intel_guc_log_get_level(struct intel_guc_log *log)

{

	return log->level;

}



#endif

drivers/gpu/drm/i915/intel_uc.c

+1 −1
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ void intel_uc_init_mmio(struct drm_i915_private *i915) 


static void guc_capture_load_err_log(struct intel_guc *guc)

{

	if (!guc->log.vma || !i915_modparams.guc_log_level)

	if (!guc->log.vma || !intel_guc_log_get_level(&guc->log))

		return;



	if (!guc->load_err_log)