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
7ec60c04
Commit
7ec60c04
authored
May 06, 2020
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nouveau/disp/hda/gf119-: select HDA device entry based on bound head
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
d4115d17
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
+4
-3
drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagf119.c
drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagf119.c
+4
-3
No files found.
drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagf119.c
View file @
7ec60c04
...
@@ -28,14 +28,14 @@ gf119_hda_device_entry(struct nvkm_ior *ior, int head)
...
@@ -28,14 +28,14 @@ gf119_hda_device_entry(struct nvkm_ior *ior, int head)
{
{
struct
nvkm_device
*
device
=
ior
->
disp
->
engine
.
subdev
.
device
;
struct
nvkm_device
*
device
=
ior
->
disp
->
engine
.
subdev
.
device
;
const
u32
hoff
=
0x800
*
head
;
const
u32
hoff
=
0x800
*
head
;
nvkm_mask
(
device
,
0x616548
+
hoff
,
0x00000070
,
0x00000000
);
nvkm_mask
(
device
,
0x616548
+
hoff
,
0x00000070
,
head
<<
4
);
}
}
void
void
gf119_hda_eld
(
struct
nvkm_ior
*
ior
,
int
head
,
u8
*
data
,
u8
size
)
gf119_hda_eld
(
struct
nvkm_ior
*
ior
,
int
head
,
u8
*
data
,
u8
size
)
{
{
struct
nvkm_device
*
device
=
ior
->
disp
->
engine
.
subdev
.
device
;
struct
nvkm_device
*
device
=
ior
->
disp
->
engine
.
subdev
.
device
;
const
u32
soff
=
0x030
*
ior
->
id
;
const
u32
soff
=
0x030
*
ior
->
id
+
(
head
*
0x04
)
;
int
i
;
int
i
;
for
(
i
=
0
;
i
<
size
;
i
++
)
for
(
i
=
0
;
i
<
size
;
i
++
)
...
@@ -49,6 +49,7 @@ void
...
@@ -49,6 +49,7 @@ void
gf119_hda_hpd
(
struct
nvkm_ior
*
ior
,
int
head
,
bool
present
)
gf119_hda_hpd
(
struct
nvkm_ior
*
ior
,
int
head
,
bool
present
)
{
{
struct
nvkm_device
*
device
=
ior
->
disp
->
engine
.
subdev
.
device
;
struct
nvkm_device
*
device
=
ior
->
disp
->
engine
.
subdev
.
device
;
const
u32
soff
=
0x030
*
ior
->
id
+
(
head
*
0x04
);
u32
data
=
0x80000000
;
u32
data
=
0x80000000
;
u32
mask
=
0x80000001
;
u32
mask
=
0x80000001
;
if
(
present
)
{
if
(
present
)
{
...
@@ -57,5 +58,5 @@ gf119_hda_hpd(struct nvkm_ior *ior, int head, bool present)
...
@@ -57,5 +58,5 @@ gf119_hda_hpd(struct nvkm_ior *ior, int head, bool present)
}
else
{
}
else
{
mask
|=
0x00000002
;
mask
|=
0x00000002
;
}
}
nvkm_mask
(
device
,
0x10ec10
+
ior
->
id
*
0x030
,
mask
,
data
);
nvkm_mask
(
device
,
0x10ec10
+
soff
,
mask
,
data
);
}
}
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