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

Commit d62e2bf3 authored by Michal Wajdeczko's avatar Michal Wajdeczko Committed by Joonas Lahtinen
Browse files

drm/i915/guc: Move GuC log declarations into dedicated header 



Move GuC log declarations into dedicated header as we want to
keep component specific code in separate files.

v2: fix includes (Chris)
    update commit message (Joonas)

Suggested-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Sagar Arun Kamble <sagar.a.kamble@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171004181343.66348-2-michal.wajdeczko@intel.com
parent 3cf1934a

drivers/gpu/drm/i915/intel_guc_log.c

+3 −0
Original line number Diff line number Diff line
@@ -21,8 +21,11 @@ 
 * IN THE SOFTWARE.

 *

 */



#include <linux/debugfs.h>

#include <linux/relay.h>



#include "intel_guc_log.h"

#include "i915_drv.h"



static void guc_log_capture_logs(struct intel_guc *guc);

drivers/gpu/drm/i915/intel_guc_log.h

0 → 100644
+59 −0
Original line number Diff line number Diff line 
/*

 * Copyright © 2014-2017 Intel Corporation

 *

 * Permission is hereby granted, free of charge, to any person obtaining a

 * copy of this software and associated documentation files (the "Software"),

 * to deal in the Software without restriction, including without limitation

 * the rights to use, copy, modify, merge, publish, distribute, sublicense,

 * and/or sell copies of the Software, and to permit persons to whom the

 * Software is furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice (including the next

 * paragraph) shall be included in all copies or substantial portions of the

 * Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

 * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

 * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS

 * IN THE SOFTWARE.

 *

 */



#ifndef _INTEL_GUC_LOG_H_

#define _INTEL_GUC_LOG_H_



#include <linux/workqueue.h>



#include "intel_guc_fwif.h"



struct drm_i915_private;

struct intel_guc;



struct intel_guc_log {

	uint32_t flags;

	struct i915_vma *vma;

	/* The runtime stuff gets created only when GuC logging gets enabled */

	struct {

		void *buf_addr;

		struct workqueue_struct *flush_wq;

		struct work_struct flush_work;

		struct rchan *relay_chan;

	} runtime;

	/* logging related stats */

	u32 capture_miss_count;

	u32 flush_interrupt_count;

	u32 prev_overflow_count[GUC_MAX_LOG_BUFFER];

	u32 total_overflow_count[GUC_MAX_LOG_BUFFER];

	u32 flush_count[GUC_MAX_LOG_BUFFER];

};



int intel_guc_log_create(struct intel_guc *guc);

void intel_guc_log_destroy(struct intel_guc *guc);

int i915_guc_log_control(struct drm_i915_private *dev_priv, u64 control_val);

void i915_guc_log_register(struct drm_i915_private *dev_priv);

void i915_guc_log_unregister(struct drm_i915_private *dev_priv);



#endif

drivers/gpu/drm/i915/intel_uc.h

+1 −25
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include "i915_guc_reg.h"

#include "intel_ringbuffer.h"

#include "intel_guc_ct.h"

#include "intel_guc_log.h"

#include "i915_vma.h"

#include "intel_huc.h"
@@ -72,24 +73,6 @@ struct i915_guc_client { 
	uint64_t submissions[I915_NUM_ENGINES];

};



struct intel_guc_log {

	uint32_t flags;

	struct i915_vma *vma;

	/* The runtime stuff gets created only when GuC logging gets enabled */

	struct {

		void *buf_addr;

		struct workqueue_struct *flush_wq;

		struct work_struct flush_work;

		struct rchan *relay_chan;

	} runtime;

	/* logging related stats */

	u32 capture_miss_count;

	u32 flush_interrupt_count;

	u32 prev_overflow_count[GUC_MAX_LOG_BUFFER];

	u32 total_overflow_count[GUC_MAX_LOG_BUFFER];

	u32 flush_count[GUC_MAX_LOG_BUFFER];

};



struct intel_guc {

	struct intel_uc_fw fw;

	struct intel_guc_log log;
@@ -165,13 +148,6 @@ void i915_guc_submission_disable(struct drm_i915_private *dev_priv); 
void i915_guc_submission_fini(struct drm_i915_private *dev_priv);

struct i915_vma *intel_guc_allocate_vma(struct intel_guc *guc, u32 size);



/* intel_guc_log.c */

int intel_guc_log_create(struct intel_guc *guc);

void intel_guc_log_destroy(struct intel_guc *guc);

int i915_guc_log_control(struct drm_i915_private *dev_priv, u64 control_val);

void i915_guc_log_register(struct drm_i915_private *dev_priv);

void i915_guc_log_unregister(struct drm_i915_private *dev_priv);



static inline u32 guc_ggtt_offset(struct i915_vma *vma)

{

	u32 offset = i915_ggtt_offset(vma);