drm/i915/opregion: proper handling of DIDL and CADL

Previously we've just shoved the first eight devices in DIDL to CADL (list of active outputs). Some of the active outputs may have been left outside of CADL. The problem is, some BIOS implementations prevent laptop brightness hotkey propagation if the flat panel is not active.

Now that we have connector to acpi device id mapping covered, we can update CADL based on which outputs are actually active.

v3: actually git add the dev->dev_priv change.

v4: update cadl in intel_shared_dpll_commit() if intel_state->modeset
(Maarten)

Cc Maarten Lankhorst <[email protected]>

Reviewed-and-tested-by Peter Wu <[email protected]>

Signed-off-by Jani Nikula <[email protected]>

---
 drivers/gpu/drm/i915/i915_drv.h       |  2 +
 drivers/gpu/drm/i915/intel_display.c  |  4 ++
 drivers/gpu/drm/i915/intel_opregion.c | 70 ++++++++++++++++++-----------------
 3 files changed, 43 insertions(+), 33 deletions(-)

drivers/gpu/drm/i915/i915_drv.h +2 -0

index 724d34b00196..64ab52529be8 100644
@@ -3692,6 +3692,7 @@ extern int intel_opregion_notify_encoder(struct intel_encoder *intel_encoder,
 extern int intel_opregion_notify_adapter(struct drm_i915_private *dev_priv,
 					 pci_power_t state);
 extern int intel_opregion_get_panel_type(struct drm_i915_private *dev_priv);
+extern void intel_opregion_update_cadl(struct drm_i915_private *dev_priv);
 #else
 static inline int intel_opregion_setup(struct drm_i915_private *dev) { return 0; }
 static inline void intel_opregion_register(struct drm_i915_private *dev_priv) { }

@@ -3713,6 +3714,7 @@ static inline int intel_opregion_get_panel_type(struct drm_i915_private *dev)
 {
 	return -ENODEV;
 }
+static inline void intel_opregion_update_cadl(struct drm_i915_private *dev_priv) { }
 #endif
 
 /* intel_acpi.c */

drivers/gpu/drm/i915/intel_display.c +4 -0

index d902a70edb84..4f404900f610 100644
@@ -13953,6 +13953,10 @@ static int intel_atomic_commit(struct drm_device *dev,
 	dev_priv->wm.distrust_bios_wm = false;
 	dev_priv->wm.skl_results = intel_state->wm_results;
 	intel_shared_dpll_commit(state);
+
+	if (intel_state->modeset)
+		intel_opregion_update_cadl(dev_priv);
+
 	intel_atomic_track_fbs(state);
 
 	if (nonblock)

drivers/gpu/drm/i915/intel_opregion.c +10 -30

index 632f0178c2b0..8b3f7e6ae4bb 100644
@@ -642,24 +642,6 @@ static struct notifier_block intel_opregion_notifier = {
  * (version 3)
  */
 
-static u32 get_did(struct intel_opregion *opregion, int i)
-{
-	u32 did;
-
-	if (i < ARRAY_SIZE(opregion->acpi->didl)) {
-		did = opregion->acpi->didl[i];
-	} else {
-		i -= ARRAY_SIZE(opregion->acpi->didl);
-
-		if (WARN_ON(i >= ARRAY_SIZE(opregion->acpi->did2)))
-			return 0;
-
-		did = opregion->acpi->did2[i];
-	}
-
-	return did;
-}
-
 static void set_did(struct intel_opregion *opregion, int i, u32 val)
 {
 	if (i < ARRAY_SIZE(opregion->acpi->didl)) {

@@ -674,6 +656,14 @@ static void set_did(struct intel_opregion *opregion, int i, u32 val)
 	}
 }
 
+static void set_cad(struct intel_opregion *opregion, int i, u32 val)
+{
+	if (WARN_ON(i >= ARRAY_SIZE(opregion->acpi->cadl)))
+		return;
+
+	opregion->acpi->cadl[i] = val;
+}
+
 static u32 acpi_display_type(struct intel_connector *connector)
 {
 	u32 display_type;

@@ -759,22 +749,36 @@ static void intel_didl_outputs(struct drm_i915_private *dev_priv)
 		set_did(opregion, i, 0);
 }
 
-static void intel_setup_cadls(struct drm_i915_private *dev_priv)
+/* Update CADL to reflect active outputs. */
+void intel_opregion_update_cadl(struct drm_i915_private *dev_priv)
 {
 	struct intel_opregion *opregion = &dev_priv->opregion;
-	int i = 0;
-	u32 disp_id;
-
-	/* Initialize the CADL field by duplicating the DIDL values.
-	 * Technically, this is not always correct as display outputs may exist,
-	 * but not active. This initialization is necessary for some Clevo
-	 * laptops that check this field before processing the brightness and
-	 * display switching hotkeys. Just like DIDL, CADL is NULL-terminated if
-	 * there are less than eight devices. */
-	do {
-		disp_id = get_did(opregion, i);

This is v4 of [1]. The first three have already been pushed to drm-intel-next-queued. The only change here is the atomic commit.

Review and testing would be much appreciated to move this forward. For testing, I've pushed this to opregion-didl-v4 branch of my repo at [2].

Maarten, please check the hunk touching the atomic code in patch 2.

BR,
Jani.

[1] http://mid.gmane.org/[email protected]
[2] https://cgit.freedesktop.org/~jani/drm/

Jani Nikula (2):
drm/i915: make i915 the source of acpi device ids for _DOD drm/i915/opregion: update cadl based on actually active outputs

drivers/gpu/drm/i915/i915_drv.h       |   2 +
drivers/gpu/drm/i915/intel_display.c  |   4 +
drivers/gpu/drm/i915/intel_drv.h      |   3 +
drivers/gpu/drm/i915/intel_opregion.c | 155
+++++++++++++---------------------
4 files changed, 69 insertions(+), 95 deletions(-)

This is v4 of [1]. The first three have already been pushed to drm-intel-next-queued. The only change here is the atomic commit.

Review and testing would be much appreciated to move this forward. For testing, I've pushed this to opregion-didl-v4 branch of my repo at [2].

Am 29.06.2016 um 17:36 schrieb Jani Nikula:

Quoted 6 lines

This is v4 of [1]. The first three have already been pushed to drm-intel-next-queued. The only change here is the atomic commit.

Review and testing would be much appreciated to move this forward. For testing, I've pushed this to opregion-didl-v4 branch of my repo at [2].

Tested on a Fujitsu LIFEBOOK E736: Brightness keys are working now.

Best regards
Rainer

Found a problem: After screensaver kicked in and display was turned off the brightness keys stop working.

Problem can be reproduced like that:

1. Boot laptop
2. Test brightness keys, they are working
3. open Terminal and issue "xset -display :0 dpms force off"
4. the screen goes blank (like after the screensaver timeout)
5. push a key to bring the screen back
6. test brightness keys again, now they don't work

If the system is sent to suspend and woken up everything is fine again.

Behaviour happens on the 4.7.0-rc5 kernel from the opregion-didl-v4 branch. Before I compiled the 4.7.0-r4 from the same git repository. On this (v3) everything still works after the screen was blanked.

Best regards
Rainer

Am 30.06.2016 um 11:19 schrieb Rainer Koenig:

Quoted 12 lines

Am 29.06.2016 um 17:36 schrieb Jani Nikula:

Quoted 6 lines

This is v4 of [1]. The first three have already been pushed to drm-intel-next-queued. The only change here is the atomic commit.

Review and testing would be much appreciated to move this forward. For testing, I've pushed this to opregion-didl-v4 branch of my repo at [2].

Tested on a Fujitsu LIFEBOOK E736: Brightness keys are working now.

Best regards
Rainer

Quoted 12 lines

Found a problem: After screensaver kicked in and display was turned off the brightness keys stop working.

Problem can be reproduced like that:

1. Boot laptop
2. Test brightness keys, they are working
3. open Terminal and issue "xset -display :0 dpms force off"
4. the screen goes blank (like after the screensaver timeout)
5. push a key to bring the screen back
6. test brightness keys again, now they don't work

Quoted 5 lines

If the system is sent to suspend and woken up everything is fine again.

Behaviour happens on the 4.7.0-rc5 kernel from the opregion-didl-v4 branch. Before I compiled the 4.7.0-r4 from the same git repository. On this (v3) everything still works after the screen was blanked.

Maarten, I think the difference is between where and when the calls to cadl update are made.