Commit 388e19fc authored Oct 09, 2019 by Alisha Thapaliya Committed by Linux Build Service Account Oct 21, 2019

Merge remote-tracking branch 'quic/display-kernel.lnx.4.19' into display-kernel.lnx.1.0



Merge commit to pull display-kernel.lnx.1.0 to tip
* quic/display-kernel.lnx.4.19:
  disp: msm: sde: wait for lp2 and pm_suspend frame trigger
  disp: msm: sde: update max display resolution with scale config
  drm: msm: add support for ltm off event
  disp: msm: sde: switch to WD vsync on unexpected panel jitter
  disp: msm: sde: add null check for pingpong hw block
  disp: msm: dsi: add null check for panel and proper ctrl iteration
  disp: msm: sde: add pending flush for merge3d
  disp: msm: dsi: Set OLED reugalor mode when exit LP1
  disp: msm: config AB/IBB power when AOD mode enter/exit
  disp: msm: Set the dsi panel type
  disp: msm: only set nolp command when panel in LP1/LP2 mode
  disp: msm: sde: Init ltm_buf_busy list head before adding new node
  disp: msm: update topology based on clock requirement
  makefile: add Bengal config support for display techpack
  drm/msm/sde: Fix UBSan warnings in sde
  disp: msm: sde: reserve primary CTL and LM for primary connector
  disp: msm: sde: fix inline rotator downscale ratio check
  disp: msm: add changes for bengal target compilation
  clk: qcom: mdss: remove recalculation of vco rate for 10nm pll
  disp: msm: sde: avoid plane update if crtc inactive
  drm: msm: dp: Fix DSC and FEC handling
  disp: msm: dp: Detect failure cases when setting mst topology manager
  disp: msm: dp: Fix dp mst vcpi slot management for inactive crtcs
  disp: msm: dp: Fix incorrect NULL pointer check
  disp: msm: sde: increase rsc min_threshold time
  disp: msm: sde: fix panel mode check during SUI validations
  disp: msm: dsi: refine the logic for mode filling and calculation
  drm/msm/dsi-staging: update dsi debug bus error message
  disp: drm: dp: wait for a graceful dp_mst disable
  disp: msm: sde: ensure input handler unregistration in command mode
  disp: msm: dp: fix locking in hotplug processing
  disp: msm: dsi: enable multi mode support for video mode panel
  disp: msm: sde: fix panel mode check during secure transition
  disp: msm: sde: Get connector roi state even PU disabled
  disp: msm: sde: Add check to avoid list double add
  disp: msm: sde: revert to previous smmu state upon failure to switch
  disp: msm: dp: fix for dp link layer cts failures
  disp: msm: dsi: Enable ESD check after POMS done
  disp: msm: dp: remove session lock for power state update
  disp: msm: dp: clear scrambler bypass for test pattern 4
  disp: pll: update dynamic dsi clock sequence
  drm: msm: dp: turn off audio before dp lane status toggling
  disp: msm: add length check for debugfs_ctrl
  drm:msm:dsi: Add check for max controller count
  drm: sde: Remove feature support for IGC/3D LUT for virtual planes
  drm: msm: dp: change voltage swing levels for lito/kona

Change-Id: Ie2f7020274c75192228a9b367132b1a53d1301c8
Signed-off-by: Alisha Thapaliya <athapali@codeaurora.org>

parents 643c2e2f cc1226ed

Makefile

+8 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,14 @@ ifeq ($(CONFIG_ARCH_LITO), y)
		LINUXINCLUDE += -include $(srctree)/techpack/display/config/saipdispconf.h
		endif

		ifeq ($(CONFIG_ARCH_BENGAL), y)
		include $(srctree)/techpack/display/config/bengaldisp.conf
		endif

		ifeq ($(CONFIG_ARCH_BENGAL), y)
		LINUXINCLUDE += -include $(srctree)/techpack/display/config/bengaldispconf.h
		endif

		obj-$(CONFIG_DRM_MSM) += msm/
		obj-$(CONFIG_MSM_SDE_ROTATOR) += rotator/
		obj-$(CONFIG_QCOM_MDSS_PLL) += pll/

config/bengaldisp.conf

0 → 100644

+16 −0

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0-only
		# Copyright (c) 2019, The Linux Foundation. All rights reserved.

		export CONFIG_DRM_MSM=y
		export CONFIG_DRM_MSM_SDE=y
		export CONFIG_SYNC_FILE=y
		export CONFIG_DRM_MSM_DSI=y
		export CONFIG_DRM_MSM_DP=n
		export CONFIG_QCOM_MDSS_DP_PLL=n
		export CONFIG_DSI_PARSER=y
		export CONFIG_DRM_SDE_WB=n
		export CONFIG_DRM_MSM_REGISTER_LOGGING=y
		export CONFIG_QCOM_MDSS_PLL=y
		export CONFIG_MSM_SDE_ROTATOR=y
		export CONFIG_MSM_SDE_ROTATOR_EVTLOG_DEBUG=y
		export CONFIG_DRM_SDE_RSC=n

config/bengaldispconf.h

0 → 100644

+15 −0

Original line number	Diff line number	Diff line
		/* SPDX-License-Identifier: GPL-2.0-only */
		/*
		* Copyright (c) 2019, The Linux Foundation. All rights reserved.
		*/

		#define CONFIG_DRM_MSM 1
		#define CONFIG_DRM_MSM_SDE 1
		#define CONFIG_SYNC_FILE 1
		#define CONFIG_DRM_MSM_DSI 1
		#define CONFIG_DSI_PARSER 1
		#define CONFIG_DRM_MSM_REGISTER_LOGGING 1
		#define CONFIG_DRM_SDE_EVTLOG_DEBUG 1
		#define CONFIG_QCOM_MDSS_PLL 1
		#define CONFIG_MSM_SDE_ROTATOR 1
		#define CONFIG_MSM_SDE_ROTATOR_EVTLOG_DEBUG 1

msm/dp/dp_audio.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -377,7 +377,7 @@ static struct dp_audio_private dp_audio_get_data(struct platform_device pdev)
		}

		dp_audio = ext_data->intf_data;
		if (!ext_data) {
		if (!dp_audio) {
		DP_ERR("invalid intf data\n");
		return ERR_PTR(-EINVAL);
		}
		@@ -424,6 +424,11 @@ static int dp_audio_get_edid_blk(struct platform_device *pdev,
		struct dp_audio_private *audio;
		struct sde_edid_ctrl *edid;

		if (!blk) {
		DP_ERR("invalid input\n");
		return -EINVAL;
		}

		audio = dp_audio_get_data(pdev);
		if (IS_ERR(audio)) {
		rc = PTR_ERR(audio);

msm/dp/dp_catalog.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1824,7 +1824,7 @@ static void dp_catalog_ctrl_send_phy_pattern(struct dp_catalog_ctrl *ctrl,
		dp_write(DP_MAINLINK_CTRL, value);
		break;
		case DP_TEST_PHY_PATTERN_CP2520_PATTERN_3:
		dp_write(DP_MAINLINK_CTRL, 0x11);
		dp_write(DP_MAINLINK_CTRL, 0x01);
		dp_write(DP_STATE_CTRL, 0x8);
		break;
		default: