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
f9895e6d
Commit
f9895e6d
authored
Oct 28, 2014
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nouveau/disp: clear notify intr status when enabling, to prevent races
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
2832271d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
0 deletions
+4
-0
drivers/gpu/drm/nouveau/core/engine/disp/nv50.c
drivers/gpu/drm/nouveau/core/engine/disp/nv50.c
+2
-0
drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c
drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c
+2
-0
No files found.
drivers/gpu/drm/nouveau/core/engine/disp/nv50.c
View file @
f9895e6d
...
@@ -88,12 +88,14 @@ nv50_disp_chan_uevent_fini(struct nvkm_event *event, int type, int index)
...
@@ -88,12 +88,14 @@ nv50_disp_chan_uevent_fini(struct nvkm_event *event, int type, int index)
{
{
struct
nv50_disp_priv
*
priv
=
container_of
(
event
,
typeof
(
*
priv
),
uevent
);
struct
nv50_disp_priv
*
priv
=
container_of
(
event
,
typeof
(
*
priv
),
uevent
);
nv_mask
(
priv
,
0x610028
,
0x00000001
<<
index
,
0x00000000
<<
index
);
nv_mask
(
priv
,
0x610028
,
0x00000001
<<
index
,
0x00000000
<<
index
);
nv_wr32
(
priv
,
0x610020
,
0x00000001
<<
index
);
}
}
static
void
static
void
nv50_disp_chan_uevent_init
(
struct
nvkm_event
*
event
,
int
types
,
int
index
)
nv50_disp_chan_uevent_init
(
struct
nvkm_event
*
event
,
int
types
,
int
index
)
{
{
struct
nv50_disp_priv
*
priv
=
container_of
(
event
,
typeof
(
*
priv
),
uevent
);
struct
nv50_disp_priv
*
priv
=
container_of
(
event
,
typeof
(
*
priv
),
uevent
);
nv_wr32
(
priv
,
0x610020
,
0x00000001
<<
index
);
nv_mask
(
priv
,
0x610028
,
0x00000001
<<
index
,
0x00000001
<<
index
);
nv_mask
(
priv
,
0x610028
,
0x00000001
<<
index
,
0x00000001
<<
index
);
}
}
...
...
drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c
View file @
f9895e6d
...
@@ -51,12 +51,14 @@ nvd0_disp_chan_uevent_fini(struct nvkm_event *event, int type, int index)
...
@@ -51,12 +51,14 @@ nvd0_disp_chan_uevent_fini(struct nvkm_event *event, int type, int index)
{
{
struct
nv50_disp_priv
*
priv
=
container_of
(
event
,
typeof
(
*
priv
),
uevent
);
struct
nv50_disp_priv
*
priv
=
container_of
(
event
,
typeof
(
*
priv
),
uevent
);
nv_mask
(
priv
,
0x610090
,
0x00000001
<<
index
,
0x00000000
<<
index
);
nv_mask
(
priv
,
0x610090
,
0x00000001
<<
index
,
0x00000000
<<
index
);
nv_wr32
(
priv
,
0x61008c
,
0x00000001
<<
index
);
}
}
static
void
static
void
nvd0_disp_chan_uevent_init
(
struct
nvkm_event
*
event
,
int
types
,
int
index
)
nvd0_disp_chan_uevent_init
(
struct
nvkm_event
*
event
,
int
types
,
int
index
)
{
{
struct
nv50_disp_priv
*
priv
=
container_of
(
event
,
typeof
(
*
priv
),
uevent
);
struct
nv50_disp_priv
*
priv
=
container_of
(
event
,
typeof
(
*
priv
),
uevent
);
nv_wr32
(
priv
,
0x61008c
,
0x00000001
<<
index
);
nv_mask
(
priv
,
0x610090
,
0x00000001
<<
index
,
0x00000001
<<
index
);
nv_mask
(
priv
,
0x610090
,
0x00000001
<<
index
,
0x00000001
<<
index
);
}
}
...
...
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