Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d61f716 authored by Dhinakaran Pandiyan's avatar Dhinakaran Pandiyan Committed by Jani Nikula
Browse files

drm/i915/vbt: Fix VBT parsing for the PSR section 

A single 32-bit PSR2 training pattern field follows the sixteen element
array of PSR table entries in the VBT spec. But, we incorrectly define
this PSR2 field for each of the PSR table entries. As a result, the PSR1
training pattern duration for any panel_type != 0 will be parsed
incorrectly. Secondly, PSR2 training pattern durations for VBTs with bdb
version >= 226 will also be wrong.

Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: José Roberto de Souza <jose.souza@intel.com>
Cc: stable@vger.kernel.org
Cc: stable@vger.kernel.org #v5.2
Fixes: 88a0d960 ("drm/i915/vbt: Parse and use the new field with PSR2 TP2/3 wakeup time")
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111088
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=204183


Signed-off-by: default avatarDhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarJosé Roberto de Souza <jose.souza@intel.com>
Acked-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Tested-by: default avatarFrançois Guerraz <kubrick@fgv6.net>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190717223451.2595-1-dhinakaran.pandiyan@intel.com


(cherry picked from commit b5ea9c93)
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent a8f196a0

drivers/gpu/drm/i915/display/intel_bios.c

+1 −1
Original line number Diff line number Diff line
@@ -765,7 +765,7 @@ parse_psr(struct drm_i915_private *dev_priv, const struct bdb_header *bdb) 
	}



	if (bdb->version >= 226) {

		u32 wakeup_time = psr_table->psr2_tp2_tp3_wakeup_time;

		u32 wakeup_time = psr->psr2_tp2_tp3_wakeup_time;



		wakeup_time = (wakeup_time >> (2 * panel_type)) & 0x3;

		switch (wakeup_time) {

drivers/gpu/drm/i915/display/intel_vbt_defs.h

+3 −3
Original line number Diff line number Diff line
@@ -478,13 +478,13 @@ struct psr_table { 
	/* TP wake up time in multiple of 100 */

	u16 tp1_wakeup_time;

	u16 tp2_tp3_wakeup_time;



	/* PSR2 TP2/TP3 wakeup time for 16 panels */

	u32 psr2_tp2_tp3_wakeup_time;

} __packed;



struct bdb_psr {

	struct psr_table psr_table[16];



	/* PSR2 TP2/TP3 wakeup time for 16 panels */

	u32 psr2_tp2_tp3_wakeup_time;

} __packed;



/*