Commit 727fd72f authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/intr: add shared interrupt plumbing between pci/tegra 



Unifies the handling between PCI-based and Tegra GPUs, and makes more
explicit/obvious where device interrupts can be expected.

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
parent eec3f6df

drivers/gpu/drm/nouveau/include/nvkm/core/device.h

+9 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#ifndef __NVKM_DEVICE_H__

#define __NVKM_DEVICE_H__

#include <core/oclass.h>

#include <core/intr.h>

enum nvkm_subdev_type;



enum nvkm_device_type {
@@ -60,6 +61,13 @@ struct nvkm_device { 
#undef NVKM_LAYOUT_INST

#undef NVKM_LAYOUT_ONCE

	struct list_head subdev;



	struct {

		spinlock_t lock;

		int irq;

		bool alloc;

		bool armed;

	} intr;

};



struct nvkm_subdev *nvkm_device_subdev(struct nvkm_device *, int type, int inst);
@@ -72,6 +80,7 @@ struct nvkm_device_func { 
	int (*preinit)(struct nvkm_device *);

	int (*init)(struct nvkm_device *);

	void (*fini)(struct nvkm_device *, bool suspend);

	int (*irq)(struct nvkm_device *);

	resource_size_t (*resource_addr)(struct nvkm_device *, unsigned bar);

	resource_size_t (*resource_size)(struct nvkm_device *, unsigned bar);

	bool cpu_coherent;

drivers/gpu/drm/nouveau/include/nvkm/core/intr.h

0 → 100644
+12 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: MIT */

#ifndef __NVKM_INTR_H__

#define __NVKM_INTR_H__

#include <core/os.h>

struct nvkm_device;



void nvkm_intr_ctor(struct nvkm_device *);

void nvkm_intr_dtor(struct nvkm_device *);

int nvkm_intr_install(struct nvkm_device *);

void nvkm_intr_unarm(struct nvkm_device *);

void nvkm_intr_rearm(struct nvkm_device *);

#endif

drivers/gpu/drm/nouveau/include/nvkm/core/tegra.h

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ struct nvkm_device_tegra { 
	const struct nvkm_device_tegra_func *func;

	struct nvkm_device device;

	struct platform_device *pdev;

	int irq;



	struct reset_control *rst;

	struct clk *clk;

drivers/gpu/drm/nouveau/include/nvkm/subdev/pci.h

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ struct nvkm_pci { 
	const struct nvkm_pci_func *func;

	struct nvkm_subdev subdev;

	struct pci_dev *pdev;

	int irq;



	struct {

		struct agp_bridge_data *bridge;
@@ -38,6 +37,7 @@ void nvkm_pci_wr08(struct nvkm_pci *, u16 addr, u8 data); 
void nvkm_pci_wr32(struct nvkm_pci *, u16 addr, u32 data);

u32 nvkm_pci_mask(struct nvkm_pci *, u16 addr, u32 mask, u32 value);

void nvkm_pci_rom_shadow(struct nvkm_pci *, bool shadow);

void nvkm_pci_msi_rearm(struct nvkm_device *);



int nv04_pci_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_pci **);

int nv40_pci_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_pci **);

drivers/gpu/drm/nouveau/nvkm/core/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ nvkm-y += nvkm/core/enum.o 
nvkm-y += nvkm/core/event.o

nvkm-y += nvkm/core/firmware.o

nvkm-y += nvkm/core/gpuobj.o

nvkm-y += nvkm/core/intr.o

nvkm-y += nvkm/core/ioctl.o

nvkm-y += nvkm/core/memory.o

nvkm-y += nvkm/core/mm.o