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

Commit a111ef6b authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2019-08-08' of... 

Merge tag 'drm-intel-fixes-2019-08-08' of git://anongit.freedesktop.org/drm/drm-intel

 into drm-fixes

drm/i915 fixes for v5.3-rc4:
- Fix GLK DSI escape clock setting
- Fix a memleak on HDCP revoked Ksv error path

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/87pnlghz79.fsf@intel.com
parents 359f1dcb 73a0ff0b

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

+2 −1
Original line number Diff line number Diff line
@@ -536,7 +536,8 @@ int intel_hdcp_auth_downstream(struct intel_connector *connector) 


	if (drm_hdcp_check_ksvs_revoked(dev, ksv_fifo, num_downstream)) {

		DRM_ERROR("Revoked Ksv(s) in ksv_fifo\n");

		return -EPERM;

		ret = -EPERM;

		goto err;

	}



	/*

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

+2 −2
Original line number Diff line number Diff line
@@ -396,8 +396,8 @@ static void glk_dsi_program_esc_clock(struct drm_device *dev, 
	else

		txesc2_div = 10;



	I915_WRITE(MIPIO_TXESC_CLK_DIV1, txesc1_div & GLK_TX_ESC_CLK_DIV1_MASK);

	I915_WRITE(MIPIO_TXESC_CLK_DIV2, txesc2_div & GLK_TX_ESC_CLK_DIV2_MASK);

	I915_WRITE(MIPIO_TXESC_CLK_DIV1, (1 << (txesc1_div - 1)) & GLK_TX_ESC_CLK_DIV1_MASK);

	I915_WRITE(MIPIO_TXESC_CLK_DIV2, (1 << (txesc2_div - 1)) & GLK_TX_ESC_CLK_DIV2_MASK);

}



/* Program BXT Mipi clocks and dividers */