fbdev/core: Move framebuffer and backlight helpers into separate files
Move framebuffer and backlight helpers into separate files. Leave fbsysfs.c to sysfs-related code. No functional changes. The framebuffer helpers are not in fbmem.c because they are under GPL-2.0-or-later copyright, while fbmem.c is GPL-2.0. v2: * include <linux/mutex.h> (Sam) Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> Reviewed-by: Sam Ravnborg <sam@ravnborg.org> Link: https://patchwork.freedesktop.org/patch/msgid/20230613110953.24176-34-tzimmermann@suse.de
This commit is contained in:
Thomas Zimmermann
parent
403f0dda63
commit
f0f6839be4
@ -1,7 +1,9 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
obj-$(CONFIG_FB_NOTIFY) += fb_notify.o
|
||||
obj-$(CONFIG_FB) += fb.o
|
||||
fb-y := fbmem.o fbmon.o fbcmap.o fbsysfs.o \
|
||||
fb-y := fb_backlight.o \
|
||||
fb_info.o \
|
||||
fbmem.o fbmon.o fbcmap.o fbsysfs.o \
|
||||
modedb.o fbcvt.o fb_cmdline.o fb_io_fops.o
|
||||
fb-$(CONFIG_FB_DEFERRED_IO) += fb_defio.o
|
||||
|
||||
|
||||
33
drivers/video/fbdev/core/fb_backlight.c
Normal file
33
drivers/video/fbdev/core/fb_backlight.c
Normal file
@ -0,0 +1,33 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
#include <linux/export.h>
|
||||
#include <linux/fb.h>
|
||||
#include <linux/mutex.h>
|
||||
|
||||
#if IS_ENABLED(CONFIG_FB_BACKLIGHT)
|
||||
/*
|
||||
* This function generates a linear backlight curve
|
||||
*
|
||||
* 0: off
|
||||
* 1-7: min
|
||||
* 8-127: linear from min to max
|
||||
*/
|
||||
void fb_bl_default_curve(struct fb_info *fb_info, u8 off, u8 min, u8 max)
|
||||
{
|
||||
unsigned int i, flat, count, range = (max - min);
|
||||
|
||||
mutex_lock(&fb_info->bl_curve_mutex);
|
||||
|
||||
fb_info->bl_curve[0] = off;
|
||||
|
||||
for (flat = 1; flat < (FB_BACKLIGHT_LEVELS / 16); ++flat)
|
||||
fb_info->bl_curve[flat] = min;
|
||||
|
||||
count = FB_BACKLIGHT_LEVELS * 15 / 16;
|
||||
for (i = 0; i < count; ++i)
|
||||
fb_info->bl_curve[flat + i] = min + (range * (i + 1) / count);
|
||||
|
||||
mutex_unlock(&fb_info->bl_curve_mutex);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(fb_bl_default_curve);
|
||||
#endif
|
||||
78
drivers/video/fbdev/core/fb_info.c
Normal file
78
drivers/video/fbdev/core/fb_info.c
Normal file
@ -0,0 +1,78 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
#include <linux/export.h>
|
||||
#include <linux/fb.h>
|
||||
#include <linux/mutex.h>
|
||||
#include <linux/slab.h>
|
||||
|
||||
/**
|
||||
* framebuffer_alloc - creates a new frame buffer info structure
|
||||
*
|
||||
* @size: size of driver private data, can be zero
|
||||
* @dev: pointer to the device for this fb, this can be NULL
|
||||
*
|
||||
* Creates a new frame buffer info structure. Also reserves @size bytes
|
||||
* for driver private data (info->par). info->par (if any) will be
|
||||
* aligned to sizeof(long).
|
||||
*
|
||||
* Returns the new structure, or NULL if an error occurred.
|
||||
*
|
||||
*/
|
||||
struct fb_info *framebuffer_alloc(size_t size, struct device *dev)
|
||||
{
|
||||
#define BYTES_PER_LONG (BITS_PER_LONG/8)
|
||||
#define PADDING (BYTES_PER_LONG - (sizeof(struct fb_info) % BYTES_PER_LONG))
|
||||
int fb_info_size = sizeof(struct fb_info);
|
||||
struct fb_info *info;
|
||||
char *p;
|
||||
|
||||
if (size)
|
||||
fb_info_size += PADDING;
|
||||
|
||||
p = kzalloc(fb_info_size + size, GFP_KERNEL);
|
||||
|
||||
if (!p)
|
||||
return NULL;
|
||||
|
||||
info = (struct fb_info *) p;
|
||||
|
||||
if (size)
|
||||
info->par = p + fb_info_size;
|
||||
|
||||
info->device = dev;
|
||||
info->fbcon_rotate_hint = -1;
|
||||
|
||||
#if IS_ENABLED(CONFIG_FB_BACKLIGHT)
|
||||
mutex_init(&info->bl_curve_mutex);
|
||||
#endif
|
||||
|
||||
return info;
|
||||
#undef PADDING
|
||||
#undef BYTES_PER_LONG
|
||||
}
|
||||
EXPORT_SYMBOL(framebuffer_alloc);
|
||||
|
||||
/**
|
||||
* framebuffer_release - marks the structure available for freeing
|
||||
*
|
||||
* @info: frame buffer info structure
|
||||
*
|
||||
* Drop the reference count of the device embedded in the
|
||||
* framebuffer info structure.
|
||||
*
|
||||
*/
|
||||
void framebuffer_release(struct fb_info *info)
|
||||
{
|
||||
if (!info)
|
||||
return;
|
||||
|
||||
if (WARN_ON(refcount_read(&info->count)))
|
||||
return;
|
||||
|
||||
#if IS_ENABLED(CONFIG_FB_BACKLIGHT)
|
||||
mutex_destroy(&info->bl_curve_mutex);
|
||||
#endif
|
||||
|
||||
kfree(info);
|
||||
}
|
||||
EXPORT_SYMBOL(framebuffer_release);
|
||||
@ -5,93 +5,12 @@
|
||||
* Copyright (c) 2004 James Simmons <jsimmons@infradead.org>
|
||||
*/
|
||||
|
||||
/*
|
||||
* Note: currently there's only stubs for framebuffer_alloc and
|
||||
* framebuffer_release here. The reson for that is that until all drivers
|
||||
* are converted to use it a sysfsification will open OOPSable races.
|
||||
*/
|
||||
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/console.h>
|
||||
#include <linux/fb.h>
|
||||
#include <linux/fbcon.h>
|
||||
#include <linux/console.h>
|
||||
#include <linux/module.h>
|
||||
|
||||
#define FB_SYSFS_FLAG_ATTR 1
|
||||
|
||||
/**
|
||||
* framebuffer_alloc - creates a new frame buffer info structure
|
||||
*
|
||||
* @size: size of driver private data, can be zero
|
||||
* @dev: pointer to the device for this fb, this can be NULL
|
||||
*
|
||||
* Creates a new frame buffer info structure. Also reserves @size bytes
|
||||
* for driver private data (info->par). info->par (if any) will be
|
||||
* aligned to sizeof(long).
|
||||
*
|
||||
* Returns the new structure, or NULL if an error occurred.
|
||||
*
|
||||
*/
|
||||
struct fb_info *framebuffer_alloc(size_t size, struct device *dev)
|
||||
{
|
||||
#define BYTES_PER_LONG (BITS_PER_LONG/8)
|
||||
#define PADDING (BYTES_PER_LONG - (sizeof(struct fb_info) % BYTES_PER_LONG))
|
||||
int fb_info_size = sizeof(struct fb_info);
|
||||
struct fb_info *info;
|
||||
char *p;
|
||||
|
||||
if (size)
|
||||
fb_info_size += PADDING;
|
||||
|
||||
p = kzalloc(fb_info_size + size, GFP_KERNEL);
|
||||
|
||||
if (!p)
|
||||
return NULL;
|
||||
|
||||
info = (struct fb_info *) p;
|
||||
|
||||
if (size)
|
||||
info->par = p + fb_info_size;
|
||||
|
||||
info->device = dev;
|
||||
info->fbcon_rotate_hint = -1;
|
||||
|
||||
#if IS_ENABLED(CONFIG_FB_BACKLIGHT)
|
||||
mutex_init(&info->bl_curve_mutex);
|
||||
#endif
|
||||
|
||||
return info;
|
||||
#undef PADDING
|
||||
#undef BYTES_PER_LONG
|
||||
}
|
||||
EXPORT_SYMBOL(framebuffer_alloc);
|
||||
|
||||
/**
|
||||
* framebuffer_release - marks the structure available for freeing
|
||||
*
|
||||
* @info: frame buffer info structure
|
||||
*
|
||||
* Drop the reference count of the device embedded in the
|
||||
* framebuffer info structure.
|
||||
*
|
||||
*/
|
||||
void framebuffer_release(struct fb_info *info)
|
||||
{
|
||||
if (!info)
|
||||
return;
|
||||
|
||||
if (WARN_ON(refcount_read(&info->count)))
|
||||
return;
|
||||
|
||||
#if IS_ENABLED(CONFIG_FB_BACKLIGHT)
|
||||
mutex_destroy(&info->bl_curve_mutex);
|
||||
#endif
|
||||
|
||||
kfree(info);
|
||||
}
|
||||
EXPORT_SYMBOL(framebuffer_release);
|
||||
|
||||
static int activate(struct fb_info *fb_info, struct fb_var_screeninfo *var)
|
||||
{
|
||||
int err;
|
||||
@ -551,30 +470,3 @@ void fb_cleanup_device(struct fb_info *fb_info)
|
||||
fb_info->class_flag &= ~FB_SYSFS_FLAG_ATTR;
|
||||
}
|
||||
}
|
||||
|
||||
#if IS_ENABLED(CONFIG_FB_BACKLIGHT)
|
||||
/* This function generates a linear backlight curve
|
||||
*
|
||||
* 0: off
|
||||
* 1-7: min
|
||||
* 8-127: linear from min to max
|
||||
*/
|
||||
void fb_bl_default_curve(struct fb_info *fb_info, u8 off, u8 min, u8 max)
|
||||
{
|
||||
unsigned int i, flat, count, range = (max - min);
|
||||
|
||||
mutex_lock(&fb_info->bl_curve_mutex);
|
||||
|
||||
fb_info->bl_curve[0] = off;
|
||||
|
||||
for (flat = 1; flat < (FB_BACKLIGHT_LEVELS / 16); ++flat)
|
||||
fb_info->bl_curve[flat] = min;
|
||||
|
||||
count = FB_BACKLIGHT_LEVELS * 15 / 16;
|
||||
for (i = 0; i < count; ++i)
|
||||
fb_info->bl_curve[flat + i] = min + (range * (i + 1) / count);
|
||||
|
||||
mutex_unlock(&fb_info->bl_curve_mutex);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(fb_bl_default_curve);
|
||||
#endif
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user