len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-10 05:32:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Hosted: Improvements in the LCD code. (Roman Stolyarov)

Browse source 
* Kill LCD when turning off the backlight
 * Fix logic errors in lcd_enable() calls
 * Use ioctls instead of sysfs to twiddle lcd enable

Change-Id: I6864ff63d87b747ac48719b0f4ba2de00333a1d3
This commit is contained in:
Solomon Peachy 2020-10-01 08:36:05 -04:00
parent cb9b5d3b50
commit 0a7b23097a
2 changed files with 31 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

8
firmware/target/hosted/backlight-unix.c
View file

@ -7,6 +7,7 @@
* \/ \/ \/ \/ \/ * \/ \/ \/ \/ \/
* *
* Copyright (C) 2017 Marcin Bukat * Copyright (C) 2017 Marcin Bukat
* Copyright (C) 2019 by Roman Stolyarov
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -28,6 +29,7 @@
#include "backlight-target.h" #include "backlight-target.h"
#include "sysfs.h" #include "sysfs.h"
#include "panic.h" #include "panic.h"
#include "lcd.h"
static const char * const sysfs_bl_brightness = static const char * const sysfs_bl_brightness =
"/sys/class/backlight/pwm-backlight.0/brightness"; "/sys/class/backlight/pwm-backlight.0/brightness";
@ -44,12 +46,18 @@ bool backlight_hw_init(void)
void backlight_hw_on(void) void backlight_hw_on(void)
{ {
#ifdef HAVE_LCD_ENABLE
lcd_enable(true);
#endif
sysfs_set_int(sysfs_bl_power, 0); sysfs_set_int(sysfs_bl_power, 0);
} }
void backlight_hw_off(void) void backlight_hw_off(void)
{ {
sysfs_set_int(sysfs_bl_power, 1); sysfs_set_int(sysfs_bl_power, 1);
#ifdef HAVE_LCD_ENABLE
lcd_enable(false);
#endif
} }
void backlight_hw_brightness(int brightness) void backlight_hw_brightness(int brightness)

36
firmware/target/hosted/lcd-linuxfb.c
View file

@ -8,6 +8,7 @@
* *
* Copyright (C) 2017 Marcin Bukat * Copyright (C) 2017 Marcin Bukat
* Copyright (C) 2016 Amaury Pouly * Copyright (C) 2016 Amaury Pouly
* Copyright (C) 2019 Roman Stolyarov
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -22,6 +23,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>
#include <string.h>
#include <linux/fb.h> #include <linux/fb.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
@ -34,19 +36,24 @@
static int fd = -1; static int fd = -1;
static struct fb_var_screeninfo vinfo; static struct fb_var_screeninfo vinfo;
static struct fb_fix_screeninfo finfo;
fb_data *framebuffer = 0; /* global variable, see lcd-target.h */ fb_data *framebuffer = 0; /* global variable, see lcd-target.h */
static void redraw(void)
{
ioctl(fd, FBIOPAN_DISPLAY, &vinfo);
}
void lcd_init_device(void) void lcd_init_device(void)
{ {
const char * const fb_dev = "/dev/fb0"; const char * const fb_dev = "/dev/fb0";
fd = open(fb_dev, O_RDWR); fd = open(fb_dev, O_RDWR | O_SYNC);
if(fd < 0) if(fd < 0)
{ {
panicf("Cannot open framebuffer: %s\n", fb_dev); panicf("Cannot open framebuffer: %s\n", fb_dev);
} }
/* get fixed and variable information */ /* get fixed and variable information */
struct fb_fix_screeninfo finfo;
if(ioctl(fd, FBIOGET_FSCREENINFO, &finfo) < 0) if(ioctl(fd, FBIOGET_FSCREENINFO, &finfo) < 0)
{ {
panicf("Cannot read framebuffer fixed information"); panicf("Cannot read framebuffer fixed information");
@ -75,6 +82,8 @@ void lcd_init_device(void)
panicf("Cannot map framebuffer"); panicf("Cannot map framebuffer");
} }
memset(framebuffer, 0, finfo.smem_len);
#ifdef HAVE_LCD_ENABLE #ifdef HAVE_LCD_ENABLE
lcd_set_active(true); lcd_set_active(true);
#endif #endif
@ -88,30 +97,23 @@ void lcd_shutdown(void)
} }
#endif #endif
#ifdef HAVE_LCD_ENABLE
void lcd_enable(bool on) void lcd_enable(bool on)
{ {
const char * const sysfs_fb_blank = "/sys/class/graphics/fb0/blank";
#ifdef HAVE_LCD_ENABLE
if (lcd_active() != on)
#endif
{
sysfs_set_int(sysfs_fb_blank, on ? 0 : 1);
#ifdef HAVE_LCD_ENABLE
lcd_set_active(on); lcd_set_active(on);
#endif
if (on) if (on)
{ {
send_event(LCD_EVENT_ACTIVATION, NULL); send_event(LCD_EVENT_ACTIVATION, NULL);
ioctl(fd, FB_BLANK_UNBLANK);
} }
} else
}
static void redraw(void)
{ {
ioctl(fd, FBIOPAN_DISPLAY, &vinfo); memset(framebuffer, 0, finfo.smem_len);
redraw();
ioctl(fd, FB_BLANK_POWERDOWN);
} }
}
#endif
extern void lcd_copy_buffer_rect(fb_data *dst, const fb_data *src, extern void lcd_copy_buffer_rect(fb_data *dst, const fb_data *src,
int width, int height); int width, int height);