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

Unverified Commit e4409f82 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'LA.UM.9.14.r1-19500-LAHAINA.QSSI12.0' of... 

Merge tag 'LA.UM.9.14.r1-19500-LAHAINA.QSSI12.0' of https://git.codelinaro.org/clo/la/platform/vendor/opensource/display-drivers into android12-5.4-lahaina

"LA.UM.9.14.r1-19500-LAHAINA.QSSI12.0"

* tag 'LA.UM.9.14.r1-19500-LAHAINA.QSSI12.0' of https://git.codelinaro.org/clo/la/platform/vendor/opensource/display-drivers:
  disp: msm: use vzalloc for large allocations
  disp: msm: sde: Fix data width calculation when widebus is enabled
  drm: msm: call rsc hw_init after hibernation
  disp: msm: sde: remove redundant backlight update
  disp: msm: sde: take min ib votes from perf config
  disp: msm: sde: validate plane mode and gem obj flags
  disp: msm: dsi: fix compressed RGB101010 support
  disp: msm: sde: set parent to xo for link clks while enterting suspend
  disp: msm: sde: while timing engine enabling poll for active region
  disp: msm: sde: fix null pointer dereference
  disp: msm: sde: set NOAUTOEN for sde irq to match with power event
  disp: msm: sde: always set CTL_x_UIDLE_ACTIVE register to "1"
  disp: msm: sde: move sde power event call into kms post init
  disp: msm: sde: fix RM poll timeouts during PM suspend/resume usecase
  disp: msm: sde: remove clearing cur_master in encoder enable function
  disp: msm: sde: cancel delayed_off_work before reinitialization
  disp: msm: sde: update TEAR_SYNC_WRCOUNT register before vsync counter
  disp: msm: sde: disable vsync counter before tear check update
  disp: msm: sde: disable vsync_in to update tear check
  disp: msm: sde: avoid tx wait during DMS for targets with dsc rev2
  disp: msm: sde: avoid irq enable/disable during modeset
  disp: msm: fix rsc static wakeup time calculation
  disp: msm: dsi: allocate DSI command buffer during bind
  disp: msm: sde: update uidle_db_updates in both enable/disable cases
  disp: msm: dsi: add API to handle PHY programming during 0p9 collapse
  disp: msm: sde: modify format specifier
  disp: msm: dsi: Clear slave dma status only for broadcast command
  disp: msm: sde: avoid CWB in power on commit
  disp: msm: sde: avoid sde irq enable or disable when sde irq not active
  disp: msm: dsi: remove early return from dma_cmd_wait_for_done
  disp: msm: sde: protect file private structure with mutex lock
  disp: msm: add support for twm entry
  disp: msm: sde: add twm mode sysfs mode
  disp: msm: sde: add sysfs node to give panel power state
  disp: msm: dsi: Support uncompressed rgb101010 format
  disp: msm: sde: avoid rsvp_nxt allocation for suspend commit
  disp: rotator: remove ubwc format support for rotator
  disp: msm: sde: add changes to allocate compatible cwb mixers in RM
  disp: msm: sde: add evt log in rsc timer calculation
  msm: disp: rotator: add ROT macros for logs
  disp: msm: dp: replace pr_err with DP_ERR
  disp: msm: dsi: Do not call devm_clk_put() with invalid clk
  disp: msm: sde: disable CWB crop after cwb session is ended
  disp: rotator: remove warning log from spin_lock
  disp: msm: sde: protect file private structure with mutex lock
  disp: msm: dsi: add support for ultra low power state
  disp: msm: sde: switch rsc state before CTL_PREPARE in dual display
  disp: msm: sde: add checks to avoid null pointer dereference
  drm: msm: dsi: Update DSI parser util to skip disabled child nodes
  disp: msm: qpic: fix kw issues in QPIC display driver
  disp: msm: dsi: Fix deadlock issue in debugfs_esd_trigger_check function

Change-Id: I4acda3b051e4306f0c1f1a99c9aa61dfeb99ef90
parents 2cef6c9e 26e27499

techpack/display/msm/dp/dp_display.c

+1 −1
Original line number Diff line number Diff line
@@ -3051,7 +3051,7 @@ static int dp_display_setup_colospace(struct dp_display *dp_display, 
	struct dp_display_private *dp;



	if (!dp_display || !panel) {

		pr_err("invalid input\n");

		DP_ERR("invalid input\n");

		return -EINVAL;

	}

techpack/display/msm/dp/dp_drm.c

+2 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.

 * Copyright (c) 2017-2021, The Linux Foundation. All rights reserved.

 */



#include <drm/drm_atomic_helper.h>
@@ -336,7 +336,7 @@ int dp_connector_set_colorspace(struct drm_connector *connector, 


	sde_conn = to_sde_connector(connector);

	if (!sde_conn->drv_panel) {

		pr_err("invalid dp panel\n");

		DP_ERR("invalid dp panel\n");

		return -EINVAL;

	}

techpack/display/msm/dp/dp_panel.c

+2 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2012-2020, The Linux Foundation. All rights reserved.

 * Copyright (c) 2012-2021, The Linux Foundation. All rights reserved.

 */



#include "dp_panel.h"
@@ -2571,7 +2571,7 @@ static int dp_panel_set_colorspace(struct dp_panel *dp_panel, 
	struct dp_panel_private *panel;



	if (!dp_panel) {

		pr_err("invalid input\n");

		DP_ERR("invalid input\n");

		rc = -EINVAL;

		goto end;

	}

techpack/display/msm/dsi/dsi_catalog.c

+2 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2015-2020, The Linux Foundation. All rights reserved.

 * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved.

 */



#include <linux/errno.h>
@@ -293,6 +294,7 @@ static void dsi_catalog_phy_4_0_init(struct dsi_phy_hw *phy) 
		dsi_phy_hw_v4_0_cache_phy_timings;

	phy->ops.set_continuous_clk = dsi_phy_hw_v4_0_set_continuous_clk;

	phy->ops.commit_phy_timing = dsi_phy_hw_v4_0_commit_phy_timing;

	phy->ops.phy_idle_off = dsi_phy_hw_v4_0_phy_idle_off;

}



/**

techpack/display/msm/dsi/dsi_catalog.h

+2 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copyright (c) 2015-2020, The Linux Foundation. All rights reserved.

 * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved.

 */



#ifndef _DSI_CATALOG_H_
@@ -125,6 +126,7 @@ void dsi_phy_hw_v4_0_reset_clk_en_sel(struct dsi_phy_hw *phy); 
void dsi_phy_hw_v4_0_set_continuous_clk(struct dsi_phy_hw *phy, bool enable);

void dsi_phy_hw_v4_0_commit_phy_timing(struct dsi_phy_hw *phy,

		struct dsi_phy_per_lane_cfgs *timing);

void dsi_phy_hw_v4_0_phy_idle_off(struct dsi_phy_hw *phy);



/* DSI controller common ops */

u32 dsi_ctrl_hw_cmn_get_interrupt_status(struct dsi_ctrl_hw *ctrl);