summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2018-01-09 12:03:10 +1000
committerDave Airlie <airlied@redhat.com>2018-01-09 12:03:10 +1000
commitb0bb222440a5c8273f67dd37946707e6ba6ad832 (patch)
tree3dd62fdaf288a80e3a7fbea3928b2baf0bda9d52 /drivers/gpu/drm
parent909ef254ee3bfb305524b6651c2e74c4b330d8df (diff)
parent1b5c7ef3d0d0610bda9b63263f7c5b7178d11015 (diff)
downloadop-kernel-dev-b0bb222440a5c8273f67dd37946707e6ba6ad832.zip
op-kernel-dev-b0bb222440a5c8273f67dd37946707e6ba6ad832.tar.gz
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
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r--drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c1
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 a2978a3..700fc75 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 = {
.links = gf119_sor_dp_links,
.power = g94_sor_dp_power,
.pattern = gf119_sor_dp_pattern,
+ .drive = gf119_sor_dp_drive,
.vcpi = gf119_sor_dp_vcpi,
.audio = gf119_sor_dp_audio,
.audio_sym = gf119_sor_dp_audio_sym,
OpenPOWER on IntegriCloud