diff options
| author | Arnd Bergmann <[email protected]> | 2016-03-17 09:02:10 +0000 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2016-03-17 21:15:57 +0000 |
| commit | e6087877794520748f7295212a4c6bdb870122f2 (patch) | |
| tree | f47a918ed0e122212d19cd8d5f63d26798a41ddf /drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | |
| parent | Merge branch '2016-02-26-st-drm-next' of http://git.linaro.org/people/benjami... (diff) | |
| download | kernel-e6087877794520748f7295212a4c6bdb870122f2.tar.gz kernel-e6087877794520748f7295212a4c6bdb870122f2.zip | |
drm/sti: restore mode_fixup callback
Commit 8a2fa38fddd3 removed the mode_fixup because it was empty,
but 652353e6e561 modified it to call drm_mode_set_crtcinfo()
instead.
Both commits are correct, but the merge of the two kept the nonempty
version without the reference to it, as shown by the gcc warning:
drm/sti/sti_crtc.c:54:13: error: 'sti_crtc_mode_fixup' defined but not used
This restores the callback pointer to fix the merge.
Signed-off-by: Arnd Bergmann <[email protected]>
Reverts: 8a2fa38fddd3 ("drm/sti: removed optional dummy crtc mode_fixup function.")
Fixes: 652353e6e561 ("drm/sti: set CRTC modesetting parameters")
Fixes: cf481068cdd4 ("Merge branch '2016-02-26-st-drm-next' of http://git.linaro.org/people/benjamin.gaignard/kernel into drm-next")
Acked-by: Vincent ABRIOU <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c')
0 files changed, 0 insertions, 0 deletions