diff options
| author | Daniel Vetter <[email protected]> | 2017-03-22 21:50:57 +0000 |
|---|---|---|
| committer | Daniel Vetter <[email protected]> | 2017-03-29 07:56:25 +0000 |
| commit | a4eff9aa6db8eb3d1864118f3558214b26f630b4 (patch) | |
| tree | 522c9efe828e81679e1b12ab666ddc3c80a7b747 /drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | |
| parent | drm: Add explicit acquire ctx handling around ->set_config (diff) | |
| download | kernel-a4eff9aa6db8eb3d1864118f3558214b26f630b4.tar.gz kernel-a4eff9aa6db8eb3d1864118f3558214b26f630b4.zip | |
drm: Add acquire ctx parameter to ->set_config
Surprisingly a lot of legacy drivers roll their own, for
runtime pm and because vmwgfx.
Also make nouveau's set_config static while at it.
Cc: Sinclair Yeh <[email protected]>
Cc: Thomas Hellstrom <[email protected]>
Cc: Ben Skeggs <[email protected]>
Cc: Patrik Jakobsson <[email protected]>
Cc: Alex Deucher <[email protected]>
Cc: Christian König <[email protected]>
Reviewed-by: Harry Wentland <[email protected]>
Signed-off-by: Daniel Vetter <[email protected]>
Link: http://patchwork.freedesktop.org/patch/msgid/[email protected]
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_display.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c index 7b4fe91d3aec..ce15721cadda 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c @@ -333,7 +333,8 @@ int amdgpu_crtc_page_flip_target(struct drm_crtc *crtc, return 0; } -int amdgpu_crtc_set_config(struct drm_mode_set *set) +int amdgpu_crtc_set_config(struct drm_mode_set *set, + struct drm_modeset_acquire_ctx *ctx) { struct drm_device *dev; struct amdgpu_device *adev; @@ -350,7 +351,7 @@ int amdgpu_crtc_set_config(struct drm_mode_set *set) if (ret < 0) return ret; - ret = drm_crtc_helper_set_config(set); + ret = drm_crtc_helper_set_config(set, ctx); list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) if (crtc->enabled) |