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
33378104
Commit
33378104
authored
May 19, 2017
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nouveau/disp/g94-: port OR DP lane mapping to nvkm_ior
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
797b2fb8
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
30 additions
and
9 deletions
+30
-9
drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.h
drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.h
+4
-0
drivers/gpu/drm/nouveau/nvkm/engine/disp/sorg94.c
drivers/gpu/drm/nouveau/nvkm/engine/disp/sorg94.c
+4
-8
drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c
drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c
+3
-0
drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgk104.c
drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgk104.c
+3
-0
drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgm107.c
drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgm107.c
+3
-0
drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgm200.c
drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgm200.c
+4
-1
drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgt215.c
drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgt215.c
+3
-0
drivers/gpu/drm/nouveau/nvkm/engine/disp/sormcp77.c
drivers/gpu/drm/nouveau/nvkm/engine/disp/sormcp77.c
+3
-0
drivers/gpu/drm/nouveau/nvkm/engine/disp/sormcp89.c
drivers/gpu/drm/nouveau/nvkm/engine/disp/sormcp89.c
+3
-0
No files found.
drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.h
View file @
33378104
...
@@ -49,6 +49,10 @@ struct nvkm_ior_func {
...
@@ -49,6 +49,10 @@ struct nvkm_ior_func {
u8
max_ac_packet
,
u8
rekey
,
u8
*
avi
,
u8
avi_size
,
u8
max_ac_packet
,
u8
rekey
,
u8
*
avi
,
u8
avi_size
,
u8
*
vendor
,
u8
vendor_size
);
u8
*
vendor
,
u8
vendor_size
);
}
hdmi
;
}
hdmi
;
struct
{
u8
lanes
[
4
];
}
dp
;
};
};
int
nvkm_ior_new_
(
const
struct
nvkm_ior_func
*
func
,
struct
nvkm_disp
*
,
int
nvkm_ior_new_
(
const
struct
nvkm_ior_func
*
func
,
struct
nvkm_disp
*
,
...
...
drivers/gpu/drm/nouveau/nvkm/engine/disp/sorg94.c
View file @
33378104
...
@@ -44,14 +44,7 @@ g94_sor_loff(struct nvkm_output_dp *outp)
...
@@ -44,14 +44,7 @@ g94_sor_loff(struct nvkm_output_dp *outp)
u32
u32
g94_sor_dp_lane_map
(
struct
nvkm_device
*
device
,
u8
lane
)
g94_sor_dp_lane_map
(
struct
nvkm_device
*
device
,
u8
lane
)
{
{
static
const
u8
gm100
[]
=
{
0
,
8
,
16
,
24
};
return
nvkm_ior_find
(
device
->
disp
,
SOR
,
-
1
)
->
func
->
dp
.
lanes
[
lane
]
*
8
;
static
const
u8
mcp89
[]
=
{
24
,
16
,
8
,
0
};
/* thanks, apple.. */
static
const
u8
g94
[]
=
{
16
,
8
,
0
,
24
};
if
(
device
->
chipset
>=
0x110
)
return
gm100
[
lane
];
if
(
device
->
chipset
==
0xaf
)
return
mcp89
[
lane
];
return
g94
[
lane
];
}
}
static
int
static
int
...
@@ -305,6 +298,9 @@ static const struct nvkm_ior_func
...
@@ -305,6 +298,9 @@ static const struct nvkm_ior_func
g94_sor
=
{
g94_sor
=
{
.
state
=
g94_sor_state
,
.
state
=
g94_sor_state
,
.
power
=
nv50_sor_power
,
.
power
=
nv50_sor_power
,
.
dp
=
{
.
lanes
=
{
2
,
1
,
0
,
3
},
},
};
};
int
int
...
...
drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c
View file @
33378104
...
@@ -160,6 +160,9 @@ gf119_sor = {
...
@@ -160,6 +160,9 @@ gf119_sor = {
.
hdmi
=
{
.
hdmi
=
{
.
ctrl
=
gf119_hdmi_ctrl
,
.
ctrl
=
gf119_hdmi_ctrl
,
},
},
.
dp
=
{
.
lanes
=
{
2
,
1
,
0
,
3
},
},
};
};
int
int
...
...
drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgk104.c
View file @
33378104
...
@@ -28,6 +28,9 @@ gk104_sor = {
...
@@ -28,6 +28,9 @@ gk104_sor = {
.
hdmi
=
{
.
hdmi
=
{
.
ctrl
=
gk104_hdmi_ctrl
,
.
ctrl
=
gk104_hdmi_ctrl
,
},
},
.
dp
=
{
.
lanes
=
{
2
,
1
,
0
,
3
},
},
};
};
int
int
...
...
drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgm107.c
View file @
33378104
...
@@ -60,6 +60,9 @@ gm107_sor = {
...
@@ -60,6 +60,9 @@ gm107_sor = {
.
hdmi
=
{
.
hdmi
=
{
.
ctrl
=
gk104_hdmi_ctrl
,
.
ctrl
=
gk104_hdmi_ctrl
,
},
},
.
dp
=
{
.
lanes
=
{
0
,
1
,
2
,
3
},
},
};
};
int
int
...
...
drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgm200.c
View file @
33378104
...
@@ -41,7 +41,7 @@ gm200_sor_loff(struct nvkm_output_dp *outp)
...
@@ -41,7 +41,7 @@ gm200_sor_loff(struct nvkm_output_dp *outp)
static
inline
u32
static
inline
u32
gm200_sor_dp_lane_map
(
struct
nvkm_device
*
device
,
u8
lane
)
gm200_sor_dp_lane_map
(
struct
nvkm_device
*
device
,
u8
lane
)
{
{
return
lane
*
0x0
8
;
return
nvkm_ior_find
(
device
->
disp
,
SOR
,
-
1
)
->
func
->
dp
.
lanes
[
lane
]
*
8
;
}
}
static
int
static
int
...
@@ -137,6 +137,9 @@ gm200_sor = {
...
@@ -137,6 +137,9 @@ gm200_sor = {
.
hdmi
=
{
.
hdmi
=
{
.
ctrl
=
gk104_hdmi_ctrl
,
.
ctrl
=
gk104_hdmi_ctrl
,
},
},
.
dp
=
{
.
lanes
=
{
0
,
1
,
2
,
3
},
},
};
};
int
int
...
...
drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgt215.c
View file @
33378104
...
@@ -28,6 +28,9 @@ gt215_sor = {
...
@@ -28,6 +28,9 @@ gt215_sor = {
.
hdmi
=
{
.
hdmi
=
{
.
ctrl
=
gt215_hdmi_ctrl
,
.
ctrl
=
gt215_hdmi_ctrl
,
},
},
.
dp
=
{
.
lanes
=
{
2
,
1
,
0
,
3
},
},
};
};
int
int
...
...
drivers/gpu/drm/nouveau/nvkm/engine/disp/sormcp77.c
View file @
33378104
...
@@ -28,6 +28,9 @@ mcp77_sor = {
...
@@ -28,6 +28,9 @@ mcp77_sor = {
.
hdmi
=
{
.
hdmi
=
{
.
ctrl
=
g84_hdmi_ctrl
,
.
ctrl
=
g84_hdmi_ctrl
,
},
},
.
dp
=
{
.
lanes
=
{
2
,
1
,
0
,
3
},
},
};
};
int
int
...
...
drivers/gpu/drm/nouveau/nvkm/engine/disp/sormcp89.c
View file @
33378104
...
@@ -28,6 +28,9 @@ mcp89_sor = {
...
@@ -28,6 +28,9 @@ mcp89_sor = {
.
hdmi
=
{
.
hdmi
=
{
.
ctrl
=
gt215_hdmi_ctrl
,
.
ctrl
=
gt215_hdmi_ctrl
,
},
},
.
dp
=
{
.
lanes
=
{
3
,
2
,
1
,
0
},
},
};
};
int
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