tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/nouveau/disp/sor/gm107: training pattern registers are like gm200
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Cc: stable@vger.kernel.org
+64
-18
+1
drivers/gpu/drm/nouveau/nvkm/engine/disp/Kbuild
+1
drivers/gpu/drm/nouveau/nvkm/engine/disp/Kbuild
+1
-1
drivers/gpu/drm/nouveau/nvkm/engine/disp/gm107.c
+1
-1
drivers/gpu/drm/nouveau/nvkm/engine/disp/gm107.c
···
36
36
.outp.internal.crt = nv50_dac_output_new,
37
37
.outp.internal.tmds = nv50_sor_output_new,
38
38
.outp.internal.lvds = nv50_sor_output_new,
39
-
.outp.internal.dp = gf119_sor_dp_new,
39
+
.outp.internal.dp = gm107_sor_dp_new,
40
40
.dac.nr = 3,
41
41
.dac.power = nv50_dac_power,
42
42
.dac.sense = nv50_dac_sense,
+7
-2
drivers/gpu/drm/nouveau/nvkm/engine/disp/outpdp.h
+7
-2
drivers/gpu/drm/nouveau/nvkm/engine/disp/outpdp.h
···
62
62
int gf119_sor_dp_new(struct nvkm_disp *, int, struct dcb_output *,
63
63
struct nvkm_output **);
64
64
int gf119_sor_dp_lnk_ctl(struct nvkm_output_dp *, int, int, bool);
65
+
int gf119_sor_dp_drv_ctl(struct nvkm_output_dp *, int, int, int, int);
65
66
66
-
int gm200_sor_dp_new(struct nvkm_disp *, int, struct dcb_output *,
67
-
struct nvkm_output **);
67
+
int gm107_sor_dp_new(struct nvkm_disp *, int, struct dcb_output *,
68
+
struct nvkm_output **);
69
+
int gm107_sor_dp_pattern(struct nvkm_output_dp *, int);
70
+
71
+
int gm200_sor_dp_new(struct nvkm_disp *, int, struct dcb_output *,
72
+
struct nvkm_output **);
68
73
#endif
+1
-1
drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c
+1
-1
drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c
+53
drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgm107.c
+53
drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgm107.c
···
1
+
/*
2
+
* Copyright 2016 Red Hat Inc.
3
+
*
4
+
* Permission is hereby granted, free of charge, to any person obtaining a
5
+
* copy of this software and associated documentation files (the "Software"),
6
+
* to deal in the Software without restriction, including without limitation
7
+
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
8
+
* and/or sell copies of the Software, and to permit persons to whom the
9
+
* Software is furnished to do so, subject to the following conditions:
10
+
*
11
+
* The above copyright notice and this permission notice shall be included in
12
+
* all copies or substantial portions of the Software.
13
+
*
14
+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15
+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16
+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
17
+
* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
18
+
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
19
+
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
20
+
* OTHER DEALINGS IN THE SOFTWARE.
21
+
*
22
+
* Authors: Ben Skeggs <bskeggs@redhat.com>
23
+
*/
24
+
#include "nv50.h"
25
+
#include "outpdp.h"
26
+
27
+
int
28
+
gm107_sor_dp_pattern(struct nvkm_output_dp *outp, int pattern)
29
+
{
30
+
struct nvkm_device *device = outp->base.disp->engine.subdev.device;
31
+
const u32 soff = outp->base.or * 0x800;
32
+
const u32 data = 0x01010101 * pattern;
33
+
if (outp->base.info.sorconf.link & 1)
34
+
nvkm_mask(device, 0x61c110 + soff, 0x0f0f0f0f, data);
35
+
else
36
+
nvkm_mask(device, 0x61c12c + soff, 0x0f0f0f0f, data);
37
+
return 0;
38
+
}
39
+
40
+
static const struct nvkm_output_dp_func
41
+
gm107_sor_dp_func = {
42
+
.pattern = gm107_sor_dp_pattern,
43
+
.lnk_pwr = g94_sor_dp_lnk_pwr,
44
+
.lnk_ctl = gf119_sor_dp_lnk_ctl,
45
+
.drv_ctl = gf119_sor_dp_drv_ctl,
46
+
};
47
+
48
+
int
49
+
gm107_sor_dp_new(struct nvkm_disp *disp, int index,
50
+
struct dcb_output *dcbE, struct nvkm_output **poutp)
51
+
{
52
+
return nvkm_output_dp_new_(&gm107_sor_dp_func, disp, index, dcbE, poutp);
53
+
}
+1
-14
drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgm200.c
+1
-14
drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgm200.c
···
57
57
}
58
58
59
59
static int
60
-
gm200_sor_dp_pattern(struct nvkm_output_dp *outp, int pattern)
61
-
{
62
-
struct nvkm_device *device = outp->base.disp->engine.subdev.device;
63
-
const u32 soff = gm200_sor_soff(outp);
64
-
const u32 data = 0x01010101 * pattern;
65
-
if (outp->base.info.sorconf.link & 1)
66
-
nvkm_mask(device, 0x61c110 + soff, 0x0f0f0f0f, data);
67
-
else
68
-
nvkm_mask(device, 0x61c12c + soff, 0x0f0f0f0f, data);
69
-
return 0;
70
-
}
71
-
72
-
static int
73
60
gm200_sor_dp_lnk_pwr(struct nvkm_output_dp *outp, int nr)
74
61
{
75
62
struct nvkm_device *device = outp->base.disp->engine.subdev.device;
···
116
129
117
130
static const struct nvkm_output_dp_func
118
131
gm200_sor_dp_func = {
119
-
.pattern = gm200_sor_dp_pattern,
132
+
.pattern = gm107_sor_dp_pattern,
120
133
.lnk_pwr = gm200_sor_dp_lnk_pwr,
121
134
.lnk_ctl = gf119_sor_dp_lnk_ctl,
122
135
.drv_ctl = gm200_sor_dp_drv_ctl,