leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gpu: host1x: Fix client_managed type

Browse Source 
client_managed field in syncpoint structure was defined as an
integer. The field holds, however, only a boolean value. This patch
modifies the type to boolean.

Signed-off-by: Arto Merilainen <amerilainen@nvidia.com>
Acked-By: Terje Bergstrom <tbergstrom@nvidia.com>
Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
This commit is contained in:
Arto Merilainen
2013-05-29 13:26:07 +03:00
committed by Thierry Reding
parent edeabfcbc1
commit ece66891ff
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/host1x/drm/gr2d.c
View File

@@ -285,7 +285,7 @@ static int gr2d_probe(struct platform_device *pdev)
if (!gr2d->channel) if (!gr2d->channel)
return -ENOMEM; return -ENOMEM;
*syncpts = host1x_syncpt_request(dev, 0); *syncpts = host1x_syncpt_request(dev, false);
if (!(*syncpts)) { if (!(*syncpts)) {
host1x_channel_free(gr2d->channel); host1x_channel_free(gr2d->channel);
return -ENOMEM; return -ENOMEM;

8
drivers/gpu/host1x/syncpt.c
View File

@@ -32,7 +32,7 @@
static struct host1x_syncpt *_host1x_syncpt_alloc(struct host1x *host, static struct host1x_syncpt *_host1x_syncpt_alloc(struct host1x *host,
struct device *dev, struct device *dev,
int client_managed) bool client_managed)
{ {
int i; int i;
struct host1x_syncpt *sp = host->syncpt; struct host1x_syncpt *sp = host->syncpt;
@@ -332,7 +332,7 @@ int host1x_syncpt_init(struct host1x *host)
host1x_syncpt_restore(host); host1x_syncpt_restore(host);
/* Allocate sync point to use for clearing waits for expired fences */ /* Allocate sync point to use for clearing waits for expired fences */
host->nop_sp = _host1x_syncpt_alloc(host, NULL, 0); host->nop_sp = _host1x_syncpt_alloc(host, NULL, false);
if (!host->nop_sp) if (!host->nop_sp)
return -ENOMEM; return -ENOMEM;
@@ -340,7 +340,7 @@ int host1x_syncpt_init(struct host1x *host)
} }
struct host1x_syncpt *host1x_syncpt_request(struct device *dev, struct host1x_syncpt *host1x_syncpt_request(struct device *dev,
int client_managed) bool client_managed)
{ {
struct host1x *host = dev_get_drvdata(dev->parent); struct host1x *host = dev_get_drvdata(dev->parent);
return _host1x_syncpt_alloc(host, dev, client_managed); return _host1x_syncpt_alloc(host, dev, client_managed);
@@ -354,7 +354,7 @@ void host1x_syncpt_free(struct host1x_syncpt *sp)
kfree(sp->name); kfree(sp->name);
sp->dev = NULL; sp->dev = NULL;
sp->name = NULL; sp->name = NULL;
sp->client_managed = 0; sp->client_managed = false;
} }
void host1x_syncpt_deinit(struct host1x *host) void host1x_syncpt_deinit(struct host1x *host)

6
drivers/gpu/host1x/syncpt.h
View File

@@ -36,7 +36,7 @@ struct host1x_syncpt {
atomic_t max_val; atomic_t max_val;
u32 base_val; u32 base_val;
const char *name; const char *name;
int client_managed; bool client_managed;
struct host1x *host; struct host1x *host;
struct device *dev; struct device *dev;
@@ -94,7 +94,7 @@ static inline bool host1x_syncpt_check_max(struct host1x_syncpt *sp, u32 real)
} }
/* Return true if sync point is client managed. */ /* Return true if sync point is client managed. */
static inline int host1x_syncpt_client_managed(struct host1x_syncpt *sp) static inline bool host1x_syncpt_client_managed(struct host1x_syncpt *sp)
{ {
return sp->client_managed; return sp->client_managed;
} }
@@ -157,7 +157,7 @@ u32 host1x_syncpt_id(struct host1x_syncpt *sp);
/* Allocate a sync point for a device. */ /* Allocate a sync point for a device. */
struct host1x_syncpt *host1x_syncpt_request(struct device *dev, struct host1x_syncpt *host1x_syncpt_request(struct device *dev,
int client_managed); bool client_managed);
/* Free a sync point. */ /* Free a sync point. */
void host1x_syncpt_free(struct host1x_syncpt *sp); void host1x_syncpt_free(struct host1x_syncpt *sp);