diff options
| author |   Maxime Ripard <maxime@cerno.tech> | 2020-03-04 08:56:28 +0100 |
|---|---|---|
| committer | Maxime Ripard <maxime@cerno.tech> | 2020-03-04 08:56:28 +0100 |
| commit | 83794ee6c13b41c7db86ccfcaa20dc360b08fdb6 (patch) | |
| tree | c80162f31fdea3ddded188870e61d5dc71cbf892 /drivers/gpu/drm/amd/amdgpu/amdgpu.h | |
| parent | drm/hdcp: fix DRM_HDCP_2_KSV_COUNT_2_LSBITS (diff) | |
| parent | Merge tag 'drm-misc-next-2020-02-27' of git://anongit.freedesktop.org/drm/drm-misc into drm-next (diff) | |
| download | linux-dev-83794ee6c13b41c7db86ccfcaa20dc360b08fdb6.tar.xz linux-dev-83794ee6c13b41c7db86ccfcaa20dc360b08fdb6.zip | |
Merge drm/drm-next into drm-misc-next
Daniel needs a few commits from drm-next.
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu.h')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index 2f9da6d182f3..97dd9596d17a 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h @@ -969,6 +969,7 @@ struct amdgpu_device { int pstate; /* enable runtime pm on the device */ bool runpm; + bool in_runpm; bool pm_sysfs_en; bool ucode_sysfs_en; |