* [PATCH 2/2] video: clps711x: Fix sparse warnings
From: Alexander Shiyan @ 2014-06-28 6:34 UTC (permalink / raw)
To: linux-fbdev
This patch fixes below warnings:
CHECK drivers/video/fbdev/clps711x-fb.c
drivers/video/fbdev/clps711x-fb.c:247:24: warning: incorrect type in argument 1 (different address spaces)
drivers/video/fbdev/clps711x-fb.c:247:24: expected void const *ptr
drivers/video/fbdev/clps711x-fb.c:247:24: got char [noderef] <asn:2>*screen_base
drivers/video/fbdev/clps711x-fb.c:248:35: warning: incorrect type in argument 1 (different address spaces)
drivers/video/fbdev/clps711x-fb.c:248:35: expected void const *ptr
drivers/video/fbdev/clps711x-fb.c:248:35: got char [noderef] <asn:2>*screen_base
drivers/video/fbdev/clps711x-fb.c:314:17: warning: incorrect type in initializer (different address spaces)
drivers/video/fbdev/clps711x-fb.c:314:17: expected void *__p
drivers/video/fbdev/clps711x-fb.c:314:17: got char [noderef] <asn:2>*screen_base
CC [M] drivers/video/fbdev/clps711x-fb.o
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
drivers/video/fbdev/clps711x-fb.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/video/fbdev/clps711x-fb.c b/drivers/video/fbdev/clps711x-fb.c
index 4d17fbb..bbf40fe 100644
--- a/drivers/video/fbdev/clps711x-fb.c
+++ b/drivers/video/fbdev/clps711x-fb.c
@@ -244,8 +244,8 @@ static int clps711x_fb_probe(struct platform_device *pdev)
res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
info->screen_base = devm_ioremap_resource(dev, res);
- if (IS_ERR(info->screen_base)) {
- ret = PTR_ERR(info->screen_base);
+ if (IS_ERR((__force void *)info->screen_base)) {
+ ret = PTR_ERR((__force void *)info->screen_base);
goto out_fb_release;
}
@@ -311,7 +311,7 @@ static int clps711x_fb_probe(struct platform_device *pdev)
/* Setup start FB address */
writeb(info->fix.smem_start >> 28, cfb->base + CLPS711X_FBADDR);
/* Clean FB memory */
- memset(info->screen_base, 0, cfb->buffsize);
+ memset_io(info->screen_base, 0, cfb->buffsize);
}
cfb->lcd_pwr = devm_regulator_get(dev, "lcd");
--
1.8.5.5
^ permalink raw reply related
* Re: [PATCH 5/5] drm/i915: Kick out vga console
From: Ed Tomlinson @ 2014-06-29 3:55 UTC (permalink / raw)
To: Daniel Vetter
Cc: Intel Graphics Development, DRI Development, LKML, David Herrmann,
Jean-Christophe Plagniol-Villard, Tomi Valkeinen, linux-fbdev,
Jani Nikula, Chris Wilson, Dave Airlie
In-Reply-To: <1602327.OGkKxHtt2b@grover>
On Saturday 28 June 2014 15:28:22 Ed Tomlinson wrote:
Resend without html krud which causes list to bounce the message.
> Hi
>
> This commit ( a4de05268e674e8ed31df6348269e22d6c6a1803 ) hangs my boot with 3.16-git. Reverting it lets the boot proceed.
>
> I have an i7 with a built-in i915 and an pcie r7 260x. The R7 is the primary console. The i915 is initialized
> but does not have a physical display attached.
>
> With the patch applied the boot stops at the messages:
>
> [drm] Memory usable by graphics device = 2048M
> [drm] Replacing VGA console driver
>
> and I need to interrupt or power off the box to get it back.
>
> (I did not notice messages about the R7 but they could have easily been missed - this box does not have a serial console)
>
> Without the patch I get:
>
> Jun 28 14:53:54 localhost kernel: [ 2.075351] e1000e: Intel(R) PRO/1000 Network Driver - 2.3.2-k
> Jun 28 14:53:54 localhost kernel: [ 2.075796] [drm] Initialized drm 1.1.0 20060810
> Jun 28 14:53:54 localhost kernel: [ 2.075958] microcode: CPU0 sig=0x306c3, pf=0x2, revision=0x17
> Jun 28 14:53:54 localhost kernel: [ 2.077289] microcode: CPU1 sig=0x306c3, pf=0x2, revision=0x17
> Jun 28 14:53:54 localhost kernel: [ 2.077299] microcode: CPU2 sig=0x306c3, pf=0x2, revision=0x17
> Jun 28 14:53:54 localhost kernel: [ 2.077307] microcode: CPU3 sig=0x306c3, pf=0x2, revision=0x17
> Jun 28 14:53:54 localhost kernel: [ 2.077315] microcode: CPU4 sig=0x306c3, pf=0x2, revision=0x17
> Jun 28 14:53:54 localhost kernel: [ 2.077325] microcode: CPU5 sig=0x306c3, pf=0x2, revision=0x17
> Jun 28 14:53:54 localhost kernel: [ 2.077335] microcode: CPU6 sig=0x306c3, pf=0x2, revision=0x17
> Jun 28 14:53:54 localhost kernel: [ 2.077342] microcode: CPU7 sig=0x306c3, pf=0x2, revision=0x17
> Jun 28 14:53:54 localhost kernel: [ 2.077378] microcode: Microcode Update Driver: v2.00 <tigran@aivazian.fsnet.co.uk>, Peter Oruba
> Jun 28 14:53:54 localhost kernel: [ 2.079726] input: PC Speaker as /devices/platform/pcspkr/input/input4
> Jun 28 14:53:54 localhost kernel: [ 2.083930] e1000e: Copyright(c) 1999 - 2014 Intel Corporation.
> Jun 28 14:53:54 localhost kernel: [ 2.084787] ACPI Warning: SystemIO range 0x000000000000f040-0x000000000000f05f conflicts with OpRegion 0x000000000000f040-0x000000000000f04f (\_SB_.PCI0.SBUS.SMBI) (20140424/utaddress-258)
> Jun 28 14:53:54 localhost kernel: [ 2.084788] ACPI: If an ACPI driver is available for this device, you should use it instead of the native driver
> Jun 28 14:53:54 localhost kernel: [ 2.084894] e1000e 0000:00:19.0: Interrupt Throttling Rate (ints/sec) set to dynamic conservative mode
> Jun 28 14:53:54 localhost kernel: [ 2.084905] e1000e 0000:00:19.0: irq 44 for MSI/MSI-X
> Jun 28 14:53:54 localhost kernel: [ 2.096721] iTCO_vendor_support: vendor-support=0
> Jun 28 14:53:54 localhost kernel: [ 2.096780] AVX2 version of gcm_enc/dec engaged.
> Jun 28 14:53:54 localhost kernel: [ 2.098512] iTCO_wdt: Intel TCO WatchDog Timer Driver v1.11
> Jun 28 14:53:54 localhost kernel: [ 2.099042] iTCO_wdt: Found a Lynx Point TCO device (Version=2, TCOBASE=0x1860)
> Jun 28 14:53:54 localhost kernel: [ 2.099561] iTCO_wdt: initialized. heartbeat0 sec (nowayout=0)
> Jun 28 14:53:54 localhost kernel: [ 2.100401] [drm] radeon kernel modesetting enabled.
> Jun 28 14:53:54 localhost kernel: [ 2.100918] checking generic (e0000000 300000) vs hw (e0000000 10000000)
> Jun 28 14:53:54 localhost kernel: [ 2.100919] fb: switching to radeondrmfb from simple
> Jun 28 14:53:54 localhost kernel: [ 2.101372] Console: switching to colour dummy device 80x25
> Jun 28 14:53:54 localhost kernel: [ 2.101527] [drm] initializing kernel modesetting (BONAIRE 0x1002:0x6658 0x174B:0xE253).
> Jun 28 14:53:54 localhost kernel: [ 2.101534] [drm] register mmio base: 0xF0800000
> Jun 28 14:53:54 localhost kernel: [ 2.101535] [drm] register mmio size: 262144
> Jun 28 14:53:54 localhost kernel: [ 2.101540] [drm] doorbell mmio base: 0xF0000000
> Jun 28 14:53:54 localhost kernel: [ 2.101541] [drm] doorbell mmio size: 8388608
> Jun 28 14:53:54 localhost kernel: [ 2.101579] ATOM BIOS: Bonaire
> Jun 28 14:53:54 localhost kernel: [ 2.101627] radeon 0000:01:00.0: VRAM: 2048M 0x0000000000000000 - 0x000000007FFFFFFF (2048M used)
> Jun 28 14:53:54 localhost kernel: [ 2.101629] radeon 0000:01:00.0: GTT: 1024M 0x0000000080000000 - 0x00000000BFFFFFFF
> Jun 28 14:53:54 localhost kernel: [ 2.101630] [drm] Detected VRAM RAM 48M, BAR%6M
> Jun 28 14:53:54 localhost kernel: [ 2.101631] [drm] RAM width 128bits DDR
> Jun 28 14:53:54 localhost kernel: [ 2.101659] [TTM] Zone kernel: Available graphics memory: 8145364 kiB
> Jun 28 14:53:54 localhost kernel: [ 2.101660] [TTM] Zone dma32: Available graphics memory: 2097152 kiB
> Jun 28 14:53:54 localhost kernel: [ 2.101662] [TTM] Initializing pool allocator
> Jun 28 14:53:54 localhost kernel: [ 2.101664] [TTM] Initializing DMA pool allocator
> Jun 28 14:53:54 localhost kernel: [ 2.101674] [drm] radeon: 2048M of VRAM memory ready
> Jun 28 14:53:54 localhost kernel: [ 2.101675] [drm] radeon: 1024M of GTT memory ready.
> Jun 28 14:53:54 localhost kernel: [ 2.101681] [drm] Loading BONAIRE Microcode
> Jun 28 14:53:54 localhost kernel: [ 2.109479] [drm] radeon/BONAIRE_mc2.bin: 31792 bytes
> Jun 28 14:53:54 localhost kernel: [ 2.110510] [drm] Internal thermal controller with fan control
> Jun 28 14:53:54 localhost kernel: [ 2.110648] [drm] probing gen 2 caps for device 8086:c01 = 261ad03/e
> Jun 28 14:53:54 localhost kernel: [ 2.118508] [drm] radeon: dpm initialized
> Jun 28 14:53:54 localhost kernel: [ 2.122133] [drm] Found VCE firmware/feedback version 40.2.2 / 15!
> Jun 28 14:53:54 localhost kernel: [ 2.122140] [drm] GART: num cpu pages 262144, num gpu pages 262144
> Jun 28 14:53:54 localhost kernel: [ 2.122540] [drm] probing gen 2 caps for device 8086:c01 = 261ad03/e
> Jun 28 14:53:54 localhost kernel: [ 2.122544] [drm] PCIE gen 3 link speeds already enabled
> Jun 28 14:53:54 localhost kernel: [ 2.126118] Adding 5779452k swap on /dev/sdc2. Priority:-1 extents:1 across:5779452k FS
> Jun 28 14:53:54 localhost kernel: [ 2.133031] EXT4-fs (sda2): mounted filesystem with ordered data mode. Opts: discard
> Jun 28 14:53:54 localhost kernel: [ 2.136552] [drm] PCIE GART of 1024M enabled (table at 0x000000000078B000).
> Jun 28 14:53:54 localhost kernel: [ 2.136670] radeon 0000:01:00.0: WB enabled
> Jun 28 14:53:54 localhost kernel: [ 2.136697] radeon 0000:01:00.0: fence driver on ring 0 use gpu addr 0x0000000080000c00 and cpu addr 0xffff8802683e6c00
> Jun 28 14:53:54 localhost kernel: [ 2.136699] radeon 0000:01:00.0: fence driver on ring 1 use gpu addr 0x0000000080000c04 and cpu addr 0xffff8802683e6c04
> Jun 28 14:53:54 localhost kernel: [ 2.136701] radeon 0000:01:00.0: fence driver on ring 2 use gpu addr 0x0000000080000c08 and cpu addr 0xffff8802683e6c08
> Jun 28 14:53:54 localhost kernel: [ 2.136703] radeon 0000:01:00.0: fence driver on ring 3 use gpu addr 0x0000000080000c0c and cpu addr 0xffff8802683e6c0c
> Jun 28 14:53:54 localhost kernel: [ 2.136705] radeon 0000:01:00.0: fence driver on ring 4 use gpu addr 0x0000000080000c10 and cpu addr 0xffff8802683e6c10
> Jun 28 14:53:54 localhost kernel: [ 2.137230] radeon 0000:01:00.0: fence driver on ring 5 use gpu addr 0x0000000000076c98 and cpu addr 0xffffc90007936c98
> Jun 28 14:53:54 localhost kernel: [ 2.137293] radeon 0000:01:00.0: fence driver on ring 6 use gpu addr 0x0000000080000c18 and cpu addr 0xffff8802683e6c18
> Jun 28 14:53:54 localhost kernel: [ 2.137296] radeon 0000:01:00.0: fence driver on ring 7 use gpu addr 0x0000000080000c1c and cpu addr 0xffff8802683e6c1c
> Jun 28 14:53:54 localhost kernel: [ 2.137298] [drm] Supports vblank timestamp caching Rev 2 (21.10.2013).
> Jun 28 14:53:54 localhost kernel: [ 2.137299] [drm] Driver supports precise vblank timestamp query.
> Jun 28 14:53:54 localhost kernel: [ 2.137325] radeon 0000:01:00.0: irq 45 for MSI/MSI-X
> Jun 28 14:53:54 localhost kernel: [ 2.137331] radeon 0000:01:00.0: radeon: using MSI.
> Jun 28 14:53:54 localhost kernel: [ 2.137357] [drm] radeon: irq initialized.
> Jun 28 14:53:54 localhost kernel: [ 2.139870] [drm] ring test on 0 succeeded in 3 usecs
> Jun 28 14:53:54 localhost kernel: [ 2.139938] [drm] ring test on 1 succeeded in 3 usecs
> Jun 28 14:53:54 localhost kernel: [ 2.139950] [drm] ring test on 2 succeeded in 3 usecs
> Jun 28 14:53:54 localhost kernel: [ 2.140110] [drm] ring test on 3 succeeded in 2 usecs
> Jun 28 14:53:54 localhost kernel: [ 2.140116] [drm] ring test on 4 succeeded in 1 usecs
> Jun 28 14:53:54 localhost kernel: [ 2.142659] Adding 5779452k swap on /dev/sdb2. Priority:-2 extents:1 across:5779452k FS
> Jun 28 14:53:54 localhost kernel: [ 2.152066] usb 1-7: new full-speed USB device number 6 using xhci_hcd
> Jun 28 14:53:54 localhost kernel: [ 2.185418] raid6: sse2x1 13222 MB/s
> Jun 28 14:53:54 localhost kernel: [ 2.196219] [drm] ring test on 5 succeeded in 1 usecs
> Jun 28 14:53:54 localhost kernel: [ 2.216257] [drm] UVD initialized successfully.
> Jun 28 14:53:54 localhost kernel: [ 2.242145] raid6: sse2x2 17003 MB/s
> Jun 28 14:53:54 localhost kernel: [ 2.259077] e1000e 0000:00:19.0 eth0: registered PHC clock
> Jun 28 14:53:54 localhost kernel: [ 2.259080] e1000e 0000:00:19.0 eth0: (PCI Express:2.5GT/s:Width x1) bc:5f:f4:fc:fa:91
> Jun 28 14:53:54 localhost kernel: [ 2.259081] e1000e 0000:00:19.0 eth0: Intel(R) PRO/1000 Network Connection
> Jun 28 14:53:54 localhost kernel: [ 2.259119] e1000e 0000:00:19.0 eth0: MAC: 11, PHY: 12, PBA No: FFFFFF-0FF
> Jun 28 14:53:54 localhost kernel: [ 2.262208] snd_hda_intel 0000:00:1b.0: irq 46 for MSI/MSI-X
> Jun 28 14:53:54 localhost kernel: [ 2.265424] nct6775: Found NCT6776D/F or compatible chip at 0x2e:0x290
> Jun 28 14:53:54 localhost kernel: [ 2.286592] sound hdaudioC0D0: ALC1150: SKU not ready 0x00000000
> Jun 28 14:53:54 localhost kernel: [ 2.286961] sound hdaudioC0D0: autoconfig: line_outs=3 (0x14/0x15/0x16/0x0/0x0) type:line
> Jun 28 14:53:54 localhost kernel: [ 2.286963] sound hdaudioC0D0: speaker_outs=0 (0x0/0x0/0x0/0x0/0x0)
> Jun 28 14:53:54 localhost kernel: [ 2.286965] sound hdaudioC0D0: hp_outs=1 (0x1b/0x0/0x0/0x0/0x0)
> Jun 28 14:53:54 localhost kernel: [ 2.286966] sound hdaudioC0D0: mono: mono_out=0x0
> Jun 28 14:53:54 localhost kernel: [ 2.286967] sound hdaudioC0D0: dig-out=0x1e/0x0
> Jun 28 14:53:54 localhost kernel: [ 2.286968] sound hdaudioC0D0: inputs:
> Jun 28 14:53:54 localhost kernel: [ 2.286970] sound hdaudioC0D0: Front Mic=0x19
> Jun 28 14:53:54 localhost kernel: [ 2.286971] sound hdaudioC0D0: Rear Mic=0x18
> Jun 28 14:53:54 localhost kernel: [ 2.286972] sound hdaudioC0D0: Line=0x1a
> Jun 28 14:53:54 localhost kernel: [ 2.297632] input: HDA Digital PCBeep as /devices/pci0000:00/0000:00:1b.0/sound/card0/hdaudioC0D0/input5
> Jun 28 14:53:54 localhost kernel: [ 2.297798] input: HDA Intel PCH Front Mic as /devices/pci0000:00/0000:00:1b.0/sound/card0/input6
> Jun 28 14:53:54 localhost kernel: [ 2.297835] input: HDA Intel PCH Rear Mic as /devices/pci0000:00/0000:00:1b.0/sound/card0/input7
> Jun 28 14:53:54 localhost kernel: [ 2.297869] input: HDA Intel PCH Line as /devices/pci0000:00/0000:00:1b.0/sound/card0/input8
> Jun 28 14:53:54 localhost kernel: [ 2.297905] input: HDA Intel PCH Line Out Front as /devices/pci0000:00/0000:00:1b.0/sound/card0/input9
> Jun 28 14:53:54 localhost kernel: [ 2.297940] input: HDA Intel PCH Line Out Surround as /devices/pci0000:00/0000:00:1b.0/sound/card0/input10
> Jun 28 14:53:54 localhost kernel: [ 2.297973] input: HDA Intel PCH Line Out CLFE as /devices/pci0000:00/0000:00:1b.0/sound/card0/input11
> Jun 28 14:53:54 localhost kernel: [ 2.298005] input: HDA Intel PCH Front Headphone as /devices/pci0000:00/0000:00:1b.0/sound/card0/input12
> Jun 28 14:53:54 localhost kernel: [ 2.298888] raid6: sse2x4 18101 MB/s
> Jun 28 14:53:54 localhost kernel: [ 2.306396] zram: unknown parameter '#32' ignored
> Jun 28 14:53:54 localhost kernel: [ 2.306399] zram: unknown parameter 'is' ignored
> Jun 28 14:53:54 localhost kernel: [ 2.306400] zram: unknown parameter 'max' ignored
> Jun 28 14:53:54 localhost kernel: [ 2.306401] zram: unknown parameter 'zram' ignored
> Jun 28 14:53:54 localhost kernel: [ 2.306402] zram: unknown parameter 'devices' ignored
> Jun 28 14:53:54 localhost kernel: [ 2.312100] zram: Created 32 device(s) ...
> Jun 28 14:53:54 localhost kernel: [ 2.327478] [drm] ring test on 6 succeeded in 22 usecs
> Jun 28 14:53:54 localhost kernel: [ 2.327492] [drm] ring test on 7 succeeded in 4 usecs
> Jun 28 14:53:54 localhost kernel: [ 2.327493] [drm] VCE initialized successfully.
> Jun 28 14:53:54 localhost kernel: [ 2.327763] [drm] ib test on ring 0 succeeded in 0 usecs
> Jun 28 14:53:54 localhost kernel: [ 2.327925] [drm] ib test on ring 1 succeeded in 0 usecs
> Jun 28 14:53:54 localhost kernel: [ 2.328079] [drm] ib test on ring 2 succeeded in 0 usecs
> Jun 28 14:53:54 localhost kernel: [ 2.328237] [drm] ib test on ring 3 succeeded in 0 usecs
> Jun 28 14:53:54 localhost kernel: [ 2.328394] [drm] ib test on ring 4 succeeded in 0 usecs
> Jun 28 14:53:54 localhost kernel: [ 2.328707] usb 1-7: ep 0x85 - rounding interval to 64 microframes, ep desc says 80 microframes
> Jun 28 14:53:54 localhost kernel: [ 2.340997] Adding 254540k swap on /dev/zram0. Priority:32767 extents:1 across:254540k SSFS
> Jun 28 14:53:54 localhost kernel: [ 2.341054] Adding 254540k swap on /dev/zram1. Priority:32767 extents:1 across:254540k SSFS
> Jun 28 14:53:54 localhost kernel: [ 2.341110] Adding 254540k swap on /dev/zram2. Priority:32767 extents:1 across:254540k SSFS
> Jun 28 14:53:54 localhost kernel: [ 2.341162] Adding 254540k swap on /dev/zram3. Priority:32767 extents:1 across:254540k SSFS
> Jun 28 14:53:54 localhost kernel: [ 2.343872] [drm] ib test on ring 5 succeeded
> Jun 28 14:53:54 localhost kernel: [ 2.355627] raid6: avx2x1 16273 MB/s
> Jun 28 14:53:54 localhost kernel: [ 2.364832] [drm] ib test on ring 6 succeeded
> Jun 28 14:53:54 localhost kernel: [ 2.365591] [drm] ib test on ring 7 succeeded
> Jun 28 14:53:54 localhost kernel: [ 2.366015] [drm] Radeon Display Connectors
> Jun 28 14:53:54 localhost kernel: [ 2.366018] [drm] Connector 0:
> Jun 28 14:53:54 localhost kernel: [ 2.366019] [drm] DP-1
> Jun 28 14:53:54 localhost kernel: [ 2.366020] [drm] HPD2
> Jun 28 14:53:54 localhost kernel: [ 2.366022] [drm] DDC: 0x6530 0x6530 0x6534 0x6534 0x6538 0x6538 0x653c 0x653c
> Jun 28 14:53:54 localhost kernel: [ 2.366024] [drm] Encoders:
> Jun 28 14:53:54 localhost kernel: [ 2.366026] [drm] DFP1: INTERNAL_UNIPHY2
> Jun 28 14:53:54 localhost kernel: [ 2.366027] [drm] Connector 1:
> Jun 28 14:53:54 localhost kernel: [ 2.366028] [drm] HDMI-A-1
> Jun 28 14:53:54 localhost kernel: [ 2.366030] [drm] HPD3
> Jun 28 14:53:54 localhost kernel: [ 2.366032] [drm] DDC: 0x6550 0x6550 0x6554 0x6554 0x6558 0x6558 0x655c 0x655c
> Jun 28 14:53:54 localhost kernel: [ 2.366033] [drm] Encoders:
> Jun 28 14:53:54 localhost kernel: [ 2.366035] [drm] DFP2: INTERNAL_UNIPHY2
> Jun 28 14:53:54 localhost kernel: [ 2.366036] [drm] Connector 2:
> Jun 28 14:53:54 localhost kernel: [ 2.366037] [drm] DVI-D-1
> Jun 28 14:53:54 localhost kernel: [ 2.366039] [drm] HPD1
> Jun 28 14:53:54 localhost kernel: [ 2.366041] [drm] DDC: 0x6560 0x6560 0x6564 0x6564 0x6568 0x6568 0x656c 0x656c
> Jun 28 14:53:54 localhost kernel: [ 2.366043] [drm] Encoders:
> Jun 28 14:53:54 localhost kernel: [ 2.366044] [drm] DFP3: INTERNAL_UNIPHY1
> Jun 28 14:53:54 localhost kernel: [ 2.366045] [drm] Connector 3:
> Jun 28 14:53:54 localhost kernel: [ 2.366046] [drm] DVI-I-1
> Jun 28 14:53:54 localhost kernel: [ 2.366048] [drm] HPD6
> Jun 28 14:53:54 localhost kernel: [ 2.366049] [drm] DDC: 0x6580 0x6580 0x6584 0x6584 0x6588 0x6588 0x658c 0x658c
> Jun 28 14:53:54 localhost kernel: [ 2.366051] [drm] Encoders:
> Jun 28 14:53:54 localhost kernel: [ 2.366052] [drm] DFP4: INTERNAL_UNIPHY
> Jun 28 14:53:54 localhost kernel: [ 2.366053] [drm] CRT1: INTERNAL_KLDSCP_DAC1
> Jun 28 14:53:54 localhost kernel: [ 2.412356] raid6: avx2x2 20798 MB/s
> Jun 28 14:53:54 localhost kernel: [ 2.412358] Switched to clocksource tsc
> Jun 28 14:53:54 localhost kernel: [ 2.439066] usb 1-8: new low-speed USB device number 7 using xhci_hcd
> Jun 28 14:53:54 localhost kernel: [ 2.442481] e1000e 0000:00:19.0: irq 47 for MSI/MSI-X
> Jun 28 14:53:54 localhost kernel: [ 2.464181] [drm] fb mappable at 0xE098E000
> Jun 28 14:53:54 localhost kernel: [ 2.464183] [drm] vram apper at 0xE0000000
> Jun 28 14:53:54 localhost kernel: [ 2.464184] [drm] size 9216000
> Jun 28 14:53:54 localhost kernel: [ 2.464185] [drm] fb depth is 24
> Jun 28 14:53:54 localhost kernel: [ 2.464186] [drm] pitch is 7680
> Jun 28 14:53:54 localhost kernel: [ 2.464227] fbcon: radeondrmfb (fb0) is primary device
> Jun 28 14:53:54 localhost kernel: [ 2.469074] raid6: avx2x4 24141 MB/s
> Jun 28 14:53:54 localhost kernel: [ 2.469074] raid6: using algorithm avx2x4 (24141 MB/s)
> Jun 28 14:53:54 localhost kernel: [ 2.469075] raid6: using avx2x2 recovery algorithm
> Jun 28 14:53:54 localhost kernel: [ 2.469466] xor: automatically using best checksumming function:
> Jun 28 14:53:54 localhost kernel: [ 2.484840] Console: switching to colour frame buffer device 240x75
> Jun 28 14:53:54 localhost kernel: [ 2.487822] radeon 0000:01:00.0: fb0: radeondrmfb frame buffer device
> Jun 28 14:53:54 localhost kernel: [ 2.487836] radeon 0000:01:00.0: registered panic notifier
> Jun 28 14:53:54 localhost kernel: [ 2.502444] avx : 41036.400 MB/sec
> Jun 28 14:53:54 localhost kernel: [ 2.510424] Btrfs loaded
> Jun 28 14:53:54 localhost kernel: [ 2.510765] BTRFS: device fsid 9d4254aa-6715-4fa8-986a-1af0d51768ad devid 1 transid 303773 /dev/sdc1
> Jun 28 14:53:54 localhost kernel: [ 2.510907] BTRFS: device fsid 9d4254aa-6715-4fa8-986a-1af0d51768ad devid 2 transid 303773 /dev/sdb1
> Jun 28 14:53:54 localhost kernel: [ 2.513700] [drm] Initialized radeon 2.39.0 20080528 for 0000:01:00.0 on minor 0
> Jun 28 14:53:54 localhost kernel: [ 2.513800] snd_hda_intel 0000:01:00.1: Handle VGA-switcheroo audio client
> Jun 28 14:53:54 localhost kernel: [ 2.513878] snd_hda_intel 0000:01:00.1: irq 48 for MSI/MSI-X
> Jun 28 14:53:54 localhost kernel: [ 2.513971] [drm] Memory usable by graphics device = 2048M
> Jun 28 14:53:54 localhost kernel: [ 2.520123] input: HD-Audio Generic HDMI/DP,pcm=3 as /devices/pci0000:00/0000:00:01.0/0000:01:00.1/sound/card1/input13
> Jun 28 14:53:54 localhost kernel: [ 2.520184] input: HD-Audio Generic HDMI/DP,pcm=7 as /devices/pci0000:00/0000:00:01.0/0000:01:00.1/sound/card1/input14
> Jun 28 14:53:54 localhost kernel: [ 2.520258] input: HD-Audio Generic HDMI/DP,pcm=8 as /devices/pci0000:00/0000:00:01.0/0000:01:00.1/sound/card1/input15
> Jun 28 14:53:54 localhost kernel: [ 2.520368] input: HD-Audio Generic HDMI/DP,pcm=9 as /devices/pci0000:00/0000:00:01.0/0000:01:00.1/sound/card1/input16
> Jun 28 14:53:54 localhost kernel: [ 2.520440] input: HD-Audio Generic HDMI/DP,pcm\x10 as /devices/pci0000:00/0000:00:01.0/0000:01:00.1/sound/card1/input17
> Jun 28 14:53:54 localhost kernel: [ 2.521215] input: HD-Audio Generic HDMI/DP,pcm\x11 as /devices/pci0000:00/0000:00:01.0/0000:01:00.1/sound/card1/input18
> Jun 28 14:53:54 localhost kernel: [ 2.532558] i915 0000:00:02.0: irq 49 for MSI/MSI-X
> Jun 28 14:53:54 localhost kernel: [ 2.532565] [drm] Supports vblank timestamp caching Rev 2 (21.10.2013).
> Jun 28 14:53:54 localhost kernel: [ 2.532580] [drm] Driver supports precise vblank timestamp query.
> Jun 28 14:53:54 localhost kernel: [ 2.532607] vgaarb: device changed decodes: PCI:0000:01:00.0,olddecodes=io+mem,decodes=io+mem:owns=io+mem
> Jun 28 14:53:54 localhost kernel: [ 2.545934] e1000e 0000:00:19.0: irq 50 for MSI/MSI-X
> Jun 28 14:53:54 localhost kernel: [ 2.546018] IPv6: ADDRCONF(NETDEV_UP): eth0: link is not ready
> Jun 28 14:53:54 localhost kernel: [ 2.619122] usb 1-8: ep 0x81 - rounding interval to 512 microframes, ep desc says 800 microframes
> Jun 28 14:53:54 localhost kernel: [ 2.759949] i915 0000:00:02.0: fb1: inteldrmfb frame buffer device
> Jun 28 14:53:54 localhost kernel: [ 2.760226] [drm] Initialized i915 1.6.0 20080730 for 0000:00:02.0 on minor 1
> Jun 28 14:53:54 localhost kernel: [ 2.779511] usb 1-14: new high-speed USB device number 8 using xhci_hcd
>
> I am willing to try patches.
>
> Please fix or revert this commit.
>
> Thanks,
> Ed Tomlinson
>
>
> On Thursday 05 June 2014 16:58:28 Daniel Vetter wrote:
> > Touching the VGA resources on an IVB EFI machine causes hard hangs when
> > we then kick out the efifb. Ouch.
> >
> > Apparently this also prevents unclaimed register errors on hsw and
> > hard machine hangs on my i855gm when trying to unbind fbcon.
> >
> > Also, we want this to make I915_FBDEV=n safe.
> >
> > v2: Rebase and pimp commit message.
> >
> > v3: We also need to unregister the vga console, otherwise the unbind
> > of the fb console before module unload might resurrect it again.
> >
> > v4: Ignore errors when the vga console is already unregistered - this
> > can happen when e.g. reloading i915.ko.
> >
> > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?idg813
> > Cc: David Herrmann <dh.herrmann@gmail.com>
> > Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
> > Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
> > Cc: linux-fbdev@vger.kernel.org
> > Cc: Jani Nikula <jani.nikula@linux.intel.com>
> > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> (v1)
> > Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> > ---
> > drivers/gpu/drm/i915/i915_dma.c | 43 +++++++++++++++++++++++++++++++++++++++-
> > drivers/video/console/dummycon.c | 1 +
> > drivers/video/console/vgacon.c | 1 +
> > 3 files changed, 44 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
> > index 27fe65ac5940..bcb66ddd649e 100644
> > --- a/drivers/gpu/drm/i915/i915_dma.c
> > +++ b/drivers/gpu/drm/i915/i915_dma.c
> > @@ -36,6 +36,8 @@
> > #include "i915_drv.h"
> > #include "i915_trace.h"
> > #include <linux/pci.h>
> > +#include <linux/console.h>
> > +#include <linux/vt.h>
> > #include <linux/vgaarb.h>
> > #include <linux/acpi.h>
> > #include <linux/pnp.h>
> > @@ -1449,6 +1451,38 @@ static void i915_kick_out_firmware_fb(struct drm_i915_private *dev_priv)
> > }
> > #endif
> >
> > +#if !defined(CONFIG_VGA_CONSOLE)
> > +static int i915_kick_out_vgacon(struct drm_i915_private *dev_priv)
> > +{
> > + return 0;
> > +}
> > +#elif !defined(CONFIG_DUMMY_CONSOLE)
> > +static int i915_kick_out_vgacon(struct drm_i915_private *dev_priv)
> > +{
> > + return -ENODEV;
> > +}
> > +#else
> > +static int i915_kick_out_vgacon(struct drm_i915_private *dev_priv)
> > +{
> > + int ret;
> > +
> > + DRM_INFO("Replacing VGA console driver\n");
> > +
> > + console_lock();
> > + ret = do_take_over_console(&dummy_con, 0, MAX_NR_CONSOLES - 1, 1);
> > + if (ret = 0) {
> > + ret = do_unregister_con_driver(&vga_con);
> > +
> > + /* Ignore "already unregistered". */
> > + if (ret = -ENODEV)
> > + ret = 0;
> > + }
> > + console_unlock();
> > +
> > + return ret;
> > +}
> > +#endif
> > +
> > static void i915_dump_device_info(struct drm_i915_private *dev_priv)
> > {
> > const struct intel_device_info *info = &dev_priv->info;
> > @@ -1622,8 +1656,15 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
> > if (ret)
> > goto out_regs;
> >
> > - if (drm_core_check_feature(dev, DRIVER_MODESET))
> > + if (drm_core_check_feature(dev, DRIVER_MODESET)) {
> > + ret = i915_kick_out_vgacon(dev_priv);
> > + if (ret) {
> > + DRM_ERROR("failed to remove conflicting VGA console\n");
> > + goto out_gtt;
> > + }
> > +
> > i915_kick_out_firmware_fb(dev_priv);
> > + }
> >
> > pci_set_master(dev->pdev);
> >
> > diff --git a/drivers/video/console/dummycon.c b/drivers/video/console/dummycon.c
> > index b63860f7beab..40bec8d64b0a 100644
> > --- a/drivers/video/console/dummycon.c
> > +++ b/drivers/video/console/dummycon.c
> > @@ -77,3 +77,4 @@ const struct consw dummy_con = {
> > .con_set_palette = DUMMY,
> > .con_scrolldelta = DUMMY,
> > };
> > +EXPORT_SYMBOL_GPL(dummy_con);
> > diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c
> > index 9d8feac67637..84acd6223dc5 100644
> > --- a/drivers/video/console/vgacon.c
> > +++ b/drivers/video/console/vgacon.c
> > @@ -1440,5 +1440,6 @@ const struct consw vga_con = {
> > .con_build_attr = vgacon_build_attr,
> > .con_invert_region = vgacon_invert_region,
> > };
> > +EXPORT_SYMBOL(vga_con);
> >
> > MODULE_LICENSE("GPL");
> >
>
^ permalink raw reply
* Re: [PATCH 5/5] drm/i915: Kick out vga console
From: Chris Wilson @ 2014-06-30 6:59 UTC (permalink / raw)
To: Ed Tomlinson
Cc: linux-fbdev, Dave Airlie, Daniel Vetter,
Intel Graphics Development, LKML, DRI Development, Tomi Valkeinen,
David Herrmann, Jean-Christophe Plagniol-Villard
In-Reply-To: <3945293.Jtp4nyZMfX@grover>
On Sat, Jun 28, 2014 at 11:55:19PM -0400, Ed Tomlinson wrote:
> On Saturday 28 June 2014 15:28:22 Ed Tomlinson wrote:
>
> Resend without html krud which causes list to bounce the message.
>
> > Hi
> >
> > This commit ( a4de05268e674e8ed31df6348269e22d6c6a1803 ) hangs my boot with 3.16-git. Reverting it lets the boot proceed.
> >
> > I have an i7 with a built-in i915 and an pcie r7 260x. The R7 is the primary console. The i915 is initialized
> > but does not have a physical display attached.
> >
> > With the patch applied the boot stops at the messages:
> >
> > [drm] Memory usable by graphics device = 2048M
> > [drm] Replacing VGA console driver
The issue looks like that we are ripping out the radeon fb_con whilst it
is active and that upsets everyone. In which case, I think the
compromise is:
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 5f44581..4915f1d 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -1439,18 +1439,20 @@ static int i915_kick_out_vgacon(struct drm_i915_private *dev_priv)
#else
static int i915_kick_out_vgacon(struct drm_i915_private *dev_priv)
{
- int ret;
+ int ret = 0;
DRM_INFO("Replacing VGA console driver\n");
console_lock();
- ret = do_take_over_console(&dummy_con, 0, MAX_NR_CONSOLES - 1, 1);
- if (ret = 0) {
- ret = do_unregister_con_driver(&vga_con);
-
- /* Ignore "already unregistered". */
- if (ret = -ENODEV)
- ret = 0;
+ if (con_is_bound(&vga_con)) {
+ ret = do_take_over_console(&dummy_con, 0, MAX_NR_CONSOLES - 1, 1);
+ if (ret = 0) {
+ ret = do_unregister_con_driver(&vga_con);
+
+ /* Ignore "already unregistered". */
+ if (ret = -ENODEV)
+ ret = 0;
+ }
}
console_unlock();
-Chris
--
Chris Wilson, Intel Open Source Technology Centre
^ permalink raw reply related
* Re: [PATCH v2 01/13] ARM: OMAP2+: Remove non working OMAP HDMI audio initialization
From: Tony Lindgren @ 2014-06-30 7:24 UTC (permalink / raw)
To: Jyri Sarha
Cc: alsa-devel, linux-fbdev, linux-omap, peter.ujfalusi, broonie,
liam.r.girdwood, tomi.valkeinen, detheridge, jyri.sarha
In-Reply-To: <41571cc2e5a93ff95eda9263a4b5808bba7e6e36.1403894190.git.jsarha@ti.com>
* Jyri Sarha <jsarha@ti.com> [140627 11:41]:
> This code is not working currently and it can be removed. There is a
> conflict in sharing resources with the actual HDMI driver and with
> the ASoC HDMI audio DAI driver.
>
> Signed-off-by: Jyri Sarha <jsarha@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
^ permalink raw reply
* Re: [PATCH 5/5] drm/i915: Kick out vga console
From: David Herrmann @ 2014-06-30 8:19 UTC (permalink / raw)
To: Chris Wilson, Ed Tomlinson, Daniel Vetter,
Intel Graphics Development, DRI Development, LKML, David Herrmann,
Jean-Christophe Plagniol-Villard, Tomi Valkeinen,
linux-fbdev@vger.kernel.org, Jani Nikula, Dave Airlie
In-Reply-To: <20140630065955.GD7687@nuc-i3427.alporthouse.com>
Hi
On Mon, Jun 30, 2014 at 8:59 AM, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> On Sat, Jun 28, 2014 at 11:55:19PM -0400, Ed Tomlinson wrote:
>> On Saturday 28 June 2014 15:28:22 Ed Tomlinson wrote:
>>
>> Resend without html krud which causes list to bounce the message.
>>
>> > Hi
>> >
>> > This commit ( a4de05268e674e8ed31df6348269e22d6c6a1803 ) hangs my boot with 3.16-git. Reverting it lets the boot proceed.
>> >
>> > I have an i7 with a built-in i915 and an pcie r7 260x. The R7 is the primary console. The i915 is initialized
>> > but does not have a physical display attached.
>> >
>> > With the patch applied the boot stops at the messages:
>> >
>> > [drm] Memory usable by graphics device = 2048M
>> > [drm] Replacing VGA console driver
>
> The issue looks like that we are ripping out the radeon fb_con whilst it
> is active and that upsets everyone. In which case, I think the
> compromise is:
do_take_over_console() should only touch console-drivers like fbcon.
How does this affect the underlying fbdev device? Ripping out active
or inactive fbcon should be just fine, shouldn't it?
Given that this hard-locks at kick_out_vgacon(), this looks more like
a dead-lock to me.
Thanks
David
^ permalink raw reply
* [PATCH 3.12 046/181] drivers/video/fbdev/fb-puv3.c: Add header files for function unifb_mmap
From: Jiri Slaby @ 2014-06-30 11:51 UTC (permalink / raw)
To: stable
Cc: linux-kernel, Zhichuang SUN, Jean-Christophe Plagniol-Villard,
Tomi Valkeinen, Jingoo Han, Daniel Vetter, Joe Perches,
Laurent Pinchart, linux-fbdev, Jiri Slaby
In-Reply-To: <61844d8e25eb8899b0836afa9796fa239db80f1f.1404128997.git.jslaby@suse.cz>
From: Zhichuang SUN <sunzc522@gmail.com>
3.12-stable review patch. If anyone has any objections, please let me know.
=======
commit fbc6c4a13bbfb420eedfdb26a0a859f9c07e8a7b upstream.
Function unifb_mmap calls functions which are defined in linux/mm.h
and asm/pgtable.h
The related error (for unicore32 with unicore32_defconfig):
CC drivers/video/fbdev/fb-puv3.o
drivers/video/fbdev/fb-puv3.c: In function 'unifb_mmap':
drivers/video/fbdev/fb-puv3.c:646: error: implicit declaration of
function 'vm_iomap_memory'
drivers/video/fbdev/fb-puv3.c:646: error: implicit declaration of
function 'pgprot_noncached'
Signed-off-by: Zhichuang Sun <sunzc522@gmail.com>
Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: Jingoo Han <jg1.han@samsung.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Joe Perches <joe@perches.com>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: linux-fbdev@vger.kernel.org
Acked-by: Xuetao Guan <gxt@mprc.pku.edu.cn>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---
drivers/video/fb-puv3.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/video/fb-puv3.c b/drivers/video/fb-puv3.c
index 27fc956166fa..520112531eb0 100644
--- a/drivers/video/fb-puv3.c
+++ b/drivers/video/fb-puv3.c
@@ -18,8 +18,10 @@
#include <linux/fb.h>
#include <linux/init.h>
#include <linux/console.h>
+#include <linux/mm.h>
#include <asm/sizes.h>
+#include <asm/pgtable.h>
#include <mach/hardware.h>
/* Platform_data reserved for unifb registers. */
--
2.0.0
^ permalink raw reply related
* [PATCH] video: fbdev: s3c2410fb: Move to clk_prepare_enable/clk_disable_unprepare
From: Vasily Khoruzhick @ 2014-06-30 19:14 UTC (permalink / raw)
To: linux-arm-kernel
Use clk_prepare_enable/clk_disable_unprepare to make the driver
work properly with common clock framework.
Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
---
drivers/video/fbdev/s3c2410fb.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/video/fbdev/s3c2410fb.c b/drivers/video/fbdev/s3c2410fb.c
index 81af5a6..d68595d 100644
--- a/drivers/video/fbdev/s3c2410fb.c
+++ b/drivers/video/fbdev/s3c2410fb.c
@@ -932,7 +932,7 @@ static int s3c24xxfb_probe(struct platform_device *pdev,
goto release_irq;
}
- clk_enable(info->clk);
+ clk_prepare_enable(info->clk);
dprintk("got and enabled clock\n");
usleep_range(1000, 1100);
@@ -996,7 +996,7 @@ static int s3c24xxfb_probe(struct platform_device *pdev,
free_video_memory:
s3c2410fb_unmap_video_memory(fbinfo);
release_clock:
- clk_disable(info->clk);
+ clk_disable_unprepare(info->clk);
clk_put(info->clk);
release_irq:
free_irq(irq, info);
@@ -1038,7 +1038,7 @@ static int s3c2410fb_remove(struct platform_device *pdev)
s3c2410fb_unmap_video_memory(fbinfo);
if (info->clk) {
- clk_disable(info->clk);
+ clk_disable_unprepare(info->clk);
clk_put(info->clk);
info->clk = NULL;
}
@@ -1070,7 +1070,7 @@ static int s3c2410fb_suspend(struct platform_device *dev, pm_message_t state)
* before the clock goes off again (bjd) */
usleep_range(1000, 1100);
- clk_disable(info->clk);
+ clk_disable_unprepare(info->clk);
return 0;
}
@@ -1080,7 +1080,7 @@ static int s3c2410fb_resume(struct platform_device *dev)
struct fb_info *fbinfo = platform_get_drvdata(dev);
struct s3c2410fb_info *info = fbinfo->par;
- clk_enable(info->clk);
+ clk_prepare_enable(info->clk);
usleep_range(1000, 1100);
s3c2410fb_init_registers(fbinfo);
--
2.0.0
^ permalink raw reply related
* [PATCH] MAINTAINERS: Update Framebuffer file patterns
From: Jingoo Han @ 2014-07-01 1:48 UTC (permalink / raw)
To: linux-fbdev
Since the commit f7018c2 "video: move fbdev to drivers/video/fbdev",
all framebuffer drivers were moved to fbdev directory. Thus, file
patterns of these framebuffer drivers should be updated correctly.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
MAINTAINERS | 76 ++++++++++++++++++++++++++++++-----------------------------
1 file changed, 39 insertions(+), 37 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index 3f2e171..7daae48 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -587,7 +587,7 @@ W: http://www.amd.com/us-en/ConnectivitySolutions/TechnicalResources/0,,50_2334_
S: Supported
F: drivers/char/hw_random/geode-rng.c
F: drivers/crypto/geode*
-F: drivers/video/geode/
+F: drivers/video/fbdev/geode/
F: arch/x86/include/asm/geode.h
AMD IOMMU (AMD-VI)
@@ -716,8 +716,8 @@ F: drivers/ata/pata_arasan_cf.c
ARC FRAMEBUFFER DRIVER
M: Jaya Kumar <jayalk@intworks.biz>
S: Maintained
-F: drivers/video/arcfb.c
-F: drivers/video/fb_defio.c
+F: drivers/video/fbdev/arcfb.c
+F: drivers/video/fbdev/core/fb_defio.c
ARM MFM AND FLOPPY DRIVERS
M: Ian Molton <spyro@f2s.com>
@@ -756,7 +756,7 @@ F: sound/arm/aaci.*
ARM PRIMECELL CLCD PL110 DRIVER
M: Russell King <linux@arm.linux.org.uk>
S: Maintained
-F: drivers/video/amba-clcd.*
+F: drivers/video/fbdev/amba-clcd.*
ARM PRIMECELL KMI PL050 DRIVER
M: Russell King <linux@arm.linux.org.uk>
@@ -1135,7 +1135,7 @@ M: Daniel Walker <dwalker@fifo99.com>
M: Bryan Huntsman <bryanh@codeaurora.org>
L: linux-arm-msm@vger.kernel.org
F: arch/arm/mach-msm/
-F: drivers/video/msm/
+F: drivers/video/fbdev/msm/
F: drivers/mmc/host/msm_sdcc.c
F: drivers/mmc/host/msm_sdcc.h
F: drivers/tty/serial/msm_serial.h
@@ -1355,7 +1355,7 @@ F: drivers/mtd/nand/nuc900_nand.c
F: drivers/rtc/rtc-nuc900.c
F: drivers/spi/spi-nuc900.c
F: drivers/usb/host/ehci-w90x900.c
-F: drivers/video/nuc900fb.c
+F: drivers/video/fbdev/nuc900fb.c
ARM/U300 MACHINE SUPPORT
M: Linus Walleij <linus.walleij@linaro.org>
@@ -1424,9 +1424,9 @@ F: drivers/rtc/rtc-vt8500.c
F: drivers/tty/serial/vt8500_serial.c
F: drivers/usb/host/ehci-platform.c
F: drivers/usb/host/uhci-platform.c
-F: drivers/video/vt8500lcdfb.*
-F: drivers/video/wm8505fb*
-F: drivers/video/wmt_ge_rops.*
+F: drivers/video/fbdev/vt8500lcdfb.*
+F: drivers/video/fbdev/wm8505fb*
+F: drivers/video/fbdevwmt_ge_rops.*
ARM/ZIPIT Z2 SUPPORT
M: Marek Vasut <marek.vasut@gmail.com>
@@ -1616,7 +1616,7 @@ ATMEL LCDFB DRIVER
M: Nicolas Ferre <nicolas.ferre@atmel.com>
L: linux-fbdev@vger.kernel.org
S: Maintained
-F: drivers/video/atmel_lcdfb.c
+F: drivers/video/fbdev/atmel_lcdfb.c
F: include/video/atmel_lcdc.h
ATMEL MACB ETHERNET DRIVER
@@ -2626,7 +2626,7 @@ M: Russell King <linux@arm.linux.org.uk>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
W: http://www.arm.linux.org.uk/
S: Maintained
-F: drivers/video/cyber2000fb.*
+F: drivers/video/fbdev/cyber2000fb.*
CYCLADES ASYNC MUX DRIVER
W: http://www.cyclades.com/
@@ -2863,7 +2863,7 @@ M: Bernie Thompson <bernie@plugable.com>
L: linux-fbdev@vger.kernel.org
S: Maintained
W: http://plugable.com/category/projects/udlfb/
-F: drivers/video/udlfb.c
+F: drivers/video/fbdev/udlfb.c
F: include/video/udlfb.h
F: Documentation/fb/udlfb.txt
@@ -3385,7 +3385,7 @@ EFIFB FRAMEBUFFER DRIVER
L: linux-fbdev@vger.kernel.org
M: Peter Jones <pjones@redhat.com>
S: Maintained
-F: drivers/video/efifb.c
+F: drivers/video/fbdev/efifb.c
EFS FILESYSTEM
W: http://aeschi.ch.eu.org/efs/
@@ -3450,7 +3450,7 @@ EPSON S1D13XXX FRAMEBUFFER DRIVER
M: Kristoffer Ericson <kristoffer.ericson@gmail.com>
S: Maintained
T: git git://git.kernel.org/pub/scm/linux/kernel/git/kristoffer/linux-hpc.git
-F: drivers/video/s1d13xxxfb.c
+F: drivers/video/fbdev/s1d13xxxfb.c
F: include/video/s1d13xxxfb.h
ETHERNET BRIDGE
@@ -3528,7 +3528,7 @@ M: Donghwa Lee <dh09.lee@samsung.com>
M: Kyungmin Park <kyungmin.park@samsung.com>
L: linux-fbdev@vger.kernel.org
S: Maintained
-F: drivers/video/exynos/exynos_mipi*
+F: drivers/video/fbdev/exynos/exynos_mipi*
F: include/video/exynos_mipi*
F71805F HARDWARE MONITORING DRIVER
@@ -3707,7 +3707,8 @@ FREESCALE DIU FRAMEBUFFER DRIVER
M: Timur Tabi <timur@tabi.org>
L: linux-fbdev@vger.kernel.org
S: Maintained
-F: drivers/video/fsl-diu-fb.*
+F: drivers/video/fbdev/fsl-diu-fb.c
+F: include/linux/fsl-diu-fb.h
FREESCALE DMA DRIVER
M: Li Yang <leoli@freescale.com>
@@ -3729,7 +3730,7 @@ L: linux-fbdev@vger.kernel.org
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S: Maintained
F: include/linux/platform_data/video-imxfb.h
-F: drivers/video/imxfb.c
+F: drivers/video/fbdev/imxfb.c
FREESCALE SOC FS_ENET DRIVER
M: Pantelis Antoniou <pantelis.antoniou@gmail.com>
@@ -4148,7 +4149,7 @@ M: Ferenc Bakonyi <fero@drama.obuda.kando.hu>
L: linux-nvidia@lists.surfsouth.com
W: http://drama.obuda.kando.hu/~fero/cgi-bin/hgafb.shtml
S: Maintained
-F: drivers/video/hgafb.c
+F: drivers/video/fbdev/hgafb.c
HIBERNATION (aka Software Suspend, aka swsusp)
M: "Rafael J. Wysocki" <rjw@rjwysocki.net>
@@ -4290,7 +4291,7 @@ F: drivers/hv/
F: drivers/input/serio/hyperv-keyboard.c
F: drivers/net/hyperv/
F: drivers/scsi/storvsc_drv.c
-F: drivers/video/hyperv_fb.c
+F: drivers/video/fbdev/hyperv_fb.c
F: include/linux/hyperv.h
F: tools/hv/
@@ -4550,7 +4551,7 @@ F: security/integrity/ima/
IMS TWINTURBO FRAMEBUFFER DRIVER
L: linux-fbdev@vger.kernel.org
S: Orphan
-F: drivers/video/imsttfb.c
+F: drivers/video/fbdev/imsttfb.c
INFINIBAND SUBSYSTEM
M: Roland Dreier <roland@kernel.org>
@@ -4617,13 +4618,13 @@ M: Maik Broemme <mbroemme@plusserver.de>
L: linux-fbdev@vger.kernel.org
S: Maintained
F: Documentation/fb/intelfb.txt
-F: drivers/video/intelfb/
+F: drivers/video/fbdev/intelfb/
INTEL 810/815 FRAMEBUFFER DRIVER
M: Antonino Daplas <adaplas@gmail.com>
L: linux-fbdev@vger.kernel.org
S: Maintained
-F: drivers/video/i810/
+F: drivers/video/fbdev/i810/
INTEL MENLOW THERMAL DRIVER
M: Sujith Thomas <sujith.thomas@intel.com>
@@ -5702,7 +5703,7 @@ F: drivers/mmc/host/mvsdio.*
MATROX FRAMEBUFFER DRIVER
L: linux-fbdev@vger.kernel.org
S: Orphan
-F: drivers/video/matrox/matroxfb_*
+F: drivers/video/fbdev/matrox/matroxfb_*
F: include/uapi/linux/matroxfb.h
MAX16065 HARDWARE MONITOR DRIVER
@@ -6345,8 +6346,8 @@ NVIDIA (rivafb and nvidiafb) FRAMEBUFFER DRIVER
M: Antonino Daplas <adaplas@gmail.com>
L: linux-fbdev@vger.kernel.org
S: Maintained
-F: drivers/video/riva/
-F: drivers/video/nvidia/
+F: drivers/video/fbdev/riva/
+F: drivers/video/fbdev/nvidia/
NVM EXPRESS DRIVER
M: Matthew Wilcox <willy@linux.intel.com>
@@ -6416,14 +6417,14 @@ M: Tomi Valkeinen <tomi.valkeinen@ti.com>
L: linux-fbdev@vger.kernel.org
L: linux-omap@vger.kernel.org
S: Maintained
-F: drivers/video/omap/
+F: drivers/video/fbdev/omap/
OMAP DISPLAY SUBSYSTEM and FRAMEBUFFER SUPPORT (DSS2)
M: Tomi Valkeinen <tomi.valkeinen@ti.com>
L: linux-omap@vger.kernel.org
L: linux-fbdev@vger.kernel.org
S: Maintained
-F: drivers/video/omap2/
+F: drivers/video/fbdev/omap2/
F: Documentation/arm/OMAP/DSS
OMAP HARDWARE SPINLOCK SUPPORT
@@ -6714,7 +6715,7 @@ F: drivers/char/agp/parisc-agp.c
F: drivers/input/serio/gscps2.c
F: drivers/parport/parport_gsc.*
F: drivers/tty/serial/8250/8250_gsc.c
-F: drivers/video/sti*
+F: drivers/video/fbdev/sti*
F: drivers/video/console/sti*
F: drivers/video/logo/logo_parisc*
@@ -6963,7 +6964,7 @@ S: Maintained
T: git git://github.com/gxt/linux.git
F: drivers/input/serio/i8042-unicore32io.h
F: drivers/i2c/busses/i2c-puv3.c
-F: drivers/video/fb-puv3.c
+F: drivers/video/fbdev/fb-puv3.c
F: drivers/rtc/rtc-puv3.c
PMBUS HARDWARE MONITORING DRIVERS
@@ -7335,7 +7336,7 @@ RADEON FRAMEBUFFER DISPLAY DRIVER
M: Benjamin Herrenschmidt <benh@kernel.crashing.org>
L: linux-fbdev@vger.kernel.org
S: Maintained
-F: drivers/video/aty/radeon*
+F: drivers/video/fbdev/aty/radeon*
F: include/uapi/linux/radeonfb.h
RADIOSHARK RADIO DRIVER
@@ -7357,7 +7358,7 @@ RAGE128 FRAMEBUFFER DISPLAY DRIVER
M: Paul Mackerras <paulus@samba.org>
L: linux-fbdev@vger.kernel.org
S: Maintained
-F: drivers/video/aty/aty128fb.c
+F: drivers/video/fbdev/aty/aty128fb.c
RALINK RT2X00 WIRELESS LAN DRIVER
P: rt2x00 project
@@ -7591,7 +7592,7 @@ S3 SAVAGE FRAMEBUFFER DRIVER
M: Antonino Daplas <adaplas@gmail.com>
L: linux-fbdev@vger.kernel.org
S: Maintained
-F: drivers/video/savage/
+F: drivers/video/fbdev/savage/
S390
M: Martin Schwidefsky <schwidefsky@de.ibm.com>
@@ -7714,7 +7715,7 @@ SAMSUNG FRAMEBUFFER DRIVER
M: Jingoo Han <jg1.han@samsung.com>
L: linux-fbdev@vger.kernel.org
S: Maintained
-F: drivers/video/s3c-fb.c
+F: drivers/video/fbdev/s3c-fb.c
SAMSUNG MULTIFUNCTION DEVICE DRIVERS
M: Sangbeom Kim <sbkim73@samsung.com>
@@ -8186,7 +8187,7 @@ M: Thomas Winischhofer <thomas@winischhofer.net>
W: http://www.winischhofer.net/linuxsisvga.shtml
S: Maintained
F: Documentation/fb/sisfb.txt
-F: drivers/video/sis/
+F: drivers/video/fbdev/sis/
F: include/video/sisfb.h
SIS USB2VGA DRIVER
@@ -8290,7 +8291,7 @@ SMSC UFX6000 and UFX7000 USB to VGA DRIVER
M: Steve Glendinning <steve.glendinning@shawell.net>
L: linux-fbdev@vger.kernel.org
S: Maintained
-F: drivers/video/smscufx.c
+F: drivers/video/fbdev/smscufx.c
SOC-CAMERA V4L2 SUBSYSTEM
M: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
@@ -9622,7 +9623,8 @@ L: linux-fbdev@vger.kernel.org
W: http://dev.gentoo.org/~spock/projects/uvesafb/
S: Maintained
F: Documentation/fb/uvesafb.txt
-F: drivers/video/uvesafb.*
+F: drivers/video/fbdev/uvesafb.c
+F: include/video/uvesafb.h
VFAT/FAT/MSDOS FILESYSTEM
M: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
@@ -9695,7 +9697,7 @@ S: Maintained
F: include/linux/via-core.h
F: include/linux/via-gpio.h
F: include/linux/via_i2c.h
-F: drivers/video/via/
+F: drivers/video/fbdev/via/
VIA VELOCITY NETWORK DRIVER
M: Francois Romieu <romieu@fr.zoreil.com>
--
1.7.10.4
^ permalink raw reply related
* Re: [PATCH] MAINTAINERS: Update Framebuffer file patterns
From: Liu Ying @ 2014-07-01 3:36 UTC (permalink / raw)
To: linux-fbdev
In-Reply-To: <00a101cf94ce$9489daf0$bd9d90d0$%han@samsung.com>
On 07/01/2014 09:48 AM, Jingoo Han wrote:
> Since the commit f7018c2 "video: move fbdev to drivers/video/fbdev",
> all framebuffer drivers were moved to fbdev directory. Thus, file
> patterns of these framebuffer drivers should be updated correctly.
>
> Signed-off-by: Jingoo Han <jg1.han@samsung.com>
> ---
> MAINTAINERS | 76 ++++++++++++++++++++++++++++++-----------------------------
> 1 file changed, 39 insertions(+), 37 deletions(-)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 3f2e171..7daae48 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -587,7 +587,7 @@ W: http://www.amd.com/us-en/ConnectivitySolutions/TechnicalResources/0,,50_2334_
> S: Supported
> F: drivers/char/hw_random/geode-rng.c
> F: drivers/crypto/geode*
> -F: drivers/video/geode/
> +F: drivers/video/fbdev/geode/
> F: arch/x86/include/asm/geode.h
>
> AMD IOMMU (AMD-VI)
> @@ -716,8 +716,8 @@ F: drivers/ata/pata_arasan_cf.c
> ARC FRAMEBUFFER DRIVER
> M: Jaya Kumar <jayalk@intworks.biz>
> S: Maintained
> -F: drivers/video/arcfb.c
> -F: drivers/video/fb_defio.c
> +F: drivers/video/fbdev/arcfb.c
> +F: drivers/video/fbdev/core/fb_defio.c
>
> ARM MFM AND FLOPPY DRIVERS
> M: Ian Molton <spyro@f2s.com>
> @@ -756,7 +756,7 @@ F: sound/arm/aaci.*
> ARM PRIMECELL CLCD PL110 DRIVER
> M: Russell King <linux@arm.linux.org.uk>
> S: Maintained
> -F: drivers/video/amba-clcd.*
> +F: drivers/video/fbdev/amba-clcd.*
>
> ARM PRIMECELL KMI PL050 DRIVER
> M: Russell King <linux@arm.linux.org.uk>
> @@ -1135,7 +1135,7 @@ M: Daniel Walker <dwalker@fifo99.com>
> M: Bryan Huntsman <bryanh@codeaurora.org>
> L: linux-arm-msm@vger.kernel.org
> F: arch/arm/mach-msm/
> -F: drivers/video/msm/
> +F: drivers/video/fbdev/msm/
> F: drivers/mmc/host/msm_sdcc.c
> F: drivers/mmc/host/msm_sdcc.h
> F: drivers/tty/serial/msm_serial.h
> @@ -1355,7 +1355,7 @@ F: drivers/mtd/nand/nuc900_nand.c
> F: drivers/rtc/rtc-nuc900.c
> F: drivers/spi/spi-nuc900.c
> F: drivers/usb/host/ehci-w90x900.c
> -F: drivers/video/nuc900fb.c
> +F: drivers/video/fbdev/nuc900fb.c
>
> ARM/U300 MACHINE SUPPORT
> M: Linus Walleij <linus.walleij@linaro.org>
> @@ -1424,9 +1424,9 @@ F: drivers/rtc/rtc-vt8500.c
> F: drivers/tty/serial/vt8500_serial.c
> F: drivers/usb/host/ehci-platform.c
> F: drivers/usb/host/uhci-platform.c
> -F: drivers/video/vt8500lcdfb.*
> -F: drivers/video/wm8505fb*
> -F: drivers/video/wmt_ge_rops.*
> +F: drivers/video/fbdev/vt8500lcdfb.*
> +F: drivers/video/fbdev/wm8505fb*
> +F: drivers/video/fbdevwmt_ge_rops.*
A typo here. This should be
+F: drivers/video/fbdev/wmt_ge_rops.*
Regards,
Liu Ying
>
> ARM/ZIPIT Z2 SUPPORT
> M: Marek Vasut <marek.vasut@gmail.com>
> @@ -1616,7 +1616,7 @@ ATMEL LCDFB DRIVER
> M: Nicolas Ferre <nicolas.ferre@atmel.com>
> L: linux-fbdev@vger.kernel.org
> S: Maintained
> -F: drivers/video/atmel_lcdfb.c
> +F: drivers/video/fbdev/atmel_lcdfb.c
> F: include/video/atmel_lcdc.h
>
> ATMEL MACB ETHERNET DRIVER
> @@ -2626,7 +2626,7 @@ M: Russell King <linux@arm.linux.org.uk>
> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
> W: http://www.arm.linux.org.uk/
> S: Maintained
> -F: drivers/video/cyber2000fb.*
> +F: drivers/video/fbdev/cyber2000fb.*
>
> CYCLADES ASYNC MUX DRIVER
> W: http://www.cyclades.com/
> @@ -2863,7 +2863,7 @@ M: Bernie Thompson <bernie@plugable.com>
> L: linux-fbdev@vger.kernel.org
> S: Maintained
> W: http://plugable.com/category/projects/udlfb/
> -F: drivers/video/udlfb.c
> +F: drivers/video/fbdev/udlfb.c
> F: include/video/udlfb.h
> F: Documentation/fb/udlfb.txt
>
> @@ -3385,7 +3385,7 @@ EFIFB FRAMEBUFFER DRIVER
> L: linux-fbdev@vger.kernel.org
> M: Peter Jones <pjones@redhat.com>
> S: Maintained
> -F: drivers/video/efifb.c
> +F: drivers/video/fbdev/efifb.c
>
> EFS FILESYSTEM
> W: http://aeschi.ch.eu.org/efs/
> @@ -3450,7 +3450,7 @@ EPSON S1D13XXX FRAMEBUFFER DRIVER
> M: Kristoffer Ericson <kristoffer.ericson@gmail.com>
> S: Maintained
> T: git git://git.kernel.org/pub/scm/linux/kernel/git/kristoffer/linux-hpc.git
> -F: drivers/video/s1d13xxxfb.c
> +F: drivers/video/fbdev/s1d13xxxfb.c
> F: include/video/s1d13xxxfb.h
>
> ETHERNET BRIDGE
> @@ -3528,7 +3528,7 @@ M: Donghwa Lee <dh09.lee@samsung.com>
> M: Kyungmin Park <kyungmin.park@samsung.com>
> L: linux-fbdev@vger.kernel.org
> S: Maintained
> -F: drivers/video/exynos/exynos_mipi*
> +F: drivers/video/fbdev/exynos/exynos_mipi*
> F: include/video/exynos_mipi*
>
> F71805F HARDWARE MONITORING DRIVER
> @@ -3707,7 +3707,8 @@ FREESCALE DIU FRAMEBUFFER DRIVER
> M: Timur Tabi <timur@tabi.org>
> L: linux-fbdev@vger.kernel.org
> S: Maintained
> -F: drivers/video/fsl-diu-fb.*
> +F: drivers/video/fbdev/fsl-diu-fb.c
> +F: include/linux/fsl-diu-fb.h
>
> FREESCALE DMA DRIVER
> M: Li Yang <leoli@freescale.com>
> @@ -3729,7 +3730,7 @@ L: linux-fbdev@vger.kernel.org
> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
> S: Maintained
> F: include/linux/platform_data/video-imxfb.h
> -F: drivers/video/imxfb.c
> +F: drivers/video/fbdev/imxfb.c
>
> FREESCALE SOC FS_ENET DRIVER
> M: Pantelis Antoniou <pantelis.antoniou@gmail.com>
> @@ -4148,7 +4149,7 @@ M: Ferenc Bakonyi <fero@drama.obuda.kando.hu>
> L: linux-nvidia@lists.surfsouth.com
> W: http://drama.obuda.kando.hu/~fero/cgi-bin/hgafb.shtml
> S: Maintained
> -F: drivers/video/hgafb.c
> +F: drivers/video/fbdev/hgafb.c
>
> HIBERNATION (aka Software Suspend, aka swsusp)
> M: "Rafael J. Wysocki" <rjw@rjwysocki.net>
> @@ -4290,7 +4291,7 @@ F: drivers/hv/
> F: drivers/input/serio/hyperv-keyboard.c
> F: drivers/net/hyperv/
> F: drivers/scsi/storvsc_drv.c
> -F: drivers/video/hyperv_fb.c
> +F: drivers/video/fbdev/hyperv_fb.c
> F: include/linux/hyperv.h
> F: tools/hv/
>
> @@ -4550,7 +4551,7 @@ F: security/integrity/ima/
> IMS TWINTURBO FRAMEBUFFER DRIVER
> L: linux-fbdev@vger.kernel.org
> S: Orphan
> -F: drivers/video/imsttfb.c
> +F: drivers/video/fbdev/imsttfb.c
>
> INFINIBAND SUBSYSTEM
> M: Roland Dreier <roland@kernel.org>
> @@ -4617,13 +4618,13 @@ M: Maik Broemme <mbroemme@plusserver.de>
> L: linux-fbdev@vger.kernel.org
> S: Maintained
> F: Documentation/fb/intelfb.txt
> -F: drivers/video/intelfb/
> +F: drivers/video/fbdev/intelfb/
>
> INTEL 810/815 FRAMEBUFFER DRIVER
> M: Antonino Daplas <adaplas@gmail.com>
> L: linux-fbdev@vger.kernel.org
> S: Maintained
> -F: drivers/video/i810/
> +F: drivers/video/fbdev/i810/
>
> INTEL MENLOW THERMAL DRIVER
> M: Sujith Thomas <sujith.thomas@intel.com>
> @@ -5702,7 +5703,7 @@ F: drivers/mmc/host/mvsdio.*
> MATROX FRAMEBUFFER DRIVER
> L: linux-fbdev@vger.kernel.org
> S: Orphan
> -F: drivers/video/matrox/matroxfb_*
> +F: drivers/video/fbdev/matrox/matroxfb_*
> F: include/uapi/linux/matroxfb.h
>
> MAX16065 HARDWARE MONITOR DRIVER
> @@ -6345,8 +6346,8 @@ NVIDIA (rivafb and nvidiafb) FRAMEBUFFER DRIVER
> M: Antonino Daplas <adaplas@gmail.com>
> L: linux-fbdev@vger.kernel.org
> S: Maintained
> -F: drivers/video/riva/
> -F: drivers/video/nvidia/
> +F: drivers/video/fbdev/riva/
> +F: drivers/video/fbdev/nvidia/
>
> NVM EXPRESS DRIVER
> M: Matthew Wilcox <willy@linux.intel.com>
> @@ -6416,14 +6417,14 @@ M: Tomi Valkeinen <tomi.valkeinen@ti.com>
> L: linux-fbdev@vger.kernel.org
> L: linux-omap@vger.kernel.org
> S: Maintained
> -F: drivers/video/omap/
> +F: drivers/video/fbdev/omap/
>
> OMAP DISPLAY SUBSYSTEM and FRAMEBUFFER SUPPORT (DSS2)
> M: Tomi Valkeinen <tomi.valkeinen@ti.com>
> L: linux-omap@vger.kernel.org
> L: linux-fbdev@vger.kernel.org
> S: Maintained
> -F: drivers/video/omap2/
> +F: drivers/video/fbdev/omap2/
> F: Documentation/arm/OMAP/DSS
>
> OMAP HARDWARE SPINLOCK SUPPORT
> @@ -6714,7 +6715,7 @@ F: drivers/char/agp/parisc-agp.c
> F: drivers/input/serio/gscps2.c
> F: drivers/parport/parport_gsc.*
> F: drivers/tty/serial/8250/8250_gsc.c
> -F: drivers/video/sti*
> +F: drivers/video/fbdev/sti*
> F: drivers/video/console/sti*
> F: drivers/video/logo/logo_parisc*
>
> @@ -6963,7 +6964,7 @@ S: Maintained
> T: git git://github.com/gxt/linux.git
> F: drivers/input/serio/i8042-unicore32io.h
> F: drivers/i2c/busses/i2c-puv3.c
> -F: drivers/video/fb-puv3.c
> +F: drivers/video/fbdev/fb-puv3.c
> F: drivers/rtc/rtc-puv3.c
>
> PMBUS HARDWARE MONITORING DRIVERS
> @@ -7335,7 +7336,7 @@ RADEON FRAMEBUFFER DISPLAY DRIVER
> M: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> L: linux-fbdev@vger.kernel.org
> S: Maintained
> -F: drivers/video/aty/radeon*
> +F: drivers/video/fbdev/aty/radeon*
> F: include/uapi/linux/radeonfb.h
>
> RADIOSHARK RADIO DRIVER
> @@ -7357,7 +7358,7 @@ RAGE128 FRAMEBUFFER DISPLAY DRIVER
> M: Paul Mackerras <paulus@samba.org>
> L: linux-fbdev@vger.kernel.org
> S: Maintained
> -F: drivers/video/aty/aty128fb.c
> +F: drivers/video/fbdev/aty/aty128fb.c
>
> RALINK RT2X00 WIRELESS LAN DRIVER
> P: rt2x00 project
> @@ -7591,7 +7592,7 @@ S3 SAVAGE FRAMEBUFFER DRIVER
> M: Antonino Daplas <adaplas@gmail.com>
> L: linux-fbdev@vger.kernel.org
> S: Maintained
> -F: drivers/video/savage/
> +F: drivers/video/fbdev/savage/
>
> S390
> M: Martin Schwidefsky <schwidefsky@de.ibm.com>
> @@ -7714,7 +7715,7 @@ SAMSUNG FRAMEBUFFER DRIVER
> M: Jingoo Han <jg1.han@samsung.com>
> L: linux-fbdev@vger.kernel.org
> S: Maintained
> -F: drivers/video/s3c-fb.c
> +F: drivers/video/fbdev/s3c-fb.c
>
> SAMSUNG MULTIFUNCTION DEVICE DRIVERS
> M: Sangbeom Kim <sbkim73@samsung.com>
> @@ -8186,7 +8187,7 @@ M: Thomas Winischhofer <thomas@winischhofer.net>
> W: http://www.winischhofer.net/linuxsisvga.shtml
> S: Maintained
> F: Documentation/fb/sisfb.txt
> -F: drivers/video/sis/
> +F: drivers/video/fbdev/sis/
> F: include/video/sisfb.h
>
> SIS USB2VGA DRIVER
> @@ -8290,7 +8291,7 @@ SMSC UFX6000 and UFX7000 USB to VGA DRIVER
> M: Steve Glendinning <steve.glendinning@shawell.net>
> L: linux-fbdev@vger.kernel.org
> S: Maintained
> -F: drivers/video/smscufx.c
> +F: drivers/video/fbdev/smscufx.c
>
> SOC-CAMERA V4L2 SUBSYSTEM
> M: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
> @@ -9622,7 +9623,8 @@ L: linux-fbdev@vger.kernel.org
> W: http://dev.gentoo.org/~spock/projects/uvesafb/
> S: Maintained
> F: Documentation/fb/uvesafb.txt
> -F: drivers/video/uvesafb.*
> +F: drivers/video/fbdev/uvesafb.c
> +F: include/video/uvesafb.h
>
> VFAT/FAT/MSDOS FILESYSTEM
> M: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
> @@ -9695,7 +9697,7 @@ S: Maintained
> F: include/linux/via-core.h
> F: include/linux/via-gpio.h
> F: include/linux/via_i2c.h
> -F: drivers/video/via/
> +F: drivers/video/fbdev/via/
>
> VIA VELOCITY NETWORK DRIVER
> M: Francois Romieu <romieu@fr.zoreil.com>
>
^ permalink raw reply
* Re: [PATCH] MAINTAINERS: Update Framebuffer file patterns
From: Jingoo Han @ 2014-07-01 3:53 UTC (permalink / raw)
To: linux-fbdev
In-Reply-To: <00a101cf94ce$9489daf0$bd9d90d0$%han@samsung.com>
On Tuesday, July 01, 2014 12:37 PM, Liu Ying wrote:
> On 07/01/2014 09:48 AM, Jingoo Han wrote:
> > Since the commit f7018c2 "video: move fbdev to drivers/video/fbdev",
> > all framebuffer drivers were moved to fbdev directory. Thus, file
> > patterns of these framebuffer drivers should be updated correctly.
> >
> > Signed-off-by: Jingoo Han <jg1.han@samsung.com>
> > ---
> > MAINTAINERS | 76 ++++++++++++++++++++++++++++++-----------------------------
> > 1 file changed, 39 insertions(+), 37 deletions(-)
> >
> > diff --git a/MAINTAINERS b/MAINTAINERS
> > index 3f2e171..7daae48 100644
> > --- a/MAINTAINERS
> > +++ b/MAINTAINERS
> > @@ -587,7 +587,7 @@ W: http://www.amd.com/us-
> en/ConnectivitySolutions/TechnicalResources/0,,50_2334_
> > S: Supported
> > F: drivers/char/hw_random/geode-rng.c
> > F: drivers/crypto/geode*
> > -F: drivers/video/geode/
> > +F: drivers/video/fbdev/geode/
> > F: arch/x86/include/asm/geode.h
> >
> > AMD IOMMU (AMD-VI)
> > @@ -716,8 +716,8 @@ F: drivers/ata/pata_arasan_cf.c
> > ARC FRAMEBUFFER DRIVER
> > M: Jaya Kumar <jayalk@intworks.biz>
> > S: Maintained
> > -F: drivers/video/arcfb.c
> > -F: drivers/video/fb_defio.c
> > +F: drivers/video/fbdev/arcfb.c
> > +F: drivers/video/fbdev/core/fb_defio.c
> >
> > ARM MFM AND FLOPPY DRIVERS
> > M: Ian Molton <spyro@f2s.com>
> > @@ -756,7 +756,7 @@ F: sound/arm/aaci.*
> > ARM PRIMECELL CLCD PL110 DRIVER
> > M: Russell King <linux@arm.linux.org.uk>
> > S: Maintained
> > -F: drivers/video/amba-clcd.*
> > +F: drivers/video/fbdev/amba-clcd.*
> >
> > ARM PRIMECELL KMI PL050 DRIVER
> > M: Russell King <linux@arm.linux.org.uk>
> > @@ -1135,7 +1135,7 @@ M: Daniel Walker <dwalker@fifo99.com>
> > M: Bryan Huntsman <bryanh@codeaurora.org>
> > L: linux-arm-msm@vger.kernel.org
> > F: arch/arm/mach-msm/
> > -F: drivers/video/msm/
> > +F: drivers/video/fbdev/msm/
> > F: drivers/mmc/host/msm_sdcc.c
> > F: drivers/mmc/host/msm_sdcc.h
> > F: drivers/tty/serial/msm_serial.h
> > @@ -1355,7 +1355,7 @@ F: drivers/mtd/nand/nuc900_nand.c
> > F: drivers/rtc/rtc-nuc900.c
> > F: drivers/spi/spi-nuc900.c
> > F: drivers/usb/host/ehci-w90x900.c
> > -F: drivers/video/nuc900fb.c
> > +F: drivers/video/fbdev/nuc900fb.c
> >
> > ARM/U300 MACHINE SUPPORT
> > M: Linus Walleij <linus.walleij@linaro.org>
> > @@ -1424,9 +1424,9 @@ F: drivers/rtc/rtc-vt8500.c
> > F: drivers/tty/serial/vt8500_serial.c
> > F: drivers/usb/host/ehci-platform.c
> > F: drivers/usb/host/uhci-platform.c
> > -F: drivers/video/vt8500lcdfb.*
> > -F: drivers/video/wm8505fb*
> > -F: drivers/video/wmt_ge_rops.*
> > +F: drivers/video/fbdev/vt8500lcdfb.*
> > +F: drivers/video/fbdev/wm8505fb*
> > +F: drivers/video/fbdevwmt_ge_rops.*
>
> A typo here. This should be
> +F: drivers/video/fbdev/wmt_ge_rops.*
Oh, it is my mistake!
I really appreciate your comment. :-)
I will fix it and send v2 patch, soon.
Thank you.
Best regards,
Jingoo Han
>
> Regards,
> Liu Ying
>
> >
> > ARM/ZIPIT Z2 SUPPORT
> > M: Marek Vasut <marek.vasut@gmail.com>
> > @@ -1616,7 +1616,7 @@ ATMEL LCDFB DRIVER
> > M: Nicolas Ferre <nicolas.ferre@atmel.com>
> > L: linux-fbdev@vger.kernel.org
> > S: Maintained
> > -F: drivers/video/atmel_lcdfb.c
> > +F: drivers/video/fbdev/atmel_lcdfb.c
> > F: include/video/atmel_lcdc.h
> >
> > ATMEL MACB ETHERNET DRIVER
> > @@ -2626,7 +2626,7 @@ M: Russell King <linux@arm.linux.org.uk>
> > L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
> > W: http://www.arm.linux.org.uk/
> > S: Maintained
> > -F: drivers/video/cyber2000fb.*
> > +F: drivers/video/fbdev/cyber2000fb.*
> >
> > CYCLADES ASYNC MUX DRIVER
> > W: http://www.cyclades.com/
> > @@ -2863,7 +2863,7 @@ M: Bernie Thompson <bernie@plugable.com>
> > L: linux-fbdev@vger.kernel.org
> > S: Maintained
> > W: http://plugable.com/category/projects/udlfb/
> > -F: drivers/video/udlfb.c
> > +F: drivers/video/fbdev/udlfb.c
> > F: include/video/udlfb.h
> > F: Documentation/fb/udlfb.txt
> >
> > @@ -3385,7 +3385,7 @@ EFIFB FRAMEBUFFER DRIVER
> > L: linux-fbdev@vger.kernel.org
> > M: Peter Jones <pjones@redhat.com>
> > S: Maintained
> > -F: drivers/video/efifb.c
> > +F: drivers/video/fbdev/efifb.c
> >
> > EFS FILESYSTEM
> > W: http://aeschi.ch.eu.org/efs/
> > @@ -3450,7 +3450,7 @@ EPSON S1D13XXX FRAMEBUFFER DRIVER
> > M: Kristoffer Ericson <kristoffer.ericson@gmail.com>
> > S: Maintained
> > T: git git://git.kernel.org/pub/scm/linux/kernel/git/kristoffer/linux-hpc.git
> > -F: drivers/video/s1d13xxxfb.c
> > +F: drivers/video/fbdev/s1d13xxxfb.c
> > F: include/video/s1d13xxxfb.h
> >
> > ETHERNET BRIDGE
> > @@ -3528,7 +3528,7 @@ M: Donghwa Lee <dh09.lee@samsung.com>
> > M: Kyungmin Park <kyungmin.park@samsung.com>
> > L: linux-fbdev@vger.kernel.org
> > S: Maintained
> > -F: drivers/video/exynos/exynos_mipi*
> > +F: drivers/video/fbdev/exynos/exynos_mipi*
> > F: include/video/exynos_mipi*
> >
> > F71805F HARDWARE MONITORING DRIVER
> > @@ -3707,7 +3707,8 @@ FREESCALE DIU FRAMEBUFFER DRIVER
> > M: Timur Tabi <timur@tabi.org>
> > L: linux-fbdev@vger.kernel.org
> > S: Maintained
> > -F: drivers/video/fsl-diu-fb.*
> > +F: drivers/video/fbdev/fsl-diu-fb.c
> > +F: include/linux/fsl-diu-fb.h
> >
> > FREESCALE DMA DRIVER
> > M: Li Yang <leoli@freescale.com>
> > @@ -3729,7 +3730,7 @@ L: linux-fbdev@vger.kernel.org
> > L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
> > S: Maintained
> > F: include/linux/platform_data/video-imxfb.h
> > -F: drivers/video/imxfb.c
> > +F: drivers/video/fbdev/imxfb.c
> >
> > FREESCALE SOC FS_ENET DRIVER
> > M: Pantelis Antoniou <pantelis.antoniou@gmail.com>
> > @@ -4148,7 +4149,7 @@ M: Ferenc Bakonyi <fero@drama.obuda.kando.hu>
> > L: linux-nvidia@lists.surfsouth.com
> > W: http://drama.obuda.kando.hu/~fero/cgi-bin/hgafb.shtml
> > S: Maintained
> > -F: drivers/video/hgafb.c
> > +F: drivers/video/fbdev/hgafb.c
> >
> > HIBERNATION (aka Software Suspend, aka swsusp)
> > M: "Rafael J. Wysocki" <rjw@rjwysocki.net>
> > @@ -4290,7 +4291,7 @@ F: drivers/hv/
> > F: drivers/input/serio/hyperv-keyboard.c
> > F: drivers/net/hyperv/
> > F: drivers/scsi/storvsc_drv.c
> > -F: drivers/video/hyperv_fb.c
> > +F: drivers/video/fbdev/hyperv_fb.c
> > F: include/linux/hyperv.h
> > F: tools/hv/
> >
> > @@ -4550,7 +4551,7 @@ F: security/integrity/ima/
> > IMS TWINTURBO FRAMEBUFFER DRIVER
> > L: linux-fbdev@vger.kernel.org
> > S: Orphan
> > -F: drivers/video/imsttfb.c
> > +F: drivers/video/fbdev/imsttfb.c
> >
> > INFINIBAND SUBSYSTEM
> > M: Roland Dreier <roland@kernel.org>
> > @@ -4617,13 +4618,13 @@ M: Maik Broemme <mbroemme@plusserver.de>
> > L: linux-fbdev@vger.kernel.org
> > S: Maintained
> > F: Documentation/fb/intelfb.txt
> > -F: drivers/video/intelfb/
> > +F: drivers/video/fbdev/intelfb/
> >
> > INTEL 810/815 FRAMEBUFFER DRIVER
> > M: Antonino Daplas <adaplas@gmail.com>
> > L: linux-fbdev@vger.kernel.org
> > S: Maintained
> > -F: drivers/video/i810/
> > +F: drivers/video/fbdev/i810/
> >
> > INTEL MENLOW THERMAL DRIVER
> > M: Sujith Thomas <sujith.thomas@intel.com>
> > @@ -5702,7 +5703,7 @@ F: drivers/mmc/host/mvsdio.*
> > MATROX FRAMEBUFFER DRIVER
> > L: linux-fbdev@vger.kernel.org
> > S: Orphan
> > -F: drivers/video/matrox/matroxfb_*
> > +F: drivers/video/fbdev/matrox/matroxfb_*
> > F: include/uapi/linux/matroxfb.h
> >
> > MAX16065 HARDWARE MONITOR DRIVER
> > @@ -6345,8 +6346,8 @@ NVIDIA (rivafb and nvidiafb) FRAMEBUFFER DRIVER
> > M: Antonino Daplas <adaplas@gmail.com>
> > L: linux-fbdev@vger.kernel.org
> > S: Maintained
> > -F: drivers/video/riva/
> > -F: drivers/video/nvidia/
> > +F: drivers/video/fbdev/riva/
> > +F: drivers/video/fbdev/nvidia/
> >
> > NVM EXPRESS DRIVER
> > M: Matthew Wilcox <willy@linux.intel.com>
> > @@ -6416,14 +6417,14 @@ M: Tomi Valkeinen <tomi.valkeinen@ti.com>
> > L: linux-fbdev@vger.kernel.org
> > L: linux-omap@vger.kernel.org
> > S: Maintained
> > -F: drivers/video/omap/
> > +F: drivers/video/fbdev/omap/
> >
> > OMAP DISPLAY SUBSYSTEM and FRAMEBUFFER SUPPORT (DSS2)
> > M: Tomi Valkeinen <tomi.valkeinen@ti.com>
> > L: linux-omap@vger.kernel.org
> > L: linux-fbdev@vger.kernel.org
> > S: Maintained
> > -F: drivers/video/omap2/
> > +F: drivers/video/fbdev/omap2/
> > F: Documentation/arm/OMAP/DSS
> >
> > OMAP HARDWARE SPINLOCK SUPPORT
> > @@ -6714,7 +6715,7 @@ F: drivers/char/agp/parisc-agp.c
> > F: drivers/input/serio/gscps2.c
> > F: drivers/parport/parport_gsc.*
> > F: drivers/tty/serial/8250/8250_gsc.c
> > -F: drivers/video/sti*
> > +F: drivers/video/fbdev/sti*
> > F: drivers/video/console/sti*
> > F: drivers/video/logo/logo_parisc*
> >
> > @@ -6963,7 +6964,7 @@ S: Maintained
> > T: git git://github.com/gxt/linux.git
> > F: drivers/input/serio/i8042-unicore32io.h
> > F: drivers/i2c/busses/i2c-puv3.c
> > -F: drivers/video/fb-puv3.c
> > +F: drivers/video/fbdev/fb-puv3.c
> > F: drivers/rtc/rtc-puv3.c
> >
> > PMBUS HARDWARE MONITORING DRIVERS
> > @@ -7335,7 +7336,7 @@ RADEON FRAMEBUFFER DISPLAY DRIVER
> > M: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> > L: linux-fbdev@vger.kernel.org
> > S: Maintained
> > -F: drivers/video/aty/radeon*
> > +F: drivers/video/fbdev/aty/radeon*
> > F: include/uapi/linux/radeonfb.h
> >
> > RADIOSHARK RADIO DRIVER
> > @@ -7357,7 +7358,7 @@ RAGE128 FRAMEBUFFER DISPLAY DRIVER
> > M: Paul Mackerras <paulus@samba.org>
> > L: linux-fbdev@vger.kernel.org
> > S: Maintained
> > -F: drivers/video/aty/aty128fb.c
> > +F: drivers/video/fbdev/aty/aty128fb.c
> >
> > RALINK RT2X00 WIRELESS LAN DRIVER
> > P: rt2x00 project
> > @@ -7591,7 +7592,7 @@ S3 SAVAGE FRAMEBUFFER DRIVER
> > M: Antonino Daplas <adaplas@gmail.com>
> > L: linux-fbdev@vger.kernel.org
> > S: Maintained
> > -F: drivers/video/savage/
> > +F: drivers/video/fbdev/savage/
> >
> > S390
> > M: Martin Schwidefsky <schwidefsky@de.ibm.com>
> > @@ -7714,7 +7715,7 @@ SAMSUNG FRAMEBUFFER DRIVER
> > M: Jingoo Han <jg1.han@samsung.com>
> > L: linux-fbdev@vger.kernel.org
> > S: Maintained
> > -F: drivers/video/s3c-fb.c
> > +F: drivers/video/fbdev/s3c-fb.c
> >
> > SAMSUNG MULTIFUNCTION DEVICE DRIVERS
> > M: Sangbeom Kim <sbkim73@samsung.com>
> > @@ -8186,7 +8187,7 @@ M: Thomas Winischhofer <thomas@winischhofer.net>
> > W: http://www.winischhofer.net/linuxsisvga.shtml
> > S: Maintained
> > F: Documentation/fb/sisfb.txt
> > -F: drivers/video/sis/
> > +F: drivers/video/fbdev/sis/
> > F: include/video/sisfb.h
> >
> > SIS USB2VGA DRIVER
> > @@ -8290,7 +8291,7 @@ SMSC UFX6000 and UFX7000 USB to VGA DRIVER
> > M: Steve Glendinning <steve.glendinning@shawell.net>
> > L: linux-fbdev@vger.kernel.org
> > S: Maintained
> > -F: drivers/video/smscufx.c
> > +F: drivers/video/fbdev/smscufx.c
> >
> > SOC-CAMERA V4L2 SUBSYSTEM
> > M: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
> > @@ -9622,7 +9623,8 @@ L: linux-fbdev@vger.kernel.org
> > W: http://dev.gentoo.org/~spock/projects/uvesafb/
> > S: Maintained
> > F: Documentation/fb/uvesafb.txt
> > -F: drivers/video/uvesafb.*
> > +F: drivers/video/fbdev/uvesafb.c
> > +F: include/video/uvesafb.h
> >
> > VFAT/FAT/MSDOS FILESYSTEM
> > M: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
> > @@ -9695,7 +9697,7 @@ S: Maintained
> > F: include/linux/via-core.h
> > F: include/linux/via-gpio.h
> > F: include/linux/via_i2c.h
> > -F: drivers/video/via/
> > +F: drivers/video/fbdev/via/
> >
> > VIA VELOCITY NETWORK DRIVER
> > M: Francois Romieu <romieu@fr.zoreil.com>
> >
^ permalink raw reply
* [PATCH V2] MAINTAINERS: Update Framebuffer file patterns
From: Jingoo Han @ 2014-07-01 3:59 UTC (permalink / raw)
To: linux-fbdev
Since the commit f7018c2 "video: move fbdev to drivers/video/fbdev",
all framebuffer drivers were moved to fbdev directory. Thus, file
patterns of these framebuffer drivers should be updated correctly.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
Changes since v1:
- Fix the typo from 'fbdevwmt_ge_rops.*' to 'fbdev/wmt_ge_rop/*', per Liu Ying
MAINTAINERS | 76 ++++++++++++++++++++++++++++++-----------------------------
1 file changed, 39 insertions(+), 37 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index 3f2e171..c3d5dad 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -587,7 +587,7 @@ W: http://www.amd.com/us-en/ConnectivitySolutions/TechnicalResources/0,,50_2334_
S: Supported
F: drivers/char/hw_random/geode-rng.c
F: drivers/crypto/geode*
-F: drivers/video/geode/
+F: drivers/video/fbdev/geode/
F: arch/x86/include/asm/geode.h
AMD IOMMU (AMD-VI)
@@ -716,8 +716,8 @@ F: drivers/ata/pata_arasan_cf.c
ARC FRAMEBUFFER DRIVER
M: Jaya Kumar <jayalk@intworks.biz>
S: Maintained
-F: drivers/video/arcfb.c
-F: drivers/video/fb_defio.c
+F: drivers/video/fbdev/arcfb.c
+F: drivers/video/fbdev/core/fb_defio.c
ARM MFM AND FLOPPY DRIVERS
M: Ian Molton <spyro@f2s.com>
@@ -756,7 +756,7 @@ F: sound/arm/aaci.*
ARM PRIMECELL CLCD PL110 DRIVER
M: Russell King <linux@arm.linux.org.uk>
S: Maintained
-F: drivers/video/amba-clcd.*
+F: drivers/video/fbdev/amba-clcd.*
ARM PRIMECELL KMI PL050 DRIVER
M: Russell King <linux@arm.linux.org.uk>
@@ -1135,7 +1135,7 @@ M: Daniel Walker <dwalker@fifo99.com>
M: Bryan Huntsman <bryanh@codeaurora.org>
L: linux-arm-msm@vger.kernel.org
F: arch/arm/mach-msm/
-F: drivers/video/msm/
+F: drivers/video/fbdev/msm/
F: drivers/mmc/host/msm_sdcc.c
F: drivers/mmc/host/msm_sdcc.h
F: drivers/tty/serial/msm_serial.h
@@ -1355,7 +1355,7 @@ F: drivers/mtd/nand/nuc900_nand.c
F: drivers/rtc/rtc-nuc900.c
F: drivers/spi/spi-nuc900.c
F: drivers/usb/host/ehci-w90x900.c
-F: drivers/video/nuc900fb.c
+F: drivers/video/fbdev/nuc900fb.c
ARM/U300 MACHINE SUPPORT
M: Linus Walleij <linus.walleij@linaro.org>
@@ -1424,9 +1424,9 @@ F: drivers/rtc/rtc-vt8500.c
F: drivers/tty/serial/vt8500_serial.c
F: drivers/usb/host/ehci-platform.c
F: drivers/usb/host/uhci-platform.c
-F: drivers/video/vt8500lcdfb.*
-F: drivers/video/wm8505fb*
-F: drivers/video/wmt_ge_rops.*
+F: drivers/video/fbdev/vt8500lcdfb.*
+F: drivers/video/fbdev/wm8505fb*
+F: drivers/video/fbdev/wmt_ge_rops.*
ARM/ZIPIT Z2 SUPPORT
M: Marek Vasut <marek.vasut@gmail.com>
@@ -1616,7 +1616,7 @@ ATMEL LCDFB DRIVER
M: Nicolas Ferre <nicolas.ferre@atmel.com>
L: linux-fbdev@vger.kernel.org
S: Maintained
-F: drivers/video/atmel_lcdfb.c
+F: drivers/video/fbdev/atmel_lcdfb.c
F: include/video/atmel_lcdc.h
ATMEL MACB ETHERNET DRIVER
@@ -2626,7 +2626,7 @@ M: Russell King <linux@arm.linux.org.uk>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
W: http://www.arm.linux.org.uk/
S: Maintained
-F: drivers/video/cyber2000fb.*
+F: drivers/video/fbdev/cyber2000fb.*
CYCLADES ASYNC MUX DRIVER
W: http://www.cyclades.com/
@@ -2863,7 +2863,7 @@ M: Bernie Thompson <bernie@plugable.com>
L: linux-fbdev@vger.kernel.org
S: Maintained
W: http://plugable.com/category/projects/udlfb/
-F: drivers/video/udlfb.c
+F: drivers/video/fbdev/udlfb.c
F: include/video/udlfb.h
F: Documentation/fb/udlfb.txt
@@ -3385,7 +3385,7 @@ EFIFB FRAMEBUFFER DRIVER
L: linux-fbdev@vger.kernel.org
M: Peter Jones <pjones@redhat.com>
S: Maintained
-F: drivers/video/efifb.c
+F: drivers/video/fbdev/efifb.c
EFS FILESYSTEM
W: http://aeschi.ch.eu.org/efs/
@@ -3450,7 +3450,7 @@ EPSON S1D13XXX FRAMEBUFFER DRIVER
M: Kristoffer Ericson <kristoffer.ericson@gmail.com>
S: Maintained
T: git git://git.kernel.org/pub/scm/linux/kernel/git/kristoffer/linux-hpc.git
-F: drivers/video/s1d13xxxfb.c
+F: drivers/video/fbdev/s1d13xxxfb.c
F: include/video/s1d13xxxfb.h
ETHERNET BRIDGE
@@ -3528,7 +3528,7 @@ M: Donghwa Lee <dh09.lee@samsung.com>
M: Kyungmin Park <kyungmin.park@samsung.com>
L: linux-fbdev@vger.kernel.org
S: Maintained
-F: drivers/video/exynos/exynos_mipi*
+F: drivers/video/fbdev/exynos/exynos_mipi*
F: include/video/exynos_mipi*
F71805F HARDWARE MONITORING DRIVER
@@ -3707,7 +3707,8 @@ FREESCALE DIU FRAMEBUFFER DRIVER
M: Timur Tabi <timur@tabi.org>
L: linux-fbdev@vger.kernel.org
S: Maintained
-F: drivers/video/fsl-diu-fb.*
+F: drivers/video/fbdev/fsl-diu-fb.c
+F: include/linux/fsl-diu-fb.h
FREESCALE DMA DRIVER
M: Li Yang <leoli@freescale.com>
@@ -3729,7 +3730,7 @@ L: linux-fbdev@vger.kernel.org
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S: Maintained
F: include/linux/platform_data/video-imxfb.h
-F: drivers/video/imxfb.c
+F: drivers/video/fbdev/imxfb.c
FREESCALE SOC FS_ENET DRIVER
M: Pantelis Antoniou <pantelis.antoniou@gmail.com>
@@ -4148,7 +4149,7 @@ M: Ferenc Bakonyi <fero@drama.obuda.kando.hu>
L: linux-nvidia@lists.surfsouth.com
W: http://drama.obuda.kando.hu/~fero/cgi-bin/hgafb.shtml
S: Maintained
-F: drivers/video/hgafb.c
+F: drivers/video/fbdev/hgafb.c
HIBERNATION (aka Software Suspend, aka swsusp)
M: "Rafael J. Wysocki" <rjw@rjwysocki.net>
@@ -4290,7 +4291,7 @@ F: drivers/hv/
F: drivers/input/serio/hyperv-keyboard.c
F: drivers/net/hyperv/
F: drivers/scsi/storvsc_drv.c
-F: drivers/video/hyperv_fb.c
+F: drivers/video/fbdev/hyperv_fb.c
F: include/linux/hyperv.h
F: tools/hv/
@@ -4550,7 +4551,7 @@ F: security/integrity/ima/
IMS TWINTURBO FRAMEBUFFER DRIVER
L: linux-fbdev@vger.kernel.org
S: Orphan
-F: drivers/video/imsttfb.c
+F: drivers/video/fbdev/imsttfb.c
INFINIBAND SUBSYSTEM
M: Roland Dreier <roland@kernel.org>
@@ -4617,13 +4618,13 @@ M: Maik Broemme <mbroemme@plusserver.de>
L: linux-fbdev@vger.kernel.org
S: Maintained
F: Documentation/fb/intelfb.txt
-F: drivers/video/intelfb/
+F: drivers/video/fbdev/intelfb/
INTEL 810/815 FRAMEBUFFER DRIVER
M: Antonino Daplas <adaplas@gmail.com>
L: linux-fbdev@vger.kernel.org
S: Maintained
-F: drivers/video/i810/
+F: drivers/video/fbdev/i810/
INTEL MENLOW THERMAL DRIVER
M: Sujith Thomas <sujith.thomas@intel.com>
@@ -5702,7 +5703,7 @@ F: drivers/mmc/host/mvsdio.*
MATROX FRAMEBUFFER DRIVER
L: linux-fbdev@vger.kernel.org
S: Orphan
-F: drivers/video/matrox/matroxfb_*
+F: drivers/video/fbdev/matrox/matroxfb_*
F: include/uapi/linux/matroxfb.h
MAX16065 HARDWARE MONITOR DRIVER
@@ -6345,8 +6346,8 @@ NVIDIA (rivafb and nvidiafb) FRAMEBUFFER DRIVER
M: Antonino Daplas <adaplas@gmail.com>
L: linux-fbdev@vger.kernel.org
S: Maintained
-F: drivers/video/riva/
-F: drivers/video/nvidia/
+F: drivers/video/fbdev/riva/
+F: drivers/video/fbdev/nvidia/
NVM EXPRESS DRIVER
M: Matthew Wilcox <willy@linux.intel.com>
@@ -6416,14 +6417,14 @@ M: Tomi Valkeinen <tomi.valkeinen@ti.com>
L: linux-fbdev@vger.kernel.org
L: linux-omap@vger.kernel.org
S: Maintained
-F: drivers/video/omap/
+F: drivers/video/fbdev/omap/
OMAP DISPLAY SUBSYSTEM and FRAMEBUFFER SUPPORT (DSS2)
M: Tomi Valkeinen <tomi.valkeinen@ti.com>
L: linux-omap@vger.kernel.org
L: linux-fbdev@vger.kernel.org
S: Maintained
-F: drivers/video/omap2/
+F: drivers/video/fbdev/omap2/
F: Documentation/arm/OMAP/DSS
OMAP HARDWARE SPINLOCK SUPPORT
@@ -6714,7 +6715,7 @@ F: drivers/char/agp/parisc-agp.c
F: drivers/input/serio/gscps2.c
F: drivers/parport/parport_gsc.*
F: drivers/tty/serial/8250/8250_gsc.c
-F: drivers/video/sti*
+F: drivers/video/fbdev/sti*
F: drivers/video/console/sti*
F: drivers/video/logo/logo_parisc*
@@ -6963,7 +6964,7 @@ S: Maintained
T: git git://github.com/gxt/linux.git
F: drivers/input/serio/i8042-unicore32io.h
F: drivers/i2c/busses/i2c-puv3.c
-F: drivers/video/fb-puv3.c
+F: drivers/video/fbdev/fb-puv3.c
F: drivers/rtc/rtc-puv3.c
PMBUS HARDWARE MONITORING DRIVERS
@@ -7335,7 +7336,7 @@ RADEON FRAMEBUFFER DISPLAY DRIVER
M: Benjamin Herrenschmidt <benh@kernel.crashing.org>
L: linux-fbdev@vger.kernel.org
S: Maintained
-F: drivers/video/aty/radeon*
+F: drivers/video/fbdev/aty/radeon*
F: include/uapi/linux/radeonfb.h
RADIOSHARK RADIO DRIVER
@@ -7357,7 +7358,7 @@ RAGE128 FRAMEBUFFER DISPLAY DRIVER
M: Paul Mackerras <paulus@samba.org>
L: linux-fbdev@vger.kernel.org
S: Maintained
-F: drivers/video/aty/aty128fb.c
+F: drivers/video/fbdev/aty/aty128fb.c
RALINK RT2X00 WIRELESS LAN DRIVER
P: rt2x00 project
@@ -7591,7 +7592,7 @@ S3 SAVAGE FRAMEBUFFER DRIVER
M: Antonino Daplas <adaplas@gmail.com>
L: linux-fbdev@vger.kernel.org
S: Maintained
-F: drivers/video/savage/
+F: drivers/video/fbdev/savage/
S390
M: Martin Schwidefsky <schwidefsky@de.ibm.com>
@@ -7714,7 +7715,7 @@ SAMSUNG FRAMEBUFFER DRIVER
M: Jingoo Han <jg1.han@samsung.com>
L: linux-fbdev@vger.kernel.org
S: Maintained
-F: drivers/video/s3c-fb.c
+F: drivers/video/fbdev/s3c-fb.c
SAMSUNG MULTIFUNCTION DEVICE DRIVERS
M: Sangbeom Kim <sbkim73@samsung.com>
@@ -8186,7 +8187,7 @@ M: Thomas Winischhofer <thomas@winischhofer.net>
W: http://www.winischhofer.net/linuxsisvga.shtml
S: Maintained
F: Documentation/fb/sisfb.txt
-F: drivers/video/sis/
+F: drivers/video/fbdev/sis/
F: include/video/sisfb.h
SIS USB2VGA DRIVER
@@ -8290,7 +8291,7 @@ SMSC UFX6000 and UFX7000 USB to VGA DRIVER
M: Steve Glendinning <steve.glendinning@shawell.net>
L: linux-fbdev@vger.kernel.org
S: Maintained
-F: drivers/video/smscufx.c
+F: drivers/video/fbdev/smscufx.c
SOC-CAMERA V4L2 SUBSYSTEM
M: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
@@ -9622,7 +9623,8 @@ L: linux-fbdev@vger.kernel.org
W: http://dev.gentoo.org/~spock/projects/uvesafb/
S: Maintained
F: Documentation/fb/uvesafb.txt
-F: drivers/video/uvesafb.*
+F: drivers/video/fbdev/uvesafb.c
+F: include/video/uvesafb.h
VFAT/FAT/MSDOS FILESYSTEM
M: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
@@ -9695,7 +9697,7 @@ S: Maintained
F: include/linux/via-core.h
F: include/linux/via-gpio.h
F: include/linux/via_i2c.h
-F: drivers/video/via/
+F: drivers/video/fbdev/via/
VIA VELOCITY NETWORK DRIVER
M: Francois Romieu <romieu@fr.zoreil.com>
--
1.7.10.4
^ permalink raw reply related
* Re: [PATCH 2/2] video: clps711x: Fix sparse warnings
From: Tomi Valkeinen @ 2014-07-01 6:14 UTC (permalink / raw)
To: linux-fbdev
In-Reply-To: <1403937246-14506-2-git-send-email-shc_work@mail.ru>
[-- Attachment #1: Type: text/plain, Size: 1943 bytes --]
On 28/06/14 09:34, Alexander Shiyan wrote:
> This patch fixes below warnings:
> CHECK drivers/video/fbdev/clps711x-fb.c
> drivers/video/fbdev/clps711x-fb.c:247:24: warning: incorrect type in argument 1 (different address spaces)
> drivers/video/fbdev/clps711x-fb.c:247:24: expected void const *ptr
> drivers/video/fbdev/clps711x-fb.c:247:24: got char [noderef] <asn:2>*screen_base
> drivers/video/fbdev/clps711x-fb.c:248:35: warning: incorrect type in argument 1 (different address spaces)
> drivers/video/fbdev/clps711x-fb.c:248:35: expected void const *ptr
> drivers/video/fbdev/clps711x-fb.c:248:35: got char [noderef] <asn:2>*screen_base
> drivers/video/fbdev/clps711x-fb.c:314:17: warning: incorrect type in initializer (different address spaces)
> drivers/video/fbdev/clps711x-fb.c:314:17: expected void *__p
> drivers/video/fbdev/clps711x-fb.c:314:17: got char [noderef] <asn:2>*screen_base
> CC [M] drivers/video/fbdev/clps711x-fb.o
>
> Reported-by: kbuild test robot <fengguang.wu@intel.com>
> Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
> ---
> drivers/video/fbdev/clps711x-fb.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/video/fbdev/clps711x-fb.c b/drivers/video/fbdev/clps711x-fb.c
> index 4d17fbb..bbf40fe 100644
> --- a/drivers/video/fbdev/clps711x-fb.c
> +++ b/drivers/video/fbdev/clps711x-fb.c
> @@ -244,8 +244,8 @@ static int clps711x_fb_probe(struct platform_device *pdev)
>
> res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
> info->screen_base = devm_ioremap_resource(dev, res);
> - if (IS_ERR(info->screen_base)) {
> - ret = PTR_ERR(info->screen_base);
> + if (IS_ERR((__force void *)info->screen_base)) {
> + ret = PTR_ERR((__force void *)info->screen_base);
I don't see any other user of devm_ioremap_resource() having that kind
of casts. Why are they needed here?
Tomi
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply
* Re: [PATCH] video: fbdev: s3c2410fb: Move to clk_prepare_enable/clk_disable_unprepare
From: Tomi Valkeinen @ 2014-07-01 6:15 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1404155672-3158-1-git-send-email-anarsoul@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 371 bytes --]
On 30/06/14 22:14, Vasily Khoruzhick wrote:
> Use clk_prepare_enable/clk_disable_unprepare to make the driver
> work properly with common clock framework.
>
> Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
> ---
> drivers/video/fbdev/s3c2410fb.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
Thanks, queued for 3.17.
Tomi
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply
* Re: [PATCH V2] MAINTAINERS: Update Framebuffer file patterns
From: Tomi Valkeinen @ 2014-07-01 6:22 UTC (permalink / raw)
To: linux-fbdev
In-Reply-To: <000801cf94e0$d5856cb0$80904610$%han@samsung.com>
[-- Attachment #1: Type: text/plain, Size: 1077 bytes --]
On 01/07/14 06:59, Jingoo Han wrote:
> Since the commit f7018c2 "video: move fbdev to drivers/video/fbdev",
> all framebuffer drivers were moved to fbdev directory. Thus, file
> patterns of these framebuffer drivers should be updated correctly.
>
> Signed-off-by: Jingoo Han <jg1.han@samsung.com>
> ---
> Changes since v1:
> - Fix the typo from 'fbdevwmt_ge_rops.*' to 'fbdev/wmt_ge_rop/*', per Liu Ying
>
> MAINTAINERS | 76 ++++++++++++++++++++++++++++++-----------------------------
> 1 file changed, 39 insertions(+), 37 deletions(-)
Thanks! I was planning to do this but I seem to have forgotten about it...
<snip>
> @@ -3707,7 +3707,8 @@ FREESCALE DIU FRAMEBUFFER DRIVER
> M: Timur Tabi <timur@tabi.org>
> L: linux-fbdev@vger.kernel.org
> S: Maintained
> -F: drivers/video/fsl-diu-fb.*
> +F: drivers/video/fbdev/fsl-diu-fb.c
> +F: include/linux/fsl-diu-fb.h
You have a few of extra changes like the above. I'd rather have the
"update file patterns" patch doing only that, and make the new changes
in a separate patch.
Tomi
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply
* Re: [PATCH 2/2] video: clps711x: Fix sparse warnings
From: Alexander Shiyan @ 2014-07-01 6:23 UTC (permalink / raw)
To: linux-fbdev
In-Reply-To: <1374825597.724071106@f170.mail.ru>
VHVlLCAxIEp1bCAyMDE0IDA5OjE0OjAyICswMzAwINC+0YIgVG9taSBWYWxrZWluZW4gPHRvbWku
dmFsa2VpbmVuQHRpLmNvbT46Cj4gT24gMjgvMDYvMTQgMDk6MzQsIEFsZXhhbmRlciBTaGl5YW4g
d3JvdGU6Cj4gPiBUaGlzIHBhdGNoIGZpeGVzIGJlbG93IHdhcm5pbmdzOgo+ID4gQ0hFQ0sgICBk
cml2ZXJzL3ZpZGVvL2ZiZGV2L2NscHM3MTF4LWZiLmMKPiA+ICAgZHJpdmVycy92aWRlby9mYmRl
di9jbHBzNzExeC1mYi5jOjI0NzoyNDogd2FybmluZzogaW5jb3JyZWN0IHR5cGUgaW4gYXJndW1l
bnQgMSAoZGlmZmVyZW50IGFkZHJlc3Mgc3BhY2VzKQo+ID4gICBkcml2ZXJzL3ZpZGVvL2ZiZGV2
L2NscHM3MTF4LWZiLmM6MjQ3OjI0OiAgICBleHBlY3RlZCB2b2lkIGNvbnN0ICpwdHIKPiA+ICAg
ZHJpdmVycy92aWRlby9mYmRldi9jbHBzNzExeC1mYi5jOjI0NzoyNDogICAgZ290IGNoYXIgW25v
ZGVyZWZdIDxhc246Mj4qc2NyZWVuX2Jhc2UKPiA+ICAgZHJpdmVycy92aWRlby9mYmRldi9jbHBz
NzExeC1mYi5jOjI0ODozNTogd2FybmluZzogaW5jb3JyZWN0IHR5cGUgaW4gYXJndW1lbnQgMSAo
ZGlmZmVyZW50IGFkZHJlc3Mgc3BhY2VzKQo+ID4gICBkcml2ZXJzL3ZpZGVvL2ZiZGV2L2NscHM3
MTF4LWZiLmM6MjQ4OjM1OiAgICBleHBlY3RlZCB2b2lkIGNvbnN0ICpwdHIKPiA+ICAgZHJpdmVy
cy92aWRlby9mYmRldi9jbHBzNzExeC1mYi5jOjI0ODozNTogICAgZ290IGNoYXIgW25vZGVyZWZd
IDxhc246Mj4qc2NyZWVuX2Jhc2UKLi4uCj4gPiAgCWluZm8tPnNjcmVlbl9iYXNlID0gZGV2bV9p
b3JlbWFwX3Jlc291cmNlKGRldiwgcmVzKTsKPiA+IC0JaWYgKElTX0VSUihpbmZvLT5zY3JlZW5f
YmFzZSkpIHsKPiA+IC0JCXJldCA9IFBUUl9FUlIoaW5mby0+c2NyZWVuX2Jhc2UpOwo+ID4gKwlp
ZiAoSVNfRVJSKChfX2ZvcmNlIHZvaWQgKilpbmZvLT5zY3JlZW5fYmFzZSkpIHsKPiA+ICsJCXJl
dCA9IFBUUl9FUlIoKF9fZm9yY2Ugdm9pZCAqKWluZm8tPnNjcmVlbl9iYXNlKTsKPiAKPiBJIGRv
bid0IHNlZSBhbnkgb3RoZXIgdXNlciBvZiBkZXZtX2lvcmVtYXBfcmVzb3VyY2UoKSBoYXZpbmcg
dGhhdCBraW5kCj4gb2YgY2FzdHMuIFdoeSBhcmUgdGhleSBuZWVkZWQgaGVyZT8KCk5vdCBuZWVk
ZWQsIHR5cGUgY2FzdCB3YXMgZG9uZSBvbmx5IHRvIHJlbW92ZSBzcGFyc2Ugd2FybmluZ3MuCgot
LS0KCg=
^ permalink raw reply
* Re: [PATCH V2] MAINTAINERS: Update Framebuffer file patterns
From: Jingoo Han @ 2014-07-01 6:31 UTC (permalink / raw)
To: linux-fbdev
In-Reply-To: <000801cf94e0$d5856cb0$80904610$%han@samsung.com>
On Tuesday, July 01, 2014 3:22 PM, Jingoo Han wrote:
> On 01/07/14 06:59, Jingoo Han wrote:
> > Since the commit f7018c2 "video: move fbdev to drivers/video/fbdev",
> > all framebuffer drivers were moved to fbdev directory. Thus, file
> > patterns of these framebuffer drivers should be updated correctly.
> >
> > Signed-off-by: Jingoo Han <jg1.han@samsung.com>
> > ---
> > Changes since v1:
> > - Fix the typo from 'fbdevwmt_ge_rops.*' to 'fbdev/wmt_ge_rop/*', per Liu Ying
> >
> > MAINTAINERS | 76 ++++++++++++++++++++++++++++++-----------------------------
> > 1 file changed, 39 insertions(+), 37 deletions(-)
>
> Thanks! I was planning to do this but I seem to have forgotten about it...
>
> <snip>
>
> > @@ -3707,7 +3707,8 @@ FREESCALE DIU FRAMEBUFFER DRIVER
> > M: Timur Tabi <timur@tabi.org>
> > L: linux-fbdev@vger.kernel.org
> > S: Maintained
> > -F: drivers/video/fsl-diu-fb.*
> > +F: drivers/video/fbdev/fsl-diu-fb.c
> > +F: include/linux/fsl-diu-fb.h
>
> You have a few of extra changes like the above. I'd rather have the
> "update file patterns" patch doing only that, and make the new changes
> in a separate patch.
OK, I will only "update file patterns", and send v3 patch, soon.
After the patch is merged, I will send another patch to add extra
changes. Thank you for your comment. :-)
Best regards,
Jingoo Han
>
> Tomi
>
^ permalink raw reply
* [PATCH V3] MAINTAINERS: Update Framebuffer file patterns
From: Jingoo Han @ 2014-07-01 6:36 UTC (permalink / raw)
To: linux-fbdev
Since the commit f7018c2 "video: move fbdev to drivers/video/fbdev",
all framebuffer drivers were moved to fbdev directory. Thus, file
patterns of these framebuffer drivers should be updated correctly.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
Changes since v2:
- Remove extra changes, per Tomi Valkeinen
Changes since v1:
- Fix the typo from 'fbdevwmt_ge_rops.*' to 'fbdev/wmt_ge_rop/*', per Liu Ying
MAINTAINERS | 74 +++++++++++++++++++++++++++++------------------------------
1 file changed, 37 insertions(+), 37 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index 3f2e171..6a6a294 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -587,7 +587,7 @@ W: http://www.amd.com/us-en/ConnectivitySolutions/TechnicalResources/0,,50_2334_
S: Supported
F: drivers/char/hw_random/geode-rng.c
F: drivers/crypto/geode*
-F: drivers/video/geode/
+F: drivers/video/fbdev/geode/
F: arch/x86/include/asm/geode.h
AMD IOMMU (AMD-VI)
@@ -716,8 +716,8 @@ F: drivers/ata/pata_arasan_cf.c
ARC FRAMEBUFFER DRIVER
M: Jaya Kumar <jayalk@intworks.biz>
S: Maintained
-F: drivers/video/arcfb.c
-F: drivers/video/fb_defio.c
+F: drivers/video/fbdev/arcfb.c
+F: drivers/video/fbdev/core/fb_defio.c
ARM MFM AND FLOPPY DRIVERS
M: Ian Molton <spyro@f2s.com>
@@ -756,7 +756,7 @@ F: sound/arm/aaci.*
ARM PRIMECELL CLCD PL110 DRIVER
M: Russell King <linux@arm.linux.org.uk>
S: Maintained
-F: drivers/video/amba-clcd.*
+F: drivers/video/fbdev/amba-clcd.*
ARM PRIMECELL KMI PL050 DRIVER
M: Russell King <linux@arm.linux.org.uk>
@@ -1135,7 +1135,7 @@ M: Daniel Walker <dwalker@fifo99.com>
M: Bryan Huntsman <bryanh@codeaurora.org>
L: linux-arm-msm@vger.kernel.org
F: arch/arm/mach-msm/
-F: drivers/video/msm/
+F: drivers/video/fbdev/msm/
F: drivers/mmc/host/msm_sdcc.c
F: drivers/mmc/host/msm_sdcc.h
F: drivers/tty/serial/msm_serial.h
@@ -1355,7 +1355,7 @@ F: drivers/mtd/nand/nuc900_nand.c
F: drivers/rtc/rtc-nuc900.c
F: drivers/spi/spi-nuc900.c
F: drivers/usb/host/ehci-w90x900.c
-F: drivers/video/nuc900fb.c
+F: drivers/video/fbdev/nuc900fb.c
ARM/U300 MACHINE SUPPORT
M: Linus Walleij <linus.walleij@linaro.org>
@@ -1424,9 +1424,9 @@ F: drivers/rtc/rtc-vt8500.c
F: drivers/tty/serial/vt8500_serial.c
F: drivers/usb/host/ehci-platform.c
F: drivers/usb/host/uhci-platform.c
-F: drivers/video/vt8500lcdfb.*
-F: drivers/video/wm8505fb*
-F: drivers/video/wmt_ge_rops.*
+F: drivers/video/fbdev/vt8500lcdfb.*
+F: drivers/video/fbdev/wm8505fb*
+F: drivers/video/fbdev/wmt_ge_rops.*
ARM/ZIPIT Z2 SUPPORT
M: Marek Vasut <marek.vasut@gmail.com>
@@ -1616,7 +1616,7 @@ ATMEL LCDFB DRIVER
M: Nicolas Ferre <nicolas.ferre@atmel.com>
L: linux-fbdev@vger.kernel.org
S: Maintained
-F: drivers/video/atmel_lcdfb.c
+F: drivers/video/fbdev/atmel_lcdfb.c
F: include/video/atmel_lcdc.h
ATMEL MACB ETHERNET DRIVER
@@ -2626,7 +2626,7 @@ M: Russell King <linux@arm.linux.org.uk>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
W: http://www.arm.linux.org.uk/
S: Maintained
-F: drivers/video/cyber2000fb.*
+F: drivers/video/fbdev/cyber2000fb.*
CYCLADES ASYNC MUX DRIVER
W: http://www.cyclades.com/
@@ -2863,7 +2863,7 @@ M: Bernie Thompson <bernie@plugable.com>
L: linux-fbdev@vger.kernel.org
S: Maintained
W: http://plugable.com/category/projects/udlfb/
-F: drivers/video/udlfb.c
+F: drivers/video/fbdev/udlfb.c
F: include/video/udlfb.h
F: Documentation/fb/udlfb.txt
@@ -3385,7 +3385,7 @@ EFIFB FRAMEBUFFER DRIVER
L: linux-fbdev@vger.kernel.org
M: Peter Jones <pjones@redhat.com>
S: Maintained
-F: drivers/video/efifb.c
+F: drivers/video/fbdev/efifb.c
EFS FILESYSTEM
W: http://aeschi.ch.eu.org/efs/
@@ -3450,7 +3450,7 @@ EPSON S1D13XXX FRAMEBUFFER DRIVER
M: Kristoffer Ericson <kristoffer.ericson@gmail.com>
S: Maintained
T: git git://git.kernel.org/pub/scm/linux/kernel/git/kristoffer/linux-hpc.git
-F: drivers/video/s1d13xxxfb.c
+F: drivers/video/fbdev/s1d13xxxfb.c
F: include/video/s1d13xxxfb.h
ETHERNET BRIDGE
@@ -3528,7 +3528,7 @@ M: Donghwa Lee <dh09.lee@samsung.com>
M: Kyungmin Park <kyungmin.park@samsung.com>
L: linux-fbdev@vger.kernel.org
S: Maintained
-F: drivers/video/exynos/exynos_mipi*
+F: drivers/video/fbdev/exynos/exynos_mipi*
F: include/video/exynos_mipi*
F71805F HARDWARE MONITORING DRIVER
@@ -3707,7 +3707,7 @@ FREESCALE DIU FRAMEBUFFER DRIVER
M: Timur Tabi <timur@tabi.org>
L: linux-fbdev@vger.kernel.org
S: Maintained
-F: drivers/video/fsl-diu-fb.*
+F: drivers/video/fbdev/fsl-diu-fb.*
FREESCALE DMA DRIVER
M: Li Yang <leoli@freescale.com>
@@ -3729,7 +3729,7 @@ L: linux-fbdev@vger.kernel.org
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S: Maintained
F: include/linux/platform_data/video-imxfb.h
-F: drivers/video/imxfb.c
+F: drivers/video/fbdev/imxfb.c
FREESCALE SOC FS_ENET DRIVER
M: Pantelis Antoniou <pantelis.antoniou@gmail.com>
@@ -4148,7 +4148,7 @@ M: Ferenc Bakonyi <fero@drama.obuda.kando.hu>
L: linux-nvidia@lists.surfsouth.com
W: http://drama.obuda.kando.hu/~fero/cgi-bin/hgafb.shtml
S: Maintained
-F: drivers/video/hgafb.c
+F: drivers/video/fbdev/hgafb.c
HIBERNATION (aka Software Suspend, aka swsusp)
M: "Rafael J. Wysocki" <rjw@rjwysocki.net>
@@ -4290,7 +4290,7 @@ F: drivers/hv/
F: drivers/input/serio/hyperv-keyboard.c
F: drivers/net/hyperv/
F: drivers/scsi/storvsc_drv.c
-F: drivers/video/hyperv_fb.c
+F: drivers/video/fbdev/hyperv_fb.c
F: include/linux/hyperv.h
F: tools/hv/
@@ -4550,7 +4550,7 @@ F: security/integrity/ima/
IMS TWINTURBO FRAMEBUFFER DRIVER
L: linux-fbdev@vger.kernel.org
S: Orphan
-F: drivers/video/imsttfb.c
+F: drivers/video/fbdev/imsttfb.c
INFINIBAND SUBSYSTEM
M: Roland Dreier <roland@kernel.org>
@@ -4617,13 +4617,13 @@ M: Maik Broemme <mbroemme@plusserver.de>
L: linux-fbdev@vger.kernel.org
S: Maintained
F: Documentation/fb/intelfb.txt
-F: drivers/video/intelfb/
+F: drivers/video/fbdev/intelfb/
INTEL 810/815 FRAMEBUFFER DRIVER
M: Antonino Daplas <adaplas@gmail.com>
L: linux-fbdev@vger.kernel.org
S: Maintained
-F: drivers/video/i810/
+F: drivers/video/fbdev/i810/
INTEL MENLOW THERMAL DRIVER
M: Sujith Thomas <sujith.thomas@intel.com>
@@ -5702,7 +5702,7 @@ F: drivers/mmc/host/mvsdio.*
MATROX FRAMEBUFFER DRIVER
L: linux-fbdev@vger.kernel.org
S: Orphan
-F: drivers/video/matrox/matroxfb_*
+F: drivers/video/fbdev/matrox/matroxfb_*
F: include/uapi/linux/matroxfb.h
MAX16065 HARDWARE MONITOR DRIVER
@@ -6345,8 +6345,8 @@ NVIDIA (rivafb and nvidiafb) FRAMEBUFFER DRIVER
M: Antonino Daplas <adaplas@gmail.com>
L: linux-fbdev@vger.kernel.org
S: Maintained
-F: drivers/video/riva/
-F: drivers/video/nvidia/
+F: drivers/video/fbdev/riva/
+F: drivers/video/fbdev/nvidia/
NVM EXPRESS DRIVER
M: Matthew Wilcox <willy@linux.intel.com>
@@ -6416,14 +6416,14 @@ M: Tomi Valkeinen <tomi.valkeinen@ti.com>
L: linux-fbdev@vger.kernel.org
L: linux-omap@vger.kernel.org
S: Maintained
-F: drivers/video/omap/
+F: drivers/video/fbdev/omap/
OMAP DISPLAY SUBSYSTEM and FRAMEBUFFER SUPPORT (DSS2)
M: Tomi Valkeinen <tomi.valkeinen@ti.com>
L: linux-omap@vger.kernel.org
L: linux-fbdev@vger.kernel.org
S: Maintained
-F: drivers/video/omap2/
+F: drivers/video/fbdev/omap2/
F: Documentation/arm/OMAP/DSS
OMAP HARDWARE SPINLOCK SUPPORT
@@ -6714,7 +6714,7 @@ F: drivers/char/agp/parisc-agp.c
F: drivers/input/serio/gscps2.c
F: drivers/parport/parport_gsc.*
F: drivers/tty/serial/8250/8250_gsc.c
-F: drivers/video/sti*
+F: drivers/video/fbdev/sti*
F: drivers/video/console/sti*
F: drivers/video/logo/logo_parisc*
@@ -6963,7 +6963,7 @@ S: Maintained
T: git git://github.com/gxt/linux.git
F: drivers/input/serio/i8042-unicore32io.h
F: drivers/i2c/busses/i2c-puv3.c
-F: drivers/video/fb-puv3.c
+F: drivers/video/fbdev/fb-puv3.c
F: drivers/rtc/rtc-puv3.c
PMBUS HARDWARE MONITORING DRIVERS
@@ -7335,7 +7335,7 @@ RADEON FRAMEBUFFER DISPLAY DRIVER
M: Benjamin Herrenschmidt <benh@kernel.crashing.org>
L: linux-fbdev@vger.kernel.org
S: Maintained
-F: drivers/video/aty/radeon*
+F: drivers/video/fbdev/aty/radeon*
F: include/uapi/linux/radeonfb.h
RADIOSHARK RADIO DRIVER
@@ -7357,7 +7357,7 @@ RAGE128 FRAMEBUFFER DISPLAY DRIVER
M: Paul Mackerras <paulus@samba.org>
L: linux-fbdev@vger.kernel.org
S: Maintained
-F: drivers/video/aty/aty128fb.c
+F: drivers/video/fbdev/aty/aty128fb.c
RALINK RT2X00 WIRELESS LAN DRIVER
P: rt2x00 project
@@ -7591,7 +7591,7 @@ S3 SAVAGE FRAMEBUFFER DRIVER
M: Antonino Daplas <adaplas@gmail.com>
L: linux-fbdev@vger.kernel.org
S: Maintained
-F: drivers/video/savage/
+F: drivers/video/fbdev/savage/
S390
M: Martin Schwidefsky <schwidefsky@de.ibm.com>
@@ -7714,7 +7714,7 @@ SAMSUNG FRAMEBUFFER DRIVER
M: Jingoo Han <jg1.han@samsung.com>
L: linux-fbdev@vger.kernel.org
S: Maintained
-F: drivers/video/s3c-fb.c
+F: drivers/video/fbdev/s3c-fb.c
SAMSUNG MULTIFUNCTION DEVICE DRIVERS
M: Sangbeom Kim <sbkim73@samsung.com>
@@ -8186,7 +8186,7 @@ M: Thomas Winischhofer <thomas@winischhofer.net>
W: http://www.winischhofer.net/linuxsisvga.shtml
S: Maintained
F: Documentation/fb/sisfb.txt
-F: drivers/video/sis/
+F: drivers/video/fbdev/sis/
F: include/video/sisfb.h
SIS USB2VGA DRIVER
@@ -8290,7 +8290,7 @@ SMSC UFX6000 and UFX7000 USB to VGA DRIVER
M: Steve Glendinning <steve.glendinning@shawell.net>
L: linux-fbdev@vger.kernel.org
S: Maintained
-F: drivers/video/smscufx.c
+F: drivers/video/fbdev/smscufx.c
SOC-CAMERA V4L2 SUBSYSTEM
M: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
@@ -9622,7 +9622,7 @@ L: linux-fbdev@vger.kernel.org
W: http://dev.gentoo.org/~spock/projects/uvesafb/
S: Maintained
F: Documentation/fb/uvesafb.txt
-F: drivers/video/uvesafb.*
+F: drivers/video/fbdev/uvesafb.*
VFAT/FAT/MSDOS FILESYSTEM
M: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
@@ -9695,7 +9695,7 @@ S: Maintained
F: include/linux/via-core.h
F: include/linux/via-gpio.h
F: include/linux/via_i2c.h
-F: drivers/video/via/
+F: drivers/video/fbdev/via/
VIA VELOCITY NETWORK DRIVER
M: Francois Romieu <romieu@fr.zoreil.com>
--
1.7.10.4
^ permalink raw reply related
* [PATCH] fb: adv7393: add missing semicolon
From: Scott Jiang @ 2014-07-01 6:57 UTC (permalink / raw)
To: linux-fbdev
Commit f8bd493456c3da372ae81ed8f6b903f6207b9d98 by Jingoo Han
introduced this problem. This makes bfin_adv7393fb.c failed to compile.
Signed-off-by: Scott Jiang <scott.jiang.linux@gmail.com>
---
drivers/video/fbdev/bfin_adv7393fb.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/video/fbdev/bfin_adv7393fb.c b/drivers/video/fbdev/bfin_adv7393fb.c
index a54f7f7..8fe41ca 100644
--- a/drivers/video/fbdev/bfin_adv7393fb.c
+++ b/drivers/video/fbdev/bfin_adv7393fb.c
@@ -408,7 +408,7 @@ static int bfin_adv7393_fb_probe(struct i2c_client *client,
/* Workaround "PPI Does Not Start Properly In Specific Mode" */
if (ANOMALY_05000400) {
ret = gpio_request_one(P_IDENT(P_PPI0_FS3), GPIOF_OUT_INIT_LOW,
- "PPI0_FS3")
+ "PPI0_FS3");
if (ret) {
dev_err(&client->dev, "PPI0_FS3 GPIO request failed\n");
ret = -EBUSY;
--
1.7.9.5
^ permalink raw reply related
* Re: [PATCH V3] MAINTAINERS: Update Framebuffer file patterns
From: Tomi Valkeinen @ 2014-07-01 10:18 UTC (permalink / raw)
To: linux-fbdev
In-Reply-To: <002601cf94f6$b9ea9d20$2dbfd760$%han@samsung.com>
[-- Attachment #1: Type: text/plain, Size: 345 bytes --]
On 01/07/14 09:36, Jingoo Han wrote:
> Since the commit f7018c2 "video: move fbdev to drivers/video/fbdev",
> all framebuffer drivers were moved to fbdev directory. Thus, file
> patterns of these framebuffer drivers should be updated correctly.
>
> Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Thanks, queued for 3.17.
Tomi
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply
* Re: [PATCH 2/2] video: clps711x: Fix sparse warnings
From: Tomi Valkeinen @ 2014-07-01 10:22 UTC (permalink / raw)
To: linux-fbdev
In-Reply-To: <1403937246-14506-2-git-send-email-shc_work@mail.ru>
[-- Attachment #1: Type: text/plain, Size: 1517 bytes --]
On 01/07/14 09:23, Alexander Shiyan wrote:
> Tue, 1 Jul 2014 09:14:02 +0300 от Tomi Valkeinen <tomi.valkeinen@ti.com>:
>> On 28/06/14 09:34, Alexander Shiyan wrote:
>>> This patch fixes below warnings:
>>> CHECK drivers/video/fbdev/clps711x-fb.c
>>> drivers/video/fbdev/clps711x-fb.c:247:24: warning: incorrect type in argument 1 (different address spaces)
>>> drivers/video/fbdev/clps711x-fb.c:247:24: expected void const *ptr
>>> drivers/video/fbdev/clps711x-fb.c:247:24: got char [noderef] <asn:2>*screen_base
>>> drivers/video/fbdev/clps711x-fb.c:248:35: warning: incorrect type in argument 1 (different address spaces)
>>> drivers/video/fbdev/clps711x-fb.c:248:35: expected void const *ptr
>>> drivers/video/fbdev/clps711x-fb.c:248:35: got char [noderef] <asn:2>*screen_base
> ...
>>> info->screen_base = devm_ioremap_resource(dev, res);
>>> - if (IS_ERR(info->screen_base)) {
>>> - ret = PTR_ERR(info->screen_base);
>>> + if (IS_ERR((__force void *)info->screen_base)) {
>>> + ret = PTR_ERR((__force void *)info->screen_base);
>>
>> I don't see any other user of devm_ioremap_resource() having that kind
>> of casts. Why are they needed here?
>
> Not needed, type cast was done only to remove sparse warnings.
Right, but I think either sparse is wrong here, or the PTR_ERR/IS_ERR
are wrong. You shouldn't do typecasts like that to hide those warnings.
The memset warning is correct, because you shouldn't use memset to
__iomem memory.
Tomi
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply
* Re: [PATCH 2/2] video: clps711x: Fix sparse warnings
From: Alexander Shiyan @ 2014-07-01 10:31 UTC (permalink / raw)
To: linux-fbdev
In-Reply-To: <1374825597.724071106@f170.mail.ru>
VHVlLCAxIEp1bCAyMDE0IDEzOjIyOjUxICswMzAwINC+0YIgVG9taSBWYWxrZWluZW4gPHRvbWku
dmFsa2VpbmVuQHRpLmNvbT46Cj4gT24gMDEvMDcvMTQgMDk6MjMsIEFsZXhhbmRlciBTaGl5YW4g
d3JvdGU6Cj4gPiBUdWUsIDEgSnVsIDIwMTQgMDk6MTQ6MDIgKzAzMDAg0L7RgiBUb21pIFZhbGtl
aW5lbiA8dG9taS52YWxrZWluZW5AdGkuY29tPjoKPiA+PiBPbiAyOC8wNi8xNCAwOTozNCwgQWxl
eGFuZGVyIFNoaXlhbiB3cm90ZToKPiA+Pj4gVGhpcyBwYXRjaCBmaXhlcyBiZWxvdyB3YXJuaW5n
czoKPiA+Pj4gQ0hFQ0sgICBkcml2ZXJzL3ZpZGVvL2ZiZGV2L2NscHM3MTF4LWZiLmMKPiA+Pj4g
ICBkcml2ZXJzL3ZpZGVvL2ZiZGV2L2NscHM3MTF4LWZiLmM6MjQ3OjI0OiB3YXJuaW5nOiBpbmNv
cnJlY3QgdHlwZSBpbiBhcmd1bWVudCAxIChkaWZmZXJlbnQgYWRkcmVzcyBzcGFjZXMpCj4gPj4+
ICAgZHJpdmVycy92aWRlby9mYmRldi9jbHBzNzExeC1mYi5jOjI0NzoyNDogICAgZXhwZWN0ZWQg
dm9pZCBjb25zdCAqcHRyCj4gPj4+ICAgZHJpdmVycy92aWRlby9mYmRldi9jbHBzNzExeC1mYi5j
OjI0NzoyNDogICAgZ290IGNoYXIgW25vZGVyZWZdIDxhc246Mj4qc2NyZWVuX2Jhc2UKPiA+Pj4g
ICBkcml2ZXJzL3ZpZGVvL2ZiZGV2L2NscHM3MTF4LWZiLmM6MjQ4OjM1OiB3YXJuaW5nOiBpbmNv
cnJlY3QgdHlwZSBpbiBhcmd1bWVudCAxIChkaWZmZXJlbnQgYWRkcmVzcyBzcGFjZXMpCj4gPj4+
ICAgZHJpdmVycy92aWRlby9mYmRldi9jbHBzNzExeC1mYi5jOjI0ODozNTogICAgZXhwZWN0ZWQg
dm9pZCBjb25zdCAqcHRyCj4gPj4+ICAgZHJpdmVycy92aWRlby9mYmRldi9jbHBzNzExeC1mYi5j
OjI0ODozNTogICAgZ290IGNoYXIgW25vZGVyZWZdIDxhc246Mj4qc2NyZWVuX2Jhc2UKPiA+IC4u
Lgo+ID4+PiAgCWluZm8tPnNjcmVlbl9iYXNlID0gZGV2bV9pb3JlbWFwX3Jlc291cmNlKGRldiwg
cmVzKTsKPiA+Pj4gLQlpZiAoSVNfRVJSKGluZm8tPnNjcmVlbl9iYXNlKSkgewo+ID4+PiAtCQly
ZXQgPSBQVFJfRVJSKGluZm8tPnNjcmVlbl9iYXNlKTsKPiA+Pj4gKwlpZiAoSVNfRVJSKChfX2Zv
cmNlIHZvaWQgKilpbmZvLT5zY3JlZW5fYmFzZSkpIHsKPiA+Pj4gKwkJcmV0ID0gUFRSX0VSUigo
X19mb3JjZSB2b2lkICopaW5mby0+c2NyZWVuX2Jhc2UpOwo+ID4+Cj4gPj4gSSBkb24ndCBzZWUg
YW55IG90aGVyIHVzZXIgb2YgZGV2bV9pb3JlbWFwX3Jlc291cmNlKCkgaGF2aW5nIHRoYXQga2lu
ZAo+ID4+IG9mIGNhc3RzLiBXaHkgYXJlIHRoZXkgbmVlZGVkIGhlcmU/Cj4gPiAKPiA+IE5vdCBu
ZWVkZWQsIHR5cGUgY2FzdCB3YXMgZG9uZSBvbmx5IHRvIHJlbW92ZSBzcGFyc2Ugd2FybmluZ3Mu
Cj4gCj4gUmlnaHQsIGJ1dCBJIHRoaW5rIGVpdGhlciBzcGFyc2UgaXMgd3JvbmcgaGVyZSwgb3Ig
dGhlIFBUUl9FUlIvSVNfRVJSCj4gYXJlIHdyb25nLiBZb3Ugc2hvdWxkbid0IGRvIHR5cGVjYXN0
cyBsaWtlIHRoYXQgdG8gaGlkZSB0aG9zZSB3YXJuaW5ncy4KCldlbGwsIEknbGwgcmVtb3ZlIHRo
ZXNlIGNoYW5nZXMgYW5kIHNlbmQgYSBzZWNvbmQgdmVyc2lvbiBvZiB0aGUgcGF0Y2guCgotLS0K
Cg=
^ permalink raw reply
* Re: [PATCH] fb: adv7393: add missing semicolon
From: Tomi Valkeinen @ 2014-07-01 10:33 UTC (permalink / raw)
To: linux-fbdev
In-Reply-To: <1404284022-24866-1-git-send-email-scott.jiang.linux@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1019 bytes --]
On 02/07/14 09:53, Scott Jiang wrote:
> Commit f8bd493456c3da372ae81ed8f6b903f6207b9d98 by Jingoo Han
> introduced this problem. This makes bfin_adv7393fb.c failed to compile.
>
> Signed-off-by: Scott Jiang <scott.jiang.linux@gmail.com>
> ---
> drivers/video/fbdev/bfin_adv7393fb.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/video/fbdev/bfin_adv7393fb.c b/drivers/video/fbdev/bfin_adv7393fb.c
> index a54f7f7..8fe41ca 100644
> --- a/drivers/video/fbdev/bfin_adv7393fb.c
> +++ b/drivers/video/fbdev/bfin_adv7393fb.c
> @@ -408,7 +408,7 @@ static int bfin_adv7393_fb_probe(struct i2c_client *client,
> /* Workaround "PPI Does Not Start Properly In Specific Mode" */
> if (ANOMALY_05000400) {
> ret = gpio_request_one(P_IDENT(P_PPI0_FS3), GPIOF_OUT_INIT_LOW,
> - "PPI0_FS3")
> + "PPI0_FS3");
> if (ret) {
> dev_err(&client->dev, "PPI0_FS3 GPIO request failed\n");
> ret = -EBUSY;
>
Thanks, queued for 3.16 fixes.
Tomi
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply
* [GIT PULL] fbdev fixes for 3.16
From: Tomi Valkeinen @ 2014-07-01 11:31 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Linux Fbdev development list, LKML
[-- Attachment #1: Type: text/plain, Size: 1281 bytes --]
Hi Linus,
The following changes since commit a497c3ba1d97fc69c1e78e7b96435ba8c2cb42ee:
Linux 3.16-rc2 (2014-06-21 19:02:54 -1000)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux.git tags/fbdev-fixes-3.16
for you to fetch changes up to 0b479c3db63303814c1d2f8e97497db6be1caaa4:
fb: adv7393: add missing semicolon (2014-07-01 13:18:38 +0300)
----------------------------------------------------------------
fbdev fixes for 3.16
A few minor fbdev fixes for bfin_adv7393fb, omapdss, vt8500lcdfb, atmel_lcdfb.
----------------------------------------------------------------
Emil Goode (1):
video: vt8500lcdfb: Remove kfree call since devm_kzalloc() is used
Michael Welling (1):
drivers:video:fbdev atmel_lcdfb.c power GPIO registration bug
Sachin Kamat (1):
video: omapdss: Fix potential null pointer dereference
Scott Jiang (1):
fb: adv7393: add missing semicolon
drivers/video/fbdev/atmel_lcdfb.c | 2 ++
drivers/video/fbdev/bfin_adv7393fb.c | 2 +-
drivers/video/fbdev/omap2/dss/omapdss-boot-init.c | 8 +++++---
drivers/video/fbdev/vt8500lcdfb.c | 2 --
4 files changed, 8 insertions(+), 6 deletions(-)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply
* Re: [PATCH 5/5] drm/i915: Kick out vga console
From: Ed Tomlinson @ 2014-07-01 13:51 UTC (permalink / raw)
To: Chris Wilson
Cc: linux-fbdev, Dave Airlie, Daniel Vetter,
Intel Graphics Development, LKML, DRI Development, Tomi Valkeinen,
David Herrmann, Jean-Christophe Plagniol-Villard
In-Reply-To: <20140630065955.GD7687@nuc-i3427.alporthouse.com>
Hi Chris,
I had to rediff to get a patch that applies... I am not hanging with this applied - it
does look like the i915 is starting is initialization later boot the new kernel.
[ 2.389796] [drm] Radeon Display Connectors
[ 2.389798] [drm] Connector 0:
[ 2.389799] [drm] DP-1
[ 2.389799] [drm] HPD2
[ 2.389801] [drm] DDC: 0x6530 0x6530 0x6534 0x6534 0x6538 0x6538 0x653c 0x653c
[ 2.389802] [drm] Encoders:
[ 2.389803] [drm] DFP1: INTERNAL_UNIPHY2
[ 2.389804] [drm] Connector 1:
[ 2.389805] [drm] HDMI-A-1
[ 2.389805] [drm] HPD3
[ 2.389806] [drm] DDC: 0x6550 0x6550 0x6554 0x6554 0x6558 0x6558 0x655c 0x655c
[ 2.389807] [drm] Encoders:
[ 2.389808] [drm] DFP2: INTERNAL_UNIPHY2
[ 2.389809] [drm] Connector 2:
[ 2.389810] [drm] DVI-D-1
[ 2.389811] [drm] HPD1
[ 2.389812] [drm] DDC: 0x6560 0x6560 0x6564 0x6564 0x6568 0x6568 0x656c 0x656c
[ 2.389813] [drm] Encoders:
[ 2.389814] [drm] DFP3: INTERNAL_UNIPHY1
[ 2.389815] [drm] Connector 3:
[ 2.389815] [drm] DVI-I-1
[ 2.389816] [drm] HPD6
[ 2.389817] [drm] DDC: 0x6580 0x6580 0x6584 0x6584 0x6588 0x6588 0x658c 0x658c
[ 2.389818] [drm] Encoders:
[ 2.389819] [drm] DFP4: INTERNAL_UNIPHY
[ 2.389820] [drm] CRT1: INTERNAL_KLDSCP_DAC1
[ 2.435689] raid6: avx2x2 24564 MB/s
[ 2.435691] Switched to clocksource tsc
[ 2.489087] usb 1-8: new low-speed USB device number 7 using xhci_hcd
[ 2.492403] raid6: avx2x4 34887 MB/s
[ 2.492404] raid6: using algorithm avx2x4 (34887 MB/s)
[ 2.492405] raid6: using avx2x2 recovery algorithm
[ 2.492789] xor: automatically using best checksumming function:
[ 2.502557] Adding 5779452k swap on /dev/sdb2. Priority:-2 extents:1 across:5779452k FS
[ 2.511532] [drm] fb mappable at 0xE098E000
[ 2.511536] [drm] vram apper at 0xE0000000
[ 2.511538] [drm] size 9216000
[ 2.511539] [drm] fb depth is 24
[ 2.511541] [drm] pitch is 7680
[ 2.511590] fbcon: radeondrmfb (fb0) is primary device
[ 2.516691] nct6775: Found NCT6776D/F or compatible chip at 0x2e:0x290
[ 2.525778] avx : 41474.400 MB/sec
[ 2.532408] Console: switching to colour frame buffer device 240x75
[ 2.535567] radeon 0000:01:00.0: fb0: radeondrmfb frame buffer device
[ 2.535567] radeon 0000:01:00.0: registered panic notifier
[ 2.544968] Btrfs loaded
[ 2.545276] BTRFS: device fsid 9d4254aa-6715-4fa8-986a-1af0d51768ad devid 1 transid 308068 /dev/sdc1
[ 2.545739] BTRFS: device fsid 9d4254aa-6715-4fa8-986a-1af0d51768ad devid 2 transid 308068 /dev/sdb1
[ 2.552946] [drm] Initialized radeon 2.39.0 20080528 for 0000:01:00.0 on minor 0
[ 2.553248] [drm] Memory usable by graphics device = 2048M
[ 2.553273] [drm] Replacing VGA console driver
[ 2.572539] i915 0000:00:02.0: irq 46 for MSI/MSI-X
[ 2.572546] [drm] Supports vblank timestamp caching Rev 2 (21.10.2013).
[ 2.572565] [drm] Driver supports precise vblank timestamp query.
If you are happy with this you can give this patch my tested by.
Thanks
Ed Tomlinson
On Monday 30 June 2014 07:59:55 Chris Wilson wrote:
> On Sat, Jun 28, 2014 at 11:55:19PM -0400, Ed Tomlinson wrote:
> > On Saturday 28 June 2014 15:28:22 Ed Tomlinson wrote:
> >
> > Resend without html krud which causes list to bounce the message.
> >
> > > Hi
> > >
> > > This commit ( a4de05268e674e8ed31df6348269e22d6c6a1803 ) hangs my boot with 3.16-git. Reverting it lets the boot proceed.
> > >
> > > I have an i7 with a built-in i915 and an pcie r7 260x. The R7 is the primary console. The i915 is initialized
> > > but does not have a physical display attached.
> > >
> > > With the patch applied the boot stops at the messages:
> > >
> > > [drm] Memory usable by graphics device = 2048M
> > > [drm] Replacing VGA console driver
>
> The issue looks like that we are ripping out the radeon fb_con whilst it
> is active and that upsets everyone. In which case, I think the
> compromise is:
>
>
> diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
> index 5f44581..4915f1d 100644
> --- a/drivers/gpu/drm/i915/i915_dma.c
> +++ b/drivers/gpu/drm/i915/i915_dma.c
> @@ -1439,18 +1439,20 @@ static int i915_kick_out_vgacon(struct drm_i915_private *dev_priv)
> #else
> static int i915_kick_out_vgacon(struct drm_i915_private *dev_priv)
> {
> - int ret;
> + int ret = 0;
>
> DRM_INFO("Replacing VGA console driver\n");
>
> console_lock();
> - ret = do_take_over_console(&dummy_con, 0, MAX_NR_CONSOLES - 1, 1);
> - if (ret = 0) {
> - ret = do_unregister_con_driver(&vga_con);
> -
> - /* Ignore "already unregistered". */
> - if (ret = -ENODEV)
> - ret = 0;
> + if (con_is_bound(&vga_con)) {
> + ret = do_take_over_console(&dummy_con, 0, MAX_NR_CONSOLES - 1, 1);
> + if (ret = 0) {
> + ret = do_unregister_con_driver(&vga_con);
> +
> + /* Ignore "already unregistered". */
> + if (ret = -ENODEV)
> + ret = 0;
> + }
> }
> console_unlock();
>
> -Chris
>
>
^ permalink raw reply
* [PATCH] video: fbdev: broadsheetfb.c: Fix a memory leak
From: Rickard Strandqvist @ 2014-07-02 21:31 UTC (permalink / raw)
To: Jean-Christophe Plagniol-Villard, Tomi Valkeinen
Cc: Rickard Strandqvist, Jingoo Han, Daniel Vetter, Joe Perches,
Hanjun Guo, linux-fbdev, linux-kernel
Fix a memory leak.
This was found using a static code analysis program called cppcheck
Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
---
drivers/video/fbdev/broadsheetfb.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/video/fbdev/broadsheetfb.c b/drivers/video/fbdev/broadsheetfb.c
index 8556264..526e5e84 100644
--- a/drivers/video/fbdev/broadsheetfb.c
+++ b/drivers/video/fbdev/broadsheetfb.c
@@ -636,7 +636,7 @@ static int broadsheet_spiflash_rewrite_sector(struct broadsheetfb_par *par,
err = broadsheet_spiflash_read_range(par, start_sector_addr,
data_start_addr, sector_buffer);
if (err)
- return err;
+ goto end_release;
}
/* now we copy our data into the right place in the sector buffer */
@@ -657,7 +657,7 @@ static int broadsheet_spiflash_rewrite_sector(struct broadsheetfb_par *par,
err = broadsheet_spiflash_read_range(par, tail_start_addr,
tail_len, sector_buffer + tail_start_addr);
if (err)
- return err;
+ goto end_release;
}
/* if we got here we have the full sector that we want to rewrite. */
@@ -665,11 +665,14 @@ static int broadsheet_spiflash_rewrite_sector(struct broadsheetfb_par *par,
/* first erase the sector */
err = broadsheet_spiflash_erase_sector(par, start_sector_addr);
if (err)
- return err;
+ goto end_release;
/* now write it */
err = broadsheet_spiflash_write_sector(par, start_sector_addr,
sector_buffer, sector_size);
+
+end_release:
+ kfree(sector_buffer);
return err;
}
--
1.7.10.4
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox