From b0f591a7e9631ecc18fce2acc69dd4bb772a40a6 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Sun, 1 Nov 2015 08:52:23 -0600 Subject: [PATCH] intel_extreme: Fix DPMS modesetting dance --- .../accelerants/intel_extreme/mode.cpp | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/add-ons/accelerants/intel_extreme/mode.cpp b/src/add-ons/accelerants/intel_extreme/mode.cpp index ea47d3b68a..536ebf1e07 100644 --- a/src/add-ons/accelerants/intel_extreme/mode.cpp +++ b/src/add-ons/accelerants/intel_extreme/mode.cpp @@ -711,20 +711,19 @@ if (first) { // RIP ANALOG - if ((gInfo->head_mode & HEAD_MODE_TESTING) == 0) { - set_display_power_mode(sharedInfo.dpms_mode); + // TODO: This may not be neccesary (see DPMS OFF at top) + set_display_power_mode(sharedInfo.dpms_mode); - // Changing bytes per row seems to be ignored if the plane/pipe is turned - // off + // Changing bytes per row seems to be ignored if the plane/pipe is turned + // off - if (gInfo->head_mode & HEAD_MODE_A_ANALOG) - write32(INTEL_DISPLAY_A_BYTES_PER_ROW, bytesPerRow); - if (gInfo->head_mode & HEAD_MODE_B_DIGITAL) - write32(INTEL_DISPLAY_B_BYTES_PER_ROW, bytesPerRow); + if (gInfo->head_mode & HEAD_MODE_A_ANALOG) + write32(INTEL_DISPLAY_A_BYTES_PER_ROW, bytesPerRow); + if (gInfo->head_mode & HEAD_MODE_B_DIGITAL) + write32(INTEL_DISPLAY_B_BYTES_PER_ROW, bytesPerRow); - set_frame_buffer_base(); - // triggers writing back double-buffered registers - } + set_frame_buffer_base(); + // triggers writing back double-buffered registers // update shared info sharedInfo.bytes_per_row = bytesPerRow;