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
e75c091b
Commit
e75c091b
authored
Nov 01, 2017
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nouveau: store nouveau_drm in nouveau_cli, as opposed to drm_device
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
b6838c14
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
5 deletions
+5
-5
drivers/gpu/drm/nouveau/nouveau_bo.c
drivers/gpu/drm/nouveau/nouveau_bo.c
+1
-1
drivers/gpu/drm/nouveau/nouveau_drm.c
drivers/gpu/drm/nouveau/nouveau_drm.c
+1
-1
drivers/gpu/drm/nouveau/nouveau_drv.h
drivers/gpu/drm/nouveau/nouveau_drv.h
+2
-2
drivers/gpu/drm/nouveau/nouveau_gem.c
drivers/gpu/drm/nouveau/nouveau_gem.c
+1
-1
No files found.
drivers/gpu/drm/nouveau/nouveau_bo.c
View file @
e75c091b
...
...
@@ -187,7 +187,7 @@ nouveau_bo_new(struct nouveau_cli *cli, u64 size, int align,
struct
sg_table
*
sg
,
struct
reservation_object
*
robj
,
struct
nouveau_bo
**
pnvbo
)
{
struct
nouveau_drm
*
drm
=
nouveau_drm
(
cli
->
dev
)
;
struct
nouveau_drm
*
drm
=
cli
->
drm
;
struct
nouveau_bo
*
nvbo
;
size_t
acc_size
;
int
ret
;
...
...
drivers/gpu/drm/nouveau/nouveau_drm.c
View file @
e75c091b
...
...
@@ -128,7 +128,7 @@ nouveau_cli_init(struct nouveau_drm *drm, const char *sname,
int
ret
;
snprintf
(
cli
->
name
,
sizeof
(
cli
->
name
),
"%s"
,
sname
);
cli
->
d
ev
=
drm
->
dev
;
cli
->
d
rm
=
drm
;
mutex_init
(
&
cli
->
mutex
);
usif_client_init
(
cli
);
...
...
drivers/gpu/drm/nouveau/nouveau_drv.h
View file @
e75c091b
...
...
@@ -86,7 +86,7 @@ enum nouveau_drm_handle {
struct
nouveau_cli
{
struct
nvif_client
base
;
struct
drm_device
*
dev
;
struct
nouveau_drm
*
drm
;
struct
mutex
mutex
;
struct
nvif_device
device
;
...
...
@@ -204,7 +204,7 @@ void nouveau_drm_device_remove(struct drm_device *dev);
#define NV_PRINTK(l,c,f,a...) do { \
struct nouveau_cli *_cli = (c); \
dev_##l(_cli->d
ev->dev, "%s: "f, _cli->name, ##a);
\
dev_##l(_cli->d
rm->dev->dev, "%s: "f, _cli->name, ##a);
\
} while(0)
#define NV_FATAL(drm,f,a...) NV_PRINTK(crit, &(drm)->client, f, ##a)
#define NV_ERROR(drm,f,a...) NV_PRINTK(err, &(drm)->client, f, ##a)
...
...
drivers/gpu/drm/nouveau/nouveau_gem.c
View file @
e75c091b
...
...
@@ -179,7 +179,7 @@ nouveau_gem_new(struct nouveau_cli *cli, u64 size, int align, uint32_t domain,
uint32_t
tile_mode
,
uint32_t
tile_flags
,
struct
nouveau_bo
**
pnvbo
)
{
struct
nouveau_drm
*
drm
=
nouveau_drm
(
cli
->
dev
)
;
struct
nouveau_drm
*
drm
=
cli
->
drm
;
struct
nouveau_bo
*
nvbo
;
u32
flags
=
0
;
int
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