Merge tag 'drm-intel-next-fixes-2015-09-02' into drm-intel-next-queued

Backmerge -fixes since there's more DDI-E related cleanups on top of
the pile of -fixes for skl that just landed for 4.3.

Conflicts:
	drivers/gpu/drm/i915/intel_display.c
	drivers/gpu/drm/i914/intel_dp.c
	drivers/gpu/drm/i915/intel_lrc.c

Conflicts are all fairly harmless adjacent line stuff.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
index cc050a329c49..c86911c2ea2a 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
@@ -770,11 +770,11 @@ static u32 dce_v8_0_line_buffer_adjust(struct amdgpu_device *adev,
                         buffer_alloc = 2;
                 } else if (mode->crtc_hdisplay < 4096) {
                         tmp = 0;
-                        buffer_alloc = (adev->flags & AMDGPU_IS_APU) ? 2 : 4;
+                        buffer_alloc = (adev->flags & AMD_IS_APU) ? 2 : 4;
                 } else {
                         DRM_DEBUG_KMS("Mode too big for LB!\n");
                         tmp = 0;
-                        buffer_alloc = (adev->flags & AMDGPU_IS_APU) ? 2 : 4;
+                        buffer_alloc = (adev->flags & AMD_IS_APU) ? 2 : 4;
                 }
         } else {
                 tmp = 1;