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
Kirill Smelkov
linux
Commits
538b269b
Commit
538b269b
authored
Nov 08, 2015
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nouveau/nvif: split out nvsw interface definitons
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
53a6df77
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
30 additions
and
22 deletions
+30
-22
drivers/gpu/drm/nouveau/include/nvif/class.h
drivers/gpu/drm/nouveau/include/nvif/class.h
+4
-18
drivers/gpu/drm/nouveau/include/nvif/if0004.h
drivers/gpu/drm/nouveau/include/nvif/if0004.h
+13
-0
drivers/gpu/drm/nouveau/include/nvif/if0005.h
drivers/gpu/drm/nouveau/include/nvif/if0005.h
+4
-0
drivers/gpu/drm/nouveau/nouveau_drm.c
drivers/gpu/drm/nouveau/nouveau_drm.c
+4
-2
drivers/gpu/drm/nouveau/nv04_fence.c
drivers/gpu/drm/nouveau/nv04_fence.c
+2
-0
drivers/gpu/drm/nouveau/nvkm/engine/sw/nv04.c
drivers/gpu/drm/nouveau/nvkm/engine/sw/nv04.c
+1
-0
drivers/gpu/drm/nouveau/nvkm/engine/sw/nvsw.c
drivers/gpu/drm/nouveau/nvkm/engine/sw/nvsw.c
+2
-2
No files found.
drivers/gpu/drm/nouveau/include/nvif/class.h
View file @
538b269b
...
...
@@ -5,10 +5,10 @@
#define NVIF_CLASS_CONTROL -1
#define NVIF_CLASS_PERFMON -2
#define NVIF_CLASS_PERFDOM -3
#define NVIF_CLASS_SW_NV04
-4
#define NVIF_CLASS_SW_NV10
-5
#define NVIF_CLASS_SW_NV50
-6
#define NVIF_CLASS_SW_GF100
-7
#define NVIF_CLASS_SW_NV04
/* if0004.h */
-4
#define NVIF_CLASS_SW_NV10
/* if0005.h */
-5
#define NVIF_CLASS_SW_NV50
/* if0005.h */
-6
#define NVIF_CLASS_SW_GF100
/* if0005.h */
-7
/* the below match nvidia-assigned (either in hw, or sw) class numbers */
#define NV_DEVICE 0x00000080
...
...
@@ -614,18 +614,4 @@ struct nv50_disp_overlay_v0 {
};
#define NV50_DISP_OVERLAY_V0_NTFY_UEVENT 0x00
/*******************************************************************************
* software
******************************************************************************/
#define NVSW_NTFY_UEVENT 0x00
#define NV04_NVSW_GET_REF 0x00
struct
nv04_nvsw_get_ref_v0
{
__u8
version
;
__u8
pad01
[
3
];
__u32
ref
;
};
#endif
drivers/gpu/drm/nouveau/include/nvif/if0004.h
0 → 100644
View file @
538b269b
#ifndef __NVIF_IF0004_H__
#define __NVIF_IF0004_H__
#define NV04_NVSW_NTFY_UEVENT 0x00
#define NV04_NVSW_GET_REF 0x00
struct
nv04_nvsw_get_ref_v0
{
__u8
version
;
__u8
pad01
[
3
];
__u32
ref
;
};
#endif
drivers/gpu/drm/nouveau/include/nvif/if0005.h
0 → 100644
View file @
538b269b
#ifndef __NVIF_IF0005_H__
#define __NVIF_IF0005_H__
#define NV10_NVSW_NTFY_UEVENT 0x00
#endif
drivers/gpu/drm/nouveau/nouveau_drm.c
View file @
538b269b
...
...
@@ -37,6 +37,8 @@
#include <core/pci.h>
#include <core/tegra.h>
#include <nvif/if0004.h>
#include "nouveau_drm.h"
#include "nouveau_dma.h"
#include "nouveau_ttm.h"
...
...
@@ -256,8 +258,8 @@ nouveau_accel_init(struct nouveau_drm *drm)
}
ret
=
nvif_notify_init
(
&
drm
->
nvsw
,
nouveau_flip_complete
,
false
,
NV
SW_NTFY_UEVENT
,
NULL
,
0
,
0
,
&
drm
->
flip
);
false
,
NV
04_NVSW_NTFY_UEVENT
,
NULL
,
0
,
0
,
&
drm
->
flip
);
if
(
ret
==
0
)
ret
=
nvif_notify_get
(
&
drm
->
flip
);
if
(
ret
)
{
...
...
drivers/gpu/drm/nouveau/nv04_fence.c
View file @
538b269b
...
...
@@ -26,6 +26,8 @@
#include "nouveau_dma.h"
#include "nouveau_fence.h"
#include <nvif/if0004.h>
struct
nv04_fence_chan
{
struct
nouveau_fence_chan
base
;
};
...
...
drivers/gpu/drm/nouveau/nvkm/engine/sw/nv04.c
View file @
538b269b
...
...
@@ -27,6 +27,7 @@
#include "nvsw.h"
#include <nvif/class.h>
#include <nvif/if0004.h>
#include <nvif/ioctl.h>
#include <nvif/unpack.h>
...
...
drivers/gpu/drm/nouveau/nvkm/engine/sw/nvsw.c
View file @
538b269b
...
...
@@ -24,7 +24,7 @@
#include "nvsw.h"
#include "chan.h"
#include <nvif/
class
.h>
#include <nvif/
if0004
.h>
static
int
nvkm_nvsw_mthd_
(
struct
nvkm_object
*
object
,
u32
mthd
,
void
*
data
,
u32
size
)
...
...
@@ -41,7 +41,7 @@ nvkm_nvsw_ntfy_(struct nvkm_object *object, u32 mthd,
{
struct
nvkm_nvsw
*
nvsw
=
nvkm_nvsw
(
object
);
switch
(
mthd
)
{
case
NVSW_NTFY_UEVENT
:
case
NV
04_NV
SW_NTFY_UEVENT
:
*
pevent
=
&
nvsw
->
chan
->
event
;
return
0
;
default:
...
...
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