Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
b5795c77
Commit
b5795c77
authored
Apr 24, 2013
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nv04-nv40/instmem: remove parent deref hack
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
d395f1e4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
12 deletions
+0
-12
drivers/gpu/drm/nouveau/core/subdev/instmem/nv04.c
drivers/gpu/drm/nouveau/core/subdev/instmem/nv04.c
+0
-10
drivers/gpu/drm/nouveau/core/subdev/instmem/nv04.h
drivers/gpu/drm/nouveau/core/subdev/instmem/nv04.h
+0
-1
drivers/gpu/drm/nouveau/core/subdev/instmem/nv40.c
drivers/gpu/drm/nouveau/core/subdev/instmem/nv40.c
+0
-1
No files found.
drivers/gpu/drm/nouveau/core/subdev/instmem/nv04.c
View file @
b5795c77
...
@@ -93,7 +93,6 @@ nv04_instmem_alloc(struct nouveau_instmem *imem, struct nouveau_object *parent,
...
@@ -93,7 +93,6 @@ nv04_instmem_alloc(struct nouveau_instmem *imem, struct nouveau_object *parent,
u32
size
,
u32
align
,
struct
nouveau_object
**
pobject
)
u32
size
,
u32
align
,
struct
nouveau_object
**
pobject
)
{
{
struct
nouveau_object
*
engine
=
nv_object
(
imem
);
struct
nouveau_object
*
engine
=
nv_object
(
imem
);
struct
nv04_instmem_priv
*
priv
=
(
void
*
)(
imem
);
int
ret
;
int
ret
;
ret
=
nouveau_object_ctor
(
parent
,
engine
,
&
nv04_instobj_oclass
,
ret
=
nouveau_object_ctor
(
parent
,
engine
,
&
nv04_instobj_oclass
,
...
@@ -101,14 +100,6 @@ nv04_instmem_alloc(struct nouveau_instmem *imem, struct nouveau_object *parent,
...
@@ -101,14 +100,6 @@ nv04_instmem_alloc(struct nouveau_instmem *imem, struct nouveau_object *parent,
if
(
ret
)
if
(
ret
)
return
ret
;
return
ret
;
/* INSTMEM itself creates objects to reserve (and preserve across
* suspend/resume) various fixed data locations, each one of these
* takes a reference on INSTMEM itself, causing it to never be
* freed. We drop all the self-references here to avoid this.
*/
if
(
unlikely
(
!
priv
->
created
))
atomic_dec
(
&
engine
->
refcount
);
return
0
;
return
0
;
}
}
...
@@ -154,7 +145,6 @@ nv04_instmem_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
...
@@ -154,7 +145,6 @@ nv04_instmem_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
if
(
ret
)
if
(
ret
)
return
ret
;
return
ret
;
priv
->
created
=
true
;
return
0
;
return
0
;
}
}
...
...
drivers/gpu/drm/nouveau/core/subdev/instmem/nv04.h
View file @
b5795c77
...
@@ -9,7 +9,6 @@
...
@@ -9,7 +9,6 @@
struct
nv04_instmem_priv
{
struct
nv04_instmem_priv
{
struct
nouveau_instmem
base
;
struct
nouveau_instmem
base
;
bool
created
;
void
__iomem
*
iomem
;
void
__iomem
*
iomem
;
struct
nouveau_mm
heap
;
struct
nouveau_mm
heap
;
...
...
drivers/gpu/drm/nouveau/core/subdev/instmem/nv40.c
View file @
b5795c77
...
@@ -106,7 +106,6 @@ nv40_instmem_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
...
@@ -106,7 +106,6 @@ nv40_instmem_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
if
(
ret
)
if
(
ret
)
return
ret
;
return
ret
;
priv
->
created
=
true
;
return
0
;
return
0
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment