Commit d97a7842 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fbdev-for-6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev 

Pull fbdev updates from Helge Deller:
 "Three fbdev drivers (~8500 lines of code) removed. The Carillo Ranch
  fbdev driver is for an Intel product which was never shipped, and for
  the intelfb and the amba-clcd drivers the drm drivers can be used
  instead.

  The other code changes are minor: some fb_deferred_io flushing fixes,
  imxfb margin fixes and stifb cleanups.

  Summary:
   - Remove intelfb fbdev driver (Thomas Zimmermann)
   - Remove amba-clcd fbdev driver (Linus Walleij)
   - Remove vmlfb Carillo Ranch fbdev driver (Matthew Wilcox)
   - fb_deferred_io flushing fixes (Nam Cao)
   - imxfb code fixes and cleanups (Dario Binacchi)
   - stifb primary screen detection cleanups (Thomas Zimmermann)"

* tag 'fbdev-for-6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev: (28 commits)
  fbdev/intelfb: Remove driver
  fbdev/hyperv_fb: Do not clear global screen_info
  firmware/sysfb: Clear screen_info state after consuming it
  fbdev/hyperv_fb: Remove firmware framebuffers with aperture helpers
  drm/hyperv: Remove firmware framebuffers with aperture helper
  fbdev/sis: Remove dependency on screen_info
  video/logo: use %u format specifier for unsigned int values
  video/sticore: Remove info field from STI struct
  arch/parisc: Detect primary video device from device instance
  fbdev/stifb: Allocate fb_info instance with framebuffer_alloc()
  video/sticore: Store ROM device in STI struct
  fbdev: flush deferred IO before closing
  fbdev: flush deferred work in fb_deferred_io_fsync()
  fbdev: amba-clcd: Delete the old CLCD driver
  fbdev: Remove support for Carillo Ranch driver
  fbdev: hgafb: fix kernel-doc comments
  fbdev: mmp: Fix typo and wording in code comment
  fbdev: fsl-diu-fb: Fix sparse warning due to virt_to_phys() prototype change
  fbdev: imxfb: add '*/' on a separate line in block comment
  fbdev: imxfb: use __func__ for function name
  ...
parents 61da593f 689237ab

Documentation/fb/index.rst

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ Frame Buffer 
    framebuffer

    gxfb

    intel810

    intelfb

    internals

    lxfb

    matroxfb

Documentation/fb/intelfb.rst

deleted100644 → 0
+0 −155
Original line number Diff line number Diff line 
=============================================================

Intel 830M/845G/852GM/855GM/865G/915G/945G Framebuffer driver

=============================================================



A. Introduction

===============



This is a framebuffer driver for various Intel 8xx/9xx compatible

graphics devices.  These would include:



	- Intel 830M

	- Intel 845G

	- Intel 852GM

	- Intel 855GM

	- Intel 865G

	- Intel 915G

	- Intel 915GM

	- Intel 945G

	- Intel 945GM

	- Intel 945GME

	- Intel 965G

	- Intel 965GM



B.  List of available options

=============================



   a. "video=intelfb"

	enables the intelfb driver



	Recommendation: required



   b. "mode=<xres>x<yres>[-<bpp>][@<refresh>]"

	select mode



	Recommendation: user preference

	(default = 1024x768-32@70)



   c. "vram=<value>"

	select amount of system RAM in MB to allocate for the video memory

	if not enough RAM was already allocated by the BIOS.



	Recommendation: 1 - 4 MB.

	(default = 4 MB)



   d. "voffset=<value>"

	select at what offset in MB of the logical memory to allocate the

	framebuffer memory.  The intent is to avoid the memory blocks

	used by standard graphics applications (XFree86). Depending on your

	usage, adjust the value up or down, (0 for maximum usage, 63/127 MB

	for the least amount).  Note, an arbitrary setting may conflict

	with XFree86.



	Recommendation: do not set

	(default = 48 MB)



   e. "accel"

	enable text acceleration.  This can be enabled/reenabled anytime

	by using 'fbset -accel true/false'.



	Recommendation: enable

	(default = set)



   f. "hwcursor"

	enable cursor acceleration.



	Recommendation: enable

	(default = set)



   g. "mtrr"

	enable MTRR.  This allows data transfers to the framebuffer memory

	to occur in bursts which can significantly increase performance.

	Not very helpful with the intel chips because of 'shared memory'.



	Recommendation: set

	(default = set)



   h. "fixed"

	disable mode switching.



	Recommendation: do not set

	(default = not set)



   The binary parameters can be unset with a "no" prefix, example "noaccel".

   The default parameter (not named) is the mode.



C. Kernel booting

=================



Separate each option/option-pair by commas (,) and the option from its value

with an equals sign (=) as in the following::



	video=intelfb:option1,option2=value2



Sample Usage

------------



In /etc/lilo.conf, add the line::



	append="video=intelfb:mode=800x600-32@75,accel,hwcursor,vram=8"



This will initialize the framebuffer to 800x600 at 32bpp and 75Hz. The

framebuffer will use 8 MB of System RAM. hw acceleration of text and cursor

will be enabled.



Remarks

-------



If setting this parameter doesn't work (you stay in a 80x25 text-mode),

you might need to set the "vga=<mode>" parameter too - see vesafb.txt

in this directory.





D.  Module options

==================



The module parameters are essentially similar to the kernel

parameters. The main difference is that you need to include a Boolean value

(1 for TRUE, and 0 for FALSE) for those options which don't need a value.



Example, to enable MTRR, include "mtrr=1".



Sample Usage

------------



Using the same setup as described above, load the module like this::



	modprobe intelfb mode=800x600-32@75 vram=8 accel=1 hwcursor=1



Or just add the following to a configuration file in /etc/modprobe.d/::



	options intelfb mode=800x600-32@75 vram=8 accel=1 hwcursor=1



and just do a::



	modprobe intelfb





E.  Acknowledgment:

===================



	1.  Geert Uytterhoeven - his excellent howto and the virtual

	    framebuffer driver code made this possible.



	2.  Jeff Hartmann for his agpgart code.



	3.  David Dawes for his original kernel 2.4 code.



	4.  The X developers.  Insights were provided just by reading the

	    XFree86 source code.



	5.  Antonino A. Daplas for his inspiring i810fb driver.



	6.  Andrew Morton for his kernel patches maintenance.



Sylvain

Documentation/userspace-api/ioctl/ioctl-number.rst

+0 −1
Original line number Diff line number Diff line
@@ -128,7 +128,6 @@ Code Seq# Include File Comments 
'F'   all    linux/fb.h                                              conflict!

'F'   01-02  drivers/scsi/pmcraid.h                                  conflict!

'F'   20     drivers/video/fsl-diu-fb.h                              conflict!

'F'   20     drivers/video/intelfb/intelfb.h                         conflict!

'F'   20     linux/ivtvfb.h                                          conflict!

'F'   20     linux/matroxfb.h                                        conflict!

'F'   20     drivers/video/aty/atyfb_base.c                          conflict!

MAINTAINERS

+0 −12
Original line number Diff line number Diff line
@@ -1693,11 +1693,6 @@ S: Odd Fixes 
F:	drivers/amba/

F:	include/linux/amba/bus.h









ARM PRIMECELL CLCD PL110 DRIVER









M:	Russell King <linux@armlinux.org.uk>









S:	Odd Fixes









F:	drivers/video/fbdev/amba-clcd.*

















ARM PRIMECELL KMI PL050 DRIVER









M:	Russell King <linux@armlinux.org.uk>









S:	Odd Fixes








@@ -10732,13 +10727,6 @@ S:	Supported







F:	drivers/infiniband/hw/irdma/









F:	include/uapi/rdma/irdma-abi.h

















INTEL FRAMEBUFFER DRIVER (excluding 810 and 815)









M:	Maik Broemme <mbroemme@libmpq.org>









L:	linux-fbdev@vger.kernel.org









S:	Maintained









F:	Documentation/fb/intelfb.rst









F:	drivers/video/fbdev/intelfb/

















INTEL GPIO DRIVERS









M:	Andy Shevchenko <andy@kernel.org>









L:	linux-gpio@vger.kernel.org
































arch/parisc/video/fbdev.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -21,6 +21,6 @@ int fb_is_primary_device(struct fb_info *info)







		return true;



















	/* return true if it's the default built-in framebuffer driver */









	return (sti->info == info);









	return (sti->dev == info->device);









}









EXPORT_SYMBOL(fb_is_primary_device);