From f5919b65d4c671fd5083838c7a445f319f9a13c8 Mon Sep 17 00:00:00 2001 From: Stijn Tintel Date: Sat, 10 Nov 2018 13:03:18 +0200 Subject: brcm2708: add kernel 4.14 support Patch generation process: - rebase rpi/rpi-4.14.y on v4.14.89 from linux-stable - git format-patch v4.14.89 Patches skipped during rebase: - lan78xx: Read MAC address from DT if present - lan78xx: Enable LEDs and auto-negotiation - Revert "softirq: Let ksoftirqd do its job" - sc16is7xx: Fix for multi-channel stall - lan78xx: Ignore DT MAC address if already valid - lan78xx: Simple patch to prevent some crashes - tcp_write_queue_purge clears all the SKBs in the write queue - Revert "lan78xx: Simple patch to prevent some crashes" - lan78xx: Connect phy early - Arm: mm: ftrace: Only set text back to ro after kernel has been marked ro - Revert "Revert "softirq: Let ksoftirqd do its job"" - ASoC: cs4265: SOC_SINGLE register value error fix - Revert "ASoC: cs4265: SOC_SINGLE register value error fix" - Revert "net: pskb_trim_rcsum() and CHECKSUM_COMPLETE are friends" - Revert "Revert "net: pskb_trim_rcsum() and CHECKSUM_COMPLETE are friends"" Patches dropped after rebase: - net: Add non-mainline source for rtl8192cu wlan - net: Fix rtl8192cu build errors on other platforms - brcm: adds support for BCM43341 wifi - brcmfmac: Mute expected startup 'errors' - ARM64: Fix build break for RTL8187/RTL8192CU wifi - ARM64: Enable RTL8187/RTL8192CU wifi in build config - This is the driver for Sony CXD2880 DVB-T2/T tuner + demodulator - brcmfmac: add CLM download support - brcmfmac: request_firmware_direct is quieter - Sets the BCDC priority to constant 0 - brcmfmac: Disable ARP offloading when promiscuous - brcmfmac: Avoid possible out-of-bounds read - brcmfmac: Delete redundant length check - net: rtl8192cu: Normalize indentation - net: rtl8192cu: Fix implicit fallthrough warnings - Revert "Sets the BCDC priority to constant 0" - media: cxd2880: Bump to match 4.18.y version - media: cxd2880-spi: Bump to match 4.18.y version - Revert "mm: alloc_contig: re-allow CMA to compact FS pages" - Revert "Revert "mm: alloc_contig: re-allow CMA to compact FS pages"" - cxd2880: CXD2880_SPI_DRV should select DVB_CXD2880 with MEDIA_SUBDRV_AUTOSELECT - 950-0421-HID-hid-bigbenff-driver-for-BigBen-Interactive-PS3OF.patch - 950-0453-Add-hid-bigbenff-to-list-of-have_special_driver-for-.patch Make I2C built-in instead of modular as in upstream defconfig; also the easiest way to get MFD_ARIZONA enabled, which is required by kmod-sound-soc-rpi-cirrus. Add missing compatible strings from 4.9/960-add-rasbperrypi-compatible.patch, using upstream names for compute modules. Add extra patch to enable the LEDs on lan78xx. Compile-tested: bcm2708, bcm2709, bcm2710 (with CONFIG_ALL_KMODS=y) Runtime-tested: bcm2708, bcm2710 Signed-off-by: Stijn Tintel --- ...0-0346-drm-vc4-Move-plane-state-to-header.patch | 157 +++++++++++++++++++++ 1 file changed, 157 insertions(+) create mode 100644 target/linux/brcm2708/patches-4.14/950-0346-drm-vc4-Move-plane-state-to-header.patch (limited to 'target/linux/brcm2708/patches-4.14/950-0346-drm-vc4-Move-plane-state-to-header.patch') diff --git a/target/linux/brcm2708/patches-4.14/950-0346-drm-vc4-Move-plane-state-to-header.patch b/target/linux/brcm2708/patches-4.14/950-0346-drm-vc4-Move-plane-state-to-header.patch new file mode 100644 index 0000000000..9ca1eb212f --- /dev/null +++ b/target/linux/brcm2708/patches-4.14/950-0346-drm-vc4-Move-plane-state-to-header.patch @@ -0,0 +1,157 @@ +From 3747cef056a2b6def75521dc2fd9157b009715e2 Mon Sep 17 00:00:00 2001 +From: Stefan Schake +Date: Fri, 9 Mar 2018 01:53:36 +0100 +Subject: [PATCH 346/454] drm/vc4: Move plane state to header + +commit 823646983b5a31732ae82ffa60b74555857eb8a0 upstream. + +We need to reference it from the CRTC to make a decision for enabling +background color fill. + +Signed-off-by: Stefan Schake +Signed-off-by: Eric Anholt +Reviewed-by: Eric Anholt +Link: https://patchwork.freedesktop.org/patch/msgid/1520556817-97297-4-git-send-email-stschake@gmail.com +--- + drivers/gpu/drm/vc4/vc4_drv.h | 60 +++++++++++++++++++++++++++++++++ + drivers/gpu/drm/vc4/vc4_plane.c | 60 --------------------------------- + 2 files changed, 60 insertions(+), 60 deletions(-) + +--- a/drivers/gpu/drm/vc4/vc4_drv.h ++++ b/drivers/gpu/drm/vc4/vc4_drv.h +@@ -278,6 +278,66 @@ to_vc4_plane(struct drm_plane *plane) + return (struct vc4_plane *)plane; + } + ++enum vc4_scaling_mode { ++ VC4_SCALING_NONE, ++ VC4_SCALING_TPZ, ++ VC4_SCALING_PPF, ++}; ++ ++struct vc4_plane_state { ++ struct drm_plane_state base; ++ /* System memory copy of the display list for this element, computed ++ * at atomic_check time. ++ */ ++ u32 *dlist; ++ u32 dlist_size; /* Number of dwords allocated for the display list */ ++ u32 dlist_count; /* Number of used dwords in the display list. */ ++ ++ /* Offset in the dlist to various words, for pageflip or ++ * cursor updates. ++ */ ++ u32 pos0_offset; ++ u32 pos2_offset; ++ u32 ptr0_offset; ++ ++ /* Offset where the plane's dlist was last stored in the ++ * hardware at vc4_crtc_atomic_flush() time. ++ */ ++ u32 __iomem *hw_dlist; ++ ++ /* Clipped coordinates of the plane on the display. */ ++ int crtc_x, crtc_y, crtc_w, crtc_h; ++ /* Clipped area being scanned from in the FB. */ ++ u32 src_x, src_y; ++ ++ u32 src_w[2], src_h[2]; ++ ++ /* Scaling selection for the RGB/Y plane and the Cb/Cr planes. */ ++ enum vc4_scaling_mode x_scaling[2], y_scaling[2]; ++ bool is_unity; ++ bool is_yuv; ++ ++ /* Offset to start scanning out from the start of the plane's ++ * BO. ++ */ ++ u32 offsets[3]; ++ ++ /* Our allocation in LBM for temporary storage during scaling. */ ++ struct drm_mm_node lbm; ++ ++ /* Set when the plane has per-pixel alpha content or does not cover ++ * the entire screen. This is a hint to the CRTC that it might need ++ * to enable background color fill. ++ */ ++ bool needs_bg_fill; ++}; ++ ++static inline struct vc4_plane_state * ++to_vc4_plane_state(struct drm_plane_state *state) ++{ ++ return (struct vc4_plane_state *)state; ++} ++ + enum vc4_encoder_type { + VC4_ENCODER_TYPE_NONE, + VC4_ENCODER_TYPE_HDMI, +--- a/drivers/gpu/drm/vc4/vc4_plane.c ++++ b/drivers/gpu/drm/vc4/vc4_plane.c +@@ -27,66 +27,6 @@ + #include "vc4_drv.h" + #include "vc4_regs.h" + +-enum vc4_scaling_mode { +- VC4_SCALING_NONE, +- VC4_SCALING_TPZ, +- VC4_SCALING_PPF, +-}; +- +-struct vc4_plane_state { +- struct drm_plane_state base; +- /* System memory copy of the display list for this element, computed +- * at atomic_check time. +- */ +- u32 *dlist; +- u32 dlist_size; /* Number of dwords allocated for the display list */ +- u32 dlist_count; /* Number of used dwords in the display list. */ +- +- /* Offset in the dlist to various words, for pageflip or +- * cursor updates. +- */ +- u32 pos0_offset; +- u32 pos2_offset; +- u32 ptr0_offset; +- +- /* Offset where the plane's dlist was last stored in the +- * hardware at vc4_crtc_atomic_flush() time. +- */ +- u32 __iomem *hw_dlist; +- +- /* Clipped coordinates of the plane on the display. */ +- int crtc_x, crtc_y, crtc_w, crtc_h; +- /* Clipped area being scanned from in the FB. */ +- u32 src_x, src_y; +- +- u32 src_w[2], src_h[2]; +- +- /* Scaling selection for the RGB/Y plane and the Cb/Cr planes. */ +- enum vc4_scaling_mode x_scaling[2], y_scaling[2]; +- bool is_unity; +- bool is_yuv; +- +- /* Offset to start scanning out from the start of the plane's +- * BO. +- */ +- u32 offsets[3]; +- +- /* Our allocation in LBM for temporary storage during scaling. */ +- struct drm_mm_node lbm; +- +- /* Set when the plane has per-pixel alpha content or does not cover +- * the entire screen. This is a hint to the CRTC that it might need +- * to enable background color fill. +- */ +- bool needs_bg_fill; +-}; +- +-static inline struct vc4_plane_state * +-to_vc4_plane_state(struct drm_plane_state *state) +-{ +- return (struct vc4_plane_state *)state; +-} +- + static const struct hvs_format { + u32 drm; /* DRM_FORMAT_* */ + u32 hvs; /* HVS_FORMAT_* */ -- cgit v1.2.3