forked from rpms/kernel
		
	Add patch to fix FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER on s390x and
re-enable FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER on s390x
This commit is contained in:
		
							parent
							
								
									0256b7c58a
								
							
						
					
					
						commit
						d88b5d13ef
					
				| @ -0,0 +1,39 @@ | ||||
| From b4e821e0b782ff2e816ca342af6a9eab32116ece Mon Sep 17 00:00:00 2001 | ||||
| From: Hans de Goede <hdegoede@redhat.com> | ||||
| Date: Fri, 29 Jun 2018 11:46:19 +0200 | ||||
| Subject: [PATCH 8/8] console: dummycon: export | ||||
|  dummycon_[un]register_output_notifier | ||||
| 
 | ||||
| Export dummycon_[un]register_output_notifier, the fbcon code needs this | ||||
| and may be build as a module. | ||||
| 
 | ||||
| Fixes: 83d83bebf401 ("console/fbcon: Add support for deferred console takeover") | ||||
| Cc: Stephen Rothwell <sfr@canb.auug.org.au> | ||||
| Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> | ||||
| Signed-off-by: Hans de Goede <hdegoede@redhat.com> | ||||
| Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> | ||||
| ---
 | ||||
|  drivers/video/console/dummycon.c | 2 ++ | ||||
|  1 file changed, 2 insertions(+) | ||||
| 
 | ||||
| diff --git a/drivers/video/console/dummycon.c b/drivers/video/console/dummycon.c
 | ||||
| index 45ad925ad5f8..0254251fdd79 100644
 | ||||
| --- a/drivers/video/console/dummycon.c
 | ||||
| +++ b/drivers/video/console/dummycon.c
 | ||||
| @@ -38,11 +38,13 @@ void dummycon_register_output_notifier(struct notifier_block *nb)
 | ||||
|  	if (dummycon_putc_called) | ||||
|  		nb->notifier_call(nb, 0, NULL); | ||||
|  } | ||||
| +EXPORT_SYMBOL_GPL(dummycon_register_output_notifier);
 | ||||
|   | ||||
|  void dummycon_unregister_output_notifier(struct notifier_block *nb) | ||||
|  { | ||||
|  	raw_notifier_chain_unregister(&dummycon_output_nh, nb); | ||||
|  } | ||||
| +EXPORT_SYMBOL_GPL(dummycon_unregister_output_notifier);
 | ||||
|   | ||||
|  static void dummycon_putc(struct vc_data *vc, int c, int ypos, int xpos) | ||||
|  { | ||||
| -- 
 | ||||
| 2.18.0 | ||||
| 
 | ||||
| @ -1 +0,0 @@ | ||||
| # CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set | ||||
| @ -1517,7 +1517,7 @@ CONFIG_FPGA_MGR_MACHXO2_SPI=m | ||||
| CONFIG_FPGA_MGR_XILINX_SPI=m | ||||
| CONFIG_FPGA_MGR_ZYNQ_FPGA=m | ||||
| CONFIG_FPGA_REGION=m | ||||
| # CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set | ||||
| CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y | ||||
| CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y | ||||
| CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y | ||||
| CONFIG_FRAMEBUFFER_CONSOLE=y | ||||
|  | ||||
| @ -1496,7 +1496,7 @@ CONFIG_FPGA_MGR_MACHXO2_SPI=m | ||||
| CONFIG_FPGA_MGR_XILINX_SPI=m | ||||
| CONFIG_FPGA_MGR_ZYNQ_FPGA=m | ||||
| CONFIG_FPGA_REGION=m | ||||
| # CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set | ||||
| CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y | ||||
| CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y | ||||
| CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y | ||||
| CONFIG_FRAMEBUFFER_CONSOLE=y | ||||
|  | ||||
| @ -633,6 +633,7 @@ Patch524: 0004-console-fbcon-Add-support-for-deferred-console-takeo.patch | ||||
| Patch525: 0005-efi-bgrt-Drop-__initdata-from-bgrt_image_size.patch | ||||
| Patch526: 0006-efifb-Copy-the-ACPI-BGRT-boot-graphics-to-the-frameb.patch | ||||
| Patch527: 0007-efifb-BGRT-Do-not-copy-the-boot-graphics-for-non-nat.patch | ||||
| Patch528: 0008-console-dummycon-export-dummycon_-un-register_output.patch | ||||
| 
 | ||||
| # END OF PATCH DEFINITIONS | ||||
| 
 | ||||
| @ -1893,6 +1894,10 @@ fi | ||||
| # | ||||
| # | ||||
| %changelog | ||||
| * Tue Jul 31 2018 Hans de Goede <hdegoede@redhat.com> | ||||
| - Add patch to fix FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER on s390x and | ||||
|   re-enable FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER on s390x | ||||
| 
 | ||||
| * Mon Jul 30 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc7.git0.1 | ||||
| - Linux v4.18-rc7 | ||||
| 
 | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user