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
7568b106
Commit
7568b106
authored
Nov 08, 2015
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nouveau/nvif: split out display interface definitions
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
538b269b
Changes
30
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
30 changed files
with
261 additions
and
222 deletions
+261
-222
drivers/gpu/drm/nouveau/include/nvif/cl0046.h
drivers/gpu/drm/nouveau/include/nvif/cl0046.h
+28
-0
drivers/gpu/drm/nouveau/include/nvif/cl5070.h
drivers/gpu/drm/nouveau/include/nvif/cl5070.h
+99
-0
drivers/gpu/drm/nouveau/include/nvif/cl507a.h
drivers/gpu/drm/nouveau/include/nvif/cl507a.h
+11
-0
drivers/gpu/drm/nouveau/include/nvif/cl507b.h
drivers/gpu/drm/nouveau/include/nvif/cl507b.h
+11
-0
drivers/gpu/drm/nouveau/include/nvif/cl507c.h
drivers/gpu/drm/nouveau/include/nvif/cl507c.h
+12
-0
drivers/gpu/drm/nouveau/include/nvif/cl507d.h
drivers/gpu/drm/nouveau/include/nvif/cl507d.h
+11
-0
drivers/gpu/drm/nouveau/include/nvif/cl507e.h
drivers/gpu/drm/nouveau/include/nvif/cl507e.h
+12
-0
drivers/gpu/drm/nouveau/include/nvif/class.h
drivers/gpu/drm/nouveau/include/nvif/class.h
+48
-210
drivers/gpu/drm/nouveau/nouveau_connector.c
drivers/gpu/drm/nouveau/nouveau_connector.c
+1
-0
drivers/gpu/drm/nouveau/nouveau_display.c
drivers/gpu/drm/nouveau/nouveau_display.c
+1
-0
drivers/gpu/drm/nouveau/nv50_display.c
drivers/gpu/drm/nouveau/nv50_display.c
+6
-0
drivers/gpu/drm/nouveau/nvkm/engine/disp/base.c
drivers/gpu/drm/nouveau/nvkm/engine/disp/base.c
+1
-0
drivers/gpu/drm/nouveau/nvkm/engine/disp/basenv50.c
drivers/gpu/drm/nouveau/nvkm/engine/disp/basenv50.c
+1
-0
drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.c
drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.c
+1
-1
drivers/gpu/drm/nouveau/nvkm/engine/disp/corenv50.c
drivers/gpu/drm/nouveau/nvkm/engine/disp/corenv50.c
+1
-0
drivers/gpu/drm/nouveau/nvkm/engine/disp/cursnv50.c
drivers/gpu/drm/nouveau/nvkm/engine/disp/cursnv50.c
+1
-0
drivers/gpu/drm/nouveau/nvkm/engine/disp/dacnv50.c
drivers/gpu/drm/nouveau/nvkm/engine/disp/dacnv50.c
+1
-1
drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagf119.c
drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagf119.c
+1
-1
drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagt215.c
drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagt215.c
+1
-1
drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmig84.c
drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmig84.c
+1
-1
drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmigf119.c
drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmigf119.c
+1
-1
drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmigk104.c
drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmigk104.c
+1
-1
drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmigt215.c
drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmigt215.c
+1
-1
drivers/gpu/drm/nouveau/nvkm/engine/disp/oimmnv50.c
drivers/gpu/drm/nouveau/nvkm/engine/disp/oimmnv50.c
+1
-0
drivers/gpu/drm/nouveau/nvkm/engine/disp/ovlynv50.c
drivers/gpu/drm/nouveau/nvkm/engine/disp/ovlynv50.c
+1
-0
drivers/gpu/drm/nouveau/nvkm/engine/disp/piornv50.c
drivers/gpu/drm/nouveau/nvkm/engine/disp/piornv50.c
+1
-1
drivers/gpu/drm/nouveau/nvkm/engine/disp/rootgf119.c
drivers/gpu/drm/nouveau/nvkm/engine/disp/rootgf119.c
+2
-1
drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv04.c
drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv04.c
+1
-0
drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv50.c
drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv50.c
+2
-1
drivers/gpu/drm/nouveau/nvkm/engine/disp/sornv50.c
drivers/gpu/drm/nouveau/nvkm/engine/disp/sornv50.c
+1
-1
No files found.
drivers/gpu/drm/nouveau/include/nvif/cl0046.h
0 → 100644
View file @
7568b106
#ifndef __NVIF_CL0046_H__
#define __NVIF_CL0046_H__
#define NV04_DISP_NTFY_VBLANK 0x00
#define NV04_DISP_NTFY_CONN 0x01
struct
nv04_disp_mthd_v0
{
__u8
version
;
#define NV04_DISP_SCANOUTPOS 0x00
__u8
method
;
__u8
head
;
__u8
pad03
[
5
];
};
struct
nv04_disp_scanoutpos_v0
{
__u8
version
;
__u8
pad01
[
7
];
__s64
time
[
2
];
__u16
vblanks
;
__u16
vblanke
;
__u16
vtotal
;
__u16
vline
;
__u16
hblanks
;
__u16
hblanke
;
__u16
htotal
;
__u16
hline
;
};
#endif
drivers/gpu/drm/nouveau/include/nvif/cl5070.h
0 → 100644
View file @
7568b106
#ifndef __NVIF_CL5070_H__
#define __NVIF_CL5070_H__
#define NV50_DISP_MTHD 0x00
struct
nv50_disp_mthd_v0
{
__u8
version
;
#define NV50_DISP_SCANOUTPOS 0x00
__u8
method
;
__u8
head
;
__u8
pad03
[
5
];
};
struct
nv50_disp_scanoutpos_v0
{
__u8
version
;
__u8
pad01
[
7
];
__s64
time
[
2
];
__u16
vblanks
;
__u16
vblanke
;
__u16
vtotal
;
__u16
vline
;
__u16
hblanks
;
__u16
hblanke
;
__u16
htotal
;
__u16
hline
;
};
struct
nv50_disp_mthd_v1
{
__u8
version
;
#define NV50_DISP_MTHD_V1_DAC_PWR 0x10
#define NV50_DISP_MTHD_V1_DAC_LOAD 0x11
#define NV50_DISP_MTHD_V1_SOR_PWR 0x20
#define NV50_DISP_MTHD_V1_SOR_HDA_ELD 0x21
#define NV50_DISP_MTHD_V1_SOR_HDMI_PWR 0x22
#define NV50_DISP_MTHD_V1_SOR_LVDS_SCRIPT 0x23
#define NV50_DISP_MTHD_V1_SOR_DP_PWR 0x24
#define NV50_DISP_MTHD_V1_PIOR_PWR 0x30
__u8
method
;
__u16
hasht
;
__u16
hashm
;
__u8
pad06
[
2
];
};
struct
nv50_disp_dac_pwr_v0
{
__u8
version
;
__u8
state
;
__u8
data
;
__u8
vsync
;
__u8
hsync
;
__u8
pad05
[
3
];
};
struct
nv50_disp_dac_load_v0
{
__u8
version
;
__u8
load
;
__u8
pad02
[
2
];
__u32
data
;
};
struct
nv50_disp_sor_pwr_v0
{
__u8
version
;
__u8
state
;
__u8
pad02
[
6
];
};
struct
nv50_disp_sor_hda_eld_v0
{
__u8
version
;
__u8
pad01
[
7
];
__u8
data
[];
};
struct
nv50_disp_sor_hdmi_pwr_v0
{
__u8
version
;
__u8
state
;
__u8
max_ac_packet
;
__u8
rekey
;
__u8
pad04
[
4
];
};
struct
nv50_disp_sor_lvds_script_v0
{
__u8
version
;
__u8
pad01
[
1
];
__u16
script
;
__u8
pad04
[
4
];
};
struct
nv50_disp_sor_dp_pwr_v0
{
__u8
version
;
__u8
state
;
__u8
pad02
[
6
];
};
struct
nv50_disp_pior_pwr_v0
{
__u8
version
;
__u8
state
;
__u8
type
;
__u8
pad03
[
5
];
};
#endif
drivers/gpu/drm/nouveau/include/nvif/cl507a.h
0 → 100644
View file @
7568b106
#ifndef __NVIF_CL507A_H__
#define __NVIF_CL507A_H__
struct
nv50_disp_cursor_v0
{
__u8
version
;
__u8
head
;
__u8
pad02
[
6
];
};
#define NV50_DISP_CURSOR_V0_NTFY_UEVENT 0x00
#endif
drivers/gpu/drm/nouveau/include/nvif/cl507b.h
0 → 100644
View file @
7568b106
#ifndef __NVIF_CL507B_H__
#define __NVIF_CL507B_H__
struct
nv50_disp_overlay_v0
{
__u8
version
;
__u8
head
;
__u8
pad02
[
6
];
};
#define NV50_DISP_OVERLAY_V0_NTFY_UEVENT 0x00
#endif
drivers/gpu/drm/nouveau/include/nvif/cl507c.h
0 → 100644
View file @
7568b106
#ifndef __NVIF_CL507C_H__
#define __NVIF_CL507C_H__
struct
nv50_disp_base_channel_dma_v0
{
__u8
version
;
__u8
head
;
__u8
pad02
[
6
];
__u64
pushbuf
;
};
#define NV50_DISP_BASE_CHANNEL_DMA_V0_NTFY_UEVENT 0x00
#endif
drivers/gpu/drm/nouveau/include/nvif/cl507d.h
0 → 100644
View file @
7568b106
#ifndef __NVIF_CL507D_H__
#define __NVIF_CL507D_H__
struct
nv50_disp_core_channel_dma_v0
{
__u8
version
;
__u8
pad01
[
7
];
__u64
pushbuf
;
};
#define NV50_DISP_CORE_CHANNEL_DMA_V0_NTFY_UEVENT 0x00
#endif
drivers/gpu/drm/nouveau/include/nvif/cl507e.h
0 → 100644
View file @
7568b106
#ifndef __NVIF_CL507E_H__
#define __NVIF_CL507E_H__
struct
nv50_disp_overlay_channel_dma_v0
{
__u8
version
;
__u8
head
;
__u8
pad02
[
6
];
__u64
pushbuf
;
};
#define NV50_DISP_OVERLAY_CHANNEL_DMA_V0_NTFY_UEVENT 0x00
#endif
drivers/gpu/drm/nouveau/include/nvif/class.h
View file @
7568b106
This diff is collapsed.
Click to expand it.
drivers/gpu/drm/nouveau/nouveau_connector.c
View file @
7568b106
...
...
@@ -42,6 +42,7 @@
#include "nouveau_encoder.h"
#include "nouveau_crtc.h"
#include <nvif/cl0046.h>
#include <nvif/event.h>
MODULE_PARM_DESC
(
tv_disable
,
"Disable TV-out detection"
);
...
...
drivers/gpu/drm/nouveau/nouveau_display.c
View file @
7568b106
...
...
@@ -39,6 +39,7 @@
#include "nouveau_fence.h"
#include <nvif/cl0046.h>
#include <nvif/event.h>
static
int
...
...
drivers/gpu/drm/nouveau/nv50_display.c
View file @
7568b106
...
...
@@ -31,6 +31,12 @@
#include <drm/drm_fb_helper.h>
#include <nvif/class.h>
#include <nvif/cl5070.h>
#include <nvif/cl507a.h>
#include <nvif/cl507b.h>
#include <nvif/cl507c.h>
#include <nvif/cl507d.h>
#include <nvif/cl507e.h>
#include "nouveau_drm.h"
#include "nouveau_dma.h"
...
...
drivers/gpu/drm/nouveau/nvkm/engine/disp/base.c
View file @
7568b106
...
...
@@ -32,6 +32,7 @@
#include <subdev/bios/dcb.h>
#include <nvif/class.h>
#include <nvif/cl0046.h>
#include <nvif/event.h>
#include <nvif/unpack.h>
...
...
drivers/gpu/drm/nouveau/nvkm/engine/disp/basenv50.c
View file @
7568b106
...
...
@@ -27,6 +27,7 @@
#include <core/client.h>
#include <nvif/class.h>
#include <nvif/cl507c.h>
#include <nvif/unpack.h>
int
...
...
drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.c
View file @
7568b106
...
...
@@ -28,7 +28,7 @@
#include <core/ramht.h>
#include <engine/dma.h>
#include <nvif/cl
ass
.h>
#include <nvif/cl
507d
.h>
#include <nvif/event.h>
#include <nvif/unpack.h>
...
...
drivers/gpu/drm/nouveau/nvkm/engine/disp/corenv50.c
View file @
7568b106
...
...
@@ -28,6 +28,7 @@
#include <subdev/timer.h>
#include <nvif/class.h>
#include <nvif/cl507d.h>
#include <nvif/unpack.h>
int
...
...
drivers/gpu/drm/nouveau/nvkm/engine/disp/cursnv50.c
View file @
7568b106
...
...
@@ -27,6 +27,7 @@
#include <core/client.h>
#include <nvif/class.h>
#include <nvif/cl507a.h>
#include <nvif/unpack.h>
int
...
...
drivers/gpu/drm/nouveau/nvkm/engine/disp/dacnv50.c
View file @
7568b106
...
...
@@ -27,7 +27,7 @@
#include <core/client.h>
#include <subdev/timer.h>
#include <nvif/cl
ass
.h>
#include <nvif/cl
5070
.h>
#include <nvif/unpack.h>
int
...
...
drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagf119.c
View file @
7568b106
...
...
@@ -29,7 +29,7 @@
#include <subdev/bios/dcb.h>
#include <subdev/timer.h>
#include <nvif/cl
ass
.h>
#include <nvif/cl
5070
.h>
#include <nvif/unpack.h>
int
...
...
drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagt215.c
View file @
7568b106
...
...
@@ -27,7 +27,7 @@
#include <core/client.h>
#include <subdev/timer.h>
#include <nvif/cl
ass
.h>
#include <nvif/cl
5070
.h>
#include <nvif/unpack.h>
int
...
...
drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmig84.c
View file @
7568b106
...
...
@@ -25,7 +25,7 @@
#include <core/client.h>
#include <nvif/cl
ass
.h>
#include <nvif/cl
5070
.h>
#include <nvif/unpack.h>
int
...
...
drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmigf119.c
View file @
7568b106
...
...
@@ -25,7 +25,7 @@
#include <core/client.h>
#include <nvif/cl
ass
.h>
#include <nvif/cl
5070
.h>
#include <nvif/unpack.h>
int
...
...
drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmigk104.c
View file @
7568b106
...
...
@@ -25,7 +25,7 @@
#include <core/client.h>
#include <nvif/cl
ass
.h>
#include <nvif/cl
5070
.h>
#include <nvif/unpack.h>
int
...
...
drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmigt215.c
View file @
7568b106
...
...
@@ -26,7 +26,7 @@
#include <core/client.h>
#include <nvif/cl
ass
.h>
#include <nvif/cl
5070
.h>
#include <nvif/unpack.h>
int
...
...
drivers/gpu/drm/nouveau/nvkm/engine/disp/oimmnv50.c
View file @
7568b106
...
...
@@ -27,6 +27,7 @@
#include <core/client.h>
#include <nvif/class.h>
#include <nvif/cl507b.h>
#include <nvif/unpack.h>
int
...
...
drivers/gpu/drm/nouveau/nvkm/engine/disp/ovlynv50.c
View file @
7568b106
...
...
@@ -27,6 +27,7 @@
#include <core/client.h>
#include <nvif/class.h>
#include <nvif/cl507e.h>
#include <nvif/unpack.h>
int
...
...
drivers/gpu/drm/nouveau/nvkm/engine/disp/piornv50.c
View file @
7568b106
...
...
@@ -28,7 +28,7 @@
#include <subdev/i2c.h>
#include <subdev/timer.h>
#include <nvif/cl
ass
.h>
#include <nvif/cl
5070
.h>
#include <nvif/unpack.h>
int
...
...
drivers/gpu/drm/nouveau/nvkm/engine/disp/rootgf119.c
View file @
7568b106
...
...
@@ -29,6 +29,7 @@
#include <subdev/timer.h>
#include <nvif/class.h>
#include <nvif/cl5070.h>
#include <nvif/unpack.h>
int
...
...
@@ -39,7 +40,7 @@ gf119_disp_root_scanoutpos(NV50_DISP_MTHD_V0)
const
u32
blanke
=
nvkm_rd32
(
device
,
0x64041c
+
(
head
*
0x300
));
const
u32
blanks
=
nvkm_rd32
(
device
,
0x640420
+
(
head
*
0x300
));
union
{
struct
nv
04
_disp_scanoutpos_v0
v0
;
struct
nv
50
_disp_scanoutpos_v0
v0
;
}
*
args
=
data
;
int
ret
;
...
...
drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv04.c
View file @
7568b106
...
...
@@ -27,6 +27,7 @@
#include <core/client.h>
#include <nvif/class.h>
#include <nvif/cl0046.h>
#include <nvif/unpack.h>
struct
nv04_disp_root
{
...
...
drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv50.c
View file @
7568b106
...
...
@@ -29,6 +29,7 @@
#include <subdev/timer.h>
#include <nvif/class.h>
#include <nvif/cl5070.h>
#include <nvif/unpack.h>
int
...
...
@@ -39,7 +40,7 @@ nv50_disp_root_scanoutpos(NV50_DISP_MTHD_V0)
const
u32
blanks
=
nvkm_rd32
(
device
,
0x610af4
+
(
head
*
0x540
));
const
u32
total
=
nvkm_rd32
(
device
,
0x610afc
+
(
head
*
0x540
));
union
{
struct
nv
04
_disp_scanoutpos_v0
v0
;
struct
nv
50
_disp_scanoutpos_v0
v0
;
}
*
args
=
data
;
int
ret
;
...
...
drivers/gpu/drm/nouveau/nvkm/engine/disp/sornv50.c
View file @
7568b106
...
...
@@ -27,7 +27,7 @@
#include <core/client.h>
#include <subdev/timer.h>
#include <nvif/cl
ass
.h>
#include <nvif/cl
5070
.h>
#include <nvif/unpack.h>
int
...
...
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