diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-10-25 05:01:57 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-10-25 05:01:57 +1000 |
| commit | aef8cc903583c5a205b696fb0a51e1eca9117321 (patch) | |
| tree | a7e2aeeeae494633a98c0603b8cbfc757e4b0abb /drivers/gpu/drm/amd/amdgpu/amdgpu.h | |
| parent | 018155365dccecd9ea9f26e1b26fb0f960c1ee32 (diff) | |
| parent | c86f5ebfbd147d1a228ab89ee1658e18939bd7ad (diff) | |
Merge branch 'drm-fixes-4.3' of git://people.freedesktop.org/~agd5f/linux
Two regression fixes and a memory leak fix for amdgpu and radeon.
* 'drm-fixes-4.3' of git://people.freedesktop.org/~agd5f/linux:
drm/amdgpu: don't try to recreate sysfs entries on resume
drm/radeon: don't try to recreate sysfs entries on resume
drm/amdgpu: stop leaking page flip fence
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 6647fb26ef25..0d13e6368b96 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h @@ -1654,6 +1654,7 @@ struct amdgpu_pm { u8 fan_max_rpm; /* dpm */ bool dpm_enabled; + bool sysfs_initialized; struct amdgpu_dpm dpm; const struct firmware *fw; /* SMC firmware */ uint32_t fw_version; |