Skip to content

Commit 4a5cd3a

Browse files
kerneltoastExactExampl
authored andcommitted
disp: msm: Eliminate unnecessary snprintf() usage from hot paths
There's no reason to constantly use snprintf() to generate pretty debug strings from hot paths. We don't need them, so remove them. Signed-off-by: Sultan Alsawaf <sultan@kerneltoast.com> [Kazuki: Fixed warning] Signed-off-by: Kazuki Hashimoto <kazukih@tuta.io> Signed-off-by: Alexander Winkowski <dereference23@outlook.com>
1 parent 69d0b3a commit 4a5cd3a

3 files changed

Lines changed: 8 additions & 15 deletions

File tree

techpack/display/msm/dsi/dsi_drm.c

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,6 @@ static void convert_to_dsi_mode(const struct drm_display_mode *drm_mode,
9292
void dsi_convert_to_drm_mode(const struct dsi_display_mode *dsi_mode,
9393
struct drm_display_mode *drm_mode)
9494
{
95-
bool video_mode = (dsi_mode->panel_mode == DSI_OP_VIDEO_MODE);
96-
9795
memset(drm_mode, 0, sizeof(*drm_mode));
9896

9997
drm_mode->hdisplay = dsi_mode->timing.h_active;
@@ -144,10 +142,7 @@ void dsi_convert_to_drm_mode(const struct dsi_display_mode *dsi_mode,
144142
drm_mode->flags |= DRM_MODE_FLAG_CMD_MODE_PANEL;
145143

146144
/* set mode name */
147-
snprintf(drm_mode->name, DRM_DISPLAY_MODE_LEN, "%dx%dx%dx%d%s",
148-
drm_mode->hdisplay, drm_mode->vdisplay,
149-
drm_mode->vrefresh, drm_mode->clock,
150-
video_mode ? "vid" : "cmd");
145+
*drm_mode->name = '\0';
151146
}
152147

153148
static int dsi_bridge_attach(struct drm_bridge *bridge)

techpack/display/msm/sde/sde_encoder.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5951,8 +5951,10 @@ int sde_encoder_wait_for_event(struct drm_encoder *drm_enc,
59515951
}
59525952

59535953
if (phys && fn_wait) {
5954+
#ifdef CONFIG_TRACEPOINTS
59545955
snprintf(atrace_buf, sizeof(atrace_buf),
59555956
"wait_completion_event_%d", event);
5957+
#endif
59565958
SDE_ATRACE_BEGIN(atrace_buf);
59575959
ret = fn_wait(phys);
59585960
SDE_ATRACE_END(atrace_buf);

techpack/display/msm/sde/sde_fence.c

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ uint32_t sde_sync_get_name_prefix(void *fence)
8484
struct sde_fence {
8585
struct dma_fence base;
8686
struct sde_fence_context *ctx;
87-
char name[SDE_FENCE_NAME_SIZE];
8887
struct list_head fence_list;
8988
int fd;
9089
};
@@ -109,9 +108,7 @@ static inline struct sde_fence *to_sde_fence(struct dma_fence *fence)
109108

110109
static const char *sde_fence_get_driver_name(struct dma_fence *fence)
111110
{
112-
struct sde_fence *f = to_sde_fence(fence);
113-
114-
return f->name;
111+
return "sde_fence";
115112
}
116113

117114
static const char *sde_fence_get_timeline_name(struct dma_fence *fence)
@@ -202,17 +199,15 @@ static int _sde_fence_create_fd(void *fence_ctx, uint32_t val)
202199
return -ENOMEM;
203200

204201
sde_fence->ctx = fence_ctx;
205-
snprintf(sde_fence->name, SDE_FENCE_NAME_SIZE, "sde_fence:%s:%u",
206-
sde_fence->ctx->name, val);
207202
dma_fence_init(&sde_fence->base, &sde_fence_ops, &ctx->lock,
208203
ctx->context, val);
209204
kref_get(&ctx->kref);
210205

211206
/* create fd */
212207
fd = get_unused_fd_flags(0);
213208
if (fd < 0) {
214-
SDE_ERROR("failed to get_unused_fd_flags(), %s\n",
215-
sde_fence->name);
209+
SDE_ERROR("failed to get_unused_fd_flags(), sde_fence:%s:%u\n",
210+
sde_fence->ctx->name, val);
216211
dma_fence_put(&sde_fence->base);
217212
goto exit;
218213
}
@@ -222,7 +217,8 @@ static int _sde_fence_create_fd(void *fence_ctx, uint32_t val)
222217
if (sync_file == NULL) {
223218
put_unused_fd(fd);
224219
fd = -EINVAL;
225-
SDE_ERROR("couldn't create fence, %s\n", sde_fence->name);
220+
SDE_ERROR("couldn't create fence, sde_fence:%s:%u\n",
221+
sde_fence->ctx->name, val);
226222
dma_fence_put(&sde_fence->base);
227223
goto exit;
228224
}

0 commit comments

Comments
 (0)