projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
gpu
/
host1x
/
job.c
diff --git
a/drivers/gpu/host1x/job.c
b/drivers/gpu/host1x/job.c
index 112f27e51bc7df81b45efcb58f7c11fc46f097e0..63bd63f3c7dfd2da2fd3d9ae58bba1473bceb70b 100644
(file)
--- a/
drivers/gpu/host1x/job.c
+++ b/
drivers/gpu/host1x/job.c
@@
-185,16
+185,16
@@
static unsigned int pin_job(struct host1x_job *job)
struct sg_table *sgt;
dma_addr_t phys_addr;
struct sg_table *sgt;
dma_addr_t phys_addr;
- reloc->target
= host1x_bo_get(reloc->target
);
- if (!reloc->target)
+ reloc->target
.bo = host1x_bo_get(reloc->target.bo
);
+ if (!reloc->target
.bo
)
goto unpin;
goto unpin;
- phys_addr = host1x_bo_pin(reloc->target, &sgt);
+ phys_addr = host1x_bo_pin(reloc->target
.bo
, &sgt);
if (!phys_addr)
goto unpin;
job->addr_phys[job->num_unpins] = phys_addr;
if (!phys_addr)
goto unpin;
job->addr_phys[job->num_unpins] = phys_addr;
- job->unpins[job->num_unpins].bo = reloc->target;
+ job->unpins[job->num_unpins].bo = reloc->target
.bo
;
job->unpins[job->num_unpins].sgt = sgt;
job->num_unpins++;
}
job->unpins[job->num_unpins].sgt = sgt;
job->num_unpins++;
}
@@
-235,21
+235,21
@@
static unsigned int do_relocs(struct host1x_job *job, struct host1x_bo *cmdbuf)
for (i = 0; i < job->num_relocs; i++) {
struct host1x_reloc *reloc = &job->relocarray[i];
u32 reloc_addr = (job->reloc_addr_phys[i] +
for (i = 0; i < job->num_relocs; i++) {
struct host1x_reloc *reloc = &job->relocarray[i];
u32 reloc_addr = (job->reloc_addr_phys[i] +
-
reloc->target_
offset) >> reloc->shift;
+
reloc->target.
offset) >> reloc->shift;
u32 *target;
/* skip all other gathers */
u32 *target;
/* skip all other gathers */
- if (cmdbuf != reloc->cmdbuf)
+ if (cmdbuf != reloc->cmdbuf
.bo
)
continue;
continue;
- if (last_page != reloc->cmdbuf
_
offset >> PAGE_SHIFT) {
+ if (last_page != reloc->cmdbuf
.
offset >> PAGE_SHIFT) {
if (cmdbuf_page_addr)
host1x_bo_kunmap(cmdbuf, last_page,
cmdbuf_page_addr);
cmdbuf_page_addr = host1x_bo_kmap(cmdbuf,
if (cmdbuf_page_addr)
host1x_bo_kunmap(cmdbuf, last_page,
cmdbuf_page_addr);
cmdbuf_page_addr = host1x_bo_kmap(cmdbuf,
- reloc->cmdbuf
_
offset >> PAGE_SHIFT);
- last_page = reloc->cmdbuf
_
offset >> PAGE_SHIFT;
+ reloc->cmdbuf
.
offset >> PAGE_SHIFT);
+ last_page = reloc->cmdbuf
.
offset >> PAGE_SHIFT;
if (unlikely(!cmdbuf_page_addr)) {
pr_err("Could not map cmdbuf for relocation\n");
if (unlikely(!cmdbuf_page_addr)) {
pr_err("Could not map cmdbuf for relocation\n");
@@
-257,7
+257,7
@@
static unsigned int do_relocs(struct host1x_job *job, struct host1x_bo *cmdbuf)
}
}
}
}
- target = cmdbuf_page_addr + (reloc->cmdbuf
_
offset & ~PAGE_MASK);
+ target = cmdbuf_page_addr + (reloc->cmdbuf
.
offset & ~PAGE_MASK);
*target = reloc_addr;
}
*target = reloc_addr;
}
@@
-272,7
+272,7
@@
static bool check_reloc(struct host1x_reloc *reloc, struct host1x_bo *cmdbuf,
{
offset *= sizeof(u32);
{
offset *= sizeof(u32);
- if (reloc->cmdbuf
!= cmdbuf || reloc->cmdbuf_
offset != offset)
+ if (reloc->cmdbuf
.bo != cmdbuf || reloc->cmdbuf.
offset != offset)
return false;
return true;
return false;
return true;