diff options
| author | James Morris <james.morris@microsoft.com> | 2018-03-22 17:26:16 -0400 |
|---|---|---|
| committer | James Morris <james.morris@microsoft.com> | 2018-03-22 17:26:16 -0400 |
| commit | 5893ed18a26d1f56b97c0290b0cbbc2d49d6de28 (patch) | |
| tree | 97aa931519fca28a0a12fad7485347198f8267cc /drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | |
| parent | 7bd698b3c04e61ee9e03d4c2a55003f75df14dca (diff) | |
| parent | c698ca5278934c0ae32297a8725ced2e27585d7f (diff) | |
Merge tag 'v4.16-rc6' into next-general
Merge to Linux 4.16-rc6 at the request of Jarkko, for his TPM updates.
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h index 54f06c959340..2264c5c97009 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | |||
| @@ -352,6 +352,7 @@ struct amdgpu_mode_info { | |||
| 352 | u16 firmware_flags; | 352 | u16 firmware_flags; |
| 353 | /* pointer to backlight encoder */ | 353 | /* pointer to backlight encoder */ |
| 354 | struct amdgpu_encoder *bl_encoder; | 354 | struct amdgpu_encoder *bl_encoder; |
| 355 | u8 bl_level; /* saved backlight level */ | ||
| 355 | struct amdgpu_audio audio; /* audio stuff */ | 356 | struct amdgpu_audio audio; /* audio stuff */ |
| 356 | int num_crtc; /* number of crtcs */ | 357 | int num_crtc; /* number of crtcs */ |
| 357 | int num_hpd; /* number of hpd pins */ | 358 | int num_hpd; /* number of hpd pins */ |