diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-06-29 20:20:38 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-06-29 20:20:38 +0300 |
| commit | 675285ad819293844018aa8096ba9a6d7c77b90b (patch) | |
| tree | 9cfbd3e4ca5457b041fcc99b9ad5c2f3d5d400e9 /include | |
| parent | e5476f57b32621eb8eab892a908df4d0b4808835 (diff) | |
| parent | c2d22806aecb24e2de55c30a06e5d6eb297d161d (diff) | |
| download | linux-675285ad819293844018aa8096ba9a6d7c77b90b.tar.xz | |
Merge tag 'fbdev-for-6.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev
Pull fbdev updates from Helge Deller:
"Some fbdev fixes & cleanups.
Includes is a fix for a potential out-of-bound memory access
in fast_imageblit() and the switch of the VIA fbdev driver to
use GPIO descriptors.
Summary:
- fix potential OOB read in fast_imageblit()
- fbdev/media: Use GPIO descriptors for VIA GPIO
- broadsheetfb & metronomefb: Add MODULE_FIRMWARE macro
- omapfb: error handling fix in mipid_spi_probe()
- sh_mobile_lcdcfb, sh7760fb: Typo and warning fixes
- hitfb: code cleanups"
* tag 'fbdev-for-6.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev:
fbdev: fix potential OOB read in fast_imageblit()
MAINTAINERS: adjust entry in VIA UNICHROME(PRO)/CHROME9 FRAMEBUFFER DRIVER
fbdev: sh7760fb: Fix -Wimplicit-fallthrough warnings
fbdev: sh_mobile_lcdcfb: Fix ARGB32 overlay format typo
fbdev: hitfb: Use NULL for pointers
fbdev: hitfb: Fix integer-to-pointer cast
fbdev/media: Use GPIO descriptors for VIA GPIO
video/hdmi: Reorder fields in 'struct hdmi_avi_infoframe'
fbdev: broadsheetfb: Add MODULE_FIRMWARE macro
fbdev: metronomefb: Add MODULE_FIRMWARE macro
fbdev: hitfb: Declare hitfb_blank() as static
fbdev: omapfb: lcd_mipid: Fix an error handling path in mipid_spi_probe()
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/hdmi.h | 4 | ||||
| -rw-r--r-- | include/linux/via-gpio.h | 14 |
2 files changed, 2 insertions, 16 deletions
diff --git a/include/linux/hdmi.h b/include/linux/hdmi.h index 2f4dcc8d060e..3bb87bf6bc65 100644 --- a/include/linux/hdmi.h +++ b/include/linux/hdmi.h @@ -170,19 +170,19 @@ struct hdmi_avi_infoframe { enum hdmi_infoframe_type type; unsigned char version; unsigned char length; + bool itc; + unsigned char pixel_repeat; enum hdmi_colorspace colorspace; enum hdmi_scan_mode scan_mode; enum hdmi_colorimetry colorimetry; enum hdmi_picture_aspect picture_aspect; enum hdmi_active_aspect active_aspect; - bool itc; enum hdmi_extended_colorimetry extended_colorimetry; enum hdmi_quantization_range quantization_range; enum hdmi_nups nups; unsigned char video_code; enum hdmi_ycc_quantization_range ycc_quantization_range; enum hdmi_content_type content_type; - unsigned char pixel_repeat; unsigned short top_bar; unsigned short bottom_bar; unsigned short left_bar; diff --git a/include/linux/via-gpio.h b/include/linux/via-gpio.h deleted file mode 100644 index ac34668fd442..000000000000 --- a/include/linux/via-gpio.h +++ /dev/null @@ -1,14 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* - * Support for viafb GPIO ports. - * - * Copyright 2009 Jonathan Corbet <corbet@lwn.net> - */ - -#ifndef __VIA_GPIO_H__ -#define __VIA_GPIO_H__ - -extern int viafb_gpio_lookup(const char *name); -extern int viafb_gpio_init(void); -extern void viafb_gpio_exit(void); -#endif |