@@ -88,23 +88,14 @@ static int gr2d_is_addr_reg(struct device *dev, u32 class, u32 offset, u32 val)
{
struct gr2d *gr2d = dev_get_drvdata(dev);
- switch (class) {
- case HOST1X_CLASS_HOST1X:
- if (offset == 0x2b)
- return 1;
+ if (class != HOST1X_CLASS_GR2D && class != HOST1X_CLASS_GR2D_SB)
+ return 0;
- break;
+ if (offset >= GR2D_NUM_REGS)
+ return 0;
- case HOST1X_CLASS_GR2D:
- case HOST1X_CLASS_GR2D_SB:
- if (offset >= GR2D_NUM_REGS)
- break;
-
- if (test_bit(offset, gr2d->addr_regs))
- return 1;
-
- break;
- }
+ if (test_bit(offset, gr2d->addr_regs))
+ return 1;
return 0;
}
@@ -98,22 +98,14 @@ static int gr3d_is_addr_reg(struct device *dev, u32 class, u32 offset, u32 val)
{
struct gr3d *gr3d = dev_get_drvdata(dev);
- switch (class) {
- case HOST1X_CLASS_HOST1X:
- if (offset == 0x2b)
- return 1;
+ if (class != HOST1X_CLASS_GR3D)
+ return 0;
- break;
+ if (offset >= GR3D_NUM_REGS)
+ return 0;
- case HOST1X_CLASS_GR3D:
- if (offset >= GR3D_NUM_REGS)
- break;
-
- if (test_bit(offset, gr3d->addr_regs))
- return 1;
-
- break;
- }
+ if (test_bit(offset, gr3d->addr_regs))
+ return 1;
return 0;
}
@@ -295,10 +295,20 @@ struct host1x_firewall {
u32 count;
};
+static int is_addr_reg(struct host1x_firewall *fw, unsigned long offset,
+ u32 val)
+{
+ if (fw->class == HOST1X_CLASS_HOST1X &&
+ (offset == 0x2c /* INDOFF2 */ || offset == 0x2d /* INDOFF */))
+ return true;
+
+ return fw->job->is_addr_reg(fw->dev, fw->class, offset, val);
+}
+
static int check_register(struct host1x_firewall *fw,
unsigned long offset, u32 val)
{
- if (fw->job->is_addr_reg(fw->dev, fw->class, offset, val)) {
+ if (is_addr_reg(fw, offset, val)) {
if (!fw->num_relocs)
return -EINVAL;
This moves handling of address registers in the HOST1X class directly to the firewall code in host1x's job.c, so that individual clients don't have to replicate this code. The list of address registers detected also change from INDCTRL which is not actually an address register to INDOFF and INDOFF2 which are. Signed-off-by: Mikko Perttunen <mperttunen@nvidia.com> --- drivers/gpu/drm/tegra/gr2d.c | 21 ++++++--------------- drivers/gpu/drm/tegra/gr3d.c | 20 ++++++-------------- drivers/gpu/host1x/job.c | 12 +++++++++++- 3 files changed, 23 insertions(+), 30 deletions(-)