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
374b5580
Commit
374b5580
authored
Feb 17, 2020
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nouveau/kms/nv50-: wait for FIFO space on PIO channels
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
ed3d1489
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
6 deletions
+25
-6
drivers/gpu/drm/nouveau/dispnv50/curs507a.c
drivers/gpu/drm/nouveau/dispnv50/curs507a.c
+18
-3
drivers/gpu/drm/nouveau/dispnv50/cursc37a.c
drivers/gpu/drm/nouveau/dispnv50/cursc37a.c
+6
-3
drivers/gpu/drm/nouveau/dispnv50/wndw.h
drivers/gpu/drm/nouveau/dispnv50/wndw.h
+1
-0
No files found.
drivers/gpu/drm/nouveau/dispnv50/curs507a.c
View file @
374b5580
...
@@ -24,21 +24,36 @@
...
@@ -24,21 +24,36 @@
#include "head.h"
#include "head.h"
#include <nvif/cl507a.h>
#include <nvif/cl507a.h>
#include <nvif/timer.h>
#include <drm/drm_atomic_helper.h>
#include <drm/drm_atomic_helper.h>
#include <drm/drm_plane_helper.h>
#include <drm/drm_plane_helper.h>
bool
curs507a_space
(
struct
nv50_wndw
*
wndw
)
{
nvif_msec
(
&
nouveau_drm
(
wndw
->
plane
.
dev
)
->
client
.
device
,
2
,
if
(
nvif_rd32
(
&
wndw
->
wimm
.
base
.
user
,
0x0008
)
>=
4
)
return
true
;
);
WARN_ON
(
1
);
return
false
;
}
static
void
static
void
curs507a_update
(
struct
nv50_wndw
*
wndw
,
u32
*
interlock
)
curs507a_update
(
struct
nv50_wndw
*
wndw
,
u32
*
interlock
)
{
{
nvif_wr32
(
&
wndw
->
wimm
.
base
.
user
,
0x0080
,
0x00000000
);
if
(
curs507a_space
(
wndw
))
nvif_wr32
(
&
wndw
->
wimm
.
base
.
user
,
0x0080
,
0x00000000
);
}
}
static
void
static
void
curs507a_point
(
struct
nv50_wndw
*
wndw
,
struct
nv50_wndw_atom
*
asyw
)
curs507a_point
(
struct
nv50_wndw
*
wndw
,
struct
nv50_wndw_atom
*
asyw
)
{
{
nvif_wr32
(
&
wndw
->
wimm
.
base
.
user
,
0x0084
,
asyw
->
point
.
y
<<
16
|
if
(
curs507a_space
(
wndw
))
{
asyw
->
point
.
x
);
nvif_wr32
(
&
wndw
->
wimm
.
base
.
user
,
0x0084
,
asyw
->
point
.
y
<<
16
|
asyw
->
point
.
x
);
}
}
}
const
struct
nv50_wimm_func
const
struct
nv50_wimm_func
...
...
drivers/gpu/drm/nouveau/dispnv50/cursc37a.c
View file @
374b5580
...
@@ -25,14 +25,17 @@
...
@@ -25,14 +25,17 @@
static
void
static
void
cursc37a_update
(
struct
nv50_wndw
*
wndw
,
u32
*
interlock
)
cursc37a_update
(
struct
nv50_wndw
*
wndw
,
u32
*
interlock
)
{
{
nvif_wr32
(
&
wndw
->
wimm
.
base
.
user
,
0x0200
,
0x00000001
);
if
(
curs507a_space
(
wndw
))
nvif_wr32
(
&
wndw
->
wimm
.
base
.
user
,
0x0200
,
0x00000001
);
}
}
static
void
static
void
cursc37a_point
(
struct
nv50_wndw
*
wndw
,
struct
nv50_wndw_atom
*
asyw
)
cursc37a_point
(
struct
nv50_wndw
*
wndw
,
struct
nv50_wndw_atom
*
asyw
)
{
{
nvif_wr32
(
&
wndw
->
wimm
.
base
.
user
,
0x0208
,
asyw
->
point
.
y
<<
16
|
if
(
curs507a_space
(
wndw
))
{
asyw
->
point
.
x
);
nvif_wr32
(
&
wndw
->
wimm
.
base
.
user
,
0x0208
,
asyw
->
point
.
y
<<
16
|
asyw
->
point
.
x
);
}
}
}
static
const
struct
nv50_wimm_func
static
const
struct
nv50_wimm_func
...
...
drivers/gpu/drm/nouveau/dispnv50/wndw.h
View file @
374b5580
...
@@ -97,6 +97,7 @@ struct nv50_wimm_func {
...
@@ -97,6 +97,7 @@ struct nv50_wimm_func {
};
};
extern
const
struct
nv50_wimm_func
curs507a
;
extern
const
struct
nv50_wimm_func
curs507a
;
bool
curs507a_space
(
struct
nv50_wndw
*
);
int
wndwc37e_new
(
struct
nouveau_drm
*
,
enum
drm_plane_type
,
int
,
s32
,
int
wndwc37e_new
(
struct
nouveau_drm
*
,
enum
drm_plane_type
,
int
,
s32
,
struct
nv50_wndw
**
);
struct
nv50_wndw
**
);
...
...
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