From 48da5bf8ac988ded91a1189e1b681d7a31967ca1 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sun, 12 Apr 2020 10:11:00 +0200 Subject: [PATCH] intel_extreme: Do not early-enable the pipe on pre-SandyBridge Should fix #15861. --- src/add-ons/accelerants/intel_extreme/Pipes.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/add-ons/accelerants/intel_extreme/Pipes.cpp b/src/add-ons/accelerants/intel_extreme/Pipes.cpp index 1fa06121de..f3167d87f8 100644 --- a/src/add-ons/accelerants/intel_extreme/Pipes.cpp +++ b/src/add-ons/accelerants/intel_extreme/Pipes.cpp @@ -139,11 +139,12 @@ Pipe::Configure(display_mode* mode) read32(INTEL_DISPLAY_A_PIPE_CONTROL + fPipeOffset); #endif - // According to SandyBridge modesetting sequence, pipe must be enabled - // before PLL are configured. - addr_t pipeReg = INTEL_DISPLAY_A_PIPE_CONTROL + fPipeOffset; - write32(pipeReg, read32(pipeReg) | INTEL_PIPE_ENABLED); - + if (gInfo->shared_info->device_type.Generation() >= 6) { + // According to SandyBridge modesetting sequence, pipe must be enabled + // before PLL are configured. + addr_t pipeReg = INTEL_DISPLAY_A_PIPE_CONTROL + fPipeOffset; + write32(pipeReg, read32(pipeReg) | INTEL_PIPE_ENABLED); + } }