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
2bdb4995
Commit
2bdb4995
authored
Aug 20, 2015
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nouveau/fuse: switch to device pri macros
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
6758745b
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
9 deletions
+12
-9
drivers/gpu/drm/nouveau/nvkm/subdev/fuse/gf100.c
drivers/gpu/drm/nouveau/nvkm/subdev/fuse/gf100.c
+6
-5
drivers/gpu/drm/nouveau/nvkm/subdev/fuse/gm107.c
drivers/gpu/drm/nouveau/nvkm/subdev/fuse/gm107.c
+2
-1
drivers/gpu/drm/nouveau/nvkm/subdev/fuse/nv50.c
drivers/gpu/drm/nouveau/nvkm/subdev/fuse/nv50.c
+4
-3
No files found.
drivers/gpu/drm/nouveau/nvkm/subdev/fuse/gf100.c
View file @
2bdb4995
...
@@ -33,16 +33,17 @@ static u32
...
@@ -33,16 +33,17 @@ static u32
gf100_fuse_rd32
(
struct
nvkm_object
*
object
,
u64
addr
)
gf100_fuse_rd32
(
struct
nvkm_object
*
object
,
u64
addr
)
{
{
struct
gf100_fuse
*
fuse
=
(
void
*
)
object
;
struct
gf100_fuse
*
fuse
=
(
void
*
)
object
;
struct
nvkm_device
*
device
=
fuse
->
base
.
subdev
.
device
;
unsigned
long
flags
;
unsigned
long
flags
;
u32
fuse_enable
,
unk
,
val
;
u32
fuse_enable
,
unk
,
val
;
/* racy if another part of nvkm start writing to these regs */
/* racy if another part of nvkm start writing to these regs */
spin_lock_irqsave
(
&
fuse
->
fuse_enable_lock
,
flags
);
spin_lock_irqsave
(
&
fuse
->
fuse_enable_lock
,
flags
);
fuse_enable
=
nv
_mask
(
fus
e
,
0x22400
,
0x800
,
0x800
);
fuse_enable
=
nv
km_mask
(
devic
e
,
0x22400
,
0x800
,
0x800
);
unk
=
nv
_mask
(
fus
e
,
0x21000
,
0x1
,
0x1
);
unk
=
nv
km_mask
(
devic
e
,
0x21000
,
0x1
,
0x1
);
val
=
nv
_rd32
(
fus
e
,
0x21100
+
addr
);
val
=
nv
km_rd32
(
devic
e
,
0x21100
+
addr
);
nv
_wr32
(
fus
e
,
0x21000
,
unk
);
nv
km_wr32
(
devic
e
,
0x21000
,
unk
);
nv
_wr32
(
fus
e
,
0x22400
,
fuse_enable
);
nv
km_wr32
(
devic
e
,
0x22400
,
fuse_enable
);
spin_unlock_irqrestore
(
&
fuse
->
fuse_enable_lock
,
flags
);
spin_unlock_irqrestore
(
&
fuse
->
fuse_enable_lock
,
flags
);
return
val
;
return
val
;
}
}
...
...
drivers/gpu/drm/nouveau/nvkm/subdev/fuse/gm107.c
View file @
2bdb4995
...
@@ -27,7 +27,8 @@ static u32
...
@@ -27,7 +27,8 @@ static u32
gm107_fuse_rd32
(
struct
nvkm_object
*
object
,
u64
addr
)
gm107_fuse_rd32
(
struct
nvkm_object
*
object
,
u64
addr
)
{
{
struct
nvkm_fuse
*
fuse
=
(
void
*
)
object
;
struct
nvkm_fuse
*
fuse
=
(
void
*
)
object
;
return
nv_rd32
(
fuse
,
0x21100
+
addr
);
struct
nvkm_device
*
device
=
fuse
->
subdev
.
device
;
return
nvkm_rd32
(
device
,
0x21100
+
addr
);
}
}
...
...
drivers/gpu/drm/nouveau/nvkm/subdev/fuse/nv50.c
View file @
2bdb4995
...
@@ -33,14 +33,15 @@ static u32
...
@@ -33,14 +33,15 @@ static u32
nv50_fuse_rd32
(
struct
nvkm_object
*
object
,
u64
addr
)
nv50_fuse_rd32
(
struct
nvkm_object
*
object
,
u64
addr
)
{
{
struct
nv50_fuse
*
fuse
=
(
void
*
)
object
;
struct
nv50_fuse
*
fuse
=
(
void
*
)
object
;
struct
nvkm_device
*
device
=
fuse
->
base
.
subdev
.
device
;
unsigned
long
flags
;
unsigned
long
flags
;
u32
fuse_enable
,
val
;
u32
fuse_enable
,
val
;
/* racy if another part of nvkm start writing to this reg */
/* racy if another part of nvkm start writing to this reg */
spin_lock_irqsave
(
&
fuse
->
fuse_enable_lock
,
flags
);
spin_lock_irqsave
(
&
fuse
->
fuse_enable_lock
,
flags
);
fuse_enable
=
nv
_mask
(
fus
e
,
0x1084
,
0x800
,
0x800
);
fuse_enable
=
nv
km_mask
(
devic
e
,
0x1084
,
0x800
,
0x800
);
val
=
nv
_rd32
(
fus
e
,
0x21000
+
addr
);
val
=
nv
km_rd32
(
devic
e
,
0x21000
+
addr
);
nv
_wr32
(
fus
e
,
0x1084
,
fuse_enable
);
nv
km_wr32
(
devic
e
,
0x1084
,
fuse_enable
);
spin_unlock_irqrestore
(
&
fuse
->
fuse_enable_lock
,
flags
);
spin_unlock_irqrestore
(
&
fuse
->
fuse_enable_lock
,
flags
);
return
val
;
return
val
;
}
}
...
...
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