diff options
| author | Mikko Perttunen <mperttunen@nvidia.com> | 2017-06-15 01:18:42 +0200 |
|---|---|---|
| committer | Thierry Reding <treding@nvidia.com> | 2017-06-15 14:25:38 +0200 |
| commit | 8474b02531c4881a762c52ef869c52429e38633f (patch) | |
| tree | 41cdb37fa4e424170bd7670e07ca0981c9f6c81f /drivers/gpu/host1x/hw | |
| parent | gpu: host1x: Remove unused host1x_cdma_stop() definition (diff) | |
| download | linux-8474b02531c4881a762c52ef869c52429e38633f.tar.xz linux-8474b02531c4881a762c52ef869c52429e38633f.zip | |
gpu: host1x: Refactor channel allocation code
This is largely a rewrite of the Host1x channel allocation code, bringing
several changes:
- The previous code could deadlock due to an interaction
between the 'reflock' mutex and CDMA timeout handling.
This gets rid of the mutex.
- Support for more than 32 channels, required for Tegra186
- General refactoring, including better encapsulation
of channel ownership handling into channel.c
Signed-off-by: Mikko Perttunen <mperttunen@nvidia.com>
Reviewed-by: Dmitry Osipenko <digetx@gmail.com>
Tested-by: Dmitry Osipenko <digetx@gmail.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Diffstat (limited to 'drivers/gpu/host1x/hw')
| -rw-r--r-- | drivers/gpu/host1x/hw/channel_hw.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/gpu/host1x/hw/channel_hw.c b/drivers/gpu/host1x/hw/channel_hw.c index 5e8df78b7acd..8447a56c41ca 100644 --- a/drivers/gpu/host1x/hw/channel_hw.c +++ b/drivers/gpu/host1x/hw/channel_hw.c @@ -181,10 +181,6 @@ error: static int host1x_channel_init(struct host1x_channel *ch, struct host1x *dev, unsigned int index) { - ch->id = index; - mutex_init(&ch->reflock); - mutex_init(&ch->submitlock); - ch->regs = dev->regs + index * HOST1X_CHANNEL_SIZE; return 0; } |