A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-08 21:22:09 -04:00
Code Issues Projects Releases Packages Wiki Activity

Revert "(CR) dsi: pushing display notifications"

Browse source 
This reverts commit 2da822bf859e4c166c09706f62292a657273104e.
From Kernel-5.4, Send panel_notify at msm_atomic.c.
So do not add this old notify method.
Mot-CRs-fixed: (CR)

Change-Id: I16778dc0a404b1ab20e59bc73a40d32385bdc01b
Signed-off-by: houdz1 <houdz1@motorola.com>
Reviewed-on: https://gerrit.mot.com/1783211
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Jun Weng <wengjun1@motorola.com>
Reviewed-by: Yeqing Wang <wangyq13@motorola.com>
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
Submit-Approved: Jira Key
This commit is contained in:
houdz1 2020-10-23 15:37:52 +08:00 • committed by tongkun1
commit 1339782e2c
3 changed files with 2 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

8
msm/dsi/dsi_display.c
View file

@ -6519,15 +6519,11 @@ int dsi_display_dev_probe(struct platform_device *pdev)
display->display_type = of_get_property(pdev->dev.of_node,
"label", NULL);
if (!display->display_type) {
if (!display->display_type)
display->display_type = "primary";
display->display_idx = 0;
}
if (!strcmp(display->display_type, "secondary")) {
if (!strcmp(display->display_type, "secondary"))
index = DSI_SECONDARY;
display->display_idx = 1;
}
boot_disp = &boot_displays[index];
node = pdev->dev.of_node;

2
msm/dsi/dsi_display.h
View file

@ -145,7 +145,6 @@ struct dsi_display_ext_bridge {
* @ext_conn: Pointer to external connector attached to DSI connector
* @name: Name of the display.
* @display_type: Display type as defined in device tree.
* @display_idx: Display index (0-primary, 1-secondary)
* @list: List pointer.
* @is_active: Is display active.
* @is_cont_splash_enabled: Is continuous splash enabled
@ -210,7 +209,6 @@ struct dsi_display {
const char *name;
const char *display_type;
int display_idx;
struct list_head list;
bool is_cont_splash_enabled;
bool sw_te_using_wd;

34
msm/dsi/dsi_panel.c
View file

@ -11,17 +11,6 @@
#include <linux/pwm.h>
#include <video/mipi_display.h>
#if defined(CONFIG_PANEL_NOTIFICATIONS)
#include <linux/panel_notifier.h>
#define PANEL_NOTIFY(note) { \
int idx = dsi_panel_get_index(panel); \
panel_notify(note, (void *)&idx); \
}
#else
#define PANEL_NOTIFY(...)
#endif
#include "dsi_display.h"
#include "dsi_panel.h"
#include "dsi_ctrl_hw.h"
@ -5502,19 +5491,6 @@ int dsi_panel_post_switch(struct dsi_panel *panel)
return rc;
}
#if defined(CONFIG_PANEL_NOTIFICATIONS)
static inline int dsi_panel_get_index(struct dsi_panel *panel)
{
struct dsi_display *dsi_display =
container_of(panel->host, struct dsi_display, host);
if (unlikely(dsi_display == NULL))
return -EINVAL;
return dsi_display->display_idx;
}
#endif
int dsi_panel_enable(struct dsi_panel *panel)
{
int rc = 0;
@ -5573,9 +5549,6 @@ int dsi_panel_enable(struct dsi_panel *panel)
DSI_INFO("-: no_panel_on_read_support is set\n");
panel->panel_initialized = true;
PANEL_NOTIFY(PANEL_EVENT_PRE_DISPLAY_ON);
err:
mutex_unlock(&panel->panel_lock);
@ -5607,9 +5580,6 @@ int dsi_panel_post_enable(struct dsi_panel *panel)
panel->name, rc);
}
}
PANEL_NOTIFY(PANEL_EVENT_DISPLAY_ON);
error:
mutex_unlock(&panel->panel_lock);
return rc;
@ -5636,8 +5606,6 @@ int dsi_panel_pre_disable(struct dsi_panel *panel)
goto error;
}
PANEL_NOTIFY(PANEL_EVENT_PRE_DISPLAY_OFF);
error:
mutex_unlock(&panel->panel_lock);
return rc;
@ -5686,8 +5654,6 @@ int dsi_panel_disable(struct dsi_panel *panel)
panel->panel_initialized = false;
panel->power_mode = SDE_MODE_DPMS_OFF;
PANEL_NOTIFY(PANEL_EVENT_DISPLAY_OFF);
mutex_unlock(&panel->panel_lock);
return rc;
}