diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-01-08 21:03:10 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-01-08 21:03:10 -0500 |
| commit | b0bb222440a5c8273f67dd37946707e6ba6ad832 (patch) | |
| tree | 3dd62fdaf288a80e3a7fbea3928b2baf0bda9d52 | |
| parent | 909ef254ee3bfb305524b6651c2e74c4b330d8df (diff) | |
| parent | 1b5c7ef3d0d0610bda9b63263f7c5b7178d11015 (diff) | |
Merge branch 'linux-4.15' of git://github.com/skeggsb/linux into drm-fixes
nouveau displayport regression fix.
* 'linux-4.15' of git://github.com/skeggsb/linux:
drm/nouveau/disp/gf119: add missing drive vfunc ptr
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c index a2978a37b4f3..700fc754f28a 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c | |||
| @@ -174,6 +174,7 @@ gf119_sor = { | |||
| 174 | .links = gf119_sor_dp_links, | 174 | .links = gf119_sor_dp_links, |
| 175 | .power = g94_sor_dp_power, | 175 | .power = g94_sor_dp_power, |
| 176 | .pattern = gf119_sor_dp_pattern, | 176 | .pattern = gf119_sor_dp_pattern, |
| 177 | .drive = gf119_sor_dp_drive, | ||
| 177 | .vcpi = gf119_sor_dp_vcpi, | 178 | .vcpi = gf119_sor_dp_vcpi, |
| 178 | .audio = gf119_sor_dp_audio, | 179 | .audio = gf119_sor_dp_audio, |
| 179 | .audio_sym = gf119_sor_dp_audio_sym, | 180 | .audio_sym = gf119_sor_dp_audio_sym, |