diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-12-02 09:33:25 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-12-02 09:33:25 -0800 |
| commit | 0eea505058740aa45486145296ef4fefbd8cab85 (patch) | |
| tree | 1bc265d615b8353405a04630f610a42c48302f47 /drivers/gpu/drm/sti/sti_gdp.c | |
| parent | 5e0baca8b3247f459af50947eaafc68bb8168b33 (diff) | |
| parent | 31ade3b83e1821da5fbb2f11b5b3d4ab2ec39db8 (diff) | |
Merge tag 'v4.4-rc3' into next
Merge with Linux 4.4-rc3 to bring in helpers for multiu-driver modules.
Diffstat (limited to 'drivers/gpu/drm/sti/sti_gdp.c')
| -rw-r--r-- | drivers/gpu/drm/sti/sti_gdp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/sti/sti_gdp.c b/drivers/gpu/drm/sti/sti_gdp.c index 9365670427ad..c85dc7d6b005 100644 --- a/drivers/gpu/drm/sti/sti_gdp.c +++ b/drivers/gpu/drm/sti/sti_gdp.c @@ -492,7 +492,7 @@ static void sti_gdp_atomic_update(struct drm_plane *drm_plane, /* Register gdp callback */ if (sti_vtg_register_client(mixer->id == STI_MIXER_MAIN ? compo->vtg_main : compo->vtg_aux, - &gdp->vtg_field_nb, mixer->id)) { + &gdp->vtg_field_nb, crtc)) { DRM_ERROR("Cannot register VTG notifier\n"); return; } |