samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

disp: msm: sde: log pp-line count in event logs

Browse Source 
Log ping-pong current line count during ctl-start
and rd-ptr interrupt. This will help in debugging
ping-pong timeout issues.

Change-Id: I58185330fe9e8a64f48d6da60c974b23a9e68b44
Signed-off-by: Veera Sundaram Sankaran <veeras@codeaurora.org>
This commit is contained in:
Veera Sundaram Sankaran
2019-05-08 16:57:07 -07:00
parent 74f328561e
commit 1e3d105dc0
5 changed files with 51 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
msm/sde/sde_encoder.c
View File

@@ -66,8 +66,6 @@
#define MAX_PHYS_ENCODERS_PER_VIRTUAL \
(MAX_H_TILES_PER_DISPLAY * NUM_PHYS_ENCODER_TYPES)
#define MAX_CHANNELS_PER_ENC 2
#define MISR_BUFF_SIZE 256
#define IDLE_SHORT_TIMEOUT 1
@@ -4784,6 +4782,32 @@ void sde_encoder_kickoff(struct drm_encoder *drm_enc, bool is_error)
SDE_ATRACE_END("encoder_kickoff");
}
void sde_encoder_helper_get_pp_line_count(struct drm_encoder *drm_enc,
struct sde_hw_pp_vsync_info *info)
{
struct sde_encoder_virt *sde_enc;
struct sde_encoder_phys *phys;
int i, ret;
if (!drm_enc || !info)
return;
sde_enc = to_sde_encoder_virt(drm_enc);
for (i = 0; i < sde_enc->num_phys_encs; i++) {
phys = sde_enc->phys_encs[i];
if (phys && phys->hw_intf && phys->hw_pp
&& phys->hw_intf->ops.get_vsync_info) {
ret = phys->hw_intf->ops.get_vsync_info(
phys->hw_intf, &info[i]);
if (!ret) {
info[i].pp_idx = phys->hw_pp->idx - PINGPONG_0;
info[i].intf_idx = phys->hw_intf->idx - INTF_0;
}
}
}
}
int sde_encoder_helper_reset_mixers(struct sde_encoder_phys *phys_enc,
struct drm_framebuffer *fb)
{

2
msm/sde/sde_encoder.h
View File

@@ -25,6 +25,8 @@
#include "sde_hw_mdss.h"
#include "sde_kms.h"
#define MAX_CHANNELS_PER_ENC 2
#define SDE_ENCODER_FRAME_EVENT_DONE BIT(0)
#define SDE_ENCODER_FRAME_EVENT_ERROR BIT(1)
#define SDE_ENCODER_FRAME_EVENT_PANEL_DEAD BIT(2)

8
msm/sde/sde_encoder_phys.h
View File

@@ -508,6 +508,14 @@ void sde_encoder_phys_setup_cdm(struct sde_encoder_phys *phys_enc,
struct drm_framebuffer *fb, const struct sde_format *format,
struct sde_rect *wb_roi);
/**
* sde_encoder_helper_get_pp_line_count - pingpong linecount helper function
* @drm_enc: Pointer to drm encoder structure
* @info: structure used to populate the pp line count information
*/
void sde_encoder_helper_get_pp_line_count(struct drm_encoder *drm_enc,
struct sde_hw_pp_vsync_info *info);
/**
* sde_encoder_helper_trigger_flush - control flush helper function
* This helper function may be optionally specified by physical

16
msm/sde/sde_encoder_phys_cmd.c
View File

@@ -256,6 +256,7 @@ static void sde_encoder_phys_cmd_te_rd_ptr_irq(void *arg, int irq_idx)
struct sde_encoder_phys_cmd *cmd_enc;
u32 event = 0, scheduler_status = INVALID_CTL_STATUS;
struct sde_hw_ctl *ctl;
struct sde_hw_pp_vsync_info info[MAX_CHANNELS_PER_ENC] = {{0}};
if (!phys_enc || !phys_enc->hw_pp || !phys_enc->hw_intf)
return;
@@ -282,10 +283,11 @@ static void sde_encoder_phys_cmd_te_rd_ptr_irq(void *arg, int irq_idx)
if (ctl && ctl->ops.get_scheduler_status)
scheduler_status = ctl->ops.get_scheduler_status(ctl);
sde_encoder_helper_get_pp_line_count(phys_enc->parent, info);
SDE_EVT32_IRQ(DRMID(phys_enc->parent),
phys_enc->hw_pp->idx - PINGPONG_0,
phys_enc->hw_intf->idx - INTF_0,
event, scheduler_status, 0xfff);
info[0].pp_idx, info[0].intf_idx, info[0].wr_ptr_line_count,
event, scheduler_status,
info[1].pp_idx, info[1].intf_idx, info[1].wr_ptr_line_count);
if (phys_enc->parent_ops.handle_vblank_virt)
phys_enc->parent_ops.handle_vblank_virt(phys_enc->parent,
@@ -305,6 +307,7 @@ static void sde_encoder_phys_cmd_ctl_start_irq(void *arg, int irq_idx)
struct sde_hw_ctl *ctl;
u32 event = 0;
s64 time_diff_us;
struct sde_hw_pp_vsync_info info[MAX_CHANNELS_PER_ENC] = {{0}};
if (!phys_enc || !phys_enc->hw_ctl)
return;
@@ -348,8 +351,11 @@ static void sde_encoder_phys_cmd_ctl_start_irq(void *arg, int irq_idx)
}
}
SDE_EVT32_IRQ(DRMID(phys_enc->parent), ctl->idx - CTL_0,
time_diff_us, event, 0xfff);
sde_encoder_helper_get_pp_line_count(phys_enc->parent, info);
SDE_EVT32_IRQ(DRMID(phys_enc->parent),
ctl->idx - CTL_0, time_diff_us, event,
info[0].pp_idx, info[0].intf_idx, info[0].wr_ptr_line_count,
info[1].pp_idx, info[1].intf_idx, info[1].wr_ptr_line_count);
/* Signal any waiting ctl start interrupt */
wake_up_all(&phys_enc->pending_kickoff_wq);

4
msm/sde/sde_hw_mdss.h
View File

@@ -667,12 +667,16 @@ struct sde_hw_autorefresh {
/**
* struct sde_hw_pp_vsync_info - Struct contains parameters to configure
* read and write pointers for command mode panels
* @pp_idx: Ping-pong block index
* @intf_idx: Interface block index
* @rd_ptr_init_val: Value of rd pointer at vsync edge
* @rd_ptr_frame_count: num frames sent since enabling interface
* @rd_ptr_line_count: current line on panel (rd ptr)
* @wr_ptr_line_count: current line within pp fifo (wr ptr)
*/
struct sde_hw_pp_vsync_info {
u32 pp_idx;
u32 intf_idx;
u32 rd_ptr_init_val;
u32 rd_ptr_frame_count;
u32 rd_ptr_line_count;