kernel/git/next/linux-next.git/drivers/video/fbdev, branch akpm

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git

2022-06-28T01:47:19+00:00

Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc

2022-06-28T01:29:28+00:00

Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git

2022-06-28T01:29:27+00:00

# Conflicts: # drivers/gpu/drm/i915/display/intel_dp.c

fbmem: Prevent invalid virtual screen sizes

2022-06-27T11:00:21+00:00

Prevent that drivers or the user sets the virtual screen resolution smaller than the physical screen resolution. This is important, because otherwise we may access memory outside of the graphics memory area. Signed-off-by: Helge Deller Reviewed-by: Daniel Vetter Cc: stable@vger.kernel.org # v5.4+

fbcon: Use fbcon_info_from_console() in fbcon_modechange_possible()

2022-06-27T11:00:21+00:00

Use the fbcon_info_from_console() wrapper which was added to kernel v5.19 with commit 409d6c95f9c6 ("fbcon: Introduce wrapper for console->fb_info lookup"). Signed-off-by: Helge Deller Reviewed-by: Daniel Vetter

fbcon: Prevent that screen size is smaller than font size

2022-06-27T11:00:21+00:00

We need to prevent that users configure a screen size which is smaller than the currently selected font size. Otherwise rendering chars on the screen will access memory outside the graphics memory region. This patch adds a new function fbcon_modechange_possible() which implements this check and which later may be extended with other checks if necessary. The new function is called from the FBIOPUT_VSCREENINFO ioctl handler in fbmem.c, which will return -EINVAL if userspace asked for a too small screen size. Signed-off-by: Helge Deller Reviewed-by: Daniel Vetter Cc: stable@vger.kernel.org # v5.4+

fbcon: Disallow setting font bigger than screen size

2022-06-27T11:00:21+00:00

Prevent that users set a font size which is bigger than the physical screen. It's unlikely this may happen (because screens are usually much larger than the fonts and each font char is limited to 32x32 pixels), but it may happen on smaller screens/LCD displays. Signed-off-by: Helge Deller Reviewed-by: Daniel Vetter Cc: stable@vger.kernel.org # v4.14+

drm: Implement DRM aperture helpers under video/

2022-06-27T09:07:55+00:00

Implement DRM's aperture helpers under video/ for sharing with other sub-systems. Remove DRM-isms from the interface. The helpers track the ownership of framebuffer apertures and provide hand-over from firmware, such as EFI and VESA, to native graphics drivers. Other subsystems, such as fbdev and vfio, also have to maintain ownership of framebuffer apertures. Moving DRM's aperture helpers to a more public location allows all subsystems to interact with each other and share a common implementation. The aperture helpers are selected by the various firmware drivers within DRM and fbdev, and the VGA text-console driver. The original DRM interface is kept in place for use by DRM drivers. v3: * prefix all interfaces with aperture_ (Javier) * rework and simplify documentation (Javier) * rename struct dev_aperture to struct aperture_range * rebase onto latest DRM * update MAINTAINERS entry Signed-off-by: Thomas Zimmermann Reviewed-by: Javier Martinez Canillas Tested-by: Laszlo Ersek Link: https://patchwork.freedesktop.org/patch/msgid/20220622140134.12763-3-tzimmermann@suse.de

video: fbdev: omap: Remove duplicate 'the' in comment

2022-06-22T14:55:51+00:00

Signed-off-by: Jiang Jian Signed-off-by: Helge Deller

video: fbdev: omapfb: Align '*' in comment

2022-06-22T14:53:55+00:00

Consider '*' alignment in comments Signed-off-by: Jiang Jian Signed-off-by: Helge Deller