Commit 14ee642c authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-next-2019-05-24' of git://anongit.freedesktop.org/drm/drm-intel into drm-next 



Features:
- Engine discovery query (Tvrtko)
- Support for DP YCbCr4:2:0 outputs (Gwan-gyeong)
- HDCP revocation support, refactoring (Ramalingam)
- Remove DRM_AUTH from IOCTLs which also have DRM_RENDER_ALLOW (Christian König)
- Asynchronous display power disabling (Imre)
- Perma-pin uC firmware and re-enable global reset (Fernando)
- GTT remapping for display, for bigger fb size and stride (Ville)
- Enable pipe HDR mode on ICL if only HDR planes are used (Ville)
- Kconfig to tweak the busyspin durations for i915_wait_request (Chris)
- Allow multiple user handles to the same VM (Chris)
- GT/GEM runtime pm improvements using wakerefs (Chris)
- Gen 4&5 render context support (Chris)
- Allow userspace to clone contexts on creation (Chris)
- SINGLE_TIMELINE flags for context creation (Chris)
- Allow specification of parallel execbuf (Chris)

Refactoring:
- Header refactoring (Jani)
- Move GraphicsTechnology files under gt/ (Chris)
- Sideband code refactoring (Chris)

Fixes:
- ICL DSI state readout and checker fixes (Vandita)
- GLK DSI picture corruption fix (Stanislav)
- HDMI deep color fixes (Clinton, Aditya)
- Fix driver unbinding from a device in use (Janusz)
- Fix clock gating with pipe scaling (Radhakrishna)
- Disable broken FBC on GLK (Daniel Drake)
- Miscellaneous GuC fixes (Michal)
- Fix MG PHY DP register programming (Imre)
- Add missing combo PHY lane power setup (Imre)
- Workarounds for early ICL VBT issues (Imre)
- Fix fastset vs. pfit on/off on HSW EDP transcoder (Ville)
- Add readout and state check for pch_pfit.force_thru (Ville)
- Miscellaneous display fixes and refactoring (Ville)
- Display workaround fixes (Ville)
- Enable audio even if ELD is bogus (Ville)
- Fix use-after-free in reporting create.size (Chris)
- Sideband fixes to avoid BYT hard lockups (Chris)
- Workaround fixes and improvements (Chris)

Maintainer shortcomings:
- Failure to adequately describe and give credit for all changes (Jani)

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/87sgt3n45z.fsf@intel.com
parents 88cd7a2c c0a74c73

Documentation/gpu/drm-kms-helpers.rst

+6 −0
Original line number Diff line number Diff line
@@ -181,6 +181,12 @@ Panel Helper Reference 
.. kernel-doc:: drivers/gpu/drm/drm_panel_orientation_quirks.c

   :export:



HDCP Helper Functions Reference

===============================



.. kernel-doc:: drivers/gpu/drm/drm_hdcp.c

   :export:



Display Port Helper Functions Reference

=======================================

drivers/gpu/drm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ drm-y := drm_auth.o drm_cache.o \ 
		drm_plane.o drm_color_mgmt.o drm_print.o \

		drm_dumb_buffers.o drm_mode_config.o drm_vblank.o \

		drm_syncobj.o drm_lease.o drm_writeback.o drm_client.o \

		drm_atomic_uapi.o

		drm_atomic_uapi.o drm_hdcp.o



drm-$(CONFIG_DRM_LEGACY) += drm_legacy_misc.o drm_bufs.o drm_context.o drm_dma.o drm_scatter.o drm_lock.o

drm-$(CONFIG_DRM_LIB_RANDOM) += lib/drm_random.o

drivers/gpu/drm/bridge/analogix/analogix_dp_core.c

+6 −6
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ EXPORT_SYMBOL_GPL(analogix_dp_psr_enabled); 


int analogix_dp_enable_psr(struct analogix_dp_device *dp)

{

	struct edp_vsc_psr psr_vsc;

	struct dp_sdp psr_vsc;



	if (!dp->psr_enable)

		return 0;
@@ -127,8 +127,8 @@ int analogix_dp_enable_psr(struct analogix_dp_device *dp) 
	psr_vsc.sdp_header.HB2 = 0x2;

	psr_vsc.sdp_header.HB3 = 0x8;



	psr_vsc.DB0 = 0;

	psr_vsc.DB1 = EDP_VSC_PSR_STATE_ACTIVE | EDP_VSC_PSR_CRC_VALUES_VALID;

	psr_vsc.db[0] = 0;

	psr_vsc.db[1] = EDP_VSC_PSR_STATE_ACTIVE | EDP_VSC_PSR_CRC_VALUES_VALID;



	return analogix_dp_send_psr_spd(dp, &psr_vsc, true);

}
@@ -136,7 +136,7 @@ EXPORT_SYMBOL_GPL(analogix_dp_enable_psr); 


int analogix_dp_disable_psr(struct analogix_dp_device *dp)

{

	struct edp_vsc_psr psr_vsc;

	struct dp_sdp psr_vsc;

	int ret;



	if (!dp->psr_enable)
@@ -149,8 +149,8 @@ int analogix_dp_disable_psr(struct analogix_dp_device *dp) 
	psr_vsc.sdp_header.HB2 = 0x2;

	psr_vsc.sdp_header.HB3 = 0x8;



	psr_vsc.DB0 = 0;

	psr_vsc.DB1 = 0;

	psr_vsc.db[0] = 0;

	psr_vsc.db[1] = 0;



	ret = drm_dp_dpcd_writeb(&dp->aux, DP_SET_POWER, DP_SET_POWER_D0);

	if (ret != 1) {

drivers/gpu/drm/bridge/analogix/analogix_dp_core.h

+1 −1
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ void analogix_dp_enable_scrambling(struct analogix_dp_device *dp); 
void analogix_dp_disable_scrambling(struct analogix_dp_device *dp);

void analogix_dp_enable_psr_crc(struct analogix_dp_device *dp);

int analogix_dp_send_psr_spd(struct analogix_dp_device *dp,

			     struct edp_vsc_psr *vsc, bool blocking);

			     struct dp_sdp *vsc, bool blocking);

ssize_t analogix_dp_transfer(struct analogix_dp_device *dp,

			     struct drm_dp_aux_msg *msg);

drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c

+5 −5
Original line number Diff line number Diff line
@@ -1041,7 +1041,7 @@ static ssize_t analogix_dp_get_psr_status(struct analogix_dp_device *dp) 
}



int analogix_dp_send_psr_spd(struct analogix_dp_device *dp,

			     struct edp_vsc_psr *vsc, bool blocking)

			     struct dp_sdp *vsc, bool blocking)

{

	unsigned int val;

	int ret;
@@ -1069,8 +1069,8 @@ int analogix_dp_send_psr_spd(struct analogix_dp_device *dp, 
	writel(0x5D, dp->reg_base + ANALOGIX_DP_SPD_PB3);



	/* configure DB0 / DB1 values */

	writel(vsc->DB0, dp->reg_base + ANALOGIX_DP_VSC_SHADOW_DB0);

	writel(vsc->DB1, dp->reg_base + ANALOGIX_DP_VSC_SHADOW_DB1);

	writel(vsc->db[0], dp->reg_base + ANALOGIX_DP_VSC_SHADOW_DB0);

	writel(vsc->db[1], dp->reg_base + ANALOGIX_DP_VSC_SHADOW_DB1);



	/* set reuse spd inforframe */

	val = readl(dp->reg_base + ANALOGIX_DP_VIDEO_CTL_3);
@@ -1092,8 +1092,8 @@ int analogix_dp_send_psr_spd(struct analogix_dp_device *dp, 


	ret = readx_poll_timeout(analogix_dp_get_psr_status, dp, psr_status,

		psr_status >= 0 &&

		((vsc->DB1 && psr_status == DP_PSR_SINK_ACTIVE_RFB) ||

		(!vsc->DB1 && psr_status == DP_PSR_SINK_INACTIVE)), 1500,

		((vsc->db[1] && psr_status == DP_PSR_SINK_ACTIVE_RFB) ||

		(!vsc->db[1] && psr_status == DP_PSR_SINK_INACTIVE)), 1500,

		DP_TIMEOUT_PSR_LOOP_MS * 1000);

	if (ret) {

		dev_warn(dp->dev, "Failed to apply PSR %d\n", ret);

CRA Git | Maintained and supported by SUSTech CRA and CCSE