sun60iw2: remove temporary logo scanout traces

drivers/video/drm/sunxi_device/hardware/lowlevel_de/ovl/de_ovl.c

@@ -530,8 +530,6 @@ static int de_ovl_u_set_lay_layout(struct ovl_u_reg *reg, unsigned int x0, unsig
 	addr_tmp = (u64)(fb->dma_addr) + fb->offsets[0];
 	addr = addr_tmp
 		+ pitch * y0 + (x0 * bpp >> 3);
-	printf("armbian logo: ovl layer %u fmt %d bpp %u pitch %u addr 0x%llx src %u,%u\n",
-	       layer_id, format, bpp, pitch, addr, x0, y0);
 
 	reg->lay[layer_id].pitch.dwval = pitch;
 	reg->lay[layer_id].top_laddr.dwval = (u32)addr;
@@ -616,10 +614,6 @@ static int de_ovl_u_apply_lay(struct de_ovl_handle *handle, struct display_chann
 			reg->lay[i].fcolor.dwval = state->color[i];
 
 		de_ovl_u_set_lay_layout(reg, x, y, fmt, fb, i);
-		printf("armbian logo: ovl apply layer %u ctl 0x%x size %ux%u win %u,%u alpha %u ignore_pixel_alpha %u\n",
-		       i, reg->lay[i].ctl.dwval, width, height,
-		       cfg->lay_win[i].left, cfg->lay_win[i].top,
-		       alpha, ignore_pixel_alpha);
 
 		ovl_set_block_dirty(priv, i, 1);
 	}

drivers/video/drm/sunxi_device/hardware/lowlevel_de/sunxi_de.c

@@ -481,12 +481,9 @@ void sunxi_de_atomic_flush(struct sunxi_de_out *hwde,  struct sunxi_de_flush_cfg
 	bool use_rcq = engine->match_data->update_mode == RCQ_MODE;
 	bool use_double_buffer = engine->match_data->update_mode == DOUBLE_BUFFER_MODE;
 	if (!hwde->enable) {
-		printf("armbian logo: de %d flush skipped, not enabled\n", disp);
 		DRM_INFO("%s de %d not enable, skip\n", __func__, disp);
 		return;
 	}
-	printf("armbian logo: de %d flush start rcq %u double_buffer %u\n",
-	       disp, use_rcq, use_double_buffer);
 
 	sunxi_de_exconfig_check_and_update(hwde, cfg);
 	check_update_finished(hwde);
@@ -521,10 +518,8 @@ void sunxi_de_atomic_flush(struct sunxi_de_out *hwde,  struct sunxi_de_flush_cfg
 
 	//de_rtmx_check_rcq_head_dirty(hwde);
 	if (timeout) {
-		printf("armbian logo: de %d flush timeout\n", disp);
 		DRM_INFO("%s timeout\n", __func__);
 	} else {
-		printf("armbian logo: de %d flush done\n", disp);
 		de_rtmx_set_all_reg_dirty(hwde, 0);
 		sunxi_de_process_late(hwde);
 	}

drivers/video/drm/sunxi_drm_drv.c

@@ -84,32 +84,19 @@ static struct file_info_t *load_armbian_boot_logo_from(const char *dev_part,
 	if (!dev_part || !path)
 		return NULL;
 
-	printf("armbian logo: try mmc %s %s\n", dev_part, path);
-
-	if (fs_set_blk_dev("mmc", dev_part, fstype)) {
-		printf("armbian logo: fs_set_blk_dev failed for mmc %s\n",
-		       dev_part);
+	if (fs_set_blk_dev("mmc", dev_part, fstype))
 		return NULL;
-	}
 
 	if (fs_read(path, (ulong)&header, 0, sizeof(header), &read_size) ||
-	    read_size != sizeof(header)) {
-		printf("armbian logo: header read failed mmc %s %s\n", dev_part,
-		       path);
+	    read_size != sizeof(header))
 		return NULL;
-	}
 
-	if (header.signature[0] != 'B' || header.signature[1] != 'M') {
-		printf("armbian logo: not a BMP mmc %s %s\n", dev_part, path);
+	if (header.signature[0] != 'B' || header.signature[1] != 'M')
 		return NULL;
-	}
 
 	file_size = le32_to_cpu(header.file_size);
-	if (file_size < sizeof(header) || file_size > (8 * 1024 * 1024)) {
-		printf("armbian logo: bad BMP size %llu mmc %s %s\n",
-		       (unsigned long long)file_size, dev_part, path);
+	if (file_size < sizeof(header) || file_size > (8 * 1024 * 1024))
 		return NULL;
-	}
 
 	file = malloc(sizeof(*file));
 	if (!file)
@@ -126,17 +113,12 @@ static struct file_info_t *load_armbian_boot_logo_from(const char *dev_part,
 	strncpy(file->name, path, strlen(path) + 1);
 	sprintf(file->path, "mmc%s", dev_part);
 
-	if (fs_set_blk_dev("mmc", dev_part, fstype)) {
-		printf("armbian logo: fs_set_blk_dev failed before read mmc %s\n",
-		       dev_part);
+	if (fs_set_blk_dev("mmc", dev_part, fstype))
 		goto err_free;
-	}
 
 	if (fs_read(path, (ulong)file->file_addr, 0, file_size, &read_size) ||
-	    read_size != file_size) {
-		printf("armbian logo: read failed mmc %s %s\n", dev_part, path);
+	    read_size != file_size)
 		goto err_free;
-	}
 
 #if !CONFIG_IS_ENABLED(SYS_DCACHE_OFF)
 	flush_dcache_range((ulong)file->file_addr,
@@ -1060,9 +1042,6 @@ static int display_set_plane(struct display_state *state)
 		DRM_ERROR("Failed to set plane %d fb %d on crtc %d: %d\n",
 			  plane_req.plane_id, plane_req.fb_id,
 			  plane_req.crtc_id, ret);
-	else
-		printf("armbian logo: set plane %d fb %d on crtc %d\n",
-		       plane_req.plane_id, plane_req.fb_id, plane_req.crtc_id);
 
 	return ret;
 
@@ -1425,9 +1404,6 @@ static int display_logo(struct display_state *state)
 	struct video_uc_platdata *plat = dev_get_uclass_platdata(drm->dev);
 	struct bmp_image *bmp = NULL;
 	struct drm_framebuffer *fb = NULL;
-	u32 *fbmem;
-	unsigned int pixels;
-	unsigned int i;
 	int ret = 0, left_offset = 0, upper_offset = 0;
 
 	if (!state->is_init)
@@ -1450,15 +1426,6 @@ static int display_logo(struct display_state *state)
 		return -ENOMEM;
 	}
 
-	fbmem = (u32 *)(uintptr_t)fb->dma_addr;
-	pixels = fb->pitches[0] / sizeof(*fbmem) * fb->height;
-	for (i = 0; i < pixels; i++)
-		fbmem[i] = 0xffff0000;
-	printf("armbian logo: filled framebuffer red for DE scanout test\n");
-	flush_dcache_range((ulong)fb->dma_addr,
-			   ALIGN((ulong)(fb->dma_addr + fb->buf_size),
-				 CONFIG_SYS_CACHELINE_SIZE));
-
 	// FIXME: dual display, modify it if some new demands need later
 	plat->base = fb->dma_addr;
 	plat->size = fb->buf_size;
@@ -1475,16 +1442,6 @@ static int display_logo(struct display_state *state)
 	if (fb->height > bmp->header.height)
 		upper_offset = ((fb->height - bmp->header.height) >> 1);
 
-	printf("armbian logo: fb %dx%d fmt %c%c%c%c addr 0x%lx pitch %u size %u, bmp %ux%u bpp %u offset %d,%d\n",
-	       fb->width, fb->height,
-	       fb->format->format & 0xff,
-	       (fb->format->format >> 8) & 0xff,
-	       (fb->format->format >> 16) & 0xff,
-	       (fb->format->format >> 24) & 0xff,
-	       (ulong)fb->dma_addr, fb->pitches[0], fb->buf_size,
-	       bmp->header.width, bmp->header.height,
-	       bmp->header.bit_count, left_offset, upper_offset);
-
 	ret = bmp_display((ulong)state->logo->file_addr, left_offset, upper_offset);
 	if (ret) {
 		DRM_ERROR("bmp_display failed: %d\n", ret);
@@ -1500,8 +1457,6 @@ static int display_logo(struct display_state *state)
 		return ret;
 	}
 
-	printf("armbian logo: display enabled\n");
-
 	return ret;
 }