diff options
| author | Thomas Gleixner <[email protected]> | 2015-09-30 19:20:39 +0000 |
|---|---|---|
| committer | Thomas Gleixner <[email protected]> | 2015-09-30 19:20:39 +0000 |
| commit | 09907ca630047bbeaa96de0102df7a6cc3a966cd (patch) | |
| tree | 99e2155ea7b87ebdbeea96b7165d55ad0413006d /drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | |
| parent | x86/apic: Deinline various functions (diff) | |
| parent | x86/x2apic: Make stub functions available even if !CONFIG_X86_LOCAL_APIC (diff) | |
| download | kernel-09907ca630047bbeaa96de0102df7a6cc3a966cd.tar.gz kernel-09907ca630047bbeaa96de0102df7a6cc3a966cd.zip | |
Merge branch 'x86/for-kvm' into x86/apic
Pull in the apic change which is provided for kvm folks to pull into
their tree.
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c index 0aba8e9bc8a0..7c42ff670080 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c @@ -140,7 +140,7 @@ void amdgpu_irq_preinstall(struct drm_device *dev) */ int amdgpu_irq_postinstall(struct drm_device *dev) { - dev->max_vblank_count = 0x001fffff; + dev->max_vblank_count = 0x00ffffff; return 0; } |