in fbtft-io Critical section, to reset and set spi msg struct

Author: Vincent-FK

arch/arm/boot/dts/sun8i-v3s-funkey.dts

@@ -190,8 +190,8 @@
                buswidth = <8>;
                reset-gpios = <&pio 1 2 GPIO_ACTIVE_HIGH>;	//PB2
                dc-gpios = <&pio 2 0 GPIO_ACTIVE_LOW>;		//PC0 (MISO)
-               te-irq = <&pio 1 1 GPIO_ACTIVE_LOW>;		//PB1
                debug = <0>;
+               te-irq = <&pio 1 1 GPIO_ACTIVE_LOW>;		//PB1
        };
 };
 

drivers/staging/fbtft/fbtft-bus.c

@@ -143,15 +143,20 @@ int fbtft_start_new_screen_transfer_async(struct fbtft_par *par)
 
 		if (par->nb_fps_values == 200) {
 			fbtft_par_dbg(DEBUG_TIME_EACH_UPDATE, par,
-				 "Display update: fps=%ld\n", par->avg_fps / par->nb_fps_values);
+				 "Display update%s: fps=%ld\n", 
+				 par->pdata->te_irq_enabled?" (TE)":"",
+				 par->avg_fps / par->nb_fps_values);
+			printk("Display update%s: fps=%ld\n", 
+				 par->pdata->te_irq_enabled?" (TE)":"",
+				 par->avg_fps / par->nb_fps_values);
 			par->avg_fps = 0;
 			par->nb_fps_values = 0;
 		}
 	}
 
 #endif //FPS_DEBUG
 
-	/* Post process screen for doufle buf cpy, notifs, rotation soft... */
+	/* Post process screen for doufle buf copy, notifs, rotation soft... */
 	fbtft_post_process_screen(par);
 
 	/* new line to write */
@@ -256,17 +261,17 @@ static void spi_complete_cmd_init_data_write(void *arg)
 
 int fbtft_write_init_cmd_data_transfers(struct fbtft_par *par)
 {
-	static u8 init_data_cmd_buf = MIPI_DCS_WRITE_MEMORY_START;
+	static const u8 init_data_cmd_buf = MIPI_DCS_WRITE_MEMORY_START;
 	int ret = 0;
 
 	// printk("%s\n", __func__);
 
-	/* Resetting to 0 for incoming cmd init data write */
+	/* Resetting to 0 for incoming cmd: "init data write" */
 	if (gpio_is_valid(par->gpio.dc))
 		gpio_set_value(par->gpio.dc, 0);
 
 	/* Start sending cmd init data */
-	ret = par->fbtftops.write_async(par, &init_data_cmd_buf, 1,
+	ret = par->fbtftops.write_async(par, (u8 *) &init_data_cmd_buf, 1,
 					spi_complete_cmd_init_data_write);
 	if (ret < 0)
 		dev_err(par->info->device, "write() failed and returned %d\n", ret);
@@ -351,7 +356,8 @@ int fbtft_write_vmem16_bus8_async(struct fbtft_par *par, size_t offset, size_t l
 		startbyte_size = 1;
 	}
 
-	while (remain) {
+	/* No while here, must be one shot */
+	//while (remain) {
 		to_copy = min(tx_array_size, remain);
 		dev_dbg(par->info->device, "    to_copy=%zu, remain=%zu\n",
 						to_copy, remain - to_copy);
@@ -360,12 +366,12 @@ int fbtft_write_vmem16_bus8_async(struct fbtft_par *par, size_t offset, size_t l
 			txbuf16[i] = cpu_to_be16(vmem16[i]);
 
 		vmem16 = vmem16 + to_copy;
-		ret = par->fbtftops.write_async(par, par->txbuf.buf,
+		ret = par->fbtftops.write_async(par, (u8 *) par->txbuf.buf,
 						startbyte_size + to_copy * 2, spi_complete_data_write);
 		if (ret < 0)
 			return ret;
 		remain -= to_copy;
-	}
+	//}
 
 	return ret;
 }

drivers/staging/fbtft/fbtft-core.c

@@ -582,24 +582,27 @@ void fbtft_post_process_screen(struct fbtft_par *par)
 
 		/* Copy buffer */
 
-		/* This should be handled using a double buffer (or
-		   triple depending on game fps vs screen fps) pointed
-		   by par->info->screen_buffer. The buffer pointed
-		   (the one being written) should change using the
-		   FBIOPAN_DISPLAY ioctl called by SDL_Flip() (in
-		   FB_FlipHWSurface). This is a dirty but very
-		   efficient alternative for now: we make a quick
-		   memcpy of the screen_buffer in another one. It goes
-		   so fast that the "applicative" tearing that could
-		   happen if this function were to launch in the
-		   middle of a user space SDL_BlitSurface(sw_surface,
-		   NULL, hw_surface, NULL) call is so unbelievably
-		   rare that completey unnoticeable and it takes up so
-		   little CPU that really, it's worth the compromise
-		   for now */
+		/* 
+		This should be handled using a double buffer (or
+		triple depending on game fps vs screen fps) pointed
+		by par->info->screen_buffer. The buffer pointed
+		(the one being written) should change using the
+		FBIOPAN_DISPLAY ioctl called by SDL_Flip() (in
+		FB_FlipHWSurface). This is a dirty but very
+		efficient alternative for now: we make a quick
+		memcpy of the screen_buffer in another one. It goes
+		so fast that the "applicative" tearing that could
+		happen if this function were to launch in the
+		middle of a user space SDL_BlitSurface(sw_surface,
+		NULL, hw_surface, NULL) call is rare enough not to 
+		be noticed much and it takes up so little CPU that 
+		really, it's worth the compromise for now 
+		*/
+		//printk("m\n");
 		memcpy(par->vmem_post_process + par->write_line_start * par->info->fix.line_length,
 			par->info->screen_buffer + par->write_line_start * par->info->fix.line_length,
 			(par->write_line_end-par->write_line_start + 1) * par->info->fix.line_length);
+		//printk("n\n");
 
 		/* Notifications */
 		if (par->notification[0]) {
@@ -634,7 +637,7 @@ static void fbtft_deferred_io(struct fb_info *info, struct list_head *pagelist)
 	unsigned long index;
 	unsigned int y_low = 0, y_high = 0;
 	int count = 0;
-
+	
 	//#define FPS_DEBUG
 	#if 0
 		long fps;
@@ -1336,7 +1339,7 @@ int fbtft_register_framebuffer(struct fb_info *fb_info)
 		 fb_info->fix.id, fb_info->var.xres, fb_info->var.yres,
 		 fb_info->fix.smem_len >> 10, text1,
 		 HZ / fb_info->fbdefio->delay, text2,
-		 par->spi_async_mode ? "SPI mode asynchrone, " : "",
+		 par->spi_async_mode ? "SPI mode async, " : "",
 		 par->interlacing ? "Interlaced" : "");
 
 #ifdef CONFIG_FB_BACKLIGHT
@@ -1864,10 +1867,12 @@ int fbtft_probe_common(struct fbtft_display *display,
 		/* Start constant Display update using spi async */
 		par->write_line_start = 0;
 		par->write_line_end = par->info->var.yres - 1;
-		if (par->pdata->te_irq_enabled)
+		if (par->pdata->te_irq_enabled){
 			par->ready_for_spi_async = true;
-		else
+		}
+		else{
 			fbtft_start_new_screen_transfer_async(par);
+		}
 	}
 	return 0;
 

drivers/staging/fbtft/fbtft-io.c

@@ -3,6 +3,7 @@
 #include <linux/errno.h>
 #include <linux/gpio.h>
 #include <linux/spi/spi.h>
+#include <linux/spinlock.h>
 #include "fbtft.h"
 
 /* Ugly static declarations for now */
@@ -31,10 +32,15 @@ int fbtft_write_spi_async(struct fbtft_par *par, void *buf, size_t len, void (*
 		return -1;
 	}
 
+	/** Critical section, to reset and set spi msg struct */
+	spin_lock(&par->dirty_lock);
+
 	spi_message_init(m);
 	m->complete = cb;
 	m->context = par;
 	spi_message_add_tail(t, m);
+	
+	spin_unlock(&par->dirty_lock);
 
 	return spi_async(par->spi, m);
 #endif