djsundog/sharp-drm-driver-radxa-zero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix refresh

Browse Source
This commit is contained in:
Andrew D'Angelo 2023-07-13 18:14:46 -05:00
commit 0f82af168d
4 changed files with 57 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
drm_iface.c
View File

@ -6,7 +6,7 @@
*/ */
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/gpio.h> #include <linux/gpio/consumer.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/property.h> #include <linux/property.h>
#include <linux/sched/clock.h> #include <linux/sched/clock.h>
@ -35,10 +35,6 @@
#include "indicators.h" #include "indicators.h"
#define GPIO_DISP 22
#define GPIO_SCS 8
#define GPIO_VCOM 23
#define CMD_WRITE_LINE 0b10000000 #define CMD_WRITE_LINE 0b10000000
#define CMD_CLEAR_SCREEN 0b00100000 #define CMD_CLEAR_SCREEN 0b00100000
@ -61,6 +57,9 @@ struct sharp_memory_panel {
unsigned char *trailer_buf; unsigned char *trailer_buf;
char indicators[MAX_INDICATORS]; char indicators[MAX_INDICATORS];
struct gpio_desc *gpio_disp;
struct gpio_desc *gpio_vcom;
}; };
static struct sharp_memory_panel* g_panel = NULL; static struct sharp_memory_panel* g_panel = NULL;
@ -78,7 +77,7 @@ static void vcom_timer_callback(struct timer_list *t)
// Toggle the GPIO pin // Toggle the GPIO pin
vcom_setting = (vcom_setting) ? 0 : 1; vcom_setting = (vcom_setting) ? 0 : 1;
gpio_set_value(GPIO_VCOM, vcom_setting); gpiod_set_value(panel->gpio_vcom, 1);
// Reschedule the timer // Reschedule the timer
mod_timer(&panel->vcom_timer, jiffies + msecs_to_jiffies(1000)); mod_timer(&panel->vcom_timer, jiffies + msecs_to_jiffies(1000));
@ -98,9 +97,8 @@ static int sharp_memory_spi_clear_screen(struct sharp_memory_panel *panel)
// Write clear screen command // Write clear screen command
ndelay(80); ndelay(80);
gpio_set_value(GPIO_SCS, 1);
rc = spi_sync_transfer(panel->spi, panel->spi_3_xfers, 2); rc = spi_sync_transfer(panel->spi, panel->spi_3_xfers, 2);
gpio_set_value(GPIO_SCS, 0);
return rc; return rc;
} }
@ -133,9 +131,8 @@ static int sharp_memory_spi_write_tagged_lines(struct sharp_memory_panel *panel,
panel->spi_3_xfers[2].len = 1; panel->spi_3_xfers[2].len = 1;
ndelay(80); ndelay(80);
gpio_set_value(GPIO_SCS, 1);
rc = spi_sync_transfer(panel->spi, panel->spi_3_xfers, 3); rc = spi_sync_transfer(panel->spi, panel->spi_3_xfers, 3);
gpio_set_value(GPIO_SCS, 0);
return rc; return rc;
} }
@ -321,9 +318,8 @@ static void power_off(struct sharp_memory_panel *panel)
printk(KERN_INFO "sharp_memory: powering off\n"); printk(KERN_INFO "sharp_memory: powering off\n");
/* Turn off power and all signals */ /* Turn off power and all signals */
gpio_set_value(GPIO_SCS, 0); gpiod_set_value(panel->gpio_disp, 0);
gpio_set_value(GPIO_DISP, 0); gpiod_set_value(panel->gpio_vcom, 0);
gpio_set_value(GPIO_VCOM, 0);
} }
static void sharp_memory_pipe_enable(struct drm_simple_display_pipe *pipe, static void sharp_memory_pipe_enable(struct drm_simple_display_pipe *pipe,
@ -345,14 +341,13 @@ static void sharp_memory_pipe_enable(struct drm_simple_display_pipe *pipe,
} }
// Power up sequence // Power up sequence
gpio_set_value(GPIO_SCS, 0); gpiod_set_value(panel->gpio_disp, 1);
gpio_set_value(GPIO_DISP, 1); gpiod_set_value(panel->gpio_vcom, 0);
gpio_set_value(GPIO_VCOM, 0);
usleep_range(5000, 10000); usleep_range(5000, 10000);
// Clear display // Clear display
if (sharp_memory_spi_clear_screen(panel)) { if (sharp_memory_spi_clear_screen(panel)) {
gpio_set_value(GPIO_DISP, 0); // Power down display, VCOM is not running gpiod_set_value(panel->gpio_disp, 0); // Power down display, VCOM is not running
goto out_exit; goto out_exit;
} }
@ -462,9 +457,9 @@ static const struct drm_driver sharp_memory_driver = {
DRM_GEM_DMA_DRIVER_OPS_VMAP, DRM_GEM_DMA_DRIVER_OPS_VMAP,
.name = "sharp_memory", .name = "sharp_memory",
.desc = "Sharp Memory LCD panel", .desc = "Sharp Memory LCD panel",
.date = "20230526", .date = "20230713",
.major = 1, .major = 1,
.minor = 0, .minor = 1,
}; };
int drm_probe(struct spi_device *spi) int drm_probe(struct spi_device *spi)
@ -498,6 +493,15 @@ int drm_probe(struct spi_device *spi)
} }
g_panel = panel; g_panel = panel;
// Initialize GPIO
panel->gpio_disp = devm_gpiod_get(dev, "disp", GPIOD_OUT_HIGH);
if (IS_ERR(panel->gpio_disp))
return dev_err_probe(dev, PTR_ERR(panel->gpio_disp), "Failed to get GPIO 'disp'\n");
panel->gpio_vcom = devm_gpiod_get(dev, "vcom", GPIOD_OUT_LOW);
if (IS_ERR(panel->gpio_vcom))
return dev_err_probe(dev, PTR_ERR(panel->gpio_vcom), "Failed to get GPIO 'vcom'\n");
// Initalize DRM mode // Initalize DRM mode
drm = &panel->drm; drm = &panel->drm;
ret = drmm_mode_config_init(drm); ret = drmm_mode_config_init(drm);
@ -567,6 +571,8 @@ int drm_probe(struct spi_device *spi)
void drm_remove(struct spi_device *spi) void drm_remove(struct spi_device *spi)
{ {
struct drm_device *drm; struct drm_device *drm;
struct device *dev;
struct sharp_memory_panel *panel;
printk(KERN_INFO "sharp_memory: drm_remove\n"); printk(KERN_INFO "sharp_memory: drm_remove\n");
@ -576,15 +582,32 @@ void drm_remove(struct spi_device *spi)
// Get DRM and panel device from SPI // Get DRM and panel device from SPI
drm = spi_get_drvdata(spi); drm = spi_get_drvdata(spi);
// Clean up the GPIO descriptors
dev = &spi->dev;
panel = drm_to_panel(drm);
devm_gpiod_put(dev, panel->gpio_disp);
devm_gpiod_put(dev, panel->gpio_vcom);
drm_dev_unplug(drm); drm_dev_unplug(drm);
drm_atomic_helper_shutdown(drm); drm_atomic_helper_shutdown(drm);
} }
static int force_redraw(struct drm_framebuffer* fb, struct drm_clip_rect* dirty_rect)
{
if (!fb || !fb->funcs->dirty) {
return -1;
}
// Call framebuffer region update handler
return fb->funcs->dirty(fb, NULL, 0, 0, dirty_rect, 1);
}
int drm_refresh(void) int drm_refresh(void)
{ {
struct drm_rect dirty_rect; struct drm_clip_rect dirty_rect;
if (!g_panel || !g_panel->fb) { if (!g_panel) {
return 0; return 0;
} }
@ -593,14 +616,14 @@ int drm_refresh(void)
dirty_rect.x2 = g_panel->fb->width; dirty_rect.x2 = g_panel->fb->width;
dirty_rect.y1 = 0; dirty_rect.y1 = 0;
dirty_rect.y2 = g_panel->fb->height; dirty_rect.y2 = g_panel->fb->height;
return force_redraw(g_panel->fb, &dirty_rect);
return sharp_memory_fb_dirty(g_panel->fb, &dirty_rect);
} }
int drm_set_indicator(size_t idx, char c) int drm_set_indicator(size_t idx, char c)
{ {
struct drm_rect dirty_rect; struct drm_clip_rect dirty_rect;
if (!g_panel || !g_panel->fb) {
if (!g_panel || !g_panel->fb || !g_panel->fb->funcs->dirty) {
return -1; return -1;
} }
@ -610,11 +633,10 @@ int drm_set_indicator(size_t idx, char c)
} }
g_panel->indicators[idx] = c; g_panel->indicators[idx] = c;
// Refresh framebuffer // Refresh indicator portion of framebuffer
dirty_rect.x1 = 0;//g_panel->fb->width - INDICATORS_WIDTH; dirty_rect.x1 = 0;
dirty_rect.x2 = g_panel->fb->width; dirty_rect.x2 = g_panel->fb->width;
dirty_rect.y1 = 0; dirty_rect.y1 = 0;
dirty_rect.y2 = INDICATOR_HEIGHT; dirty_rect.y2 = INDICATOR_HEIGHT;
return force_redraw(g_panel->fb, &dirty_rect);
return sharp_memory_fb_dirty(g_panel->fb, &dirty_rect);
} }

2
drm_iface.h
View File

@ -2,7 +2,7 @@
#define DRM_IFACE_H_ #define DRM_IFACE_H_
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/gpio.h> #include <linux/gpio/consumer.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/property.h> #include <linux/property.h>
#include <linux/sched/clock.h> #include <linux/sched/clock.h>

2
params_iface.c
View File

@ -39,7 +39,7 @@ module_param_cb(mono_invert, &u8_param_ops, &g_param_mono_invert, 0660);
MODULE_PARM_DESC(mono_invert, "0 for no inversion, 1 for inversion"); MODULE_PARM_DESC(mono_invert, "0 for no inversion, 1 for inversion");
module_param_cb(indicators, &u8_param_ops, &g_param_indicators, 0660); module_param_cb(indicators, &u8_param_ops, &g_param_indicators, 0660);
MODULE_PARM_DESC(mono_invert, "0 for no indicators, 1 for indicators"); MODULE_PARM_DESC(indicators, "0 for no indicators, 1 for indicators");
int params_probe(void) int params_probe(void)
{ {

4
sharp.dts
View File

@ -48,6 +48,10 @@
reg = <0>; reg = <0>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&sharp_pins>; pinctrl-0 = <&sharp_pins>;
vcom-gpios = <&gpio 23 0>;
disp-gpios = <&gpio 22 0>;
spi-cs-high = <1>; spi-cs-high = <1>;
spi-max-frequency = <8000000>; spi-max-frequency = <8000000>;
buswidth = <8>; buswidth = <8>;