aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/host1x
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/host1x')
-rw-r--r--drivers/gpu/host1x/syncpt.c18
1 files changed, 11 insertions, 7 deletions
diff --git a/drivers/gpu/host1x/syncpt.c b/drivers/gpu/host1x/syncpt.c
index 03cf2922e469..5b88ba4c974e 100644
--- a/drivers/gpu/host1x/syncpt.c
+++ b/drivers/gpu/host1x/syncpt.c
@@ -30,9 +30,9 @@
30#define SYNCPT_CHECK_PERIOD (2 * HZ) 30#define SYNCPT_CHECK_PERIOD (2 * HZ)
31#define MAX_STUCK_CHECK_COUNT 15 31#define MAX_STUCK_CHECK_COUNT 15
32 32
33static struct host1x_syncpt *_host1x_syncpt_alloc(struct host1x *host, 33static struct host1x_syncpt *host1x_syncpt_alloc(struct host1x *host,
34 struct device *dev, 34 struct device *dev,
35 bool client_managed) 35 unsigned long flags)
36{ 36{
37 int i; 37 int i;
38 struct host1x_syncpt *sp = host->syncpt; 38 struct host1x_syncpt *sp = host->syncpt;
@@ -51,7 +51,11 @@ static struct host1x_syncpt *_host1x_syncpt_alloc(struct host1x *host,
51 51
52 sp->dev = dev; 52 sp->dev = dev;
53 sp->name = name; 53 sp->name = name;
54 sp->client_managed = client_managed; 54
55 if (flags & HOST1X_SYNCPT_CLIENT_MANAGED)
56 sp->client_managed = true;
57 else
58 sp->client_managed = false;
55 59
56 return sp; 60 return sp;
57} 61}
@@ -321,7 +325,7 @@ int host1x_syncpt_init(struct host1x *host)
321 host1x_syncpt_restore(host); 325 host1x_syncpt_restore(host);
322 326
323 /* Allocate sync point to use for clearing waits for expired fences */ 327 /* Allocate sync point to use for clearing waits for expired fences */
324 host->nop_sp = _host1x_syncpt_alloc(host, NULL, false); 328 host->nop_sp = host1x_syncpt_alloc(host, NULL, 0);
325 if (!host->nop_sp) 329 if (!host->nop_sp)
326 return -ENOMEM; 330 return -ENOMEM;
327 331
@@ -329,10 +333,10 @@ int host1x_syncpt_init(struct host1x *host)
329} 333}
330 334
331struct host1x_syncpt *host1x_syncpt_request(struct device *dev, 335struct host1x_syncpt *host1x_syncpt_request(struct device *dev,
332 bool client_managed) 336 unsigned long flags)
333{ 337{
334 struct host1x *host = dev_get_drvdata(dev->parent); 338 struct host1x *host = dev_get_drvdata(dev->parent);
335 return _host1x_syncpt_alloc(host, dev, client_managed); 339 return host1x_syncpt_alloc(host, dev, flags);
336} 340}
337 341
338void host1x_syncpt_free(struct host1x_syncpt *sp) 342void host1x_syncpt_free(struct host1x_syncpt *sp)