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
nexedi
linux
Commits
1409d90f
Commit
1409d90f
authored
Apr 24, 2013
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nv04-nv40/instmem: use self as parent for subobjects
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
be1e8e16
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
8 deletions
+13
-8
drivers/gpu/drm/nouveau/core/subdev/instmem/nv04.c
drivers/gpu/drm/nouveau/core/subdev/instmem/nv04.c
+6
-4
drivers/gpu/drm/nouveau/core/subdev/instmem/nv40.c
drivers/gpu/drm/nouveau/core/subdev/instmem/nv40.c
+7
-4
No files found.
drivers/gpu/drm/nouveau/core/subdev/instmem/nv04.c
View file @
1409d90f
...
...
@@ -125,23 +125,25 @@ nv04_instmem_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
return
ret
;
/* 0x00000-0x10000: reserve for probable vbios image */
ret
=
nouveau_gpuobj_new
(
parent
,
NULL
,
0x10000
,
0
,
0
,
&
priv
->
vbios
);
ret
=
nouveau_gpuobj_new
(
nv_object
(
priv
),
NULL
,
0x10000
,
0
,
0
,
&
priv
->
vbios
);
if
(
ret
)
return
ret
;
/* 0x10000-0x18000: reserve for RAMHT */
ret
=
nouveau_ramht_new
(
parent
,
NULL
,
0x08000
,
0
,
&
priv
->
ramht
);
ret
=
nouveau_ramht_new
(
nv_object
(
priv
)
,
NULL
,
0x08000
,
0
,
&
priv
->
ramht
);
if
(
ret
)
return
ret
;
/* 0x18000-0x18800: reserve for RAMFC (enough for 32 nv30 channels) */
ret
=
nouveau_gpuobj_new
(
parent
,
NULL
,
0x00800
,
0
,
ret
=
nouveau_gpuobj_new
(
nv_object
(
priv
)
,
NULL
,
0x00800
,
0
,
NVOBJ_FLAG_ZERO_ALLOC
,
&
priv
->
ramfc
);
if
(
ret
)
return
ret
;
/* 0x18800-0x18a00: reserve for RAMRO */
ret
=
nouveau_gpuobj_new
(
parent
,
NULL
,
0x00200
,
0
,
0
,
&
priv
->
ramro
);
ret
=
nouveau_gpuobj_new
(
nv_object
(
priv
),
NULL
,
0x00200
,
0
,
0
,
&
priv
->
ramro
);
if
(
ret
)
return
ret
;
...
...
drivers/gpu/drm/nouveau/core/subdev/instmem/nv40.c
View file @
1409d90f
...
...
@@ -82,26 +82,29 @@ nv40_instmem_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
return
ret
;
/* 0x00000-0x10000: reserve for probable vbios image */
ret
=
nouveau_gpuobj_new
(
parent
,
NULL
,
0x10000
,
0
,
0
,
&
priv
->
vbios
);
ret
=
nouveau_gpuobj_new
(
nv_object
(
priv
),
NULL
,
0x10000
,
0
,
0
,
&
priv
->
vbios
);
if
(
ret
)
return
ret
;
/* 0x10000-0x18000: reserve for RAMHT */
ret
=
nouveau_ramht_new
(
parent
,
NULL
,
0x08000
,
0
,
&
priv
->
ramht
);
ret
=
nouveau_ramht_new
(
nv_object
(
priv
),
NULL
,
0x08000
,
0
,
&
priv
->
ramht
);
if
(
ret
)
return
ret
;
/* 0x18000-0x18200: reserve for RAMRO
* 0x18200-0x20000: padding
*/
ret
=
nouveau_gpuobj_new
(
parent
,
NULL
,
0x08000
,
0
,
0
,
&
priv
->
ramro
);
ret
=
nouveau_gpuobj_new
(
nv_object
(
priv
),
NULL
,
0x08000
,
0
,
0
,
&
priv
->
ramro
);
if
(
ret
)
return
ret
;
/* 0x20000-0x21000: reserve for RAMFC
* 0x21000-0x40000: padding and some unknown crap
*/
ret
=
nouveau_gpuobj_new
(
parent
,
NULL
,
0x20000
,
0
,
ret
=
nouveau_gpuobj_new
(
nv_object
(
priv
)
,
NULL
,
0x20000
,
0
,
NVOBJ_FLAG_ZERO_ALLOC
,
&
priv
->
ramfc
);
if
(
ret
)
return
ret
;
...
...
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