Commit 1ffdeca6 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/amdgpu: move more defines into amdgpu_irq.h 



Everything that isn't related to the IH ring.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarHuang Rui <ray.huang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 1f896946

drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h

+1 −21
Original line number Diff line number Diff line
@@ -24,12 +24,8 @@ 
#ifndef __AMDGPU_IH_H__

#define __AMDGPU_IH_H__



#include "soc15_ih_clientid.h"



struct amdgpu_device;



#define AMDGPU_IH_CLIENTID_LEGACY 0

#define AMDGPU_IH_CLIENTID_MAX SOC15_IH_CLIENTID_MAX

struct amdgpu_iv_entry;



/*

 * R6xx+ IH ring
@@ -51,22 +47,6 @@ struct amdgpu_ih_ring { 
	dma_addr_t		rb_dma_addr; /* only used when use_bus_addr = true */

};



#define AMDGPU_IH_SRC_DATA_MAX_SIZE_DW 4



struct amdgpu_iv_entry {

	unsigned client_id;

	unsigned src_id;

	unsigned ring_id;

	unsigned vmid;

	unsigned vmid_src;

	uint64_t timestamp;

	unsigned timestamp_src;

	unsigned pasid;

	unsigned pasid_src;

	unsigned src_data[AMDGPU_IH_SRC_DATA_MAX_SIZE_DW];

	const uint32_t *iv_entry;

};



/* provided by the ih block */

struct amdgpu_ih_funcs {

	/* ring read/write ptr handling, called from interrupt context */

drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c

+5 −5
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ void amdgpu_irq_disable_all(struct amdgpu_device *adev) 
	int r;



	spin_lock_irqsave(&adev->irq.lock, irqflags);

	for (i = 0; i < AMDGPU_IH_CLIENTID_MAX; ++i) {

	for (i = 0; i < AMDGPU_IRQ_CLIENTID_MAX; ++i) {

		if (!adev->irq.client[i].sources)

			continue;
@@ -302,7 +302,7 @@ void amdgpu_irq_fini(struct amdgpu_device *adev) 
		cancel_work_sync(&adev->reset_work);

	}



	for (i = 0; i < AMDGPU_IH_CLIENTID_MAX; ++i) {

	for (i = 0; i < AMDGPU_IRQ_CLIENTID_MAX; ++i) {

		if (!adev->irq.client[i].sources)

			continue;
@@ -342,7 +342,7 @@ int amdgpu_irq_add_id(struct amdgpu_device *adev, 
		      unsigned client_id, unsigned src_id,

		      struct amdgpu_irq_src *source)

{

	if (client_id >= AMDGPU_IH_CLIENTID_MAX)

	if (client_id >= AMDGPU_IRQ_CLIENTID_MAX)

		return -EINVAL;



	if (src_id >= AMDGPU_MAX_IRQ_SRC_ID)
@@ -396,7 +396,7 @@ void amdgpu_irq_dispatch(struct amdgpu_device *adev, 


	trace_amdgpu_iv(entry);



	if (client_id >= AMDGPU_IH_CLIENTID_MAX) {

	if (client_id >= AMDGPU_IRQ_CLIENTID_MAX) {

		DRM_DEBUG("Invalid client_id in IV: %d\n", client_id);

		return;

	}
@@ -469,7 +469,7 @@ void amdgpu_irq_gpu_reset_resume_helper(struct amdgpu_device *adev) 
{

	int i, j, k;



	for (i = 0; i < AMDGPU_IH_CLIENTID_MAX; ++i) {

	for (i = 0; i < AMDGPU_IRQ_CLIENTID_MAX; ++i) {

		if (!adev->irq.client[i].sources)

			continue;

drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h

+22 −3
Original line number Diff line number Diff line
@@ -25,19 +25,38 @@ 
#define __AMDGPU_IRQ_H__



#include <linux/irqdomain.h>

#include "soc15_ih_clientid.h"

#include "amdgpu_ih.h"



#define AMDGPU_MAX_IRQ_SRC_ID		0x100

#define AMDGPU_MAX_IRQ_CLIENT_ID	0x100



#define AMDGPU_IRQ_CLIENTID_LEGACY	0

#define AMDGPU_IRQ_CLIENTID_MAX		SOC15_IH_CLIENTID_MAX



#define AMDGPU_IRQ_SRC_DATA_MAX_SIZE_DW	4



struct amdgpu_device;

struct amdgpu_iv_entry;



enum amdgpu_interrupt_state {

	AMDGPU_IRQ_STATE_DISABLE,

	AMDGPU_IRQ_STATE_ENABLE,

};



struct amdgpu_iv_entry {

	unsigned client_id;

	unsigned src_id;

	unsigned ring_id;

	unsigned vmid;

	unsigned vmid_src;

	uint64_t timestamp;

	unsigned timestamp_src;

	unsigned pasid;

	unsigned pasid_src;

	unsigned src_data[AMDGPU_IRQ_SRC_DATA_MAX_SIZE_DW];

	const uint32_t *iv_entry;

};



struct amdgpu_irq_src {

	unsigned				num_types;

	atomic_t				*enabled_types;
@@ -63,7 +82,7 @@ struct amdgpu_irq { 
	bool				installed;

	spinlock_t			lock;

	/* interrupt sources */

	struct amdgpu_irq_client	client[AMDGPU_IH_CLIENTID_MAX];

	struct amdgpu_irq_client	client[AMDGPU_IRQ_CLIENTID_MAX];



	/* status, etc. */

	bool				msi_enabled; /* msi enabled */

drivers/gpu/drm/amd/amdgpu/ci_dpm.c

+2 −2
Original line number Diff line number Diff line
@@ -6277,12 +6277,12 @@ static int ci_dpm_sw_init(void *handle) 
	int ret;

	struct amdgpu_device *adev = (struct amdgpu_device *)handle;



	ret = amdgpu_irq_add_id(adev, AMDGPU_IH_CLIENTID_LEGACY, 230,

	ret = amdgpu_irq_add_id(adev, AMDGPU_IRQ_CLIENTID_LEGACY, 230,

				&adev->pm.dpm.thermal.irq);

	if (ret)

		return ret;



	ret = amdgpu_irq_add_id(adev, AMDGPU_IH_CLIENTID_LEGACY, 231,

	ret = amdgpu_irq_add_id(adev, AMDGPU_IRQ_CLIENTID_LEGACY, 231,

				&adev->pm.dpm.thermal.irq);

	if (ret)

		return ret;

drivers/gpu/drm/amd/amdgpu/cik_ih.c

+1 −1
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ static void cik_ih_decode_iv(struct amdgpu_device *adev, 
	dw[2] = le32_to_cpu(adev->irq.ih.ring[ring_index + 2]);

	dw[3] = le32_to_cpu(adev->irq.ih.ring[ring_index + 3]);



	entry->client_id = AMDGPU_IH_CLIENTID_LEGACY;

	entry->client_id = AMDGPU_IRQ_CLIENTID_LEGACY;

	entry->src_id = dw[0] & 0xff;

	entry->src_data[0] = dw[1] & 0xfffffff;

	entry->ring_id = dw[2] & 0xff;

CRA Git | Maintained and supported by SUSTech CRA and CCSE