5bd75403be
* remotes/origin/tmp-f686d9f:
ANDROID: update abi_gki_aarch64.xml for 5.2-rc6
Linux 5.2-rc6
Revert "iommu/vt-d: Fix lock inversion between iommu->lock and device_domain_lock"
Bluetooth: Fix regression with minimum encryption key size alignment
tcp: refine memory limit test in tcp_fragment()
x86/vdso: Prevent segfaults due to hoisted vclock reads
SUNRPC: Fix a credential refcount leak
Revert "SUNRPC: Declare RPC timers as TIMER_DEFERRABLE"
net :sunrpc :clnt :Fix xps refcount imbalance on the error path
NFS4: Only set creation opendata if O_CREAT
ANDROID: gki_defconfig: workaround to enable configs
ANDROID: gki_defconfig: more configs for partners
ARM: 8867/1: vdso: pass --be8 to linker if necessary
KVM: nVMX: reorganize initial steps of vmx_set_nested_state
KVM: PPC: Book3S HV: Invalidate ERAT when flushing guest TLB entries
habanalabs: use u64_to_user_ptr() for reading user pointers
nfsd: replace Jeff by Chuck as nfsd co-maintainer
inet: clear num_timeout reqsk_alloc()
PCI/P2PDMA: Ignore root complex whitelist when an IOMMU is present
net: mvpp2: debugfs: Add pmap to fs dump
ipv6: Default fib6_type to RTN_UNICAST when not set
net: hns3: Fix inconsistent indenting
net/af_iucv: always register net_device notifier
net/af_iucv: build proper skbs for HiperTransport
net/af_iucv: remove GFP_DMA restriction for HiperTransport
doc: fix documentation about UIO_MEM_LOGICAL using
MAINTAINERS / Documentation: Thorsten Scherer is the successor of Gavin Schenk
docs: fb: Add TER16x32 to the available font names
MAINTAINERS: fpga: hand off maintainership to Moritz
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 507
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 506
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 505
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 504
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 503
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 502
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 501
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 499
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 498
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 497
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 496
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 495
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 491
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 490
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 489
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 488
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 487
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 486
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 485
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 484
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 482
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 481
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 480
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 479
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 477
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 475
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 474
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 473
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 472
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 471
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 469
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 468
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 467
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 466
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 465
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 464
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 463
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 462
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 461
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 460
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 459
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 457
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 456
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 455
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 454
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 452
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 451
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 250
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 248
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 247
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 246
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 245
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 244
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 243
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 239
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 238
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 237
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 235
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 234
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 233
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 232
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 231
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 230
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 226
KVM: arm/arm64: Fix emulated ptimer irq injection
net: dsa: mv88e6xxx: fix shift of FID bits in mv88e6185_g1_vtu_loadpurge()
tests: kvm: Check for a kernel warning
kvm: tests: Sort tests in the Makefile alphabetically
KVM: x86/mmu: Allocate PAE root array when using SVM's 32-bit NPT
KVM: x86: Modify struct kvm_nested_state to have explicit fields for data
fanotify: update connector fsid cache on add mark
quota: fix a problem about transfer quota
drm/i915: Don't clobber M/N values during fastset check
powerpc: enable a 30-bit ZONE_DMA for 32-bit pmac
ovl: make i_ino consistent with st_ino in more cases
scsi: qla2xxx: Fix hardlockup in abort command during driver remove
scsi: ufs: Avoid runtime suspend possibly being blocked forever
scsi: qedi: update driver version to 8.37.0.20
scsi: qedi: Check targetname while finding boot target information
hvsock: fix epollout hang from race condition
net/udp_gso: Allow TX timestamp with UDP GSO
net: netem: fix use after free and double free with packet corruption
net: netem: fix backlog accounting for corrupted GSO frames
net: lio_core: fix potential sign-extension overflow on large shift
tipc: pass tunnel dev as NULL to udp_tunnel(6)_xmit_skb
ip6_tunnel: allow not to count pkts on tstats by passing dev as NULL
ip_tunnel: allow not to count pkts on tstats by setting skb's dev to NULL
apparmor: reset pos on failure to unpack for various functions
apparmor: enforce nullbyte at end of tag string
apparmor: fix PROFILE_MEDIATES for untrusted input
RDMA/efa: Handle mmap insertions overflow
tun: wake up waitqueues after IFF_UP is set
drm: return -EFAULT if copy_to_user() fails
net: remove duplicate fetch in sock_getsockopt
tipc: fix issues with early FAILOVER_MSG from peer
bnx2x: Check if transceiver implements DDM before access
xhci: detect USB 3.2 capable host controllers correctly
usb: xhci: Don't try to recover an endpoint if port is in error state.
KVM: fix typo in documentation
drm/panfrost: Make sure a BO is only unmapped when appropriate
md: fix for divide error in status_resync
soc: ixp4xx: npe: Fix an IS_ERR() vs NULL check in probe
arm64/mm: don't initialize pgd_cache twice
MAINTAINERS: Update my email address
arm64/sve: <uapi/asm/ptrace.h> should not depend on <uapi/linux/prctl.h>
ovl: fix typo in MODULE_PARM_DESC
ovl: fix bogus -Wmaybe-unitialized warning
ovl: don't fail with disconnected lower NFS
mmc: core: Prevent processing SDIO IRQs when the card is suspended
mmc: sdhci: sdhci-pci-o2micro: Correctly set bus width when tuning
brcmfmac: sdio: Don't tune while the card is off
mmc: core: Add sdio_retune_hold_now() and sdio_retune_release()
brcmfmac: sdio: Disable auto-tuning around commands expected to fail
mmc: core: API to temporarily disable retuning for SDIO CRC errors
Revert "brcmfmac: disable command decode in sdio_aos"
ARM: ixp4xx: include irqs.h where needed
ARM: ixp4xx: mark ixp4xx_irq_setup as __init
ARM: ixp4xx: don't select SERIAL_OF_PLATFORM
firmware: trusted_foundations: add ARMv7 dependency
usb: dwc2: Use generic PHY width in params setup
RDMA/efa: Fix success return value in case of error
IB/hfi1: Handle port down properly in pio
IB/hfi1: Handle wakeup of orphaned QPs for pio
IB/hfi1: Wakeup QPs orphaned on wait list after flush
IB/hfi1: Use aborts to trigger RC throttling
IB/hfi1: Create inline to get extended headers
IB/hfi1: Silence txreq allocation warnings
IB/hfi1: Avoid hardlockup with flushlist_lock
KVM: PPC: Book3S HV: Only write DAWR[X] when handling h_set_dawr in real mode
KVM: PPC: Book3S HV: Fix r3 corruption in h_set_dabr()
fs/namespace: fix unprivileged mount propagation
vfs: fsmount: add missing mntget()
cifs: fix GlobalMid_Lock bug in cifs_reconnect
SMB3: retry on STATUS_INSUFFICIENT_RESOURCES instead of failing write
staging: erofs: add requirements field in superblock
arm64: ssbd: explicitly depend on <linux/prctl.h>
block: fix page leak when merging to same page
block: return from __bio_try_merge_page if merging occured in the same page
Btrfs: fix failure to persist compression property xattr deletion on fsync
riscv: remove unused barrier defines
usb: chipidea: udc: workaround for endpoint conflict issue
MAINTAINERS: Change QCOM repo location
mmc: mediatek: fix SDIO IRQ detection issue
mmc: mediatek: fix SDIO IRQ interrupt handle flow
mmc: core: complete HS400 before checking status
riscv: mm: synchronize MMU after pte change
MAINTAINERS: Update my email address to use @kernel.org
ANDROID: update abi_gki_aarch64.xml for 5.2-rc5
riscv: dts: add initial board data for the SiFive HiFive Unleashed
riscv: dts: add initial support for the SiFive FU540-C000 SoC
dt-bindings: riscv: convert cpu binding to json-schema
dt-bindings: riscv: sifive: add YAML documentation for the SiFive FU540
arch: riscv: add support for building DTB files from DT source data
drm/i915/gvt: ignore unexpected pvinfo write
lapb: fixed leak of control-blocks.
tipc: purge deferredq list for each grp member in tipc_group_delete
ax25: fix inconsistent lock state in ax25_destroy_timer
neigh: fix use-after-free read in pneigh_get_next
tcp: fix compile error if !CONFIG_SYSCTL
hv_sock: Suppress bogus "may be used uninitialized" warnings
be2net: Fix number of Rx queues used for flow hashing
net: handle 802.1P vlan 0 packets properly
Linux 5.2-rc5
tcp: enforce tcp_min_snd_mss in tcp_mtu_probing()
tcp: add tcp_min_snd_mss sysctl
tcp: tcp_fragment() should apply sane memory limits
tcp: limit payload size of sacked skbs
Revert "net: phylink: set the autoneg state in phylink_phy_change"
bpf: fix nested bpf tracepoints with per-cpu data
bpf: Fix out of bounds memory access in bpf_sk_storage
vsock/virtio: set SOCK_DONE on peer shutdown
net: dsa: rtl8366: Fix up VLAN filtering
net: phylink: set the autoneg state in phylink_phy_change
powerpc/32: fix build failure on book3e with KVM
powerpc/booke: fix fast syscall entry on SMP
powerpc/32s: fix initial setup of segment registers on secondary CPU
x86/microcode, cpuhotplug: Add a microcode loader CPU hotplug callback
net: add high_order_alloc_disable sysctl/static key
tcp: add tcp_tx_skb_cache sysctl
tcp: add tcp_rx_skb_cache sysctl
sysctl: define proc_do_static_key()
hv_netvsc: Set probe mode to sync
net: sched: flower: don't call synchronize_rcu() on mask creation
net: dsa: fix warning same module names
sctp: Free cookie before we memdup a new one
net: dsa: microchip: Don't try to read stats for unused ports
qmi_wwan: extend permitted QMAP mux_id value range
qmi_wwan: avoid RCU stalls on device disconnect when in QMAP mode
qmi_wwan: add network device usage statistics for qmimux devices
qmi_wwan: add support for QMAP padding in the RX path
bpf, x64: fix stack layout of JITed bpf code
Smack: Restore the smackfsdef mount option and add missing prefixes
bpf, devmap: Add missing RCU read lock on flush
bpf, devmap: Add missing bulk queue free
bpf, devmap: Fix premature entry free on destroying map
ftrace: Fix NULL pointer dereference in free_ftrace_func_mapper()
module: Fix livepatch/ftrace module text permissions race
tracing/uprobe: Fix obsolete comment on trace_uprobe_create()
tracing/uprobe: Fix NULL pointer dereference in trace_uprobe_create()
tracing: Make two symbols static
tracing: avoid build warning with HAVE_NOP_MCOUNT
tracing: Fix out-of-range read in trace_stack_print()
gfs2: Fix rounding error in gfs2_iomap_page_prepare
net: phylink: further mac_config documentation improvements
nfc: Ensure presence of required attributes in the deactivate_target handler
btrfs: start readahead also in seed devices
x86/kasan: Fix boot with 5-level paging and KASAN
cfg80211: report measurement start TSF correctly
cfg80211: fix memory leak of wiphy device name
cfg80211: util: fix bit count off by one
mac80211: do not start any work during reconfigure flow
cfg80211: use BIT_ULL in cfg80211_parse_mbssid_data()
mac80211: only warn once on chanctx_conf being NULL
mac80211: drop robust management frames from unknown TA
gpu: ipu-v3: image-convert: Fix image downsize coefficients
gpu: ipu-v3: image-convert: Fix input bytesperline for packed formats
gpu: ipu-v3: image-convert: Fix input bytesperline width/height align
thunderbolt: Implement CIO reset correctly for Titan Ridge
ARM: davinci: da8xx: specify dma_coherent_mask for lcdc
ARM: davinci: da850-evm: call regulator_has_full_constraints()
timekeeping: Repair ktime_get_coarse*() granularity
Revert "ALSA: hda/realtek - Improve the headset mic for Acer Aspire laptops"
ANDROID: update abi_gki_aarch64.xml
mm/devm_memremap_pages: fix final page put race
PCI/P2PDMA: track pgmap references per resource, not globally
lib/genalloc: introduce chunk owners
PCI/P2PDMA: fix the gen_pool_add_virt() failure path
mm/devm_memremap_pages: introduce devm_memunmap_pages
drivers/base/devres: introduce devm_release_action()
mm/vmscan.c: fix trying to reclaim unevictable LRU page
coredump: fix race condition between collapse_huge_page() and core dumping
mm/mlock.c: change count_mm_mlocked_page_nr return type
mm: mmu_gather: remove __tlb_reset_range() for force flush
fs/ocfs2: fix race in ocfs2_dentry_attach_lock()
mm/vmscan.c: fix recent_rotated history
mm/mlock.c: mlockall error for flag MCL_ONFAULT
scripts/decode_stacktrace.sh: prefix addr2line with $CROSS_COMPILE
mm/list_lru.c: fix memory leak in __memcg_init_list_lru_node
mm: memcontrol: don't batch updates of local VM stats and events
PCI: PM: Skip devices in D0 for suspend-to-idle
ANDROID: Removed extraneous configs from gki
powerpc/bpf: use unsigned division instruction for 64-bit operations
bpf: fix div64 overflow tests to properly detect errors
bpf: sync BPF_FIB_LOOKUP flag changes with BPF uapi
bpf: simplify definition of BPF_FIB_LOOKUP related flags
cifs: add spinlock for the openFileList to cifsInodeInfo
cifs: fix panic in smb2_reconnect
x86/fpu: Don't use current->mm to check for a kthread
KVM: nVMX: use correct clean fields when copying from eVMCS
vfio-ccw: Destroy kmem cache region on module exit
block/ps3vram: Use %llu to format sector_t after LBDAF removal
libata: Extend quirks for the ST1000LM024 drives with NOLPM quirk
bcache: only set BCACHE_DEV_WB_RUNNING when cached device attached
bcache: fix stack corruption by PRECEDING_KEY()
arm64/sve: Fix missing SVE/FPSIMD endianness conversions
blk-mq: remove WARN_ON(!q->elevator) from blk_mq_sched_free_requests
blkio-controller.txt: Remove references to CFQ
block/switching-sched.txt: Update to blk-mq schedulers
null_blk: remove duplicate check for report zone
blk-mq: no need to check return value of debugfs_create functions
io_uring: fix memory leak of UNIX domain socket inode
block: force select mq-deadline for zoned block devices
binder: fix possible UAF when freeing buffer
drm/amdgpu: return 0 by default in amdgpu_pm_load_smu_firmware
drm/amdgpu: Fix bounds checking in amdgpu_ras_is_supported()
ANDROID: x86 gki_defconfig: enable DMA_CMA
ANDROID: Fixed x86 regression
ANDROID: gki_defconfig: enable DMA_CMA
Input: synaptics - enable SMBus on ThinkPad E480 and E580
net: mvpp2: prs: Use the correct helpers when removing all VID filters
net: mvpp2: prs: Fix parser range for VID filtering
mlxsw: spectrum: Disallow prio-tagged packets when PVID is removed
mlxsw: spectrum_buffers: Reduce pool size on Spectrum-2
selftests: tc_flower: Add TOS matching test
mlxsw: spectrum_flower: Fix TOS matching
selftests: mlxsw: Test nexthop offload indication
mlxsw: spectrum_router: Refresh nexthop neighbour when it becomes dead
mlxsw: spectrum: Use different seeds for ECMP and LAG hash
net: tls, correctly account for copied bytes with multiple sk_msgs
vrf: Increment Icmp6InMsgs on the original netdev
cpuset: restore sanity to cpuset_cpus_allowed_fallback()
net: ethtool: Allow matching on vlan DEI bit
linux-next: DOC: RDS: Fix a typo in rds.txt
x86/kgdb: Return 0 from kgdb_arch_set_breakpoint()
mpls: fix af_mpls dependencies for real
selinux: fix a missing-check bug in selinux_sb_eat_lsm_opts()
selinux: fix a missing-check bug in selinux_add_mnt_opt( )
arm64: tlbflush: Ensure start/end of address range are aligned to stride
usb: typec: Make sure an alt mode exist before getting its partner
KVM: arm/arm64: vgic: Fix kvm_device leak in vgic_its_destroy
KVM: arm64: Filter out invalid core register IDs in KVM_GET_REG_LIST
KVM: arm64: Implement vq_present() as a macro
xdp: check device pointer before clearing
bpf: net: Set sk_bpf_storage back to NULL for cloned sk
Btrfs: fix race between block group removal and block group allocation
clocksource/drivers/arm_arch_timer: Don't trace count reader functions
i2c: pca-platform: Fix GPIO lookup code
thunderbolt: Make sure device runtime resume completes before taking domain lock
drm: add fallback override/firmware EDID modes workaround
i2c: acorn: fix i2c warning
arm64: Don't unconditionally add -Wno-psabi to KBUILD_CFLAGS
drm/edid: abstract override/firmware EDID retrieval
platform/mellanox: mlxreg-hotplug: Add devm_free_irq call to remove flow
platform/x86: mlx-platform: Fix parent device in i2c-mux-reg device registration
platform/x86: intel-vbtn: Report switch events when event wakes device
platform/x86: asus-wmi: Only Tell EC the OS will handle display hotkeys from asus_nb_wmi
ARM: mvebu_v7_defconfig: fix Ethernet on Clearfog
x86/resctrl: Prevent NULL pointer dereference when local MBM is disabled
x86/resctrl: Don't stop walking closids when a locksetup group is found
iommu/arm-smmu: Avoid constant zero in TLBI writes
drm/i915/perf: fix whitelist on Gen10+
drm/i915/sdvo: Implement proper HDMI audio support for SDVO
drm/i915: Fix per-pixel alpha with CCS
drm/i915/dmc: protect against reading random memory
drm/i915/dsi: Use a fuzzy check for burst mode clock check
Input: imx_keypad - make sure keyboard can always wake up system
selinux: log raw contexts as untrusted strings
ptrace: restore smp_rmb() in __ptrace_may_access()
IB/hfi1: Correct tid qp rcd to match verbs context
IB/hfi1: Close PSM sdma_progress sleep window
IB/hfi1: Validate fault injection opcode user input
geneve: Don't assume linear buffers in error handler
vxlan: Don't assume linear buffers in error handler
net: openvswitch: do not free vport if register_netdevice() is failed.
net: correct udp zerocopy refcnt also when zerocopy only on append
drm/amdgpu/{uvd,vcn}: fetch ring's read_ptr after alloc
ovl: fix wrong flags check in FS_IOC_FS[SG]ETXATTR ioctls
riscv: Fix udelay in RV32.
drm/vmwgfx: fix a warning due to missing dma_parms
riscv: export pm_power_off again
drm/vmwgfx: Honor the sg list segment size limitation
RISC-V: defconfig: enable clocks, serial console
drm/vmwgfx: Use the backdoor port if the HB port is not available
bpf: lpm_trie: check left child of last leftmost node for NULL
Revert "fuse: require /dev/fuse reads to have enough buffer capacity"
ALSA: ice1712: Check correct return value to snd_i2c_sendbytes (EWS/DMX 6Fire)
ALSA: oxfw: allow PCM capture for Stanton SCS.1m
ALSA: firewire-motu: fix destruction of data for isochronous resources
s390/ctl_reg: mark __ctl_set_bit and __ctl_clear_bit as __always_inline
s390/boot: disable address-of-packed-member warning
ANDROID: update gki aarch64 ABI representation
cgroup: Fix css_task_iter_advance_css_set() cset skip condition
drm/panfrost: Require the simple_ondemand governor
drm/panfrost: make devfreq optional again
drm/gem_shmem: Use a writecombine mapping for ->vaddr
mmc: sdhi: disallow HS400 for M3-W ES1.2, RZ/G2M, and V3H
ASoC: Intel: sst: fix kmalloc call with wrong flags
ASoC: core: Fix deadlock in snd_soc_instantiate_card()
cgroup/bfq: revert bfq.weight symlink change
ARM: dts: am335x phytec boards: Fix cd-gpios active level
ARM: dts: dra72x: Disable usb4_tm target module
nfp: ensure skb network header is set for packet redirect
tcp: fix undo spurious SYNACK in passive Fast Open
mpls: fix af_mpls dependencies
ibmvnic: Fix unchecked return codes of memory allocations
ibmvnic: Refresh device multicast list after reset
ibmvnic: Do not close unopened driver during reset
mpls: fix warning with multi-label encap
net: phy: rename Asix Electronics PHY driver
ipv6: flowlabel: fl6_sock_lookup() must use atomic_inc_not_zero
net: ipv4: fib_semantics: fix uninitialized variable
Input: iqs5xx - get axis info before calling input_mt_init_slots()
Linux 5.2-rc4
drm: panel-orientation-quirks: Add quirk for GPD MicroPC
drm: panel-orientation-quirks: Add quirk for GPD pocket2
counter/ftm-quaddec: Add missing dependencies in Kconfig
staging: iio: adt7316: Fix build errors when GPIOLIB is not set
x86/fpu: Update kernel's FPU state before using for the fsave header
MAINTAINERS: Karthikeyan Ramasubramanian is MIA
i2c: xiic: Add max_read_len quirk
ANDROID: update ABI representation
gpio: pca953x: hack to fix 24 bit gpio expanders
net/mlx5e: Support tagged tunnel over bond
net/mlx5e: Avoid detaching non-existing netdev under switchdev mode
net/mlx5e: Fix source port matching in fdb peer flow rule
net/mlx5e: Replace reciprocal_scale in TX select queue function
net/mlx5e: Add ndo_set_feature for uplink representor
net/mlx5: Avoid reloading already removed devices
net/mlx5: Update pci error handler entries and command translation
RAS/CEC: Convert the timer callback to a workqueue
RAS/CEC: Fix binary search function
x86/mm/KASLR: Compute the size of the vmemmap section properly
can: purge socket error queue on sock destruct
can: flexcan: Remove unneeded registration message
can: af_can: Fix error path of can_init()
can: m_can: implement errata "Needless activation of MRAF irq"
can: mcp251x: add support for mcp25625
dt-bindings: can: mcp251x: add mcp25625 support
can: xilinx_can: use correct bittiming_const for CAN FD core
can: flexcan: fix timeout when set small bitrate
can: usb: Kconfig: Remove duplicate menu entry
lockref: Limit number of cmpxchg loop retries
uaccess: add noop untagged_addr definition
x86/insn-eval: Fix use-after-free access to LDT entry
kbuild: use more portable 'command -v' for cc-cross-prefix
s390/unwind: correct stack switching during unwind
scsi: hpsa: correct ioaccel2 chaining
btrfs: Always trim all unallocated space in btrfs_trim_free_extents
netfilter: ipv6: nf_defrag: accept duplicate fragments again
powerpc/32s: fix booting with CONFIG_PPC_EARLY_DEBUG_BOOTX
drm/meson: fix G12A primary plane disabling
drm/meson: fix primary plane disabling
drm/meson: fix G12A HDMI PLL settings for 4K60 1000/1001 variations
block, bfq: add weight symlink to the bfq.weight cgroup parameter
cgroup: let a symlink too be created with a cftype file
powerpc/64s: __find_linux_pte() synchronization vs pmdp_invalidate()
powerpc/64s: Fix THP PMD collapse serialisation
powerpc: Fix kexec failure on book3s/32
drm/nouveau/secboot/gp10[2467]: support newer FW to fix SEC2 failures on some boards
drm/nouveau/secboot: enable loading of versioned LS PMU/SEC2 ACR msgqueue FW
drm/nouveau/secboot: split out FW version-specific LS function pointers
drm/nouveau/secboot: pass max supported FW version to LS load funcs
drm/nouveau/core: support versioned firmware loading
drm/nouveau/core: pass subdev into nvkm_firmware_get, rather than device
block: free sched's request pool in blk_cleanup_queue
bpf: expand section tests for test_section_names
bpf: more msg_name rewrite tests to test_sock_addr
bpf, bpftool: enable recvmsg attach types
bpf, libbpf: enable recvmsg attach types
bpf: sync tooling uapi header
bpf: fix unconnected udp hooks
vfio/mdev: Synchronize device create/remove with parent removal
vfio/mdev: Avoid creating sysfs remove file on stale device removal
pktgen: do not sleep with the thread lock held.
net: mvpp2: Use strscpy to handle stat strings
net: rds: fix memory leak in rds_ib_flush_mr_pool
ipv6: fix EFAULT on sendto with icmpv6 and hdrincl
ipv6: use READ_ONCE() for inet->hdrincl as in ipv4
soundwire: intel: set dai min and max channels correctly
soundwire: stream: fix bad unlock balance
x86/fpu: Use fault_in_pages_writeable() for pre-faulting
nvme-rdma: use dynamic dma mapping per command
nvme: Fix u32 overflow in the number of namespace list calculation
vfio/mdev: Improve the create/remove sequence
SoC: rt274: Fix internal jack assignment in set_jack callback
ALSA: hdac: fix memory release for SST and SOF drivers
ASoC: SOF: Intel: hda: use the defined ppcap functions
ASoC: core: move DAI pre-links initiation to snd_soc_instantiate_card
ASoC: Intel: cht_bsw_rt5672: fix kernel oops with platform_name override
ASoC: Intel: cht_bsw_nau8824: fix kernel oops with platform_name override
ASoC: Intel: bytcht_es8316: fix kernel oops with platform_name override
ASoC: Intel: cht_bsw_max98090: fix kernel oops with platform_name override
Revert "gfs2: Replace gl_revokes with a GLF flag"
arm64: Silence gcc warnings about arch ABI drift
parisc: Fix crash due alternative coding for NP iopdir_fdc bit
parisc: Use lpa instruction to load physical addresses in driver code
parisc: configs: Remove useless UEVENT_HELPER_PATH
parisc: Use implicit space register selection for loading the coherence index of I/O pdirs
usb: gadget: udc: lpc32xx: fix return value check in lpc32xx_udc_probe()
usb: gadget: dwc2: fix zlp handling
usb: dwc2: Set actual frame number for completed ISOC transfer for none DDMA
usb: gadget: udc: lpc32xx: allocate descriptor with GFP_ATOMIC
usb: gadget: fusb300_udc: Fix memory leak of fusb300->ep[i]
usb: phy: mxs: Disable external charger detect in mxs_phy_hw_init()
usb: dwc2: Fix DMA cache alignment issues
usb: dwc2: host: Fix wMaxPacketSize handling (fix webcam regression)
ARM64: trivial: s/TIF_SECOMP/TIF_SECCOMP/ comment typo fix
drm/komeda: Potential error pointer dereference
drm/komeda: remove set but not used variable 'kcrtc'
x86/CPU: Add more Icelake model numbers
hwmon: (pmbus/core) Treat parameters as paged if on multiple pages
hwmon: (pmbus/core) mutex_lock write in pmbus_set_samples
hwmon: (core) add thermal sensors only if dev->of_node is present
Revert "fib_rules: return 0 directly if an exactly same rule exists when NLM_F_EXCL not supplied"
net: aquantia: fix wol configuration not applied sometimes
ethtool: fix potential userspace buffer overflow
Fix memory leak in sctp_process_init
net: rds: fix memory leak when unload rds_rdma
ipv6: fix the check before getting the cookie in rt6_get_cookie
ipv4: not do cache for local delivery if bc_forwarding is enabled
selftests: vm: Fix test build failure when built by itself
tools: bpftool: Fix JSON output when lookup fails
mmc: also set max_segment_size in the device
mtip32xx: also set max_segment_size in the device
rsxx: don't call dma_set_max_seg_size
nvme-pci: don't limit DMA segement size
s390/qeth: handle error when updating TX queue count
s390/qeth: fix VLAN attribute in bridge_hostnotify udev event
s390/qeth: check dst entry before use
s390/qeth: handle limited IPv4 broadcast in L3 TX path
ceph: fix error handling in ceph_get_caps()
ceph: avoid iput_final() while holding mutex or in dispatch thread
ceph: single workqueue for inode related works
cgroup: css_task_iter_skip()'d iterators must be advanced before accessed
drm/amd/amdgpu: add RLC firmware to support raven1 refresh
drm/amd/powerplay: add set_power_profile_mode for raven1_refresh
drm/amdgpu: fix ring test failure issue during s3 in vce 3.0 (V2)
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 450
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 449
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 448
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 446
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 445
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 444
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 443
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 442
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 441
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 440
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 438
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 437
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 436
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 435
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 434
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 433
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 432
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 431
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 430
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 429
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 428
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 426
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 424
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 423
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 422
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 421
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 420
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 419
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 418
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 417
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 416
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 414
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 412
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 411
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 410
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 409
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 408
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 407
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 406
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 405
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 404
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 403
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 402
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 401
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 400
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 399
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 398
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 397
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 396
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 395
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 394
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 393
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 392
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 391
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 390
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 389
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 388
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 387
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 380
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 378
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 377
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 376
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 375
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 373
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 372
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 371
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 370
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 367
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 365
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 364
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 363
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 362
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 354
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 353
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 352
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 351
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 350
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 349
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 348
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 347
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 346
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 345
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 344
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 343
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 342
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 341
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 340
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 339
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 338
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 336
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 335
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 334
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 333
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 332
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 330
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 328
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 326
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 325
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 324
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 323
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 322
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 321
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 320
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 316
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 315
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 314
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 313
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 312
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 311
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 310
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 309
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 308
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 307
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 305
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 301
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 300
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 299
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 297
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 296
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 295
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 294
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 292
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 291
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 290
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 289
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 288
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 287
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 286
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 285
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 284
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 283
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 282
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 281
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 280
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 278
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 277
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 276
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 275
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 274
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 273
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 272
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 271
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 270
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 269
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 268
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 267
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 266
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 265
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 264
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 263
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 262
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 260
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 258
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 257
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 256
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 254
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 253
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 252
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 251
lib/test_stackinit: Handle Clang auto-initialization pattern
block: Drop unlikely before IS_ERR(_OR_NULL)
xen/swiotlb: don't initialize swiotlb twice on arm64
s390/mm: fix address space detection in exception handling
HID: logitech-dj: Fix 064d:c52f receiver support
Revert "HID: core: Call request_module before doing device_add"
Revert "HID: core: Do not call request_module() in async context"
Revert "HID: Increase maximum report size allowed by hid_field_extract()"
tests: fix pidfd-test compilation
signal: improve comments
samples: fix pidfd-metadata compilation
arm64: arch_timer: mark functions as __always_inline
arm64: smp: Moved cpu_logical_map[] to smp.h
arm64: cpufeature: Fix missing ZFR0 in __read_sysreg_by_encoding()
selftests/bpf: move test_lirc_mode2_user to TEST_GEN_PROGS_EXTENDED
USB: Fix chipmunk-like voice when using Logitech C270 for recording audio.
USB: usb-storage: Add new ID to ums-realtek
udmabuf: actually unmap the scatterlist
net: fix indirect calls helpers for ptype list hooks.
net: ipvlan: Fix ipvlan device tso disabled while NETIF_F_IP_CSUM is set
scsi: smartpqi: unlock on error in pqi_submit_raid_request_synchronous()
scsi: ufs: Check that space was properly alloced in copy_query_response
udp: only choose unbound UDP socket for multicast when not in a VRF
net/tls: replace the sleeping lock around RX resync with a bit lock
Revert "net/tls: avoid NULL-deref on resync during device removal"
block: aoe: no need to check return value of debugfs_create functions
net: dsa: sja1105: Fix link speed not working at 100 Mbps and below
net: phylink: avoid reducing support mask
scripts/checkstack.pl: Fix arm64 wrong or unknown architecture
kbuild: tar-pkg: enable communication with jobserver
kconfig: tests: fix recursive inclusion unit test
kbuild: teach kselftest-merge to find nested config files
nvmet: fix data_len to 0 for bdev-backed write_zeroes
MAINTAINERS: Hand over skd maintainership
ASoC: sun4i-i2s: Add offset to RX channel select
ASoC: sun4i-i2s: Fix sun8i tx channel offset mask
ASoC: max98090: remove 24-bit format support if RJ is 0
ASoC: da7219: Fix build error without CONFIG_I2C
ASoC: SOF: Intel: hda: Fix COMPILE_TEST build error
drm/arm/hdlcd: Allow a bit of clock tolerance
drm/arm/hdlcd: Actually validate CRTC modes
drm/arm/mali-dp: Add a loop around the second set CVAL and try 5 times
drm/komeda: fixing of DMA mapping sg segment warning
netfilter: ipv6: nf_defrag: fix leakage of unqueued fragments
habanalabs: Read upper bits of trace buffer from RWPHI
arm64: arch_k3: Fix kconfig dependency warning
drm: don't block fb changes for async plane updates
drm/vc4: fix fb references in async update
drm/msm: fix fb references in async update
drm/amd: fix fb references in async update
drm/rockchip: fix fb references in async update
xen-blkfront: switch kcalloc to kvcalloc for large array allocation
drm/mediatek: call mtk_dsi_stop() after mtk_drm_crtc_atomic_disable()
drm/mediatek: clear num_pipes when unbind driver
drm/mediatek: call drm_atomic_helper_shutdown() when unbinding driver
drm/mediatek: unbind components in mtk_drm_unbind()
drm/mediatek: fix unbind functions
net: sfp: read eeprom in maximum 16 byte increments
selftests: set sysctl bc_forwarding properly in router_broadcast.sh
ANDROID: update gki aarch64 ABI representation
net: ethernet: mediatek: Use NET_IP_ALIGN to judge if HW RX_2BYTE_OFFSET is enabled
net: ethernet: mediatek: Use hw_feature to judge if HWLRO is supported
net: ethernet: ti: cpsw_ethtool: fix ethtool ring param set
ANDROID: gki_defconfig: Enable CMA, SLAB_FREELIST (RANDOM and HARDENED) on x86
bpf: udp: Avoid calling reuseport's bpf_prog from udp_gro
bpf: udp: ipv6: Avoid running reuseport's bpf_prog from __udp6_lib_err
rcu: locking and unlocking need to always be at least barriers
ANDROID: gki_defconfig: enable SLAB_FREELIST_RANDOM, SLAB_FREELIST_HARDENED
ANDROID: gki_defconfig: enable CMA and increase CMA_AREAS
ASoC: SOF: fix DSP oops definitions in FW ABI
ASoC: hda: fix unbalanced codec dev refcount for HDA_DEV_ASOC
ASoC: SOF: ipc: replace fw ready bitfield with explicit bit ordering
ASoC: SOF: bump to ABI 3.6
ASoC: SOF: soundwire: add initial soundwire support
ASoC: SOF: uapi: mirror firmware changes
ASoC: Intel: Baytrail: add quirk for Aegex 10 (RU2) tablet
xfs: inode btree scrubber should calculate im_boffset correctly
mmc: sdhci_am654: Fix SLOTTYPE write
usb: typec: ucsi: ccg: fix memory leak in do_flash
ANDROID: update gki aarch64 ABI representation
habanalabs: Fix virtual address access via debugfs for 2MB pages
drm/komeda: Constify the usage of komeda_component/pipeline/dev_funcs
x86/power: Fix 'nosmt' vs hibernation triple fault during resume
mm/vmalloc: Avoid rare case of flushing TLB with weird arguments
mm/vmalloc: Fix calculation of direct map addr range
PM: sleep: Add kerneldoc comments to some functions
drm/i915/gvt: save RING_HEAD into vreg when vgpu switched out
sparc: perf: fix updated event period in response to PERF_EVENT_IOC_PERIOD
mdesc: fix a missing-check bug in get_vdev_port_node_info()
drm/i915/gvt: add F_CMD_ACCESS flag for wa regs
sparc64: Fix regression in non-hypervisor TLB flush xcall
packet: unconditionally free po->rollover
Update my email address
net: hns: Fix loopback test failed at copper ports
Linux 5.2-rc3
net: dsa: mv88e6xxx: avoid error message on remove from VLAN 0
mm, compaction: make sure we isolate a valid PFN
include/linux/generic-radix-tree.h: fix kerneldoc comment
kernel/signal.c: trace_signal_deliver when signal_group_exit
drivers/iommu/intel-iommu.c: fix variable 'iommu' set but not used
spdxcheck.py: fix directory structures
kasan: initialize tag to 0xff in __kasan_kmalloc
z3fold: fix sheduling while atomic
scripts/gdb: fix invocation when CONFIG_COMMON_CLK is not set
mm/gup: continue VM_FAULT_RETRY processing even for pre-faults
ocfs2: fix error path kobject memory leak
memcg: make it work on sparse non-0-node systems
mm, memcg: consider subtrees in memory.events
prctl_set_mm: downgrade mmap_sem to read lock
prctl_set_mm: refactor checks from validate_prctl_map
kernel/fork.c: make max_threads symbol static
arch/arm/boot/compressed/decompress.c: fix build error due to lz4 changes
arch/parisc/configs/c8000_defconfig: remove obsoleted CONFIG_DEBUG_SLAB_LEAK
mm/vmalloc.c: fix typo in comment
lib/sort.c: fix kernel-doc notation warnings
mm: fix Documentation/vm/hmm.rst Sphinx warnings
treewide: fix typos of SPDX-License-Identifier
crypto: ux500 - fix license comment syntax error
MAINTAINERS: add I2C DT bindings to ARM platforms
MAINTAINERS: add DT bindings to i2c drivers
mwifiex: Fix heap overflow in mwifiex_uap_parse_tail_ies()
iwlwifi: mvm: change TLC config cmd sent by rs to be async
iwlwifi: Fix double-free problems in iwl_req_fw_callback()
iwlwifi: fix AX201 killer sku loading firmware issue
iwlwifi: print fseq info upon fw assert
iwlwifi: clear persistence bit according to device family
iwlwifi: fix load in rfkill flow for unified firmware
iwlwifi: mvm: remove d3_sram debugfs file
bpf, riscv: clear high 32 bits for ALU32 add/sub/neg/lsh/rsh/arsh
libbpf: Return btf_fd for load_sk_storage_btf
HID: a4tech: fix horizontal scrolling
HID: hyperv: Add a module description line
net: dsa: sja1105: Don't store frame type in skb->cb
block: print offending values when cloned rq limits are exceeded
blk-mq: Document the blk_mq_hw_queue_to_node() arguments
blk-mq: Fix spelling in a source code comment
block: Fix bsg_setup_queue() kernel-doc header
block: Fix rq_qos_wait() kernel-doc header
block: Fix blk_mq_*_map_queues() kernel-doc headers
block: Fix throtl_pending_timer_fn() kernel-doc header
block: Convert blk_invalidate_devt() header into a non-kernel-doc header
block/partitions/ldm: Convert a kernel-doc header into a non-kernel-doc header
leds: avoid flush_work in atomic context
cgroup: Include dying leaders with live threads in PROCS iterations
cgroup: Implement css_task_iter_skip()
cgroup: Call cgroup_release() before __exit_signal()
netfilter: nf_tables: fix module autoload with inet family
Revert "lockd: Show pid of lockd for remote locks"
ALSA: hda/realtek - Update headset mode for ALC256
fs/adfs: fix filename fixup handling for "/" and "//" names
fs/adfs: move append_filetype_suffix() into adfs_object_fixup()
fs/adfs: remove truncated filename hashing
fs/adfs: factor out filename fixup
fs/adfs: factor out object fixups
fs/adfs: factor out filename case lowering
fs/adfs: factor out filename comparison
ovl: doc: add non-standard corner cases
pstore/ram: Run without kernel crash dump region
MAINTAINERS: add Vasily Gorbik and Christian Borntraeger for s390
MAINTAINERS: Farewell Martin Schwidefsky
pstore: Set tfm to NULL on free_buf_for_compression
nds32: add new emulations for floating point instruction
nds32: Avoid IEX status being incorrectly modified
math-emu: Use statement expressions to fix Wshift-count-overflow warning
net: correct zerocopy refcnt with udp MSG_MORE
ethtool: Check for vlan etype or vlan tci when parsing flow_rule
net: don't clear sock->sk early to avoid trouble in strparser
net-gro: fix use-after-free read in napi_gro_frags()
net: dsa: tag_8021q: Create a stable binary format
net: dsa: tag_8021q: Change order of rx_vid setup
net: mvpp2: fix bad MVPP2_TXQ_SCHED_TOKEN_CNTR_REG queue value
docs cgroups: add another example size for hugetlb
NFSv4.1: Fix bug only first CB_NOTIFY_LOCK is handled
NFSv4.1: Again fix a race where CB_NOTIFY_LOCK fails to wake a waiter
ipv4: tcp_input: fix stack out of bounds when parsing TCP options.
mlxsw: spectrum: Prevent force of 56G
mlxsw: spectrum_acl: Avoid warning after identical rules insertion
SUNRPC: Fix a use after free when a server rejects the RPCSEC_GSS credential
net: dsa: mv88e6xxx: fix handling of upper half of STATS_TYPE_PORT
SUNRPC fix regression in umount of a secure mount
r8169: fix MAC address being lost in PCI D3
treewide: Add SPDX license identifier - Kbuild
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 225
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 224
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 223
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 222
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 221
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 220
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 218
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 217
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 216
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 215
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 214
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 213
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 211
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 210
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 209
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 207
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 206
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 203
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 201
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 200
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 199
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 198
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 197
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 195
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 194
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 193
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 191
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 190
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 188
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 185
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 183
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 182
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 180
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 179
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 178
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 177
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 176
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 175
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 174
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 173
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 172
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 171
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 170
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 167
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 166
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 165
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 164
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 162
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 161
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 160
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 159
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 158
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 157
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 156
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 155
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 154
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 153
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 151
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 150
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 149
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 148
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 147
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 145
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 144
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 143
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 142
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 140
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 139
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 138
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 137
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 136
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 135
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 133
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 132
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 131
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 130
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 129
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 128
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 127
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 126
net: core: support XDP generic on stacked devices.
netvsc: unshare skb in VF rx handler
udp: Avoid post-GRO UDP checksum recalculation
nvme-tcp: fix queue mapping when queue count is limited
nvme-rdma: fix queue mapping when queue count is limited
fpga: zynqmp-fpga: Correctly handle error pointer
selftests: vm: install test_vmalloc.sh for run_vmtests
userfaultfd: selftest: fix compiler warning
kselftest/cgroup: fix incorrect test_core skip
kselftest/cgroup: fix unexpected testing failure on test_core
kselftest/cgroup: fix unexpected testing failure on test_memcontrol
xtensa: Fix section mismatch between memblock_reserve and mem_reserve
signal/ptrace: Don't leak unitialized kernel memory with PTRACE_PEEK_SIGINFO
mwifiex: Abort at too short BSS descriptor element
mwifiex: Fix possible buffer overflows at parsing bss descriptor
drm/i915/gvt: Assign NULL to the pointer after memory free.
drm/i915/gvt: Check if cur_pt_type is valid
x86: intel_epb: Do not build when CONFIG_PM is unset
crypto: hmac - fix memory leak in hmac_init_tfm()
crypto: jitterentropy - change back to module_init()
ARM: dts: Drop bogus CLKSEL for timer12 on dra7
KVM: PPC: Book3S HV: Restore SPRG3 in kvmhv_p9_guest_entry()
KVM: PPC: Book3S HV: Fix lockdep warning when entering guest on POWER9
KVM: PPC: Book3S HV: XIVE: Fix page offset when clearing ESB pages
KVM: PPC: Book3S HV: XIVE: Take the srcu read lock when accessing memslots
KVM: PPC: Book3S HV: XIVE: Do not clear IRQ data of passthrough interrupts
KVM: PPC: Book3S HV: XIVE: Introduce a new mutex for the XIVE device
drm/i915/gvt: Fix cmd length of VEB_DI_IECP
drm/i915/gvt: refine ggtt range validation
drm/i915/gvt: Fix vGPU CSFE_CHICKEN1_REG mmio handler
drm/i915/gvt: Fix GFX_MODE handling
drm/i915/gvt: Update force-to-nonpriv register whitelist
drm/i915/gvt: Initialize intel_gvt_gtt_entry in stack
ima: show rules with IMA_INMASK correctly
evm: check hash algorithm passed to init_desc()
scsi: libsas: delete sas port if expander discover failed
scsi: libsas: only clear phy->in_shutdown after shutdown event done
scsi: scsi_dh_alua: Fix possible null-ptr-deref
scsi: smartpqi: properly set both the DMA mask and the coherent DMA mask
scsi: zfcp: fix to prevent port_remove with pure auto scan LUNs (only sdevs)
scsi: zfcp: fix missing zfcp_port reference put on -EBUSY from port_remove
scsi: libcxgbi: add a check for NULL pointer in cxgbi_check_route()
net: phy: dp83867: Set up RGMII TX delay
net: phy: dp83867: do not call config_init twice
net: phy: dp83867: increase SGMII autoneg timer duration
net: phy: dp83867: fix speed 10 in sgmii mode
net: phy: marvell10g: report if the PHY fails to boot firmware
net: phylink: ensure consistent phy interface mode
cgroup: Use css_tryget() instead of css_tryget_online() in task_get_css()
blk-mq: Fix memory leak in error handling
usbip: usbip_host: fix stub_dev lock context imbalance regression
net: sh_eth: fix mdio access in sh_eth_close() for R-Car Gen2 and RZ/A1 SoCs
MIPS: uprobes: remove set but not used variable 'epc'
s390/crypto: fix possible sleep during spinlock aquired
MIPS: pistachio: Build uImage.gz by default
MIPS: Make virt_addr_valid() return bool
MIPS: Bounds check virt_addr_valid
CIFS: cifs_read_allocate_pages: don't iterate through whole page array on ENOMEM
RDMA/efa: Remove MAYEXEC flag check from mmap flow
mlx5: avoid 64-bit division
IB/hfi1: Validate page aligned for a given virtual address
IB/{qib, hfi1, rdmavt}: Correct ibv_devinfo max_mr value
IB/hfi1: Insure freeze_work work_struct is canceled on shutdown
IB/rdmavt: Fix alloc_qpn() WARN_ON()
ASoC: sun4i-codec: fix first delay on Speaker
drm/amdgpu: reserve stollen vram for raven series
media: venus: hfi_parser: fix a regression in parser
selftests: bpf: fix compiler warning in flow_dissector test
arm64: use the correct function type for __arm64_sys_ni_syscall
arm64: use the correct function type in SYSCALL_DEFINE0
arm64: fix syscall_fn_t type
block: don't protect generic_make_request_checks with blk_queue_enter
block: move blk_exit_queue into __blk_release_queue
selftests: bpf: complete sub-register zero extension checks
selftests: bpf: move sub-register zero extension checks into subreg.c
ovl: detect overlapping layers
drm/i915/icl: Add WaDisableBankHangMode
ALSA: fireface: Use ULL suffixes for 64-bit constants
signal/arm64: Use force_sig not force_sig_fault for SIGKILL
nl80211: fill all policy .type entries
mac80211: free peer keys before vif down in mesh
ANDROID: ABI out: Use the extension .xml rather then .out
drm/mediatek: respect page offset for PRIME mmap calls
drm/mediatek: adjust ddp clock control flow
ALSA: hda/realtek - Improve the headset mic for Acer Aspire laptops
KVM: PPC: Book3S HV: XIVE: Fix the enforced limit on the vCPU identifier
KVM: PPC: Book3S HV: XIVE: Do not test the EQ flag validity when resetting
KVM: PPC: Book3S HV: XIVE: Clear file mapping when device is released
KVM: PPC: Book3S HV: Don't take kvm->lock around kvm_for_each_vcpu
KVM: PPC: Book3S: Use new mutex to synchronize access to rtas token list
KVM: PPC: Book3S HV: Use new mutex to synchronize MMU setup
KVM: PPC: Book3S HV: Avoid touching arch.mmu_ready in XIVE release functions
Revert "drivers: thermal: tsens: Add new operation to check if a sensor is enabled"
net/mlx5e: Disable rxhash when CQE compress is enabled
net/mlx5e: restrict the real_dev of vlan device is the same as uplink device
net/mlx5: Allocate root ns memory using kzalloc to match kfree
net/mlx5: Avoid double free in fs init error unwinding path
net/mlx5: Avoid double free of root ns in the error flow path
net/mlx5: Fix error handling in mlx5_load()
Documentation: net-sysfs: Remove duplicate PHY device documentation
llc: fix skb leak in llc_build_and_send_ui_pkt()
selftests: pmtu: Fix encapsulating device in pmtu_vti6_link_change_mtu
dfs_cache: fix a wrong use of kfree in flush_cache_ent()
fs/cifs/smb2pdu.c: fix buffer free in SMB2_ioctl_free
cifs: fix memory leak of pneg_inbuf on -EOPNOTSUPP ioctl case
xenbus: Avoid deadlock during suspend due to open transactions
xen/pvcalls: Remove set but not used variable
tracing: Avoid memory leak in predicate_parse()
habanalabs: fix bug in checking huge page optimization
mmc: sdhci: Fix SDIO IRQ thread deadlock
dpaa_eth: use only online CPU portals
net: mvneta: Fix err code path of probe
net: stmmac: Do not output error on deferred probe
Btrfs: fix race updating log root item during fsync
Btrfs: fix wrong ctime and mtime of a directory after log replay
ARC: [plat-hsdk] Get rid of inappropriate PHY settings
ARC: [plat-hsdk]: Add support of Vivante GPU
ARC: [plat-hsdk]: enable creg-gpio controller
Btrfs: fix fsync not persisting changed attributes of a directory
btrfs: qgroup: Check bg while resuming relocation to avoid NULL pointer dereference
btrfs: reloc: Also queue orphan reloc tree for cleanup to avoid BUG_ON()
Btrfs: incremental send, fix emission of invalid clone operations
Btrfs: incremental send, fix file corruption when no-holes feature is enabled
btrfs: correct zstd workspace manager lock to use spin_lock_bh()
btrfs: Ensure replaced device doesn't have pending chunk allocation
ia64: fix build errors by exporting paddr_to_nid()
ASoC: SOF: Intel: hda: fix the hda init chip
ASoC: SOF: ipc: fix a race, leading to IPC timeouts
ASoC: SOF: control: correct the copy size for bytes kcontrol put
ASoC: SOF: pcm: remove warning - initialize workqueue on open
ASoC: SOF: pcm: clear hw_params_upon_resume flag correctly
ASoC: SOF: core: fix error handling with the probe workqueue
ASoC: SOF: core: remove snd_soc_unregister_component in case of error
ASoC: SOF: core: remove DSP after unregistering machine driver
ASoC: soc-core: fixup references at soc_cleanup_card_resources()
arm64/module: revert to unsigned interpretation of ABS16/32 relocations
KVM: s390: Do not report unusabled IDs via KVM_CAP_MAX_VCPU_ID
kvm: fix compile on s390 part 2
xprtrdma: Use struct_size() in kzalloc()
tools headers UAPI: Sync kvm.h headers with the kernel sources
perf record: Fix s390 missing module symbol and warning for non-root users
perf machine: Read also the end of the kernel
perf test vmlinux-kallsyms: Ignore aliases to _etext when searching on kallsyms
perf session: Add missing swap ops for namespace events
perf namespace: Protect reading thread's namespace
tools headers UAPI: Sync drm/drm.h with the kernel
s390/crypto: fix gcm-aes-s390 selftest failures
s390/zcrypt: Fix wrong dispatching for control domain CPRBs
s390/pci: fix assignment of bus resources
s390/pci: fix struct definition for set PCI function
s390: mark __cpacf_check_opcode() and cpacf_query_func() as __always_inline
s390: add unreachable() to dump_fault_info() to fix -Wmaybe-uninitialized
tools headers UAPI: Sync drm/i915_drm.h with the kernel
tools headers UAPI: Sync linux/fs.h with the kernel
tools headers UAPI: Sync linux/sched.h with the kernel
tools arch x86: Sync asm/cpufeatures.h with the with the kernel
tools include UAPI: Update copy of files related to new fspick, fsmount, fsconfig, fsopen, move_mount and open_tree syscalls
perf arm64: Fix mksyscalltbl when system kernel headers are ahead of the kernel
perf data: Fix 'strncat may truncate' build failure with recent gcc
arm64: Fix the arm64_personality() syscall wrapper redirection
rtw88: Make some symbols static
rtw88: avoid circular locking between local->iflist_mtx and rtwdev->mutex
rsi: Properly initialize data in rsi_sdio_ta_reset
rtw88: fix unassigned rssi_level in rtw_sta_info
rtw88: fix subscript above array bounds compiler warning
fuse: extract helper for range writeback
fuse: fix copy_file_range() in the writeback case
mmc: meson-gx: fix irq ack
mmc: tmio: fix SCC error handling to avoid false positive CRC error
mmc: tegra: Fix a warning message
memstick: mspro_block: Fix an error code in mspro_block_issue_req()
mac80211: mesh: fix RCU warning
nl80211: fix station_info pertid memory leak
mac80211: Do not use stack memory with scatterlist for GMAC
ALSA: line6: Assure canceling delayed work at disconnection
configfs: Fix use-after-free when accessing sd->s_dentry
ALSA: hda - Force polling mode on CNL for fixing codec communication
i2c: synquacer: fix synquacer_i2c_doxfer() return value
i2c: mlxcpld: Fix wrong initialization order in probe
i2c: dev: fix potential memory leak in i2cdev_ioctl_rdwr
RDMA/core: Fix panic when port_data isn't initialized
RDMA/uverbs: Pass udata on uverbs error unwind
RDMA/core: Clear out the udata before error unwind
net: aquantia: tcp checksum 0xffff being handled incorrectly
net: aquantia: fix LRO with FCS error
net: aquantia: check rx csum for all packets in LRO session
net: aquantia: tx clean budget logic error
vhost: scsi: add weight support
vhost: vsock: add weight support
vhost_net: fix possible infinite loop
vhost: introduce vhost_exceeds_weight()
virtio: Fix indentation of VIRTIO_MMIO
virtio: add unlikely() to WARN_ON_ONCE()
iommu/vt-d: Set the right field for Page Walk Snoop
iommu/vt-d: Fix lock inversion between iommu->lock and device_domain_lock
iommu: Add missing new line for dma type
drm/etnaviv: lock MMU while dumping core
block: Don't revalidate bdev of hidden gendisk
loop: Don't change loop device under exclusive opener
drm/imx: ipuv3-plane: fix atomic update status query for non-plus i.MX6Q
drm/qxl: drop WARN_ONCE()
iio: temperature: mlx90632 Relax the compatibility check
iio: imu: st_lsm6dsx: fix PM support for st_lsm6dsx i2c controller
staging:iio:ad7150: fix threshold mode config bit
fuse: add FUSE_WRITE_KILL_PRIV
fuse: fallocate: fix return with locked inode
PCI: PM: Avoid possible suspend-to-idle issue
ACPI: PM: Call pm_set_suspend_via_firmware() during hibernation
ACPI/PCI: PM: Add missing wakeup.flags.valid checks
ovl: support the FS_IOC_FS[SG]ETXATTR ioctls
soundwire: stream: fix out of boundary access on port properties
net: tulip: de4x5: Drop redundant MODULE_DEVICE_TABLE()
selftests/tls: add test for sleeping even though there is data
net/tls: fix no wakeup on partial reads
selftests/tls: test for lowat overshoot with multiple records
net/tls: fix lowat calculation if some data came from previous record
dpaa2-eth: Make constant 64-bit long
dpaa2-eth: Use PTR_ERR_OR_ZERO where appropriate
dpaa2-eth: Fix potential spectre issue
bonding/802.3ad: fix slave link initialization transition states
io_uring: Fix __io_uring_register() false success
net: ethtool: Document get_rxfh_context and set_rxfh_context ethtool ops
net: stmmac: dwmac-mediatek: modify csr_clk value to fix mdio read/write fail
net: stmmac: fix csr_clk can't be zero issue
net: stmmac: update rx tail pointer register to fix rx dma hang issue.
ip_sockglue: Fix missing-check bug in ip_ra_control()
ipv6_sockglue: Fix a missing-check bug in ip6_ra_control()
efi: Allow the number of EFI configuration tables entries to be zero
efi/x86/Add missing error handling to old_memmap 1:1 mapping code
parisc: Fix compiler warnings in float emulation code
parisc/slab: cleanup after /proc/slab_allocators removal
bpf: sockmap, fix use after free from sleep in psock backlog workqueue
net: sched: don't use tc_action->order during action dump
cxgb4: Revert "cxgb4: Remove SGE_HOST_PAGE_SIZE dependency on page size"
net: fec: fix the clk mismatch in failed_reset path
habanalabs: Avoid using a non-initialized MMU cache mutex
habanalabs: fix debugfs code
uapi/habanalabs: add opcode for enable/disable device debug mode
habanalabs: halt debug engines on user process close
selftests: rtc: rtctest: specify timeouts
selftests/harness: Allow test to configure timeout
selftests/ftrace: Add checkbashisms meta-testcase
selftests/ftrace: Make a script checkbashisms clean
media: smsusb: better handle optional alignment
test_firmware: Use correct snprintf() limit
genwqe: Prevent an integer overflow in the ioctl
parport: Fix mem leak in parport_register_dev_model
fpga: dfl: expand minor range when registering chrdev region
fpga: dfl: Add lockdep classes for pdata->lock
fpga: dfl: afu: Pass the correct device to dma_mapping_error()
fpga: stratix10-soc: fix use-after-free on s10_init()
w1: ds2408: Fix typo after 49695ac468
(reset on output_write retry with readback)
kheaders: Do not regenerate archive if config is not changed
kheaders: Move from proc to sysfs
drm/amd/display: Don't load DMCU for Raven 1 (v2)
drm/i915: Maintain consistent documentation subsection ordering
scripts/sphinx-pre-install: make it handle Sphinx versions
docs: Fix conf.py for Sphinx 2.0
vt/fbcon: deinitialize resources in visual_init() after failed memory allocation
xfs: fix broken log reservation debugging
clocksource/drivers/timer-ti-dm: Change to new style declaration
ASoC: core: lock client_mutex while removing link components
ASoC: simple-card: Restore original configuration of DAI format
{nl,mac}80211: allow 4addr AP operation on crypto controlled devices
mac80211_hwsim: mark expected switch fall-through
mac80211: fix rate reporting inside cfg80211_calculate_bitrate_he()
mac80211: remove set but not used variable 'old'
mac80211: handle deauthentication/disassociation from TDLS peer
gpio: fix gpio-adp5588 build errors
pinctrl: stmfx: Fix compile issue when CONFIG_OF_GPIO is not defined
staging: kpc2000: Add dependency on MFD_CORE to kconfig symbol 'KPC2000'
perf/ring-buffer: Use regular variables for nesting
perf/ring-buffer: Always use {READ,WRITE}_ONCE() for rb->user_page data
perf/ring_buffer: Add ordering to rb->nest increment
perf/ring_buffer: Fix exposing a temporarily decreased data_head
x86/CPU/AMD: Don't force the CPB cap when running under a hypervisor
x86/boot: Provide KASAN compatible aliases for string routines
ALSA: hda/realtek - Enable micmute LED for Huawei laptops
Input: uinput - add compat ioctl number translation for UI_*_FF_UPLOAD
Input: silead - add MSSL0017 to acpi_device_id
cxgb4: offload VLAN flows regardless of VLAN ethtype
hsr: fix don't prune the master node from the node_db
net: mvpp2: cls: Fix leaked ethtool_rx_flow_rule
docs: fix multiple doc build warnings in enumeration.rst
lib/list_sort: fix kerneldoc build error
docs: fix numaperf.rst and add it to the doc tree
doc: Cope with the deprecation of AutoReporter
doc: Cope with Sphinx logging deprecations
bpf: sockmap, restore sk_write_space when psock gets dropped
selftests: bpf: add zero extend checks for ALU32 and/or/xor
bpf, riscv: clear target register high 32-bits for and/or/xor on ALU32
spi: abort spi_sync if failed to prepare_transfer_hardware
ALSA: hda/realtek - Set default power save node to 0
ipv4/igmp: fix build error if !CONFIG_IP_MULTICAST
powerpc/kexec: Fix loading of kernel + initramfs with kexec_file_load()
MIPS: TXx9: Fix boot crash in free_initmem()
MIPS: remove a space after -I to cope with header search paths for VDSO
MIPS: mark ginvt() as __always_inline
ipv4/igmp: fix another memory leak in igmpv3_del_delrec()
bnxt_en: Device serial number is supported only for PFs.
bnxt_en: Reduce memory usage when running in kdump kernel.
bnxt_en: Fix possible BUG() condition when calling pci_disable_msix().
bnxt_en: Fix aggregation buffer leak under OOM condition.
ipv6: Fix redirect with VRF
net: stmmac: fix reset gpio free missing
mISDN: make sure device name is NUL terminated
net: macb: save/restore the remaining registers and features
media: dvb: warning about dvb frequency limits produces too much noise
net/tls: don't ignore netdev notifications if no TLS features
net/tls: fix state removal with feature flags off
net/tls: avoid NULL-deref on resync during device removal
Documentation: add TLS offload documentation
Documentation: tls: RSTify the ktls documentation
Documentation: net: move device drivers docs to a submenu
mISDN: Fix indenting in dsp_cmx.c
ocelot: Dont allocate another multicast list, use __dev_mc_sync
Validate required parameters in inet6_validate_link_af
xhci: Use %zu for printing size_t type
xhci: Convert xhci_handshake() to use readl_poll_timeout_atomic()
xhci: Fix immediate data transfer if buffer is already DMA mapped
usb: xhci: avoid null pointer deref when bos field is NULL
usb: xhci: Fix a potential null pointer dereference in xhci_debugfs_create_endpoint()
xhci: update bounce buffer with correct sg num
media: usb: siano: Fix false-positive "uninitialized variable" warning
spi: spi-fsl-spi: call spi_finalize_current_message() at the end
ALSA: hda/realtek - Check headset type by unplug and resume
powerpc/perf: Fix MMCRA corruption by bhrb_filter
powerpc/powernv: Return for invalid IMC domain
HID: logitech-hidpp: Add support for the S510 remote control
HID: multitouch: handle faulty Elo touch device
selftests: netfilter: add flowtable test script
netfilter: nft_flow_offload: IPCB is only valid for ipv4 family
netfilter: nft_flow_offload: don't offload when sequence numbers need adjustment
netfilter: nft_flow_offload: set liberal tracking mode for tcp
netfilter: nf_flow_table: ignore DF bit setting
ASoC: Intel: sof-rt5682: fix AMP quirk support
ASoC: Intel: sof-rt5682: fix for codec button mapping
clk: ti: clkctrl: Fix clkdm_clk handling
clk: imx: imx8mm: fix int pll clk gate
clk: sifive: restrict Kconfig scope for the FU540 PRCI driver
RDMA/hns: Fix PD memory leak for internal allocation
netfilter: nat: fix udp checksum corruption
selftests: netfilter: missing error check when setting up veth interface
RDMA/srp: Rename SRP sysfs name after IB device rename trigger
ipvs: Fix use-after-free in ip_vs_in
ARC: [plat-hsdk]: Add missing FIFO size entry in GMAC node
ARC: [plat-hsdk]: Add missing multicast filter bins number to GMAC node
samples, bpf: suppress compiler warning
samples, bpf: fix to change the buffer size for read()
bpf: Check sk_fullsock() before returning from bpf_sk_lookup()
bpf: fix out-of-bounds read in __bpf_skc_lookup
Documentation/networking: fix af_xdp.rst Sphinx warnings
netfilter: nft_fib: Fix existence check support
netfilter: nf_queue: fix reinject verdict handling
dmaengine: sprd: Add interrupt support for 2-stage transfer
dmaengine: sprd: Fix the right place to configure 2-stage transfer
dmaengine: sprd: Fix block length overflow
dmaengine: sprd: Fix the incorrect start for 2-stage destination channels
dmaengine: sprd: Add validation of current descriptor in irq handler
dmaengine: sprd: Fix the possible crash when getting descriptor status
tty: max310x: Fix external crystal register setup
serial: sh-sci: disable DMA for uart_console
serial: imx: remove log spamming error message
tty: serial: msm_serial: Fix XON/XOFF
USB: serial: option: add Telit 0x1260 and 0x1261 compositions
USB: serial: pl2303: add Allied Telesis VT-Kit3
USB: serial: option: add support for Simcom SIM7500/SIM7600 RNDIS mode
dmaengine: tegra210-adma: Fix spelling
dmaengine: tegra210-adma: Fix channel FIFO configuration
dmaengine: tegra210-adma: Fix crash during probe
dmaengine: mediatek-cqdma: sleeping in atomic context
dmaengine: dw-axi-dmac: fix null dereference when pointer first is null
perf/x86/intel/ds: Fix EVENT vs. UEVENT PEBS constraints
USB: rio500: update Documentation
USB: rio500: simplify locking
USB: rio500: fix memory leak in close after disconnect
USB: rio500: refuse more than one device at a time
usbip: usbip_host: fix BUG: sleeping function called from invalid context
USB: sisusbvga: fix oops in error path of sisusb_probe
USB: Add LPM quirk for Surface Dock GigE adapter
media: usb: siano: Fix general protection fault in smsusb
usb: mtu3: fix up undefined reference to usb_debug_root
USB: Fix slab-out-of-bounds write in usb_get_bos_descriptor
Input: elantech - enable middle button support on 2 ThinkPads
dmaengine: fsl-qdma: Add improvement
dmaengine: jz4780: Fix transfers being ACKed too soon
gcc-plugins: Fix build failures under Darwin host
MAINTAINERS: Update Stefan Wahren email address
netfilter: nf_tables: fix oops during rule dump
ARC: mm: SIGSEGV userspace trying to access kernel virtual memory
ARC: fix build warnings
ARM: dts: bcm: Add missing device_type = "memory" property
soc: bcm: brcmstb: biuctrl: Register writes require a barrier
soc: brcmstb: Fix error path for unsupported CPUs
ARM: dts: dra71x: Disable usb4_tm target module
ARM: dts: dra71x: Disable rtc target module
ARM: dts: dra76x: Disable usb4_tm target module
ARM: dts: dra76x: Disable rtc target module
ASoC: simple-card: Fix configuration of DAI format
ASoC: Intel: soc-acpi: Fix machine selection order
ASoC: rt5677-spi: Handle over reading when flipping bytes
ASoC: soc-dpm: fixup DAI active unbalance
pinctrl: intel: Clear interrupt status in mask/unmask callback
pinctrl: intel: Use GENMASK() consistently
parisc: Allow building 64-bit kernel without -mlong-calls compiler option
parisc: Kconfig: remove ARCH_DISCARD_MEMBLOCK
staging: wilc1000: Fix some double unlock bugs in wilc_wlan_cleanup()
staging: vc04_services: prevent integer overflow in create_pagelist()
Staging: vc04_services: Fix a couple error codes
staging: wlan-ng: fix adapter initialization failure
staging: kpc2000: double unlock in error handling in kpc_dma_transfer()
staging: kpc2000: Fix build error without CONFIG_UIO
staging: kpc2000: fix build error on xtensa
staging: erofs: set sb->s_root to NULL when failing from __getname()
ARM: imx: cpuidle-imx6sx: Restrict the SW2ISO increase to i.MX6SX
firmware: imx: SCU irq should ONLY be enabled after SCU IPC is ready
arm64: imx: Fix build error without CONFIG_SOC_BUS
ima: fix wrong signed policy requirement when not appraising
x86/ima: Check EFI_RUNTIME_SERVICES before using
stacktrace: Unbreak stack_trace_save_tsk_reliable()
HID: wacom: Sync INTUOSP2_BT touch state after each frame if necessary
HID: wacom: Correct button numbering 2nd-gen Intuos Pro over Bluetooth
HID: wacom: Send BTN_TOUCH in response to INTUOSP2_BT eraser contact
HID: wacom: Don't report anything prior to the tool entering range
HID: wacom: Don't set tool type until we're in range
ASoC: cs42xx8: Add regcache mask dirty
regulator: tps6507x: Fix boot regression due to testing wrong init_data pointer
ASoC: fsl_asrc: Fix the issue about unsupported rate
spi: bitbang: Fix NULL pointer dereference in spi_unregister_master
Input: elan_i2c - increment wakeup count if wake source
wireless: Skip directory when generating certificates
ASoC: ak4458: rstn_control - return a non-zero on error only
ASoC: soc-pcm: BE dai needs prepare when pause release after resume
ASoC: ak4458: add return value for ak4458_probe
ASoC : cs4265 : readable register too low
ASoC: SOF: fix error in verbose ipc command parsing
ASoC: SOF: fix race in FW boot timeout handling
ASoC: SOF: nocodec: fix undefined reference
iio: adc: ti-ads8688: fix timestamp is not updated in buffer
iio: dac: ds4422/ds4424 fix chip verification
HID: rmi: Use SET_REPORT request on control endpoint for Acer Switch 3 and 5
HID: logitech-hidpp: add support for the MX5500 keyboard
HID: logitech-dj: add support for the Logitech MX5500's Bluetooth Mini-Receiver
HID: i2c-hid: add iBall Aer3 to descriptor override
spi: Fix Raspberry Pi breakage
ARM: dts: dra76x: Update MMC2_HS200_MANUAL1 iodelay values
ARM: dts: am57xx-idk: Remove support for voltage switching for SD card
bus: ti-sysc: Handle devices with no control registers
ARM: dts: Configure osc clock for d_can on am335x
iio: imu: mpu6050: Fix FIFO layout for ICM20602
lkdtm/bugs: Adjust recursion test to avoid elision
lkdtm/usercopy: Moves the KERNEL_DS test to non-canonical
iio: adc: ads124: avoid buffer overflow
iio: adc: modify NPCM ADC read reference voltage
Change-Id: I98c823993370027391cc21dfb239c3049f025136
Signed-off-by: Raghavendra Rao Ananta <rananta@codeaurora.org>
1703 lines
43 KiB
C
1703 lines
43 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
/*
|
|
* Copyright (C) 2008
|
|
* Guennadi Liakhovetski, DENX Software Engineering, <lg@denx.de>
|
|
*
|
|
* Copyright 2004-2007 Freescale Semiconductor, Inc. All Rights Reserved.
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/sched.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/string.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/fb.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/init.h>
|
|
#include <linux/ioport.h>
|
|
#include <linux/dma-mapping.h>
|
|
#include <linux/dmaengine.h>
|
|
#include <linux/console.h>
|
|
#include <linux/clk.h>
|
|
#include <linux/mutex.h>
|
|
#include <linux/dma/ipu-dma.h>
|
|
#include <linux/backlight.h>
|
|
|
|
#include <linux/platform_data/dma-imx.h>
|
|
#include <linux/platform_data/video-mx3fb.h>
|
|
|
|
#include <asm/io.h>
|
|
#include <linux/uaccess.h>
|
|
|
|
#define MX3FB_NAME "mx3_sdc_fb"
|
|
|
|
#define MX3FB_REG_OFFSET 0xB4
|
|
|
|
/* SDC Registers */
|
|
#define SDC_COM_CONF (0xB4 - MX3FB_REG_OFFSET)
|
|
#define SDC_GW_CTRL (0xB8 - MX3FB_REG_OFFSET)
|
|
#define SDC_FG_POS (0xBC - MX3FB_REG_OFFSET)
|
|
#define SDC_BG_POS (0xC0 - MX3FB_REG_OFFSET)
|
|
#define SDC_CUR_POS (0xC4 - MX3FB_REG_OFFSET)
|
|
#define SDC_PWM_CTRL (0xC8 - MX3FB_REG_OFFSET)
|
|
#define SDC_CUR_MAP (0xCC - MX3FB_REG_OFFSET)
|
|
#define SDC_HOR_CONF (0xD0 - MX3FB_REG_OFFSET)
|
|
#define SDC_VER_CONF (0xD4 - MX3FB_REG_OFFSET)
|
|
#define SDC_SHARP_CONF_1 (0xD8 - MX3FB_REG_OFFSET)
|
|
#define SDC_SHARP_CONF_2 (0xDC - MX3FB_REG_OFFSET)
|
|
|
|
/* Register bits */
|
|
#define SDC_COM_TFT_COLOR 0x00000001UL
|
|
#define SDC_COM_FG_EN 0x00000010UL
|
|
#define SDC_COM_GWSEL 0x00000020UL
|
|
#define SDC_COM_GLB_A 0x00000040UL
|
|
#define SDC_COM_KEY_COLOR_G 0x00000080UL
|
|
#define SDC_COM_BG_EN 0x00000200UL
|
|
#define SDC_COM_SHARP 0x00001000UL
|
|
|
|
#define SDC_V_SYNC_WIDTH_L 0x00000001UL
|
|
|
|
/* Display Interface registers */
|
|
#define DI_DISP_IF_CONF (0x0124 - MX3FB_REG_OFFSET)
|
|
#define DI_DISP_SIG_POL (0x0128 - MX3FB_REG_OFFSET)
|
|
#define DI_SER_DISP1_CONF (0x012C - MX3FB_REG_OFFSET)
|
|
#define DI_SER_DISP2_CONF (0x0130 - MX3FB_REG_OFFSET)
|
|
#define DI_HSP_CLK_PER (0x0134 - MX3FB_REG_OFFSET)
|
|
#define DI_DISP0_TIME_CONF_1 (0x0138 - MX3FB_REG_OFFSET)
|
|
#define DI_DISP0_TIME_CONF_2 (0x013C - MX3FB_REG_OFFSET)
|
|
#define DI_DISP0_TIME_CONF_3 (0x0140 - MX3FB_REG_OFFSET)
|
|
#define DI_DISP1_TIME_CONF_1 (0x0144 - MX3FB_REG_OFFSET)
|
|
#define DI_DISP1_TIME_CONF_2 (0x0148 - MX3FB_REG_OFFSET)
|
|
#define DI_DISP1_TIME_CONF_3 (0x014C - MX3FB_REG_OFFSET)
|
|
#define DI_DISP2_TIME_CONF_1 (0x0150 - MX3FB_REG_OFFSET)
|
|
#define DI_DISP2_TIME_CONF_2 (0x0154 - MX3FB_REG_OFFSET)
|
|
#define DI_DISP2_TIME_CONF_3 (0x0158 - MX3FB_REG_OFFSET)
|
|
#define DI_DISP3_TIME_CONF (0x015C - MX3FB_REG_OFFSET)
|
|
#define DI_DISP0_DB0_MAP (0x0160 - MX3FB_REG_OFFSET)
|
|
#define DI_DISP0_DB1_MAP (0x0164 - MX3FB_REG_OFFSET)
|
|
#define DI_DISP0_DB2_MAP (0x0168 - MX3FB_REG_OFFSET)
|
|
#define DI_DISP0_CB0_MAP (0x016C - MX3FB_REG_OFFSET)
|
|
#define DI_DISP0_CB1_MAP (0x0170 - MX3FB_REG_OFFSET)
|
|
#define DI_DISP0_CB2_MAP (0x0174 - MX3FB_REG_OFFSET)
|
|
#define DI_DISP1_DB0_MAP (0x0178 - MX3FB_REG_OFFSET)
|
|
#define DI_DISP1_DB1_MAP (0x017C - MX3FB_REG_OFFSET)
|
|
#define DI_DISP1_DB2_MAP (0x0180 - MX3FB_REG_OFFSET)
|
|
#define DI_DISP1_CB0_MAP (0x0184 - MX3FB_REG_OFFSET)
|
|
#define DI_DISP1_CB1_MAP (0x0188 - MX3FB_REG_OFFSET)
|
|
#define DI_DISP1_CB2_MAP (0x018C - MX3FB_REG_OFFSET)
|
|
#define DI_DISP2_DB0_MAP (0x0190 - MX3FB_REG_OFFSET)
|
|
#define DI_DISP2_DB1_MAP (0x0194 - MX3FB_REG_OFFSET)
|
|
#define DI_DISP2_DB2_MAP (0x0198 - MX3FB_REG_OFFSET)
|
|
#define DI_DISP2_CB0_MAP (0x019C - MX3FB_REG_OFFSET)
|
|
#define DI_DISP2_CB1_MAP (0x01A0 - MX3FB_REG_OFFSET)
|
|
#define DI_DISP2_CB2_MAP (0x01A4 - MX3FB_REG_OFFSET)
|
|
#define DI_DISP3_B0_MAP (0x01A8 - MX3FB_REG_OFFSET)
|
|
#define DI_DISP3_B1_MAP (0x01AC - MX3FB_REG_OFFSET)
|
|
#define DI_DISP3_B2_MAP (0x01B0 - MX3FB_REG_OFFSET)
|
|
#define DI_DISP_ACC_CC (0x01B4 - MX3FB_REG_OFFSET)
|
|
#define DI_DISP_LLA_CONF (0x01B8 - MX3FB_REG_OFFSET)
|
|
#define DI_DISP_LLA_DATA (0x01BC - MX3FB_REG_OFFSET)
|
|
|
|
/* DI_DISP_SIG_POL bits */
|
|
#define DI_D3_VSYNC_POL_SHIFT 28
|
|
#define DI_D3_HSYNC_POL_SHIFT 27
|
|
#define DI_D3_DRDY_SHARP_POL_SHIFT 26
|
|
#define DI_D3_CLK_POL_SHIFT 25
|
|
#define DI_D3_DATA_POL_SHIFT 24
|
|
|
|
/* DI_DISP_IF_CONF bits */
|
|
#define DI_D3_CLK_IDLE_SHIFT 26
|
|
#define DI_D3_CLK_SEL_SHIFT 25
|
|
#define DI_D3_DATAMSK_SHIFT 24
|
|
|
|
enum ipu_panel {
|
|
IPU_PANEL_SHARP_TFT,
|
|
IPU_PANEL_TFT,
|
|
};
|
|
|
|
struct ipu_di_signal_cfg {
|
|
unsigned datamask_en:1;
|
|
unsigned clksel_en:1;
|
|
unsigned clkidle_en:1;
|
|
unsigned data_pol:1; /* true = inverted */
|
|
unsigned clk_pol:1; /* true = rising edge */
|
|
unsigned enable_pol:1;
|
|
unsigned Hsync_pol:1; /* true = active high */
|
|
unsigned Vsync_pol:1;
|
|
};
|
|
|
|
static const struct fb_videomode mx3fb_modedb[] = {
|
|
{
|
|
/* 240x320 @ 60 Hz */
|
|
.name = "Sharp-QVGA",
|
|
.refresh = 60,
|
|
.xres = 240,
|
|
.yres = 320,
|
|
.pixclock = 185925,
|
|
.left_margin = 9,
|
|
.right_margin = 16,
|
|
.upper_margin = 7,
|
|
.lower_margin = 9,
|
|
.hsync_len = 1,
|
|
.vsync_len = 1,
|
|
.sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_SHARP_MODE |
|
|
FB_SYNC_CLK_INVERT | FB_SYNC_DATA_INVERT |
|
|
FB_SYNC_CLK_IDLE_EN,
|
|
.vmode = FB_VMODE_NONINTERLACED,
|
|
.flag = 0,
|
|
}, {
|
|
/* 240x33 @ 60 Hz */
|
|
.name = "Sharp-CLI",
|
|
.refresh = 60,
|
|
.xres = 240,
|
|
.yres = 33,
|
|
.pixclock = 185925,
|
|
.left_margin = 9,
|
|
.right_margin = 16,
|
|
.upper_margin = 7,
|
|
.lower_margin = 9 + 287,
|
|
.hsync_len = 1,
|
|
.vsync_len = 1,
|
|
.sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_SHARP_MODE |
|
|
FB_SYNC_CLK_INVERT | FB_SYNC_DATA_INVERT |
|
|
FB_SYNC_CLK_IDLE_EN,
|
|
.vmode = FB_VMODE_NONINTERLACED,
|
|
.flag = 0,
|
|
}, {
|
|
/* 640x480 @ 60 Hz */
|
|
.name = "NEC-VGA",
|
|
.refresh = 60,
|
|
.xres = 640,
|
|
.yres = 480,
|
|
.pixclock = 38255,
|
|
.left_margin = 144,
|
|
.right_margin = 0,
|
|
.upper_margin = 34,
|
|
.lower_margin = 40,
|
|
.hsync_len = 1,
|
|
.vsync_len = 1,
|
|
.sync = FB_SYNC_VERT_HIGH_ACT | FB_SYNC_OE_ACT_HIGH,
|
|
.vmode = FB_VMODE_NONINTERLACED,
|
|
.flag = 0,
|
|
}, {
|
|
/* NTSC TV output */
|
|
.name = "TV-NTSC",
|
|
.refresh = 60,
|
|
.xres = 640,
|
|
.yres = 480,
|
|
.pixclock = 37538,
|
|
.left_margin = 38,
|
|
.right_margin = 858 - 640 - 38 - 3,
|
|
.upper_margin = 36,
|
|
.lower_margin = 518 - 480 - 36 - 1,
|
|
.hsync_len = 3,
|
|
.vsync_len = 1,
|
|
.sync = 0,
|
|
.vmode = FB_VMODE_NONINTERLACED,
|
|
.flag = 0,
|
|
}, {
|
|
/* PAL TV output */
|
|
.name = "TV-PAL",
|
|
.refresh = 50,
|
|
.xres = 640,
|
|
.yres = 480,
|
|
.pixclock = 37538,
|
|
.left_margin = 38,
|
|
.right_margin = 960 - 640 - 38 - 32,
|
|
.upper_margin = 32,
|
|
.lower_margin = 555 - 480 - 32 - 3,
|
|
.hsync_len = 32,
|
|
.vsync_len = 3,
|
|
.sync = 0,
|
|
.vmode = FB_VMODE_NONINTERLACED,
|
|
.flag = 0,
|
|
}, {
|
|
/* TV output VGA mode, 640x480 @ 65 Hz */
|
|
.name = "TV-VGA",
|
|
.refresh = 60,
|
|
.xres = 640,
|
|
.yres = 480,
|
|
.pixclock = 40574,
|
|
.left_margin = 35,
|
|
.right_margin = 45,
|
|
.upper_margin = 9,
|
|
.lower_margin = 1,
|
|
.hsync_len = 46,
|
|
.vsync_len = 5,
|
|
.sync = 0,
|
|
.vmode = FB_VMODE_NONINTERLACED,
|
|
.flag = 0,
|
|
},
|
|
};
|
|
|
|
struct mx3fb_data {
|
|
struct fb_info *fbi;
|
|
int backlight_level;
|
|
void __iomem *reg_base;
|
|
spinlock_t lock;
|
|
struct device *dev;
|
|
struct backlight_device *bl;
|
|
|
|
uint32_t h_start_width;
|
|
uint32_t v_start_width;
|
|
enum disp_data_mapping disp_data_fmt;
|
|
};
|
|
|
|
struct dma_chan_request {
|
|
struct mx3fb_data *mx3fb;
|
|
enum ipu_channel id;
|
|
};
|
|
|
|
/* MX3 specific framebuffer information. */
|
|
struct mx3fb_info {
|
|
int blank;
|
|
enum ipu_channel ipu_ch;
|
|
uint32_t cur_ipu_buf;
|
|
|
|
u32 pseudo_palette[16];
|
|
|
|
struct completion flip_cmpl;
|
|
struct mutex mutex; /* Protects fb-ops */
|
|
struct mx3fb_data *mx3fb;
|
|
struct idmac_channel *idmac_channel;
|
|
struct dma_async_tx_descriptor *txd;
|
|
dma_cookie_t cookie;
|
|
struct scatterlist sg[2];
|
|
|
|
struct fb_var_screeninfo cur_var; /* current var info */
|
|
};
|
|
|
|
static void sdc_set_brightness(struct mx3fb_data *mx3fb, uint8_t value);
|
|
static u32 sdc_get_brightness(struct mx3fb_data *mx3fb);
|
|
|
|
static int mx3fb_bl_get_brightness(struct backlight_device *bl)
|
|
{
|
|
struct mx3fb_data *fbd = bl_get_data(bl);
|
|
|
|
return sdc_get_brightness(fbd);
|
|
}
|
|
|
|
static int mx3fb_bl_update_status(struct backlight_device *bl)
|
|
{
|
|
struct mx3fb_data *fbd = bl_get_data(bl);
|
|
int brightness = bl->props.brightness;
|
|
|
|
if (bl->props.power != FB_BLANK_UNBLANK)
|
|
brightness = 0;
|
|
if (bl->props.fb_blank != FB_BLANK_UNBLANK)
|
|
brightness = 0;
|
|
|
|
fbd->backlight_level = (fbd->backlight_level & ~0xFF) | brightness;
|
|
|
|
sdc_set_brightness(fbd, fbd->backlight_level);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static const struct backlight_ops mx3fb_lcdc_bl_ops = {
|
|
.update_status = mx3fb_bl_update_status,
|
|
.get_brightness = mx3fb_bl_get_brightness,
|
|
};
|
|
|
|
static void mx3fb_init_backlight(struct mx3fb_data *fbd)
|
|
{
|
|
struct backlight_properties props;
|
|
struct backlight_device *bl;
|
|
|
|
if (fbd->bl)
|
|
return;
|
|
|
|
memset(&props, 0, sizeof(struct backlight_properties));
|
|
props.max_brightness = 0xff;
|
|
props.type = BACKLIGHT_RAW;
|
|
sdc_set_brightness(fbd, fbd->backlight_level);
|
|
|
|
bl = backlight_device_register("mx3fb-bl", fbd->dev, fbd,
|
|
&mx3fb_lcdc_bl_ops, &props);
|
|
if (IS_ERR(bl)) {
|
|
dev_err(fbd->dev, "error %ld on backlight register\n",
|
|
PTR_ERR(bl));
|
|
return;
|
|
}
|
|
|
|
fbd->bl = bl;
|
|
bl->props.power = FB_BLANK_UNBLANK;
|
|
bl->props.fb_blank = FB_BLANK_UNBLANK;
|
|
bl->props.brightness = mx3fb_bl_get_brightness(bl);
|
|
}
|
|
|
|
static void mx3fb_exit_backlight(struct mx3fb_data *fbd)
|
|
{
|
|
backlight_device_unregister(fbd->bl);
|
|
}
|
|
|
|
static void mx3fb_dma_done(void *);
|
|
|
|
/* Used fb-mode and bpp. Can be set on kernel command line, therefore file-static. */
|
|
static const char *fb_mode;
|
|
static unsigned long default_bpp = 16;
|
|
|
|
static u32 mx3fb_read_reg(struct mx3fb_data *mx3fb, unsigned long reg)
|
|
{
|
|
return __raw_readl(mx3fb->reg_base + reg);
|
|
}
|
|
|
|
static void mx3fb_write_reg(struct mx3fb_data *mx3fb, u32 value, unsigned long reg)
|
|
{
|
|
__raw_writel(value, mx3fb->reg_base + reg);
|
|
}
|
|
|
|
struct di_mapping {
|
|
uint32_t b0, b1, b2;
|
|
};
|
|
|
|
static const struct di_mapping di_mappings[] = {
|
|
[IPU_DISP_DATA_MAPPING_RGB666] = { 0x0005000f, 0x000b000f, 0x0011000f },
|
|
[IPU_DISP_DATA_MAPPING_RGB565] = { 0x0004003f, 0x000a000f, 0x000f003f },
|
|
[IPU_DISP_DATA_MAPPING_RGB888] = { 0x00070000, 0x000f0000, 0x00170000 },
|
|
};
|
|
|
|
static void sdc_fb_init(struct mx3fb_info *fbi)
|
|
{
|
|
struct mx3fb_data *mx3fb = fbi->mx3fb;
|
|
uint32_t reg;
|
|
|
|
reg = mx3fb_read_reg(mx3fb, SDC_COM_CONF);
|
|
|
|
mx3fb_write_reg(mx3fb, reg | SDC_COM_BG_EN, SDC_COM_CONF);
|
|
}
|
|
|
|
/* Returns enabled flag before uninit */
|
|
static uint32_t sdc_fb_uninit(struct mx3fb_info *fbi)
|
|
{
|
|
struct mx3fb_data *mx3fb = fbi->mx3fb;
|
|
uint32_t reg;
|
|
|
|
reg = mx3fb_read_reg(mx3fb, SDC_COM_CONF);
|
|
|
|
mx3fb_write_reg(mx3fb, reg & ~SDC_COM_BG_EN, SDC_COM_CONF);
|
|
|
|
return reg & SDC_COM_BG_EN;
|
|
}
|
|
|
|
static void sdc_enable_channel(struct mx3fb_info *mx3_fbi)
|
|
{
|
|
struct mx3fb_data *mx3fb = mx3_fbi->mx3fb;
|
|
struct idmac_channel *ichan = mx3_fbi->idmac_channel;
|
|
struct dma_chan *dma_chan = &ichan->dma_chan;
|
|
unsigned long flags;
|
|
dma_cookie_t cookie;
|
|
|
|
if (mx3_fbi->txd)
|
|
dev_dbg(mx3fb->dev, "mx3fbi %p, desc %p, sg %p\n", mx3_fbi,
|
|
to_tx_desc(mx3_fbi->txd), to_tx_desc(mx3_fbi->txd)->sg);
|
|
else
|
|
dev_dbg(mx3fb->dev, "mx3fbi %p, txd = NULL\n", mx3_fbi);
|
|
|
|
/* This enables the channel */
|
|
if (mx3_fbi->cookie < 0) {
|
|
mx3_fbi->txd = dmaengine_prep_slave_sg(dma_chan,
|
|
&mx3_fbi->sg[0], 1, DMA_MEM_TO_DEV, DMA_PREP_INTERRUPT);
|
|
if (!mx3_fbi->txd) {
|
|
dev_err(mx3fb->dev, "Cannot allocate descriptor on %d\n",
|
|
dma_chan->chan_id);
|
|
return;
|
|
}
|
|
|
|
mx3_fbi->txd->callback_param = mx3_fbi->txd;
|
|
mx3_fbi->txd->callback = mx3fb_dma_done;
|
|
|
|
cookie = mx3_fbi->txd->tx_submit(mx3_fbi->txd);
|
|
dev_dbg(mx3fb->dev, "%d: Submit %p #%d [%c]\n", __LINE__,
|
|
mx3_fbi->txd, cookie, list_empty(&ichan->queue) ? '-' : '+');
|
|
} else {
|
|
if (!mx3_fbi->txd || !mx3_fbi->txd->tx_submit) {
|
|
dev_err(mx3fb->dev, "Cannot enable channel %d\n",
|
|
dma_chan->chan_id);
|
|
return;
|
|
}
|
|
|
|
/* Just re-activate the same buffer */
|
|
dma_async_issue_pending(dma_chan);
|
|
cookie = mx3_fbi->cookie;
|
|
dev_dbg(mx3fb->dev, "%d: Re-submit %p #%d [%c]\n", __LINE__,
|
|
mx3_fbi->txd, cookie, list_empty(&ichan->queue) ? '-' : '+');
|
|
}
|
|
|
|
if (cookie >= 0) {
|
|
spin_lock_irqsave(&mx3fb->lock, flags);
|
|
sdc_fb_init(mx3_fbi);
|
|
mx3_fbi->cookie = cookie;
|
|
spin_unlock_irqrestore(&mx3fb->lock, flags);
|
|
}
|
|
|
|
/*
|
|
* Attention! Without this msleep the channel keeps generating
|
|
* interrupts. Next sdc_set_brightness() is going to be called
|
|
* from mx3fb_blank().
|
|
*/
|
|
msleep(2);
|
|
}
|
|
|
|
static void sdc_disable_channel(struct mx3fb_info *mx3_fbi)
|
|
{
|
|
struct mx3fb_data *mx3fb = mx3_fbi->mx3fb;
|
|
uint32_t enabled;
|
|
unsigned long flags;
|
|
|
|
if (mx3_fbi->txd == NULL)
|
|
return;
|
|
|
|
spin_lock_irqsave(&mx3fb->lock, flags);
|
|
|
|
enabled = sdc_fb_uninit(mx3_fbi);
|
|
|
|
spin_unlock_irqrestore(&mx3fb->lock, flags);
|
|
|
|
dmaengine_terminate_all(mx3_fbi->txd->chan);
|
|
mx3_fbi->txd = NULL;
|
|
mx3_fbi->cookie = -EINVAL;
|
|
}
|
|
|
|
/**
|
|
* sdc_set_window_pos() - set window position of the respective plane.
|
|
* @mx3fb: mx3fb context.
|
|
* @channel: IPU DMAC channel ID.
|
|
* @x_pos: X coordinate relative to the top left corner to place window at.
|
|
* @y_pos: Y coordinate relative to the top left corner to place window at.
|
|
* @return: 0 on success or negative error code on failure.
|
|
*/
|
|
static int sdc_set_window_pos(struct mx3fb_data *mx3fb, enum ipu_channel channel,
|
|
int16_t x_pos, int16_t y_pos)
|
|
{
|
|
if (channel != IDMAC_SDC_0)
|
|
return -EINVAL;
|
|
|
|
x_pos += mx3fb->h_start_width;
|
|
y_pos += mx3fb->v_start_width;
|
|
|
|
mx3fb_write_reg(mx3fb, (x_pos << 16) | y_pos, SDC_BG_POS);
|
|
return 0;
|
|
}
|
|
|
|
/**
|
|
* sdc_init_panel() - initialize a synchronous LCD panel.
|
|
* @mx3fb: mx3fb context.
|
|
* @panel: panel type.
|
|
* @pixel_clk: desired pixel clock frequency in Hz.
|
|
* @width: width of panel in pixels.
|
|
* @height: height of panel in pixels.
|
|
* @h_start_width: number of pixel clocks between the HSYNC signal pulse
|
|
* and the start of valid data.
|
|
* @h_sync_width: width of the HSYNC signal in units of pixel clocks.
|
|
* @h_end_width: number of pixel clocks between the end of valid data
|
|
* and the HSYNC signal for next line.
|
|
* @v_start_width: number of lines between the VSYNC signal pulse and the
|
|
* start of valid data.
|
|
* @v_sync_width: width of the VSYNC signal in units of lines
|
|
* @v_end_width: number of lines between the end of valid data and the
|
|
* VSYNC signal for next frame.
|
|
* @sig: bitfield of signal polarities for LCD interface.
|
|
* @return: 0 on success or negative error code on failure.
|
|
*/
|
|
static int sdc_init_panel(struct mx3fb_data *mx3fb, enum ipu_panel panel,
|
|
uint32_t pixel_clk,
|
|
uint16_t width, uint16_t height,
|
|
uint16_t h_start_width, uint16_t h_sync_width,
|
|
uint16_t h_end_width, uint16_t v_start_width,
|
|
uint16_t v_sync_width, uint16_t v_end_width,
|
|
struct ipu_di_signal_cfg sig)
|
|
{
|
|
unsigned long lock_flags;
|
|
uint32_t reg;
|
|
uint32_t old_conf;
|
|
uint32_t div;
|
|
struct clk *ipu_clk;
|
|
const struct di_mapping *map;
|
|
|
|
dev_dbg(mx3fb->dev, "panel size = %d x %d", width, height);
|
|
|
|
if (v_sync_width == 0 || h_sync_width == 0)
|
|
return -EINVAL;
|
|
|
|
/* Init panel size and blanking periods */
|
|
reg = ((uint32_t) (h_sync_width - 1) << 26) |
|
|
((uint32_t) (width + h_start_width + h_end_width - 1) << 16);
|
|
mx3fb_write_reg(mx3fb, reg, SDC_HOR_CONF);
|
|
|
|
#ifdef DEBUG
|
|
printk(KERN_CONT " hor_conf %x,", reg);
|
|
#endif
|
|
|
|
reg = ((uint32_t) (v_sync_width - 1) << 26) | SDC_V_SYNC_WIDTH_L |
|
|
((uint32_t) (height + v_start_width + v_end_width - 1) << 16);
|
|
mx3fb_write_reg(mx3fb, reg, SDC_VER_CONF);
|
|
|
|
#ifdef DEBUG
|
|
printk(KERN_CONT " ver_conf %x\n", reg);
|
|
#endif
|
|
|
|
mx3fb->h_start_width = h_start_width;
|
|
mx3fb->v_start_width = v_start_width;
|
|
|
|
switch (panel) {
|
|
case IPU_PANEL_SHARP_TFT:
|
|
mx3fb_write_reg(mx3fb, 0x00FD0102L, SDC_SHARP_CONF_1);
|
|
mx3fb_write_reg(mx3fb, 0x00F500F4L, SDC_SHARP_CONF_2);
|
|
mx3fb_write_reg(mx3fb, SDC_COM_SHARP | SDC_COM_TFT_COLOR, SDC_COM_CONF);
|
|
break;
|
|
case IPU_PANEL_TFT:
|
|
mx3fb_write_reg(mx3fb, SDC_COM_TFT_COLOR, SDC_COM_CONF);
|
|
break;
|
|
default:
|
|
return -EINVAL;
|
|
}
|
|
|
|
/* Init clocking */
|
|
|
|
/*
|
|
* Calculate divider: fractional part is 4 bits so simply multiple by
|
|
* 2^4 to get fractional part, as long as we stay under ~250MHz and on
|
|
* i.MX31 it (HSP_CLK) is <= 178MHz. Currently 128.267MHz
|
|
*/
|
|
ipu_clk = clk_get(mx3fb->dev, NULL);
|
|
if (!IS_ERR(ipu_clk)) {
|
|
div = clk_get_rate(ipu_clk) * 16 / pixel_clk;
|
|
clk_put(ipu_clk);
|
|
} else {
|
|
div = 0;
|
|
}
|
|
|
|
if (div < 0x40) { /* Divider less than 4 */
|
|
dev_dbg(mx3fb->dev,
|
|
"InitPanel() - Pixel clock divider less than 4\n");
|
|
div = 0x40;
|
|
}
|
|
|
|
dev_dbg(mx3fb->dev, "pixel clk = %u, divider %u.%u\n",
|
|
pixel_clk, div >> 4, (div & 7) * 125);
|
|
|
|
spin_lock_irqsave(&mx3fb->lock, lock_flags);
|
|
|
|
/*
|
|
* DISP3_IF_CLK_DOWN_WR is half the divider value and 2 fraction bits
|
|
* fewer. Subtract 1 extra from DISP3_IF_CLK_DOWN_WR based on timing
|
|
* debug. DISP3_IF_CLK_UP_WR is 0
|
|
*/
|
|
mx3fb_write_reg(mx3fb, (((div / 8) - 1) << 22) | div, DI_DISP3_TIME_CONF);
|
|
|
|
/* DI settings */
|
|
old_conf = mx3fb_read_reg(mx3fb, DI_DISP_IF_CONF) & 0x78FFFFFF;
|
|
old_conf |= sig.datamask_en << DI_D3_DATAMSK_SHIFT |
|
|
sig.clksel_en << DI_D3_CLK_SEL_SHIFT |
|
|
sig.clkidle_en << DI_D3_CLK_IDLE_SHIFT;
|
|
mx3fb_write_reg(mx3fb, old_conf, DI_DISP_IF_CONF);
|
|
|
|
old_conf = mx3fb_read_reg(mx3fb, DI_DISP_SIG_POL) & 0xE0FFFFFF;
|
|
old_conf |= sig.data_pol << DI_D3_DATA_POL_SHIFT |
|
|
sig.clk_pol << DI_D3_CLK_POL_SHIFT |
|
|
sig.enable_pol << DI_D3_DRDY_SHARP_POL_SHIFT |
|
|
sig.Hsync_pol << DI_D3_HSYNC_POL_SHIFT |
|
|
sig.Vsync_pol << DI_D3_VSYNC_POL_SHIFT;
|
|
mx3fb_write_reg(mx3fb, old_conf, DI_DISP_SIG_POL);
|
|
|
|
map = &di_mappings[mx3fb->disp_data_fmt];
|
|
mx3fb_write_reg(mx3fb, map->b0, DI_DISP3_B0_MAP);
|
|
mx3fb_write_reg(mx3fb, map->b1, DI_DISP3_B1_MAP);
|
|
mx3fb_write_reg(mx3fb, map->b2, DI_DISP3_B2_MAP);
|
|
|
|
spin_unlock_irqrestore(&mx3fb->lock, lock_flags);
|
|
|
|
dev_dbg(mx3fb->dev, "DI_DISP_IF_CONF = 0x%08X\n",
|
|
mx3fb_read_reg(mx3fb, DI_DISP_IF_CONF));
|
|
dev_dbg(mx3fb->dev, "DI_DISP_SIG_POL = 0x%08X\n",
|
|
mx3fb_read_reg(mx3fb, DI_DISP_SIG_POL));
|
|
dev_dbg(mx3fb->dev, "DI_DISP3_TIME_CONF = 0x%08X\n",
|
|
mx3fb_read_reg(mx3fb, DI_DISP3_TIME_CONF));
|
|
|
|
return 0;
|
|
}
|
|
|
|
/**
|
|
* sdc_set_color_key() - set the transparent color key for SDC graphic plane.
|
|
* @mx3fb: mx3fb context.
|
|
* @channel: IPU DMAC channel ID.
|
|
* @enable: boolean to enable or disable color keyl.
|
|
* @color_key: 24-bit RGB color to use as transparent color key.
|
|
* @return: 0 on success or negative error code on failure.
|
|
*/
|
|
static int sdc_set_color_key(struct mx3fb_data *mx3fb, enum ipu_channel channel,
|
|
bool enable, uint32_t color_key)
|
|
{
|
|
uint32_t reg, sdc_conf;
|
|
unsigned long lock_flags;
|
|
|
|
spin_lock_irqsave(&mx3fb->lock, lock_flags);
|
|
|
|
sdc_conf = mx3fb_read_reg(mx3fb, SDC_COM_CONF);
|
|
if (channel == IDMAC_SDC_0)
|
|
sdc_conf &= ~SDC_COM_GWSEL;
|
|
else
|
|
sdc_conf |= SDC_COM_GWSEL;
|
|
|
|
if (enable) {
|
|
reg = mx3fb_read_reg(mx3fb, SDC_GW_CTRL) & 0xFF000000L;
|
|
mx3fb_write_reg(mx3fb, reg | (color_key & 0x00FFFFFFL),
|
|
SDC_GW_CTRL);
|
|
|
|
sdc_conf |= SDC_COM_KEY_COLOR_G;
|
|
} else {
|
|
sdc_conf &= ~SDC_COM_KEY_COLOR_G;
|
|
}
|
|
mx3fb_write_reg(mx3fb, sdc_conf, SDC_COM_CONF);
|
|
|
|
spin_unlock_irqrestore(&mx3fb->lock, lock_flags);
|
|
|
|
return 0;
|
|
}
|
|
|
|
/**
|
|
* sdc_set_global_alpha() - set global alpha blending modes.
|
|
* @mx3fb: mx3fb context.
|
|
* @enable: boolean to enable or disable global alpha blending. If disabled,
|
|
* per pixel blending is used.
|
|
* @alpha: global alpha value.
|
|
* @return: 0 on success or negative error code on failure.
|
|
*/
|
|
static int sdc_set_global_alpha(struct mx3fb_data *mx3fb, bool enable, uint8_t alpha)
|
|
{
|
|
uint32_t reg;
|
|
unsigned long lock_flags;
|
|
|
|
spin_lock_irqsave(&mx3fb->lock, lock_flags);
|
|
|
|
if (enable) {
|
|
reg = mx3fb_read_reg(mx3fb, SDC_GW_CTRL) & 0x00FFFFFFL;
|
|
mx3fb_write_reg(mx3fb, reg | ((uint32_t) alpha << 24), SDC_GW_CTRL);
|
|
|
|
reg = mx3fb_read_reg(mx3fb, SDC_COM_CONF);
|
|
mx3fb_write_reg(mx3fb, reg | SDC_COM_GLB_A, SDC_COM_CONF);
|
|
} else {
|
|
reg = mx3fb_read_reg(mx3fb, SDC_COM_CONF);
|
|
mx3fb_write_reg(mx3fb, reg & ~SDC_COM_GLB_A, SDC_COM_CONF);
|
|
}
|
|
|
|
spin_unlock_irqrestore(&mx3fb->lock, lock_flags);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static u32 sdc_get_brightness(struct mx3fb_data *mx3fb)
|
|
{
|
|
u32 brightness;
|
|
|
|
brightness = mx3fb_read_reg(mx3fb, SDC_PWM_CTRL);
|
|
brightness = (brightness >> 16) & 0xFF;
|
|
|
|
return brightness;
|
|
}
|
|
|
|
static void sdc_set_brightness(struct mx3fb_data *mx3fb, uint8_t value)
|
|
{
|
|
dev_dbg(mx3fb->dev, "%s: value = %d\n", __func__, value);
|
|
/* This might be board-specific */
|
|
mx3fb_write_reg(mx3fb, 0x03000000UL | value << 16, SDC_PWM_CTRL);
|
|
return;
|
|
}
|
|
|
|
static uint32_t bpp_to_pixfmt(int bpp)
|
|
{
|
|
uint32_t pixfmt = 0;
|
|
switch (bpp) {
|
|
case 24:
|
|
pixfmt = IPU_PIX_FMT_BGR24;
|
|
break;
|
|
case 32:
|
|
pixfmt = IPU_PIX_FMT_BGR32;
|
|
break;
|
|
case 16:
|
|
pixfmt = IPU_PIX_FMT_RGB565;
|
|
break;
|
|
}
|
|
return pixfmt;
|
|
}
|
|
|
|
static int mx3fb_blank(int blank, struct fb_info *fbi);
|
|
static int mx3fb_map_video_memory(struct fb_info *fbi, unsigned int mem_len,
|
|
bool lock);
|
|
static int mx3fb_unmap_video_memory(struct fb_info *fbi);
|
|
|
|
/**
|
|
* mx3fb_set_fix() - set fixed framebuffer parameters from variable settings.
|
|
* @info: framebuffer information pointer
|
|
* @return: 0 on success or negative error code on failure.
|
|
*/
|
|
static int mx3fb_set_fix(struct fb_info *fbi)
|
|
{
|
|
struct fb_fix_screeninfo *fix = &fbi->fix;
|
|
struct fb_var_screeninfo *var = &fbi->var;
|
|
|
|
strncpy(fix->id, "DISP3 BG", 8);
|
|
|
|
fix->line_length = var->xres_virtual * var->bits_per_pixel / 8;
|
|
|
|
fix->type = FB_TYPE_PACKED_PIXELS;
|
|
fix->accel = FB_ACCEL_NONE;
|
|
fix->visual = FB_VISUAL_TRUECOLOR;
|
|
fix->xpanstep = 1;
|
|
fix->ypanstep = 1;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void mx3fb_dma_done(void *arg)
|
|
{
|
|
struct idmac_tx_desc *tx_desc = to_tx_desc(arg);
|
|
struct dma_chan *chan = tx_desc->txd.chan;
|
|
struct idmac_channel *ichannel = to_idmac_chan(chan);
|
|
struct mx3fb_data *mx3fb = ichannel->client;
|
|
struct mx3fb_info *mx3_fbi = mx3fb->fbi->par;
|
|
|
|
dev_dbg(mx3fb->dev, "irq %d callback\n", ichannel->eof_irq);
|
|
|
|
/* We only need one interrupt, it will be re-enabled as needed */
|
|
disable_irq_nosync(ichannel->eof_irq);
|
|
|
|
complete(&mx3_fbi->flip_cmpl);
|
|
}
|
|
|
|
static bool mx3fb_must_set_par(struct fb_info *fbi)
|
|
{
|
|
struct mx3fb_info *mx3_fbi = fbi->par;
|
|
struct fb_var_screeninfo old_var = mx3_fbi->cur_var;
|
|
struct fb_var_screeninfo new_var = fbi->var;
|
|
|
|
if ((fbi->var.activate & FB_ACTIVATE_FORCE) &&
|
|
(fbi->var.activate & FB_ACTIVATE_MASK) == FB_ACTIVATE_NOW)
|
|
return true;
|
|
|
|
/*
|
|
* Ignore xoffset and yoffset update,
|
|
* because pan display handles this case.
|
|
*/
|
|
old_var.xoffset = new_var.xoffset;
|
|
old_var.yoffset = new_var.yoffset;
|
|
|
|
return !!memcmp(&old_var, &new_var, sizeof(struct fb_var_screeninfo));
|
|
}
|
|
|
|
static int __set_par(struct fb_info *fbi, bool lock)
|
|
{
|
|
u32 mem_len, cur_xoffset, cur_yoffset;
|
|
struct ipu_di_signal_cfg sig_cfg;
|
|
enum ipu_panel mode = IPU_PANEL_TFT;
|
|
struct mx3fb_info *mx3_fbi = fbi->par;
|
|
struct mx3fb_data *mx3fb = mx3_fbi->mx3fb;
|
|
struct idmac_channel *ichan = mx3_fbi->idmac_channel;
|
|
struct idmac_video_param *video = &ichan->params.video;
|
|
struct scatterlist *sg = mx3_fbi->sg;
|
|
|
|
/* Total cleanup */
|
|
if (mx3_fbi->txd)
|
|
sdc_disable_channel(mx3_fbi);
|
|
|
|
mx3fb_set_fix(fbi);
|
|
|
|
mem_len = fbi->var.yres_virtual * fbi->fix.line_length;
|
|
if (mem_len > fbi->fix.smem_len) {
|
|
if (fbi->fix.smem_start)
|
|
mx3fb_unmap_video_memory(fbi);
|
|
|
|
if (mx3fb_map_video_memory(fbi, mem_len, lock) < 0)
|
|
return -ENOMEM;
|
|
}
|
|
|
|
sg_init_table(&sg[0], 1);
|
|
sg_init_table(&sg[1], 1);
|
|
|
|
sg_dma_address(&sg[0]) = fbi->fix.smem_start;
|
|
sg_set_page(&sg[0], virt_to_page(fbi->screen_base),
|
|
fbi->fix.smem_len,
|
|
offset_in_page(fbi->screen_base));
|
|
|
|
if (mx3_fbi->ipu_ch == IDMAC_SDC_0) {
|
|
memset(&sig_cfg, 0, sizeof(sig_cfg));
|
|
if (fbi->var.sync & FB_SYNC_HOR_HIGH_ACT)
|
|
sig_cfg.Hsync_pol = true;
|
|
if (fbi->var.sync & FB_SYNC_VERT_HIGH_ACT)
|
|
sig_cfg.Vsync_pol = true;
|
|
if (fbi->var.sync & FB_SYNC_CLK_INVERT)
|
|
sig_cfg.clk_pol = true;
|
|
if (fbi->var.sync & FB_SYNC_DATA_INVERT)
|
|
sig_cfg.data_pol = true;
|
|
if (fbi->var.sync & FB_SYNC_OE_ACT_HIGH)
|
|
sig_cfg.enable_pol = true;
|
|
if (fbi->var.sync & FB_SYNC_CLK_IDLE_EN)
|
|
sig_cfg.clkidle_en = true;
|
|
if (fbi->var.sync & FB_SYNC_CLK_SEL_EN)
|
|
sig_cfg.clksel_en = true;
|
|
if (fbi->var.sync & FB_SYNC_SHARP_MODE)
|
|
mode = IPU_PANEL_SHARP_TFT;
|
|
|
|
dev_dbg(fbi->device, "pixclock = %u Hz\n",
|
|
(u32) (PICOS2KHZ(fbi->var.pixclock) * 1000UL));
|
|
|
|
if (sdc_init_panel(mx3fb, mode,
|
|
(PICOS2KHZ(fbi->var.pixclock)) * 1000UL,
|
|
fbi->var.xres, fbi->var.yres,
|
|
fbi->var.left_margin,
|
|
fbi->var.hsync_len,
|
|
fbi->var.right_margin +
|
|
fbi->var.hsync_len,
|
|
fbi->var.upper_margin,
|
|
fbi->var.vsync_len,
|
|
fbi->var.lower_margin +
|
|
fbi->var.vsync_len, sig_cfg) != 0) {
|
|
dev_err(fbi->device,
|
|
"mx3fb: Error initializing panel.\n");
|
|
return -EINVAL;
|
|
}
|
|
}
|
|
|
|
sdc_set_window_pos(mx3fb, mx3_fbi->ipu_ch, 0, 0);
|
|
|
|
mx3_fbi->cur_ipu_buf = 0;
|
|
|
|
video->out_pixel_fmt = bpp_to_pixfmt(fbi->var.bits_per_pixel);
|
|
video->out_width = fbi->var.xres;
|
|
video->out_height = fbi->var.yres;
|
|
video->out_stride = fbi->var.xres_virtual;
|
|
|
|
if (mx3_fbi->blank == FB_BLANK_UNBLANK) {
|
|
sdc_enable_channel(mx3_fbi);
|
|
/*
|
|
* sg[0] points to fb smem_start address
|
|
* and is actually active in controller.
|
|
*/
|
|
mx3_fbi->cur_var.xoffset = 0;
|
|
mx3_fbi->cur_var.yoffset = 0;
|
|
}
|
|
|
|
/*
|
|
* Preserve xoffset and yoffest in case they are
|
|
* inactive in controller as fb is blanked.
|
|
*/
|
|
cur_xoffset = mx3_fbi->cur_var.xoffset;
|
|
cur_yoffset = mx3_fbi->cur_var.yoffset;
|
|
mx3_fbi->cur_var = fbi->var;
|
|
mx3_fbi->cur_var.xoffset = cur_xoffset;
|
|
mx3_fbi->cur_var.yoffset = cur_yoffset;
|
|
|
|
return 0;
|
|
}
|
|
|
|
/**
|
|
* mx3fb_set_par() - set framebuffer parameters and change the operating mode.
|
|
* @fbi: framebuffer information pointer.
|
|
* @return: 0 on success or negative error code on failure.
|
|
*/
|
|
static int mx3fb_set_par(struct fb_info *fbi)
|
|
{
|
|
struct mx3fb_info *mx3_fbi = fbi->par;
|
|
struct mx3fb_data *mx3fb = mx3_fbi->mx3fb;
|
|
struct idmac_channel *ichan = mx3_fbi->idmac_channel;
|
|
int ret;
|
|
|
|
dev_dbg(mx3fb->dev, "%s [%c]\n", __func__, list_empty(&ichan->queue) ? '-' : '+');
|
|
|
|
mutex_lock(&mx3_fbi->mutex);
|
|
|
|
ret = mx3fb_must_set_par(fbi) ? __set_par(fbi, true) : 0;
|
|
|
|
mutex_unlock(&mx3_fbi->mutex);
|
|
|
|
return ret;
|
|
}
|
|
|
|
/**
|
|
* mx3fb_check_var() - check and adjust framebuffer variable parameters.
|
|
* @var: framebuffer variable parameters
|
|
* @fbi: framebuffer information pointer
|
|
*/
|
|
static int mx3fb_check_var(struct fb_var_screeninfo *var, struct fb_info *fbi)
|
|
{
|
|
struct mx3fb_info *mx3_fbi = fbi->par;
|
|
u32 vtotal;
|
|
u32 htotal;
|
|
|
|
dev_dbg(fbi->device, "%s\n", __func__);
|
|
|
|
if (var->xres_virtual < var->xres)
|
|
var->xres_virtual = var->xres;
|
|
if (var->yres_virtual < var->yres)
|
|
var->yres_virtual = var->yres;
|
|
|
|
if ((var->bits_per_pixel != 32) && (var->bits_per_pixel != 24) &&
|
|
(var->bits_per_pixel != 16))
|
|
var->bits_per_pixel = default_bpp;
|
|
|
|
switch (var->bits_per_pixel) {
|
|
case 16:
|
|
var->red.length = 5;
|
|
var->red.offset = 11;
|
|
var->red.msb_right = 0;
|
|
|
|
var->green.length = 6;
|
|
var->green.offset = 5;
|
|
var->green.msb_right = 0;
|
|
|
|
var->blue.length = 5;
|
|
var->blue.offset = 0;
|
|
var->blue.msb_right = 0;
|
|
|
|
var->transp.length = 0;
|
|
var->transp.offset = 0;
|
|
var->transp.msb_right = 0;
|
|
break;
|
|
case 24:
|
|
var->red.length = 8;
|
|
var->red.offset = 16;
|
|
var->red.msb_right = 0;
|
|
|
|
var->green.length = 8;
|
|
var->green.offset = 8;
|
|
var->green.msb_right = 0;
|
|
|
|
var->blue.length = 8;
|
|
var->blue.offset = 0;
|
|
var->blue.msb_right = 0;
|
|
|
|
var->transp.length = 0;
|
|
var->transp.offset = 0;
|
|
var->transp.msb_right = 0;
|
|
break;
|
|
case 32:
|
|
var->red.length = 8;
|
|
var->red.offset = 16;
|
|
var->red.msb_right = 0;
|
|
|
|
var->green.length = 8;
|
|
var->green.offset = 8;
|
|
var->green.msb_right = 0;
|
|
|
|
var->blue.length = 8;
|
|
var->blue.offset = 0;
|
|
var->blue.msb_right = 0;
|
|
|
|
var->transp.length = 8;
|
|
var->transp.offset = 24;
|
|
var->transp.msb_right = 0;
|
|
break;
|
|
}
|
|
|
|
if (var->pixclock < 1000) {
|
|
htotal = var->xres + var->right_margin + var->hsync_len +
|
|
var->left_margin;
|
|
vtotal = var->yres + var->lower_margin + var->vsync_len +
|
|
var->upper_margin;
|
|
var->pixclock = (vtotal * htotal * 6UL) / 100UL;
|
|
var->pixclock = KHZ2PICOS(var->pixclock);
|
|
dev_dbg(fbi->device, "pixclock set for 60Hz refresh = %u ps\n",
|
|
var->pixclock);
|
|
}
|
|
|
|
var->height = -1;
|
|
var->width = -1;
|
|
var->grayscale = 0;
|
|
|
|
/* Preserve sync flags */
|
|
var->sync |= mx3_fbi->cur_var.sync;
|
|
mx3_fbi->cur_var.sync |= var->sync;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static u32 chan_to_field(unsigned int chan, struct fb_bitfield *bf)
|
|
{
|
|
chan &= 0xffff;
|
|
chan >>= 16 - bf->length;
|
|
return chan << bf->offset;
|
|
}
|
|
|
|
static int mx3fb_setcolreg(unsigned int regno, unsigned int red,
|
|
unsigned int green, unsigned int blue,
|
|
unsigned int trans, struct fb_info *fbi)
|
|
{
|
|
struct mx3fb_info *mx3_fbi = fbi->par;
|
|
u32 val;
|
|
int ret = 1;
|
|
|
|
dev_dbg(fbi->device, "%s, regno = %u\n", __func__, regno);
|
|
|
|
mutex_lock(&mx3_fbi->mutex);
|
|
/*
|
|
* If greyscale is true, then we convert the RGB value
|
|
* to greyscale no matter what visual we are using.
|
|
*/
|
|
if (fbi->var.grayscale)
|
|
red = green = blue = (19595 * red + 38470 * green +
|
|
7471 * blue) >> 16;
|
|
switch (fbi->fix.visual) {
|
|
case FB_VISUAL_TRUECOLOR:
|
|
/*
|
|
* 16-bit True Colour. We encode the RGB value
|
|
* according to the RGB bitfield information.
|
|
*/
|
|
if (regno < 16) {
|
|
u32 *pal = fbi->pseudo_palette;
|
|
|
|
val = chan_to_field(red, &fbi->var.red);
|
|
val |= chan_to_field(green, &fbi->var.green);
|
|
val |= chan_to_field(blue, &fbi->var.blue);
|
|
|
|
pal[regno] = val;
|
|
|
|
ret = 0;
|
|
}
|
|
break;
|
|
|
|
case FB_VISUAL_STATIC_PSEUDOCOLOR:
|
|
case FB_VISUAL_PSEUDOCOLOR:
|
|
break;
|
|
}
|
|
mutex_unlock(&mx3_fbi->mutex);
|
|
|
|
return ret;
|
|
}
|
|
|
|
static void __blank(int blank, struct fb_info *fbi)
|
|
{
|
|
struct mx3fb_info *mx3_fbi = fbi->par;
|
|
struct mx3fb_data *mx3fb = mx3_fbi->mx3fb;
|
|
int was_blank = mx3_fbi->blank;
|
|
|
|
mx3_fbi->blank = blank;
|
|
|
|
/* Attention!
|
|
* Do not call sdc_disable_channel() for a channel that is disabled
|
|
* already! This will result in a kernel NULL pointer dereference
|
|
* (mx3_fbi->txd is NULL). Hide the fact, that all blank modes are
|
|
* handled equally by this driver.
|
|
*/
|
|
if (blank > FB_BLANK_UNBLANK && was_blank > FB_BLANK_UNBLANK)
|
|
return;
|
|
|
|
switch (blank) {
|
|
case FB_BLANK_POWERDOWN:
|
|
case FB_BLANK_VSYNC_SUSPEND:
|
|
case FB_BLANK_HSYNC_SUSPEND:
|
|
case FB_BLANK_NORMAL:
|
|
sdc_set_brightness(mx3fb, 0);
|
|
memset((char *)fbi->screen_base, 0, fbi->fix.smem_len);
|
|
/* Give LCD time to update - enough for 50 and 60 Hz */
|
|
msleep(25);
|
|
sdc_disable_channel(mx3_fbi);
|
|
break;
|
|
case FB_BLANK_UNBLANK:
|
|
sdc_enable_channel(mx3_fbi);
|
|
sdc_set_brightness(mx3fb, mx3fb->backlight_level);
|
|
break;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* mx3fb_blank() - blank the display.
|
|
*/
|
|
static int mx3fb_blank(int blank, struct fb_info *fbi)
|
|
{
|
|
struct mx3fb_info *mx3_fbi = fbi->par;
|
|
|
|
dev_dbg(fbi->device, "%s, blank = %d, base %p, len %u\n", __func__,
|
|
blank, fbi->screen_base, fbi->fix.smem_len);
|
|
|
|
if (mx3_fbi->blank == blank)
|
|
return 0;
|
|
|
|
mutex_lock(&mx3_fbi->mutex);
|
|
__blank(blank, fbi);
|
|
mutex_unlock(&mx3_fbi->mutex);
|
|
|
|
return 0;
|
|
}
|
|
|
|
/**
|
|
* mx3fb_pan_display() - pan or wrap the display
|
|
* @var: variable screen buffer information.
|
|
* @info: framebuffer information pointer.
|
|
*
|
|
* We look only at xoffset, yoffset and the FB_VMODE_YWRAP flag
|
|
*/
|
|
static int mx3fb_pan_display(struct fb_var_screeninfo *var,
|
|
struct fb_info *fbi)
|
|
{
|
|
struct mx3fb_info *mx3_fbi = fbi->par;
|
|
u32 y_bottom;
|
|
unsigned long base;
|
|
off_t offset;
|
|
dma_cookie_t cookie;
|
|
struct scatterlist *sg = mx3_fbi->sg;
|
|
struct dma_chan *dma_chan = &mx3_fbi->idmac_channel->dma_chan;
|
|
struct dma_async_tx_descriptor *txd;
|
|
int ret;
|
|
|
|
dev_dbg(fbi->device, "%s [%c]\n", __func__,
|
|
list_empty(&mx3_fbi->idmac_channel->queue) ? '-' : '+');
|
|
|
|
if (var->xoffset > 0) {
|
|
dev_dbg(fbi->device, "x panning not supported\n");
|
|
return -EINVAL;
|
|
}
|
|
|
|
if (mx3_fbi->cur_var.xoffset == var->xoffset &&
|
|
mx3_fbi->cur_var.yoffset == var->yoffset)
|
|
return 0; /* No change, do nothing */
|
|
|
|
y_bottom = var->yoffset;
|
|
|
|
if (!(var->vmode & FB_VMODE_YWRAP))
|
|
y_bottom += fbi->var.yres;
|
|
|
|
if (y_bottom > fbi->var.yres_virtual)
|
|
return -EINVAL;
|
|
|
|
mutex_lock(&mx3_fbi->mutex);
|
|
|
|
offset = var->yoffset * fbi->fix.line_length
|
|
+ var->xoffset * (fbi->var.bits_per_pixel / 8);
|
|
base = fbi->fix.smem_start + offset;
|
|
|
|
dev_dbg(fbi->device, "Updating SDC BG buf %d address=0x%08lX\n",
|
|
mx3_fbi->cur_ipu_buf, base);
|
|
|
|
/*
|
|
* We enable the End of Frame interrupt, which will free a tx-descriptor,
|
|
* which we will need for the next dmaengine_prep_slave_sg(). The
|
|
* IRQ-handler will disable the IRQ again.
|
|
*/
|
|
init_completion(&mx3_fbi->flip_cmpl);
|
|
enable_irq(mx3_fbi->idmac_channel->eof_irq);
|
|
|
|
ret = wait_for_completion_timeout(&mx3_fbi->flip_cmpl, HZ / 10);
|
|
if (ret <= 0) {
|
|
mutex_unlock(&mx3_fbi->mutex);
|
|
dev_info(fbi->device, "Panning failed due to %s\n", ret < 0 ?
|
|
"user interrupt" : "timeout");
|
|
disable_irq(mx3_fbi->idmac_channel->eof_irq);
|
|
return ret ? : -ETIMEDOUT;
|
|
}
|
|
|
|
mx3_fbi->cur_ipu_buf = !mx3_fbi->cur_ipu_buf;
|
|
|
|
sg_dma_address(&sg[mx3_fbi->cur_ipu_buf]) = base;
|
|
sg_set_page(&sg[mx3_fbi->cur_ipu_buf],
|
|
virt_to_page(fbi->screen_base + offset), fbi->fix.smem_len,
|
|
offset_in_page(fbi->screen_base + offset));
|
|
|
|
if (mx3_fbi->txd)
|
|
async_tx_ack(mx3_fbi->txd);
|
|
|
|
txd = dmaengine_prep_slave_sg(dma_chan, sg +
|
|
mx3_fbi->cur_ipu_buf, 1, DMA_MEM_TO_DEV, DMA_PREP_INTERRUPT);
|
|
if (!txd) {
|
|
dev_err(fbi->device,
|
|
"Error preparing a DMA transaction descriptor.\n");
|
|
mutex_unlock(&mx3_fbi->mutex);
|
|
return -EIO;
|
|
}
|
|
|
|
txd->callback_param = txd;
|
|
txd->callback = mx3fb_dma_done;
|
|
|
|
/*
|
|
* Emulate original mx3fb behaviour: each new call to idmac_tx_submit()
|
|
* should switch to another buffer
|
|
*/
|
|
cookie = txd->tx_submit(txd);
|
|
dev_dbg(fbi->device, "%d: Submit %p #%d\n", __LINE__, txd, cookie);
|
|
if (cookie < 0) {
|
|
dev_err(fbi->device,
|
|
"Error updating SDC buf %d to address=0x%08lX\n",
|
|
mx3_fbi->cur_ipu_buf, base);
|
|
mutex_unlock(&mx3_fbi->mutex);
|
|
return -EIO;
|
|
}
|
|
|
|
mx3_fbi->txd = txd;
|
|
|
|
fbi->var.xoffset = var->xoffset;
|
|
fbi->var.yoffset = var->yoffset;
|
|
|
|
if (var->vmode & FB_VMODE_YWRAP)
|
|
fbi->var.vmode |= FB_VMODE_YWRAP;
|
|
else
|
|
fbi->var.vmode &= ~FB_VMODE_YWRAP;
|
|
|
|
mx3_fbi->cur_var = fbi->var;
|
|
|
|
mutex_unlock(&mx3_fbi->mutex);
|
|
|
|
dev_dbg(fbi->device, "Update complete\n");
|
|
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
* This structure contains the pointers to the control functions that are
|
|
* invoked by the core framebuffer driver to perform operations like
|
|
* blitting, rectangle filling, copy regions and cursor definition.
|
|
*/
|
|
static struct fb_ops mx3fb_ops = {
|
|
.owner = THIS_MODULE,
|
|
.fb_set_par = mx3fb_set_par,
|
|
.fb_check_var = mx3fb_check_var,
|
|
.fb_setcolreg = mx3fb_setcolreg,
|
|
.fb_pan_display = mx3fb_pan_display,
|
|
.fb_fillrect = cfb_fillrect,
|
|
.fb_copyarea = cfb_copyarea,
|
|
.fb_imageblit = cfb_imageblit,
|
|
.fb_blank = mx3fb_blank,
|
|
};
|
|
|
|
#ifdef CONFIG_PM
|
|
/*
|
|
* Power management hooks. Note that we won't be called from IRQ context,
|
|
* unlike the blank functions above, so we may sleep.
|
|
*/
|
|
|
|
/*
|
|
* Suspends the framebuffer and blanks the screen. Power management support
|
|
*/
|
|
static int mx3fb_suspend(struct platform_device *pdev, pm_message_t state)
|
|
{
|
|
struct mx3fb_data *mx3fb = platform_get_drvdata(pdev);
|
|
struct mx3fb_info *mx3_fbi = mx3fb->fbi->par;
|
|
|
|
console_lock();
|
|
fb_set_suspend(mx3fb->fbi, 1);
|
|
console_unlock();
|
|
|
|
if (mx3_fbi->blank == FB_BLANK_UNBLANK) {
|
|
sdc_disable_channel(mx3_fbi);
|
|
sdc_set_brightness(mx3fb, 0);
|
|
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
* Resumes the framebuffer and unblanks the screen. Power management support
|
|
*/
|
|
static int mx3fb_resume(struct platform_device *pdev)
|
|
{
|
|
struct mx3fb_data *mx3fb = platform_get_drvdata(pdev);
|
|
struct mx3fb_info *mx3_fbi = mx3fb->fbi->par;
|
|
|
|
if (mx3_fbi->blank == FB_BLANK_UNBLANK) {
|
|
sdc_enable_channel(mx3_fbi);
|
|
sdc_set_brightness(mx3fb, mx3fb->backlight_level);
|
|
}
|
|
|
|
console_lock();
|
|
fb_set_suspend(mx3fb->fbi, 0);
|
|
console_unlock();
|
|
|
|
return 0;
|
|
}
|
|
#else
|
|
#define mx3fb_suspend NULL
|
|
#define mx3fb_resume NULL
|
|
#endif
|
|
|
|
/*
|
|
* Main framebuffer functions
|
|
*/
|
|
|
|
/**
|
|
* mx3fb_map_video_memory() - allocates the DRAM memory for the frame buffer.
|
|
* @fbi: framebuffer information pointer
|
|
* @mem_len: length of mapped memory
|
|
* @lock: do not lock during initialisation
|
|
* @return: Error code indicating success or failure
|
|
*
|
|
* This buffer is remapped into a non-cached, non-buffered, memory region to
|
|
* allow palette and pixel writes to occur without flushing the cache. Once this
|
|
* area is remapped, all virtual memory access to the video memory should occur
|
|
* at the new region.
|
|
*/
|
|
static int mx3fb_map_video_memory(struct fb_info *fbi, unsigned int mem_len,
|
|
bool lock)
|
|
{
|
|
int retval = 0;
|
|
dma_addr_t addr;
|
|
|
|
fbi->screen_base = dma_alloc_wc(fbi->device, mem_len, &addr,
|
|
GFP_DMA | GFP_KERNEL);
|
|
|
|
if (!fbi->screen_base) {
|
|
dev_err(fbi->device, "Cannot allocate %u bytes framebuffer memory\n",
|
|
mem_len);
|
|
retval = -EBUSY;
|
|
goto err0;
|
|
}
|
|
|
|
if (lock)
|
|
mutex_lock(&fbi->mm_lock);
|
|
fbi->fix.smem_start = addr;
|
|
fbi->fix.smem_len = mem_len;
|
|
if (lock)
|
|
mutex_unlock(&fbi->mm_lock);
|
|
|
|
dev_dbg(fbi->device, "allocated fb @ p=0x%08x, v=0x%p, size=%d.\n",
|
|
(uint32_t) fbi->fix.smem_start, fbi->screen_base, fbi->fix.smem_len);
|
|
|
|
fbi->screen_size = fbi->fix.smem_len;
|
|
|
|
/* Clear the screen */
|
|
memset((char *)fbi->screen_base, 0, fbi->fix.smem_len);
|
|
|
|
return 0;
|
|
|
|
err0:
|
|
fbi->fix.smem_len = 0;
|
|
fbi->fix.smem_start = 0;
|
|
fbi->screen_base = NULL;
|
|
return retval;
|
|
}
|
|
|
|
/**
|
|
* mx3fb_unmap_video_memory() - de-allocate frame buffer memory.
|
|
* @fbi: framebuffer information pointer
|
|
* @return: error code indicating success or failure
|
|
*/
|
|
static int mx3fb_unmap_video_memory(struct fb_info *fbi)
|
|
{
|
|
dma_free_wc(fbi->device, fbi->fix.smem_len, fbi->screen_base,
|
|
fbi->fix.smem_start);
|
|
|
|
fbi->screen_base = NULL;
|
|
mutex_lock(&fbi->mm_lock);
|
|
fbi->fix.smem_start = 0;
|
|
fbi->fix.smem_len = 0;
|
|
mutex_unlock(&fbi->mm_lock);
|
|
return 0;
|
|
}
|
|
|
|
/**
|
|
* mx3fb_init_fbinfo() - initialize framebuffer information object.
|
|
* @return: initialized framebuffer structure.
|
|
*/
|
|
static struct fb_info *mx3fb_init_fbinfo(struct device *dev, struct fb_ops *ops)
|
|
{
|
|
struct fb_info *fbi;
|
|
struct mx3fb_info *mx3fbi;
|
|
int ret;
|
|
|
|
/* Allocate sufficient memory for the fb structure */
|
|
fbi = framebuffer_alloc(sizeof(struct mx3fb_info), dev);
|
|
if (!fbi)
|
|
return NULL;
|
|
|
|
mx3fbi = fbi->par;
|
|
mx3fbi->cookie = -EINVAL;
|
|
mx3fbi->cur_ipu_buf = 0;
|
|
|
|
fbi->var.activate = FB_ACTIVATE_NOW;
|
|
|
|
fbi->fbops = ops;
|
|
fbi->flags = FBINFO_FLAG_DEFAULT;
|
|
fbi->pseudo_palette = mx3fbi->pseudo_palette;
|
|
|
|
mutex_init(&mx3fbi->mutex);
|
|
|
|
/* Allocate colormap */
|
|
ret = fb_alloc_cmap(&fbi->cmap, 16, 0);
|
|
if (ret < 0) {
|
|
framebuffer_release(fbi);
|
|
return NULL;
|
|
}
|
|
|
|
return fbi;
|
|
}
|
|
|
|
static int init_fb_chan(struct mx3fb_data *mx3fb, struct idmac_channel *ichan)
|
|
{
|
|
struct device *dev = mx3fb->dev;
|
|
struct mx3fb_platform_data *mx3fb_pdata = dev_get_platdata(dev);
|
|
const char *name = mx3fb_pdata->name;
|
|
unsigned int irq;
|
|
struct fb_info *fbi;
|
|
struct mx3fb_info *mx3fbi;
|
|
const struct fb_videomode *mode;
|
|
int ret, num_modes;
|
|
|
|
if (mx3fb_pdata->disp_data_fmt >= ARRAY_SIZE(di_mappings)) {
|
|
dev_err(dev, "Illegal display data format %d\n",
|
|
mx3fb_pdata->disp_data_fmt);
|
|
return -EINVAL;
|
|
}
|
|
|
|
ichan->client = mx3fb;
|
|
irq = ichan->eof_irq;
|
|
|
|
if (ichan->dma_chan.chan_id != IDMAC_SDC_0)
|
|
return -EINVAL;
|
|
|
|
fbi = mx3fb_init_fbinfo(dev, &mx3fb_ops);
|
|
if (!fbi)
|
|
return -ENOMEM;
|
|
|
|
if (!fb_mode)
|
|
fb_mode = name;
|
|
|
|
if (!fb_mode) {
|
|
ret = -EINVAL;
|
|
goto emode;
|
|
}
|
|
|
|
if (mx3fb_pdata->mode && mx3fb_pdata->num_modes) {
|
|
mode = mx3fb_pdata->mode;
|
|
num_modes = mx3fb_pdata->num_modes;
|
|
} else {
|
|
mode = mx3fb_modedb;
|
|
num_modes = ARRAY_SIZE(mx3fb_modedb);
|
|
}
|
|
|
|
if (!fb_find_mode(&fbi->var, fbi, fb_mode, mode,
|
|
num_modes, NULL, default_bpp)) {
|
|
ret = -EBUSY;
|
|
goto emode;
|
|
}
|
|
|
|
fb_videomode_to_modelist(mode, num_modes, &fbi->modelist);
|
|
|
|
/* Default Y virtual size is 2x panel size */
|
|
fbi->var.yres_virtual = fbi->var.yres * 2;
|
|
|
|
mx3fb->fbi = fbi;
|
|
|
|
/* set Display Interface clock period */
|
|
mx3fb_write_reg(mx3fb, 0x00100010L, DI_HSP_CLK_PER);
|
|
/* Might need to trigger HSP clock change - see 44.3.3.8.5 */
|
|
|
|
sdc_set_brightness(mx3fb, 255);
|
|
sdc_set_global_alpha(mx3fb, true, 0xFF);
|
|
sdc_set_color_key(mx3fb, IDMAC_SDC_0, false, 0);
|
|
|
|
mx3fbi = fbi->par;
|
|
mx3fbi->idmac_channel = ichan;
|
|
mx3fbi->ipu_ch = ichan->dma_chan.chan_id;
|
|
mx3fbi->mx3fb = mx3fb;
|
|
mx3fbi->blank = FB_BLANK_NORMAL;
|
|
|
|
mx3fb->disp_data_fmt = mx3fb_pdata->disp_data_fmt;
|
|
|
|
init_completion(&mx3fbi->flip_cmpl);
|
|
disable_irq(ichan->eof_irq);
|
|
dev_dbg(mx3fb->dev, "disabling irq %d\n", ichan->eof_irq);
|
|
ret = __set_par(fbi, false);
|
|
if (ret < 0)
|
|
goto esetpar;
|
|
|
|
__blank(FB_BLANK_UNBLANK, fbi);
|
|
|
|
dev_info(dev, "registered, using mode %s\n", fb_mode);
|
|
|
|
ret = register_framebuffer(fbi);
|
|
if (ret < 0)
|
|
goto erfb;
|
|
|
|
return 0;
|
|
|
|
erfb:
|
|
esetpar:
|
|
emode:
|
|
fb_dealloc_cmap(&fbi->cmap);
|
|
framebuffer_release(fbi);
|
|
|
|
return ret;
|
|
}
|
|
|
|
static bool chan_filter(struct dma_chan *chan, void *arg)
|
|
{
|
|
struct dma_chan_request *rq = arg;
|
|
struct device *dev;
|
|
struct mx3fb_platform_data *mx3fb_pdata;
|
|
|
|
if (!imx_dma_is_ipu(chan))
|
|
return false;
|
|
|
|
if (!rq)
|
|
return false;
|
|
|
|
dev = rq->mx3fb->dev;
|
|
mx3fb_pdata = dev_get_platdata(dev);
|
|
|
|
return rq->id == chan->chan_id &&
|
|
mx3fb_pdata->dma_dev == chan->device->dev;
|
|
}
|
|
|
|
static void release_fbi(struct fb_info *fbi)
|
|
{
|
|
mx3fb_unmap_video_memory(fbi);
|
|
|
|
fb_dealloc_cmap(&fbi->cmap);
|
|
|
|
unregister_framebuffer(fbi);
|
|
framebuffer_release(fbi);
|
|
}
|
|
|
|
static int mx3fb_probe(struct platform_device *pdev)
|
|
{
|
|
struct device *dev = &pdev->dev;
|
|
int ret;
|
|
struct resource *sdc_reg;
|
|
struct mx3fb_data *mx3fb;
|
|
dma_cap_mask_t mask;
|
|
struct dma_chan *chan;
|
|
struct dma_chan_request rq;
|
|
|
|
/*
|
|
* Display Interface (DI) and Synchronous Display Controller (SDC)
|
|
* registers
|
|
*/
|
|
sdc_reg = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
if (!sdc_reg)
|
|
return -EINVAL;
|
|
|
|
mx3fb = devm_kzalloc(&pdev->dev, sizeof(*mx3fb), GFP_KERNEL);
|
|
if (!mx3fb)
|
|
return -ENOMEM;
|
|
|
|
spin_lock_init(&mx3fb->lock);
|
|
|
|
mx3fb->reg_base = ioremap(sdc_reg->start, resource_size(sdc_reg));
|
|
if (!mx3fb->reg_base) {
|
|
ret = -ENOMEM;
|
|
goto eremap;
|
|
}
|
|
|
|
pr_debug("Remapped %pR at %p\n", sdc_reg, mx3fb->reg_base);
|
|
|
|
/* IDMAC interface */
|
|
dmaengine_get();
|
|
|
|
mx3fb->dev = dev;
|
|
platform_set_drvdata(pdev, mx3fb);
|
|
|
|
rq.mx3fb = mx3fb;
|
|
|
|
dma_cap_zero(mask);
|
|
dma_cap_set(DMA_SLAVE, mask);
|
|
dma_cap_set(DMA_PRIVATE, mask);
|
|
rq.id = IDMAC_SDC_0;
|
|
chan = dma_request_channel(mask, chan_filter, &rq);
|
|
if (!chan) {
|
|
ret = -EBUSY;
|
|
goto ersdc0;
|
|
}
|
|
|
|
mx3fb->backlight_level = 255;
|
|
|
|
ret = init_fb_chan(mx3fb, to_idmac_chan(chan));
|
|
if (ret < 0)
|
|
goto eisdc0;
|
|
|
|
mx3fb_init_backlight(mx3fb);
|
|
|
|
return 0;
|
|
|
|
eisdc0:
|
|
dma_release_channel(chan);
|
|
ersdc0:
|
|
dmaengine_put();
|
|
iounmap(mx3fb->reg_base);
|
|
eremap:
|
|
dev_err(dev, "mx3fb: failed to register fb\n");
|
|
return ret;
|
|
}
|
|
|
|
static int mx3fb_remove(struct platform_device *dev)
|
|
{
|
|
struct mx3fb_data *mx3fb = platform_get_drvdata(dev);
|
|
struct fb_info *fbi = mx3fb->fbi;
|
|
struct mx3fb_info *mx3_fbi = fbi->par;
|
|
struct dma_chan *chan;
|
|
|
|
chan = &mx3_fbi->idmac_channel->dma_chan;
|
|
release_fbi(fbi);
|
|
|
|
mx3fb_exit_backlight(mx3fb);
|
|
|
|
dma_release_channel(chan);
|
|
dmaengine_put();
|
|
|
|
iounmap(mx3fb->reg_base);
|
|
return 0;
|
|
}
|
|
|
|
static struct platform_driver mx3fb_driver = {
|
|
.driver = {
|
|
.name = MX3FB_NAME,
|
|
},
|
|
.probe = mx3fb_probe,
|
|
.remove = mx3fb_remove,
|
|
.suspend = mx3fb_suspend,
|
|
.resume = mx3fb_resume,
|
|
};
|
|
|
|
/*
|
|
* Parse user specified options (`video=mx3fb:')
|
|
* example:
|
|
* video=mx3fb:bpp=16
|
|
*/
|
|
static int __init mx3fb_setup(void)
|
|
{
|
|
#ifndef MODULE
|
|
char *opt, *options = NULL;
|
|
|
|
if (fb_get_options("mx3fb", &options))
|
|
return -ENODEV;
|
|
|
|
if (!options || !*options)
|
|
return 0;
|
|
|
|
while ((opt = strsep(&options, ",")) != NULL) {
|
|
if (!*opt)
|
|
continue;
|
|
if (!strncmp(opt, "bpp=", 4))
|
|
default_bpp = simple_strtoul(opt + 4, NULL, 0);
|
|
else
|
|
fb_mode = opt;
|
|
}
|
|
#endif
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int __init mx3fb_init(void)
|
|
{
|
|
int ret = mx3fb_setup();
|
|
|
|
if (ret < 0)
|
|
return ret;
|
|
|
|
ret = platform_driver_register(&mx3fb_driver);
|
|
return ret;
|
|
}
|
|
|
|
static void __exit mx3fb_exit(void)
|
|
{
|
|
platform_driver_unregister(&mx3fb_driver);
|
|
}
|
|
|
|
module_init(mx3fb_init);
|
|
module_exit(mx3fb_exit);
|
|
|
|
MODULE_AUTHOR("Freescale Semiconductor, Inc.");
|
|
MODULE_DESCRIPTION("MX3 framebuffer driver");
|
|
MODULE_ALIAS("platform:" MX3FB_NAME);
|
|
MODULE_LICENSE("GPL v2");
|