mirror of
git://nv-tegra.nvidia.com/linux-nv-oot.git
synced 2025-12-24 10:11:26 +03:00
gpu: host1x: Enable general interrupts for actmon
Host1x general interrupts include actmon-related interrupts, axi timeout interrupts, and illegal access interrupts. This change enables actmon-related interrupts only. Bug 3788919 Signed-off-by: Johnny Liu <johnliu@nvidia.com> Change-Id: Iea1f1622a11afa72f70f8d10efebd857a51cc4e2 Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/2889825 Reviewed-by: Mikko Perttunen <mperttunen@nvidia.com> Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com> Reviewed-by: svc-mobile-cert <svc-mobile-cert@nvidia.com> GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
This commit is contained in:
committed by
mobile promotions
parent
8733469474
commit
03fd3f1188
@@ -12,6 +12,7 @@
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/reset.h>
|
||||
|
||||
#include "actmon.h"
|
||||
#include "cdma.h"
|
||||
#include "channel.h"
|
||||
#include "context.h"
|
||||
@@ -73,6 +74,12 @@ struct host1x_syncpt_ops {
|
||||
void (*enable_protection)(struct host1x *host);
|
||||
};
|
||||
|
||||
struct host1x_intr_general_ops {
|
||||
int (*init_host_general)(struct host1x *host);
|
||||
void (*enable_general_intrs)(struct host1x *host);
|
||||
void (*disable_all_general_intrs)(struct host1x *host);
|
||||
};
|
||||
|
||||
struct host1x_intr_ops {
|
||||
int (*init_host_sync)(struct host1x *host, u32 cpm);
|
||||
void (*set_syncpt_threshold)(
|
||||
@@ -142,6 +149,7 @@ struct host1x {
|
||||
void __iomem *common_regs;
|
||||
void __iomem *actmon_regs;
|
||||
int syncpt_irq;
|
||||
int general_irq;
|
||||
struct host1x_syncpt *syncpt;
|
||||
struct host1x_syncpt_base *bases;
|
||||
struct device *dev;
|
||||
@@ -166,6 +174,7 @@ struct host1x {
|
||||
struct mutex intr_mutex;
|
||||
|
||||
const struct host1x_syncpt_ops *syncpt_op;
|
||||
const struct host1x_intr_general_ops *intr_general_op;
|
||||
const struct host1x_intr_ops *intr_op;
|
||||
const struct host1x_channel_ops *channel_op;
|
||||
const struct host1x_cdma_ops *cdma_op;
|
||||
@@ -185,6 +194,9 @@ struct host1x {
|
||||
struct mutex devices_lock;
|
||||
struct list_head devices;
|
||||
|
||||
spinlock_t actmons_lock;
|
||||
struct list_head actmons;
|
||||
|
||||
struct list_head list;
|
||||
|
||||
struct device_dma_parameters dma_parms;
|
||||
@@ -193,6 +205,7 @@ struct host1x {
|
||||
};
|
||||
|
||||
void host1x_common_writel(struct host1x *host1x, u32 v, u32 r);
|
||||
u32 host1x_common_readl(struct host1x *host1x, u32 r);
|
||||
void host1x_hypervisor_writel(struct host1x *host1x, u32 r, u32 v);
|
||||
u32 host1x_hypervisor_readl(struct host1x *host1x, u32 r);
|
||||
void host1x_sync_writel(struct host1x *host1x, u32 r, u32 v);
|
||||
@@ -242,6 +255,30 @@ static inline void host1x_hw_syncpt_enable_protection(struct host1x *host)
|
||||
return host->syncpt_op->enable_protection(host);
|
||||
}
|
||||
|
||||
static inline int host1x_hw_intr_init_host_general(struct host1x *host)
|
||||
{
|
||||
if (!host->intr_general_op)
|
||||
return -EPERM;
|
||||
|
||||
return host->intr_general_op->init_host_general(host);
|
||||
}
|
||||
|
||||
static inline void host1x_hw_intr_enable_general_intrs(struct host1x *host)
|
||||
{
|
||||
if (!host->intr_general_op)
|
||||
return;
|
||||
|
||||
host->intr_general_op->enable_general_intrs(host);
|
||||
}
|
||||
|
||||
static inline void host1x_hw_intr_disable_all_general_intrs(struct host1x *host)
|
||||
{
|
||||
if (!host->intr_general_op)
|
||||
return;
|
||||
|
||||
host->intr_general_op->disable_all_general_intrs(host);
|
||||
}
|
||||
|
||||
static inline int host1x_hw_intr_init_host_sync(struct host1x *host, u32 cpm)
|
||||
{
|
||||
return host->intr_op->init_host_sync(host, cpm);
|
||||
|
||||
Reference in New Issue
Block a user