diff options
| author | Maxime Ripard <maxime@cerno.tech> | 2022-09-14 12:22:18 +0100 |
|---|---|---|
| committer | Maxime Ripard <maxime@cerno.tech> | 2022-09-14 12:22:18 +0100 |
| commit | a108772d03d8bdb43258218b00bfe43bbe1e8800 (patch) | |
| tree | 11b1f413ab384f2b5de0773f01b6886e2c601f8b /drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | |
| parent | 75cebd664d57a78af3e46c14bd2659df0a08847b (diff) | |
| parent | 213cb76ddc8b875e772f9f4d173feefa122716af (diff) | |
Merge drm/drm-next into drm-misc-next
We need 6.0-rc1 to merge the backlight rework PR.
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c index afe22f83d4a6..3ea48385fab3 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c @@ -402,7 +402,7 @@ static void amdgpu_ctx_fini(struct kref *ref) } } - if (drm_dev_enter(&adev->ddev, &idx)) { + if (drm_dev_enter(adev_to_drm(adev), &idx)) { amdgpu_ctx_set_stable_pstate(ctx, ctx->stable_pstate); drm_dev_exit(idx); } |