Phil Elwell [Mon, 20 Nov 2023 15:17:34 +0000 (15:17 +0000)]
ASoC: dwc: Remove check in set_bclk_ratio handling
A check added to dw_i2s_set_bclk_ratio that the data format is
consistent with the ratio seems reasonable but breaks when the
ratio is changed before the format. Remove the check - it is
unnecessary.
See: https://github.com/raspberrypi/linux/issues/5724
Fixes:
9c6694c24f26 ("ASOC: dwc: Fix 16-bit audio handling")
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
Naushir Patuck [Thu, 16 Nov 2023 14:29:47 +0000 (14:29 +0000)]
drivers: media: pisp_be: Add mono and 48-bit RGB pixel format support
Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
Naushir Patuck [Thu, 16 Nov 2023 14:28:55 +0000 (14:28 +0000)]
drivers: media: cfe: Add 16-bit and compressed mono format support
Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
Naushir Patuck [Thu, 16 Nov 2023 14:25:39 +0000 (14:25 +0000)]
include: uapi: v4l2: Add additional pixel formats for use with PiSP
Add the following formats:
- V4L2_PIX_FMT_RGB48/V4L2_PIX_FMT_BGR48
48-bit RGB where each colour sample is 16-bits.
- V4L2_PIX_FMT_PISP_COMP1_MONO/V4L2_PIX_FMT_PISP_COMP2_MONO
16-bit to 8-bit pisp compressed monochrome pixel format.
Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
Phil Elwell [Mon, 20 Nov 2023 14:46:14 +0000 (14:46 +0000)]
w1: Disable kernel log spam
See: https://forums.raspberrypi.com/viewtopic.php?p=2159344
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
Phil Elwell [Mon, 20 Nov 2023 10:16:10 +0000 (10:16 +0000)]
overlays: ov5647: cam0 mode should use cam0_reg
When the cam0 parameter is used, the vcm should be updated to refer to
the cam0 regulator.
See: https://github.com/raspberrypi/linux/issues/5722
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
Phil Elwell [Mon, 20 Nov 2023 10:15:15 +0000 (10:15 +0000)]
overlays: ov5647: Regularise vcm node label name
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
Phil Elwell [Fri, 17 Nov 2023 19:23:15 +0000 (19:23 +0000)]
configs: Add the drivetemp module
See: https://github.com/raspberrypi/linux/issues/5670
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
Naushir Patuck [Wed, 15 Nov 2023 08:25:11 +0000 (08:25 +0000)]
overlays: imx296: Fix cam port override for regulators
The override was missing/incorrect for the regulator labels.
Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
Naushir Patuck [Wed, 8 Nov 2023 10:05:05 +0000 (10:05 +0000)]
drivers: media: cfe: Don't confuse MHz and Mbps
The driver was interchaning these units when talking about link rate.
Fix this to avoid confusion. Apart from the logging message change,
there is no function change in this commit.
Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
Nick Hollinghurst [Tue, 14 Nov 2023 16:03:54 +0000 (16:03 +0000)]
Revert "media: i2c: imx296: Add 2ms delay after releasing standby"
This reverts commit
ecbc04aa0c2e7c8879764c9d2c769ecc74fd9093
which duplicated
5fb3b300557d6a6902e7321f42fdabb8c09eef54
Signed-off-by: Nick Hollinghurst <nick.hollinghurst@raspberrypi.com>
Nick Hollinghurst [Wed, 8 Nov 2023 10:57:45 +0000 (10:57 +0000)]
drivers: media: imx708: Adjust broken line correction parameter
In full-resolution mode, the LPF_INTENSITY_EN and LPF_INTENSITY
registers control Quad Bayer Re-mosaic broken line correction.
Expose this as a module parameter "qbc_adjust": zero disables
the correction and values in the range 2 to 5 set its strength.
There is a trade-off between coloured and monochrome patterns.
The previous fixed value 4 could produce ladder/spots artefacts
in coloured textures. The new default value 2 may suit a wider
range of scenes.
Signed-off-by: Nick Hollinghurst <nick.hollinghurst@raspberrypi.com>
Phil Elwell [Wed, 8 Nov 2023 19:17:33 +0000 (19:17 +0000)]
ASoC: bcm: audioinjector_octo: Add soundcard "owner"
See: https://github.com/raspberrypi/linux/issues/5697
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
Jonathan Bell [Wed, 8 Nov 2023 16:14:25 +0000 (16:14 +0000)]
arm: dts: change RP1 SDHCI controller compatible string
Also add a sdio-pi5 overlay which enables mmc0 on GPIOs 22-27, as was
possible with earlier models of Pi.
Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
Jonathan Bell [Wed, 8 Nov 2023 16:12:59 +0000 (16:12 +0000)]
drivers: mmc: sdhci-of-dwcmshc: add RP1 dt ID and quirks
Differentiate the RP1 variant of the Designware MSHC controller(s).
Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
Jonathan Bell [Wed, 8 Nov 2023 16:10:13 +0000 (16:10 +0000)]
dt-bindings: mmc: sdhci-of-dwcmhsc: Add Raspberry Pi RP1 support
The DWC MSHC controller on RP1 needs differentiating from the generic
version.
Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
Jonathan Bell [Wed, 8 Nov 2023 11:52:16 +0000 (11:52 +0000)]
drivers: mmc: sdhci: add SPURIOUS_INT_RESP quirk
Certain controllers (dwc-mshc) generate timeout conditions separately to
command-completion conditions, where the end result is interrupts are
separated in time depending on the current SDCLK frequency.
This causes spurious interrupts if SDCLK is slow compared to the CPU's
ability to process and return from interrupt. This occurs during card
probe with an empty slot where all commands that would generate a
response time out.
Add a quirk to squelch command response interrupts when a command
timeout interrupt is received.
Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
Dave Stevenson [Wed, 8 Nov 2023 12:04:20 +0000 (12:04 +0000)]
defconfigs: Drop FB_UDL from all Pi defconfigs
CONFIG_FB_UBL is the fbdev driver for DisplayLink USB displays.
CONFIG_UDL is the DRM driver for DisplayLink USB displays.
Both attach themselves to the same USB device alias, so both
get loaded for any attached display. You now have 2 drivers for
the same hardware, and a race as to which one will load.
DRM emulates the framebuffer interface, so disable the fbdev
driver.
https://github.com/raspberrypi/bookworm-feedback/issues/133
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
Phil Elwell [Tue, 7 Nov 2023 14:49:47 +0000 (14:49 +0000)]
spi: dw-dma: Get the last DMA scoop out of the FIFO
With a DMA FIFO threshold greater than 1 (encoded as 0), it is possible
for data in the FIFO to be inaccessible, causing the transfer to fail
after a timeout. If the transfer includes a transmission, reduce the
RX threshold when the TX completes, otherwise use 1 for the whole
transfer (inefficient, but not catastrophic at SPI data rates).
See: https://github.com/raspberrypi/linux/issues/5696
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
Dom Cobley [Tue, 24 Oct 2023 15:20:42 +0000 (16:20 +0100)]
drm/vc4: crtc: Support odd horizontal timings on BCM2712
BCM2711 runs pixelvalve at two pixels per clock cycle which results
in an unfortunate limitation that odd horizontal timings are not
possible. This is apparent on the standard DMT mode of 1366x768@60
which cannot be driven with correct timing.
BCM2712 defaults to the same behaviour, but has a mode to support
odd timings. While internally it still runs at two pixels per clock,
setting the PV_VCONTROL_ODD_TIMING bit makes it appear externally
to behave as it is one pixel per clock.
Switching to this mode fixes 1366x768@60 mode, and other custom
resultions with odd horizontal timings.
Signed-off-by: Dom Cobley <popcornmix@gmail.com>
Dave Stevenson [Tue, 31 Oct 2023 11:15:38 +0000 (11:15 +0000)]
drm/vc4: Log the size of the dlist allocation that was attempted
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
Dave Stevenson [Fri, 27 Oct 2023 15:46:04 +0000 (16:46 +0100)]
drm/vc4: Add hvs_dlist_allocs debugfs function.
Users are reporting running out of DLIST memory. Add a
debugfs file to dump out all the allocations.
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
Dave Stevenson [Thu, 26 Oct 2023 17:23:31 +0000 (18:23 +0100)]
drm/vc4: Free all stale dlists if channel is disabled
The code handling freeing stale dlists had 2 issues:
- it disabled the interrupt as soon as the first EOF interrupt
occurred, even if it didn't clear all stale allocations, thus
leading to stale entries
- It didn't free stale entries from disabled channels, so eg
"kmstest -c 0" could leave a stale alloc on channel 1 floating
around.
Keep the interrupt enabled whilst there are any outstanding
allocs, and discard those on disabled channels. This second
channel does require us to call vc4_hvs_stop_channel from
vc4_crtc_atomic_disable so that the channel actually gets stopped.
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
Dave Stevenson [Thu, 26 Oct 2023 17:05:09 +0000 (18:05 +0100)]
drm/vc4: Drop WARN for HVS FIFOs not being empty
The reset condition for the EMPTY flag in DISPSTATx is 0,
so seeing as we've just reset the pipeline there is no
guarantee that the flag will denote empty if it hasn't been
enabled.
Drop the WARN.
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
Dave Stevenson [Thu, 26 Oct 2023 16:46:13 +0000 (17:46 +0100)]
drm/vc4: Correct logic on stopping an HVS channel
When factoring out __vc4_hvs_stop_channel, the logic got inverted from
if (condition)
// stop channel
to
if (condition)
goto out
//stop channel
out:
and also changed the exact register writes used to stop the channel.
Correct the logic so that the channel is actually stopped, and revert
to the original register writes.
Fixes:
6d01a106b4c8 ("drm/vc4: crtc: Move HVS init and close to a function")
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
Naushir Patuck [Mon, 6 Nov 2023 09:42:37 +0000 (09:42 +0000)]
drivers: media: imx477: Correctly set IMX477_PIXEL_RATE as a r/o control
This control is meant to be read-only, mark it as such.
Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
Naushir Patuck [Mon, 6 Nov 2023 09:40:50 +0000 (09:40 +0000)]
drivers: media: imx477: Add V4L2_CID_LINK_FREQ control
Add V4L2_CID_LINK_FREQ as a read-only control with a value of 450 Mhz.
This will be used by the CFE driver to corretly setup the DPHY timing
parameters in the CSI-2 block.
Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
Phil Elwell [Thu, 2 Nov 2023 17:05:46 +0000 (17:05 +0000)]
overlays: uart<n>-pi5: Add the pinctrl-0 property
Without the pinctrl-0 property in the overlays, the UARTs may not be
mapped correctly.
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
Phil Elwell [Thu, 2 Nov 2023 13:12:55 +0000 (13:12 +0000)]
dts: rp1: Add spi6, fix spi1 #address-cells
spi6 won't be useful on Pi 5 because it can't be enabled on the 40-pin
header, but include it for completeness.
Also fix the #address-cells value for spi1, otherwise the kernel will
reject attempts to apply the, say, spi1-2cs overlay at runtime.
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
Phil Elwell [Thu, 2 Nov 2023 10:39:11 +0000 (10:39 +0000)]
dts: bcm2712-rpi-5-b: Create some dummy nodes
The kernel now treats multiple fragments targeting the same node as an
error. For this reason, it is important that labels created just for
compatibility with other systems (e.g. i2c0if and i2c0mux) are
attached to unique nodes, not just tacked onto existing nodes.
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
Naushir Patuck [Wed, 1 Nov 2023 13:25:54 +0000 (13:25 +0000)]
drivers: media: cfe: Set the CSI-2 link frequency correctly
Use the sensor provided link frequency to set the DPHY timing parameters
on stream_on. This replaces the hard-coded 999 MHz value currently being
used. As a fallback, revert to the original 999 Mhz link frequency.
As a drive-by, fix a 80-character line formatting error.
Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
Phil Elwell [Mon, 12 Jun 2023 14:23:55 +0000 (15:23 +0100)]
dts: bcm2710-rpi-zero-2-w: Remove WLAN firmwares
With careful use of qualified firmware names there is no need for the
ability to override the device names based on Device Tree properties.
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
Phil Elwell [Mon, 12 Jun 2023 14:22:20 +0000 (15:22 +0100)]
Revert "brcmfmac: Read alternative firmware names from DT"
This reverts commit
5dba6ec6f4f2ac9ed8556116481b107e50e15251.
With careful use of qualified firmware names there is no need for the
ability to override the device names based on Device Tree properties.
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
David Plowman [Fri, 27 Oct 2023 11:14:22 +0000 (12:14 +0100)]
drivers: media: imx477: Set horizontal binning when disabling the scaler
The horizontal scaler has been disabled but actually the sensor is not
binning horizontally, resulting in images that are stretched 2x
horizontally (missing the right half of the field of view completely).
Therefore we must additionally set the horizontal binning mode. There
is only marginal change in output quality and noise levels.
Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
Fixes:
f075893e9b0e ("drivers: media: imx477: Disable the scaler")
Jonathan Bell [Wed, 20 Sep 2023 12:04:54 +0000 (13:04 +0100)]
arm: dt: add dtparams for PCIe reset timing override
The Pi 5 variant gets two parameters so that the CM4-compatible
name will also work on Pi 5.
Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
Jonathan Bell [Wed, 20 Sep 2023 12:01:11 +0000 (13:01 +0100)]
drivers: pci: brcmstb: optionally extend Tperst_clk time during link-up
The RC has a feature that allows for manual control over the deassertion
of the PERST# output pin, which allows the time between refclk active
and reset deassert at the EP to be increased.
Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
Phil Elwell [Wed, 1 Nov 2023 10:27:28 +0000 (10:27 +0000)]
dts: bcm2712-rpi-5-b: Set enable-mps-rcb for RP1
It is safe to set the MPS_RCB bit for RP1, but not necessarily for other
devices, so add the new enabling property to pcie2 on Pi 5.
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
Phil Elwell [Wed, 1 Nov 2023 10:13:29 +0000 (10:13 +0000)]
PCI: brcmstb: Change RCB_{MPS,64B}_MODE bits
Upstream commit [1] unconditionally sets the RCB_MPS and RCB_64B bits
that govern where packets are split. We think this is potentially
harmful, particularly on CM4 and Pi 5 where potentially any PCIe devices
could be attached.
Make RCB_MPS conditional on a DT property and never set RCB_64B.
[1] commit
602fb860945f ("PCI: brcmstb: Set RCB_{MPS,64B}_MODE bits")
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
Jonathan Bell [Wed, 20 Sep 2023 09:04:15 +0000 (10:04 +0100)]
dt-bindings: PCI: brcmstb: add optional property - "brcm,tperst-clk-ms"
This property can be used to delay deassertion of external fundamental
reset, which may be useful for endpoints that require an extended time for
internal setup to complete.
Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
Naushir Patuck [Thu, 26 Oct 2023 07:55:24 +0000 (08:55 +0100)]
drivers: media: pisp_be: Add back V4L2_PIX_FMT_RPI_BE format
Add the opaque V4L2_PIX_FMT_RPI_BE format back to the format list as it
is needed for the verification test suite. Also set the default format
to YUV420 non-multiplanar.
Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
Dave Stevenson [Mon, 23 Oct 2023 13:10:15 +0000 (14:10 +0100)]
dt: Add drm_fbN_vc4 overrides for Pi0-4
Follows up '
61b138adaead ("dt: Add overrides for drm framebuffer
allocations on Pi5")' with an equivalent for Pi0-4.
These will have no effect on most normal systems, but drm_fb0_vc4
will stop SPI displays jumping in and claiming /dev/fb0.
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
Naushir Patuck [Mon, 23 Oct 2023 09:03:03 +0000 (10:03 +0100)]
drivers: media: imx477: Disable the scaler
The horizontal scaler was enabled for the 2028x1520 and 2028x1080 modes,
with a scale factor of 1. It caused a single column of bad pixels on the
right edge of the image. Since scaling is not needed for these modes,
disable it entirely.
Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
Dave Stevenson [Fri, 20 Oct 2023 16:12:09 +0000 (17:12 +0100)]
dt: Switch bcm2712 firmware-kms node to using the 2712 compatible
With the new compatible to handle the interrupts correctly, switch
the base dt to use it.
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
Dave Stevenson [Fri, 20 Oct 2023 16:09:54 +0000 (17:09 +0100)]
drm/vc4_fkms: Fix up interrupt handler for both 2835/2711 and 2712
2712 has switched from using the SMI peripheral to another interrupt
source for the vsync interrupt, so handle both sources cleanly.
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
Dave Stevenson [Fri, 20 Oct 2023 14:21:34 +0000 (15:21 +0100)]
Revert "vc4/fkms: Remove use of SMI peripheral"
This reverts commit
3fb20da9f3bff93f20b1a1fe2c950c6c8f4d1e1e.
Phil Elwell [Fri, 20 Oct 2023 16:15:25 +0000 (17:15 +0100)]
dts: bcm2712: Add the krnbt parameter
Add a Pi 5 implementation of the krnbt parameter, for symmetry and
for tinkering purposes.
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
Andrew Scheller [Thu, 19 Oct 2023 13:13:36 +0000 (14:13 +0100)]
Typo in overlays README
touchscreen-size-y for rpi-ft5406 defaults to 480, not 600
Dave Stevenson [Thu, 19 Oct 2023 09:29:20 +0000 (10:29 +0100)]
dt: Alter alias names from _ to - for drm_fbN_* overrides
Fixes:
61b138adaead ("dt: Add overrides for drm framebuffer allocations on Pi5")
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
Dave Stevenson [Thu, 19 Oct 2023 09:32:04 +0000 (10:32 +0100)]
drm/fb_helper: Change query for FB designation from drm_fb to drm-fb
Fixes:
1216ea56c2e3 ("drm/fb-helper: Look up preferred fbdev node number from DT")
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
Dave Stevenson [Thu, 19 Oct 2023 09:28:43 +0000 (10:28 +0100)]
dt: Alter alias names from _ to - for drm_dsiN
Fixes:
7ec42740a45b ("dt: Add DSI1 and DSI2 aliases to 2712")
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
Dave Stevenson [Thu, 19 Oct 2023 09:34:58 +0000 (10:34 +0100)]
drm/connector: Change DRM card alias from underscore to hyphen
Apparently aliases are only allowed lower case and hyphens,
so swap the use of underscore to hyphen.
Fixes:
3aa1f2477545 ("drm: Look for an alias for the displays to use as the DRM device name")
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
Phil Elwell [Thu, 19 Oct 2023 08:17:25 +0000 (09:17 +0100)]
overlays: Add Pi 5 version of dwc2
Most bus masters on Pi 5 have access to at least the lower 4GB, but
the old DWC OTG controller is still restricted to the first 1GB.
Create a Pi 5-specific version of the overlay including a fragment
that ensures the swiotlb bounce buffers are allocated in that
area.
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
Dave Stevenson [Wed, 11 Oct 2023 10:03:51 +0000 (11:03 +0100)]
dt: Add overrides for drm framebuffer allocations on Pi5
Adds dtparam overrides to the base Pi5 DT such that vc4,
DSI0, DSI1, or DPI can be requested to be /dev/fb[012].
No override is specified by default, so the order will be
based on probe order (aka semi-random). Any device that
doesn't have an override specified will be placed above
all specified overrides. Having an fb1 or fb2 override but
no fb0 one will result in no console via fbcon.
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
Dave Stevenson [Mon, 9 Oct 2023 15:34:36 +0000 (16:34 +0100)]
drm/fb-helper: Look up preferred fbdev node number from DT
For situations where there are multiple DRM cards in a system,
add a query of DT for "drm_fb" designations for cards to set
their preferred /dev/fbN designation.
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
Dave Stevenson [Mon, 9 Oct 2023 15:32:45 +0000 (16:32 +0100)]
fbdev: Allow client to request a particular /dev/fbN node
Add a flag custom_fb_num to denote that the client has
requested a specific fbdev node number via node.
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
Phil Elwell [Tue, 17 Oct 2023 16:28:11 +0000 (17:28 +0100)]
dts: bcm2712: Use the new model name
"Model B" is no more - "Raspberry Pi 5" is the official name.
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
Naushir Patuck [Tue, 17 Oct 2023 08:35:44 +0000 (09:35 +0100)]
drivers: media: rp1_cfe: Fix link validate test for pixel format
Now that we have removed unique PISP media bus codes, the cfe format
table has multiple entries with the same media bus code for 16-bit
formats. The test in cfe_video_link_validate() did not account for this.
Fix it by testing the media bus code and the V4L2 pixelformat 4cc
together.
As a drive-by, ensure we have a valid CSI2 datatype id when programming
the hardware block.
Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
Dave Stevenson [Mon, 16 Oct 2023 11:13:38 +0000 (12:13 +0100)]
drm/vc4: Correct address offset for planes with src_[xy] offsets
11cf37e741b4 switched to using drm_fb_dma_get_gem_addr instead of
drm_fb_dma_get_gem_obj and adding fb->offset[].
However the tiled formats need to compute the offset in a more
involved manner than drm_fb_dma_get_gem_addr applies, and we
were ending up with the offset for src_[xy] being applied twice.
Switch back to using drm_fb_dma_get_gem_obj and fully computing
the offsets ourselves.
Fixes:
11cf37e741b4 ("drm/vc4: Move the buffer offset out of the vc4_plane_state")
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
Phil Elwell [Sat, 14 Oct 2023 13:57:49 +0000 (14:57 +0100)]
vc_mem: Add the DMA memcpy support from bcm2708_fb
bcm2708_fb is disabled by the vc4-kms-v3d overlay, which means that the
DMA memcpy support it provides is not available to allow vclog to read
the VC logs from the top 16MB on Pi 2 and Pi 3. Add the code to the
vc_mem driver, which will still be enabled.
It ought to be possible to do a proper DMA_MEM_TO_MEM copy via the
generic DMA customer API, but that can be a later step.
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
Phil Elwell [Mon, 16 Oct 2023 08:06:25 +0000 (09:06 +0100)]
dts: bcm2712: Set default I2C baudrates to 100kHz
The RP1 I2C interfaces were being left with their default clock rates,
apparently 400kHz.
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
Janis Streib [Sun, 15 Oct 2023 19:08:40 +0000 (21:08 +0200)]
overlays: mcp23017: allow specification of the i2c bus
Analogous to i2c-rtc-overlay.dts
See: https://github.com/raspberrypi/linux/pull/5650
Dom Cobley [Thu, 12 Oct 2023 14:52:38 +0000 (15:52 +0100)]
Revert "bcm2708_fb: Hack out dma support"
This reverts commit
d60956f30586ced37e2152f2ba338f547e6c64f7.
Dom Cobley [Thu, 12 Oct 2023 14:52:24 +0000 (15:52 +0100)]
Revert "bcm2708_fb: Fix more build warnings"
This reverts commit
7b11991e91e65ebeb315986fae05d363663d24c4.
Nick Hollinghurst [Wed, 11 Oct 2023 14:14:59 +0000 (15:14 +0100)]
input: touchscreen: edt-ft5x06: Suppress bogus data on startup
When polled without the use of IRQ, FT5x06 registers may return
undefined initial data, causing unwanted touches or event spamming.
A simple way to filter this out is to suppress touches until the
TD_STATUS register changes for the first time.
Increase the delay before first polling to 300ms, to avoid
transient I2C read flakiness that seems to occur after reset.
Signed-off-by: Nick Hollinghurst <nick.hollinghurst@raspberrypi.com>
Phil Elwell [Fri, 6 Oct 2023 13:30:50 +0000 (14:30 +0100)]
configs: Enable more sound devices
See: https://github.com/raspberrypi/linux/issues/4179
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
Dave Stevenson [Wed, 11 Oct 2023 14:05:38 +0000 (15:05 +0100)]
vc04_services: bcm2835-codec: Correct alignment requirements for YUYV
The firmware wants the YUYV format stride alignment to be to a multiple
of 32pixels / 64 bytes. The kernel driver was configuring it to a multiple
of 16 pixels / 32 bytes, which then failed when it tried starting to
stream.
Correct the alignment requirements.
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
Naushir Patuck [Tue, 10 Oct 2023 11:41:15 +0000 (12:41 +0100)]
drivers: media: rp1_cfe: Remove PISP specific MBUS formats
Remove the MEDIA_BUS_FMT_PISP* format codcs entirely. For the image
pad formats, use the 16-bit Bayer format mbus codes instead. For the
config and stats pad formats, use MEDIA_BUS_FMT_FIXED.
Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
John Cox [Mon, 2 Oct 2023 14:15:13 +0000 (15:15 +0100)]
dts/bcm2712: Add iommu to rpivid
Add iommu to rpivid so it can cope with scatter/gather
Signed-off-by: John Cox <jc@kynesim.co.uk>
John Cox [Mon, 2 Oct 2023 14:12:52 +0000 (15:12 +0100)]
media/rpivid: Allow use of iommu in rpivid
In order to use iommu on hevc set dma mask_and_coherent in probe.
I am assured dma_set_mask_and_coherent is benign on Pi4 (which has
no iommu) and it seems to be so in practice.
Also adds a bit of debug to make internal buffer allocation failure
easier to spot in future
Signed-off-by: John Cox <jc@kynesim.co.uk>
Dave Stevenson [Wed, 11 Oct 2023 10:12:41 +0000 (11:12 +0100)]
media: i2c: ov9282: Read chip ID via 2 reads
Vision Components have made an OV9281 module which blocks reading
back the majority of registers to comply with NDAs, and in doing
so doesn't allow auto-increment register reading as used when
reading the chip ID.
Use two reads and manually combine the results.
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
Phil Elwell [Fri, 6 Oct 2023 16:35:43 +0000 (17:35 +0100)]
Revert "pinctrl-bcm2835: Set base to 0 give expected gpio numbering"
This reverts commit
2afa8798ada2b03fd6ae3ef5c5dfcb39a5877ad8.
Phil Elwell [Fri, 6 Oct 2023 15:30:35 +0000 (16:30 +0100)]
gpio: brcmstb: Use dynamic GPIO base numbers
Forcing a gpiochip to have a fixed base number now leads to a warning
message. Remove the need to do so by calculating hwirq numbers based
on bank numbers.
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
Fixes:
3b0213d56eb7 ("gpio: Add GPIO support for Broadcom STB SoCs")
Phil Elwell [Fri, 6 Oct 2023 07:59:42 +0000 (08:59 +0100)]
config: Regenerate defconfigs
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
Dom Cobley [Tue, 19 Sep 2023 14:56:20 +0000 (15:56 +0100)]
config: 2712: Update defconfig
Phil Elwell [Thu, 5 Oct 2023 09:06:18 +0000 (10:06 +0100)]
dts: 2712: Update for device tree
dtoverlays: Fix up edt5406 entries to match with vc4-kms-dsi-7inch
vc4-kms-dsi-7inch expects the touch fragment to be named ts_i2c_frag,
but edt5406 didn't do this.
dt: Add DSI1 and DSI2 aliases to 2712
In order to keep the DRM names consistent as DSI-1 and DSI-2, add
aliases to the Pi5 DT.
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
Phil Elwell [Fri, 29 Sep 2023 11:21:29 +0000 (12:21 +0100)]
README: Show rpi-6.5.y build status
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
Phil Elwell [Thu, 28 Sep 2023 14:45:05 +0000 (15:45 +0100)]
.github/workflows: Add a bcm2712 build configuration
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
Dom Cobley [Wed, 4 Oct 2023 15:02:39 +0000 (16:02 +0100)]
vc4/drm: Remove the clear of SCALER_DISPBKGND_FILL
Since "drm/vc4: hvs: Support BCM2712 HVS" booting Pi4
with dual 4kp30 displays connected fails with:
vc4-drm gpu: [drm] *ERROR* [CRTC:107:pixelvalve-4] flip_done timed out
It has been tracked down to the referenced commit adding a
path to clear the SCALER_DISPBKGND_FILL when not required.
Dual 4kp30 works with a core clock of 297MHz when background fill
is enabled, but requires a higher value with it disabled.
320MHz still fails, while 330MHz seems okay.
Lets always enable background fill for Pi0-4.
Fixes:
e84da235223d ("drm/vc4: hvs: Support BCM2712 HVS")
Signed-off-by: Dom Cobley <popcornmix@gmail.com>
Dave Stevenson [Thu, 28 Sep 2023 17:27:09 +0000 (18:27 +0100)]
drm: Look for an alias for the displays to use as the DRM device name
Allow DT aliases of eg DSI2 to force make DRM allocate the
display with the requested name.
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
Naushir Patuck [Wed, 4 Oct 2023 10:09:10 +0000 (11:09 +0100)]
media: i2c: Move Kconfig entry for IMX477 to the camera sensor section
It was accidentally placed in the audio decoder section.
Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
Naushir Patuck [Wed, 4 Oct 2023 08:39:59 +0000 (09:39 +0100)]
media: rp1: cfe: Fail streaming if FE_CONFIG node is not enabled
When the FE is enabled, ensure that the FE_CONFIG node is enabled.
Otherwise fail cfe_start_streaming() entirely.
Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
Tomi Valkeinen [Mon, 2 Oct 2023 11:38:07 +0000 (14:38 +0300)]
media: rp1: cfe: Fix default meta format's field
Set default meta format's field to V4L2_FIELD_NONE, instead of zeroing
it which indicates V4L2_FIELD_ANY. Metadata doesn't have fields, so NONE
makes sense, and furthermore the default v4l2 link validation will check
for matching fields, or that the sink field is NONE.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Tomi Valkeinen [Fri, 29 Sep 2023 10:29:15 +0000 (13:29 +0300)]
media: rp1: fe: Fix default mbus code
When pisp_fe_pad_set_fmt() is given an mbus code that CFE does not
support, it currently defaults to MEDIA_BUS_FMT_SBGGR10_1X10. This is
not correct, as FE does not support SBGGR10.
Set the default to MEDIA_BUS_FMT_SRGGB16_1X16 instead.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Tomi Valkeinen [Fri, 29 Sep 2023 09:57:23 +0000 (12:57 +0300)]
media: rp1: csi2: Set values for enum csi2_mode
Set hardcoded values for enum csi2_mode, as the values will be
programmed to HW registers.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Tomi Valkeinen [Thu, 28 Sep 2023 14:04:07 +0000 (17:04 +0300)]
media: rp1: cfe: Drop unused field
Drop 'sensor_embedded_data' field, as it is unused.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Tomi Valkeinen [Thu, 21 Sep 2023 15:18:53 +0000 (18:18 +0300)]
media: rp1: csi2: Track CSI-2 errors
Track the errors from the CSI-2 receiver: overflows and discards. These
are recorded in a table which can be read by the userspace via debugfs.
As tracking the errors may cause much more interrupt load, the tracking
needs to be enabled with a module parameter.
Note that the recording is not perfect: we only record the last
discarded DT for each discard type, instead of recording all of them.
This means that e.g. if the device is discarding two unmatched DTs, the
debugfs file only shows the last one recorded. Recording all of them
would need a more sophisticated recording system to avoid the need of a
very large table, or dynamic allocation.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Tomi Valkeinen [Wed, 4 Oct 2023 07:19:47 +0000 (10:19 +0300)]
media: rp1: cfe: Add verbose debug module parameter
Expose the verbose debug flag as a module parameter.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Tomi Valkeinen [Fri, 22 Sep 2023 09:39:33 +0000 (12:39 +0300)]
media: rp1: Add back reg write debug prints
Add back debug prints in csi2 and pisp_fe reg_write() functions, but use
the 'irq' variants to avoid spamming in normal situation.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Tomi Valkeinen [Wed, 4 Oct 2023 07:12:37 +0000 (10:12 +0300)]
media: rp1: cfe: Rename xxx_dbg_irq() to xxx_dbg_verbose()
Rename the xxx_dbg_irq() macros to xxx_dbg_verbose(), as they can be
used to verbose debugs outside irq context too.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Tomi Valkeinen [Fri, 22 Sep 2023 09:41:35 +0000 (12:41 +0300)]
media: rp1: cfe: Fix verbose debug print
The debug print in cfe_schedule_next_csi2_job() is printed every frame,
and should thus use cfe_dbg_irq() to avoid spamming, rather than cfe_dbg().
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Tomi Valkeinen [Thu, 21 Sep 2023 13:03:07 +0000 (16:03 +0300)]
media: rp1: fe: Use ~0, not -1, when working with unsigned values
Use ~0, not -1, when working with unsigned values (-1 is not unsigned).
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Tomi Valkeinen [Thu, 28 Sep 2023 07:42:22 +0000 (10:42 +0300)]
media: rp1: csi2: Fix missing reg writes
The driver has two places where it writes a register based on a
condition, and when that condition is false, the driver presumes that
the register has the reset value. This is not a good idea, so fix those
places to always write the register.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Tomi Valkeinen [Wed, 27 Sep 2023 13:00:39 +0000 (16:00 +0300)]
media: rp1: cfe: Fix width & height in cfe_start_channel()
The logic for handling width & height in cfe_start_channel() is somewhat
odd and, afaics, broken. The code reads:
bool start_fe = is_fe_enabled(cfe) &&
test_all_nodes(cfe, NODE_ENABLED, NODE_STREAMING);
if (start_fe || is_image_output_node(node)) {
width = node->fmt.fmt.pix.width;
height = node->fmt.fmt.pix.height;
}
cfe_start_channel() is called for all video nodes that will be used. So
this means that if, say, fe_stats is enabled as the last node, start_fe
will be true, and width and height will be taken from fe_stats' node.
The width and height will thus contain garbage, which then gets
programmed to the csi2 registers.
It seems that this often still works fine, though, probably if the width
& height are large enough.
Drop the above code, and instead get the width & height from the csi2
subdev's sink pad for the csi2 channel that is used. For metadata the
width & height will be 0 as before.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Tomi Valkeinen [Thu, 28 Sep 2023 08:33:53 +0000 (11:33 +0300)]
media: rp1: cfe: Fix use of freed memory on errors
cfe_probe_complete() calls cfe_put() on both success and fail code paths.
This works for the success path, but causes the cfe_device struct to be
freed, even if it will be used later in the teardown code.
Fix this by making the ref handling a bit saner: Let the video nodes
have the refs as they do now, but also keep a ref in the "main" driver,
released only at cfe_remove() time. This way the driver does not depend
on the video nodes keeping the refs.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Tomi Valkeinen [Mon, 11 Sep 2023 09:17:25 +0000 (12:17 +0300)]
media: i2c: imx477: Fix locking in imx477_init_controls()
The driver does not lock the imx477 mutex when calling
imx477_set_framing_limits(), leading to:
WARNING: CPU: 3 PID: 426 at drivers/media/v4l2-core/v4l2-ctrls-api.c:934 __v4l2_ctrl_modify_range+0x1a0/0x210 [
videodev]
Fix this by taking the lock.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Dave Stevenson [Fri, 28 Jul 2023 17:10:53 +0000 (18:10 +0100)]
drm/panel: waveshare: Fix up timings for 10.1" panel
The 10.1" panel doesn't work with the timings defined. vc4
will always have been fixing up the timing due to the limited
integer divider, so compute the fixed up mode and use it
directly.
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
Dave Stevenson [Fri, 28 Jul 2023 16:40:27 +0000 (17:40 +0100)]
drm/panel: simple: Alter the timing for the Pi 7" DSI display
vc4 has always fixed up the timing, so the values defined have
never actually appeared on the wire.
The display appears to want a slightly longer HFP, so extend
the timings and recompute the clock to give the same frame rate.
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
Dave Stevenson [Thu, 31 Aug 2023 10:45:38 +0000 (11:45 +0100)]
drm/vc4: Assign LBM memory during atomic_flush.
Avoid double buffering LBM allocations by making the
allocation a single alloc per crtc at atomic_flush.
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
Dom Cobley [Mon, 17 Jul 2023 16:45:32 +0000 (17:45 +0100)]
drm/vc4: kms: Avoid setting core and disp clocks for hdmi modes
On 2712, the firmware always runs these clock at a speed sufficient
for dual 4kp60.
The requests here prevent the gpu from going into its lowest voltage
mode, so just skip the clock requests.
With this applied the idle voltage on my pi 5 reduces from 0.7424V
to 0.72V.
Signed-off-by: Dom Cobley <popcornmix@gmail.com>
Maxime Ripard [Fri, 14 Apr 2023 11:43:32 +0000 (13:43 +0200)]
drm/vc4: tests: Introduce a test for LBM buffer size
The BCM2712 comes with a different LBM size computation than the
previous generations, so let's add the few examples provided as kunit
tests to make sure we always satisfy those requirements.
Signed-off-by: Maxime Ripard <maxime@cerno.tech>