-
Notifications
You must be signed in to change notification settings - Fork 19.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
b7305e2
commit 23d466f
Showing
75 changed files
with
157 additions
and
198 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
LINUX_VERSION-6.6 = .64 | ||
LINUX_KERNEL_HASH-6.6.64 = 065fd93fa6cb422f650fb563f15d3e0107c85009f766405993d795fd39796ab1 | ||
LINUX_VERSION-6.6 = .66 | ||
LINUX_KERNEL_HASH-6.6.66 = 9d757937c4661c2f512c62641b74ef74eff9bb13dc5dbcbaaa108c21152f1e52 |
41 changes: 0 additions & 41 deletions
41
.../linux/bcm27xx/patches-6.6/950-0029-vc4_hdmi-Avoid-log-spam-for-audio-start-failure.patch
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -19,7 +19,7 @@ Signed-off-by: Dave Stevenson <[email protected]> | |
|
||
--- a/drivers/gpu/drm/vc4/vc4_hvs.c | ||
+++ b/drivers/gpu/drm/vc4/vc4_hvs.c | ||
@@ -1368,6 +1368,17 @@ static int vc4_hvs_bind(struct device *d | ||
@@ -1379,6 +1379,17 @@ static int vc4_hvs_bind(struct device *d | ||
dispctrl |= VC4_SET_FIELD(2, SCALER_DISPCTRL_PANIC1); | ||
dispctrl |= VC4_SET_FIELD(2, SCALER_DISPCTRL_PANIC2); | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -36,7 +36,7 @@ Signed-off-by: Phil Elwell <[email protected]> | |
- reg | ||
--- a/drivers/tty/serial/amba-pl011.c | ||
+++ b/drivers/tty/serial/amba-pl011.c | ||
@@ -2808,6 +2808,11 @@ static int pl011_probe(struct amba_devic | ||
@@ -2815,6 +2815,11 @@ static int pl011_probe(struct amba_devic | ||
if (IS_ERR(uap->clk)) | ||
return PTR_ERR(uap->clk); | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -344,7 +344,7 @@ Signed-off-by: Phil Elwell <[email protected]> | |
} | ||
--- a/drivers/mmc/core/quirks.h | ||
+++ b/drivers/mmc/core/quirks.h | ||
@@ -134,6 +134,14 @@ static const struct mmc_fixup __maybe_un | ||
@@ -143,6 +143,14 @@ static const struct mmc_fixup __maybe_un | ||
MMC_FIXUP(CID_NAME_ANY, CID_MANFID_SANDISK_SD, 0x5344, add_quirk_sd, | ||
MMC_QUIRK_BROKEN_SD_DISCARD), | ||
|
||
|
@@ -2013,10 +2013,10 @@ Signed-off-by: Phil Elwell <[email protected]> | |
sdhci_dumpregs(host); | ||
--- a/include/linux/mmc/card.h | ||
+++ b/include/linux/mmc/card.h | ||
@@ -296,6 +296,7 @@ struct mmc_card { | ||
#define MMC_QUIRK_BROKEN_SD_DISCARD (1<<14) /* Disable broken SD discard support */ | ||
@@ -297,6 +297,7 @@ struct mmc_card { | ||
#define MMC_QUIRK_BROKEN_SD_CACHE (1<<15) /* Disable broken SD cache support */ | ||
#define MMC_QUIRK_BROKEN_CACHE_FLUSH (1<<16) /* Don't flush cache until the write has occurred */ | ||
#define MMC_QUIRK_BROKEN_SD_POWEROFF_NOTIFY (1<<17) /* Disable broken SD poweroff notify support */ | ||
+#define MMC_QUIRK_ERASE_BROKEN (1<<31) /* Skip erase */ | ||
|
||
bool written_flag; /* Indicates eMMC has been written since power on */ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -17583,7 +17583,7 @@ Signed-off-by: Phil Elwell <[email protected]> | |
* For devices with more than one control interface, we assume the | ||
--- a/sound/usb/quirks.c | ||
+++ b/sound/usb/quirks.c | ||
@@ -2212,6 +2212,8 @@ static const struct usb_audio_quirk_flag | ||
@@ -2233,6 +2233,8 @@ static const struct usb_audio_quirk_flag | ||
QUIRK_FLAG_ALIGN_TRANSFER), | ||
DEVICE_FLG(0x534d, 0x2109, /* MacroSilicon MS2109 */ | ||
QUIRK_FLAG_ALIGN_TRANSFER), | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -125,7 +125,7 @@ Signed-off-by: Jonathan Bell <[email protected]> | |
* non-error returns are a promise to giveback() the urb later | ||
* we drop ownership so next owner (or urb unlink) can get it | ||
*/ | ||
@@ -5328,6 +5431,7 @@ static const struct hc_driver xhci_hc_dr | ||
@@ -5347,6 +5450,7 @@ static const struct hc_driver xhci_hc_dr | ||
.endpoint_reset = xhci_endpoint_reset, | ||
.check_bandwidth = xhci_check_bandwidth, | ||
.reset_bandwidth = xhci_reset_bandwidth, | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -23,7 +23,7 @@ Signed-off-by: Jonathan Bell <[email protected]> | |
|
||
--- a/drivers/hid/hid-ids.h | ||
+++ b/drivers/hid/hid-ids.h | ||
@@ -242,6 +242,9 @@ | ||
@@ -243,6 +243,9 @@ | ||
#define USB_VENDOR_ID_BAANTO 0x2453 | ||
#define USB_DEVICE_ID_BAANTO_MT_190W2 0x0100 | ||
|
||
|
@@ -33,7 +33,7 @@ Signed-off-by: Jonathan Bell <[email protected]> | |
#define USB_VENDOR_ID_BELKIN 0x050d | ||
#define USB_DEVICE_ID_FLIP_KVM 0x3201 | ||
|
||
@@ -1405,6 +1408,9 @@ | ||
@@ -1406,6 +1409,9 @@ | ||
#define USB_VENDOR_ID_XIAOMI 0x2717 | ||
#define USB_DEVICE_ID_MI_SILENT_MOUSE 0x5014 | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -47,7 +47,7 @@ Signed-off-by: Dave Stevenson <[email protected]> | |
static const struct display_timing rocktech_rk070er9427_timing = { | ||
.pixelclock = { 26400000, 33300000, 46800000 }, | ||
.hactive = { 800, 800, 800 }, | ||
@@ -4427,6 +4452,9 @@ static const struct of_device_id platfor | ||
@@ -4452,6 +4477,9 @@ static const struct of_device_id platfor | ||
.compatible = "rocktech,rk043fn48h", | ||
.data = &rocktech_rk043fn48h, | ||
}, { | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -46,7 +46,7 @@ Acked-by: Maxime Ripard <[email protected]> | |
static const struct drm_display_mode giantplus_gpg482739qs5_mode = { | ||
.clock = 9000, | ||
.hdisplay = 480, | ||
@@ -4302,6 +4328,9 @@ static const struct of_device_id platfor | ||
@@ -4327,6 +4353,9 @@ static const struct of_device_id platfor | ||
.compatible = "friendlyarm,hd702e", | ||
.data = &friendlyarm_hd702e, | ||
}, { | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -48,7 +48,7 @@ Signed-off-by: David Plowman <[email protected]> | |
/* | ||
* A cached value of the page's pageblock's migratetype, used when the page is | ||
* put on a pcplist. Used to avoid the pageblock migratetype lookup when | ||
@@ -2094,12 +2115,13 @@ __rmqueue(struct zone *zone, unsigned in | ||
@@ -2109,12 +2130,13 @@ __rmqueue(struct zone *zone, unsigned in | ||
if (IS_ENABLED(CONFIG_CMA)) { | ||
/* | ||
* Balance movable allocations between regular and CMA areas by | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -165,7 +165,7 @@ Signed-off-by: Phil Elwell <[email protected]> | |
static const struct drm_display_mode innolux_at070tn92_mode = { | ||
.clock = 33333, | ||
.hdisplay = 800, | ||
@@ -4352,6 +4384,9 @@ static const struct of_device_id platfor | ||
@@ -4377,6 +4409,9 @@ static const struct of_device_id platfor | ||
.compatible = "innolux,at043tn24", | ||
.data = &innolux_at043tn24, | ||
}, { | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -20,15 +20,15 @@ Signed-off-by: Phil Elwell <[email protected]> | |
|
||
--- a/net/bluetooth/hci_sync.c | ||
+++ b/net/bluetooth/hci_sync.c | ||
@@ -4865,6 +4865,7 @@ static const struct { | ||
@@ -4872,6 +4872,7 @@ static const struct { | ||
*/ | ||
static int hci_dev_setup_sync(struct hci_dev *hdev) | ||
{ | ||
+ struct fwnode_handle *fwnode = dev_fwnode(hdev->dev.parent); | ||
int ret = 0; | ||
bool invalid_bdaddr; | ||
size_t i; | ||
@@ -4893,7 +4894,8 @@ static int hci_dev_setup_sync(struct hci | ||
@@ -4900,7 +4901,8 @@ static int hci_dev_setup_sync(struct hci | ||
test_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks); | ||
if (!ret) { | ||
if (test_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks) && | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -24,7 +24,7 @@ Signed-off-by: Jonathan Bell <[email protected]> | |
|
||
--- a/drivers/usb/host/xhci-pci.c | ||
+++ b/drivers/usb/host/xhci-pci.c | ||
@@ -493,6 +493,7 @@ static void xhci_pci_quirks(struct devic | ||
@@ -483,6 +483,7 @@ static void xhci_pci_quirks(struct devic | ||
if (pdev->vendor == PCI_VENDOR_ID_VIA && pdev->device == 0x3483) { | ||
xhci->quirks |= XHCI_LPM_SUPPORT; | ||
xhci->quirks |= XHCI_EP_CTX_BROKEN_DCS; | ||
|
@@ -52,9 +52,9 @@ Signed-off-by: Jonathan Bell <[email protected]> | |
addr = xhci_trb_virt_to_dma(new_seg, new_deq); | ||
--- a/drivers/usb/host/xhci.h | ||
+++ b/drivers/usb/host/xhci.h | ||
@@ -1662,6 +1662,9 @@ struct xhci_hcd { | ||
#define XHCI_WRITE_64_HI_LO BIT_ULL(47) | ||
@@ -1663,6 +1663,9 @@ struct xhci_hcd { | ||
#define XHCI_CDNS_SCTX_QUIRK BIT_ULL(48) | ||
#define XHCI_ETRON_HOST BIT_ULL(49) | ||
|
||
+/* Downstream VLI fixes */ | ||
+#define XHCI_AVOID_DQ_ON_LINK BIT_ULL(56) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -22,7 +22,7 @@ Signed-off-by: Jonathan Bell <[email protected]> | |
|
||
--- a/drivers/usb/host/xhci-pci.c | ||
+++ b/drivers/usb/host/xhci-pci.c | ||
@@ -494,6 +494,7 @@ static void xhci_pci_quirks(struct devic | ||
@@ -484,6 +484,7 @@ static void xhci_pci_quirks(struct devic | ||
xhci->quirks |= XHCI_LPM_SUPPORT; | ||
xhci->quirks |= XHCI_EP_CTX_BROKEN_DCS; | ||
xhci->quirks |= XHCI_AVOID_DQ_ON_LINK; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -90,7 +90,7 @@ Signed-off-by: Jonathan Bell <[email protected]> | |
/* Allow 3 retries for everything but isoc, set CErr = 3 */ | ||
--- a/drivers/usb/host/xhci-pci.c | ||
+++ b/drivers/usb/host/xhci-pci.c | ||
@@ -495,6 +495,7 @@ static void xhci_pci_quirks(struct devic | ||
@@ -485,6 +485,7 @@ static void xhci_pci_quirks(struct devic | ||
xhci->quirks |= XHCI_EP_CTX_BROKEN_DCS; | ||
xhci->quirks |= XHCI_AVOID_DQ_ON_LINK; | ||
xhci->quirks |= XHCI_ZHAOXIN_TRB_FETCH; | ||
|
@@ -100,7 +100,7 @@ Signed-off-by: Jonathan Bell <[email protected]> | |
if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA && | ||
--- a/drivers/usb/host/xhci.h | ||
+++ b/drivers/usb/host/xhci.h | ||
@@ -1664,6 +1664,7 @@ struct xhci_hcd { | ||
@@ -1665,6 +1665,7 @@ struct xhci_hcd { | ||
|
||
/* Downstream VLI fixes */ | ||
#define XHCI_AVOID_DQ_ON_LINK BIT_ULL(56) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -64,7 +64,7 @@ Signed-off-by: Jonathan Bell <[email protected]> | |
static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) | ||
{ | ||
struct pci_dev *pdev = to_pci_dev(dev); | ||
@@ -496,6 +508,8 @@ static void xhci_pci_quirks(struct devic | ||
@@ -486,6 +498,8 @@ static void xhci_pci_quirks(struct devic | ||
xhci->quirks |= XHCI_AVOID_DQ_ON_LINK; | ||
xhci->quirks |= XHCI_ZHAOXIN_TRB_FETCH; | ||
xhci->quirks |= XHCI_VLI_SS_BULK_OUT_BUG; | ||
|
@@ -75,7 +75,7 @@ Signed-off-by: Jonathan Bell <[email protected]> | |
if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA && | ||
--- a/drivers/usb/host/xhci-ring.c | ||
+++ b/drivers/usb/host/xhci-ring.c | ||
@@ -3679,6 +3679,48 @@ static int xhci_align_td(struct xhci_hcd | ||
@@ -3674,6 +3674,48 @@ static int xhci_align_td(struct xhci_hcd | ||
return 1; | ||
} | ||
|
||
|
@@ -124,7 +124,7 @@ Signed-off-by: Jonathan Bell <[email protected]> | |
/* This is very similar to what ehci-q.c qtd_fill() does */ | ||
int xhci_queue_bulk_tx(struct xhci_hcd *xhci, gfp_t mem_flags, | ||
struct urb *urb, int slot_id, unsigned int ep_index) | ||
@@ -3835,6 +3877,8 @@ int xhci_queue_bulk_tx(struct xhci_hcd * | ||
@@ -3830,6 +3872,8 @@ int xhci_queue_bulk_tx(struct xhci_hcd * | ||
} | ||
|
||
check_trb_math(urb, enqd_len); | ||
|
@@ -133,7 +133,7 @@ Signed-off-by: Jonathan Bell <[email protected]> | |
giveback_first_trb(xhci, slot_id, ep_index, urb->stream_id, | ||
start_cycle, start_trb); | ||
return 0; | ||
@@ -3970,6 +4014,8 @@ int xhci_queue_ctrl_tx(struct xhci_hcd * | ||
@@ -3979,6 +4023,8 @@ int xhci_queue_ctrl_tx(struct xhci_hcd * | ||
/* Event on completion */ | ||
field | TRB_IOC | TRB_TYPE(TRB_STATUS) | ep_ring->cycle_state); | ||
|
||
|
@@ -144,7 +144,7 @@ Signed-off-by: Jonathan Bell <[email protected]> | |
return 0; | ||
--- a/drivers/usb/host/xhci.h | ||
+++ b/drivers/usb/host/xhci.h | ||
@@ -1665,6 +1665,7 @@ struct xhci_hcd { | ||
@@ -1666,6 +1666,7 @@ struct xhci_hcd { | ||
/* Downstream VLI fixes */ | ||
#define XHCI_AVOID_DQ_ON_LINK BIT_ULL(56) | ||
#define XHCI_VLI_SS_BULK_OUT_BUG BIT_ULL(57) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -333,15 +333,15 @@ Signed-off-by: Jonathan Bell <[email protected]> | |
/* Global Debug LSP MUX Select */ | ||
#define DWC3_GDBGLSPMUX_ENDBC BIT(15) /* Host only */ | ||
#define DWC3_GDBGLSPMUX_HOSTSELECT(n) ((n) & 0x3fff) | ||
@@ -1061,6 +1064,7 @@ struct dwc3_scratchpad_array { | ||
@@ -1062,6 +1065,7 @@ struct dwc3_scratchpad_array { | ||
* @tx_max_burst_prd: max periodic ESS transmit burst size | ||
* @tx_fifo_resize_max_num: max number of fifos allocated during txfifo resize | ||
* @clear_stall_protocol: endpoint number that requires a delayed status phase | ||
+ * @axi_max_pipe: set to override the maximum number of pipelined AXI transfers | ||
* @hsphy_interface: "utmi" or "ulpi" | ||
* @connected: true when we're connected to a host, false otherwise | ||
* @softconnect: true when gadget connect is called, false when disconnect runs | ||
@@ -1298,6 +1302,7 @@ struct dwc3 { | ||
@@ -1299,6 +1303,7 @@ struct dwc3 { | ||
u8 tx_max_burst_prd; | ||
u8 tx_fifo_resize_max_num; | ||
u8 clear_stall_protocol; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -31,7 +31,7 @@ Signed-off-by: Phil Elwell <[email protected]> | |
#ifdef CONFIG_ACPI_SPCR_TABLE | ||
static const struct vendor_data vendor_qdt_qdf2400_e44 = { | ||
.reg_offset = pl011_std_offsets, | ||
@@ -2979,6 +2993,86 @@ static struct platform_driver arm_sbsa_u | ||
@@ -2986,6 +3000,86 @@ static struct platform_driver arm_sbsa_u | ||
}, | ||
}; | ||
|
||
|
@@ -118,7 +118,7 @@ Signed-off-by: Phil Elwell <[email protected]> | |
static const struct amba_id pl011_ids[] = { | ||
{ | ||
.id = 0x00041011, | ||
@@ -3012,6 +3106,8 @@ static int __init pl011_init(void) | ||
@@ -3019,6 +3113,8 @@ static int __init pl011_init(void) | ||
|
||
if (platform_driver_register(&arm_sbsa_uart_platform_driver)) | ||
pr_warn("could not register SBSA UART platform driver\n"); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -655,7 +655,7 @@ Signed-off-by: Maxime Ripard <[email protected]> | |
dispctrl &= ~(SCALER_DISPCTRL_DMAEIRQ | | ||
SCALER_DISPCTRL_SLVWREIRQ | | ||
SCALER_DISPCTRL_SLVRDEIRQ | | ||
@@ -1398,7 +1404,7 @@ static int vc4_hvs_bind(struct device *d | ||
@@ -1409,7 +1415,7 @@ static int vc4_hvs_bind(struct device *d | ||
|
||
/* Recompute Composite Output Buffer (COB) allocations for the displays | ||
*/ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -99,7 +99,7 @@ Signed-off-by: Maxime Ripard <[email protected]> | |
|
||
reg = HVS_READ(SCALER_DISPECTRL); | ||
reg &= ~SCALER_DISPECTRL_DSP2_MUX_MASK; | ||
@@ -1440,6 +1371,86 @@ static int vc4_hvs_bind(struct device *d | ||
@@ -1451,6 +1382,86 @@ static int vc4_hvs_bind(struct device *d | ||
|
||
HVS_WRITE(SCALER_DISPCTRL, dispctrl); | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -16,7 +16,7 @@ Signed-off-by: Maxime Ripard <[email protected]> | |
|
||
--- a/drivers/gpu/drm/vc4/vc4_hvs.c | ||
+++ b/drivers/gpu/drm/vc4/vc4_hvs.c | ||
@@ -1374,6 +1374,77 @@ static int vc4_hvs_hw_init(struct vc4_hv | ||
@@ -1385,6 +1385,77 @@ static int vc4_hvs_hw_init(struct vc4_hv | ||
return 0; | ||
} | ||
|
||
|
@@ -94,15 +94,15 @@ Signed-off-by: Maxime Ripard <[email protected]> | |
static int vc4_hvs_bind(struct device *dev, struct device *master, void *data) | ||
{ | ||
struct platform_device *pdev = to_platform_device(dev); | ||
@@ -1381,7 +1452,6 @@ static int vc4_hvs_bind(struct device *d | ||
@@ -1392,7 +1463,6 @@ static int vc4_hvs_bind(struct device *d | ||
struct vc4_dev *vc4 = to_vc4_dev(drm); | ||
struct vc4_hvs *hvs = NULL; | ||
int ret; | ||
- u32 reg, top; | ||
|
||
hvs = __vc4_hvs_alloc(vc4, NULL); | ||
if (IS_ERR(hvs)) | ||
@@ -1451,59 +1521,9 @@ static int vc4_hvs_bind(struct device *d | ||
@@ -1462,59 +1532,9 @@ static int vc4_hvs_bind(struct device *d | ||
if (ret) | ||
return ret; | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -25,7 +25,7 @@ Signed-off-by: Maxime Ripard <[email protected]> | |
VC4_REG32(SCALER_DISPCTRL), | ||
VC4_REG32(SCALER_DISPSTAT), | ||
VC4_REG32(SCALER_DISPID), | ||
@@ -1462,8 +1462,8 @@ static int vc4_hvs_bind(struct device *d | ||
@@ -1473,8 +1473,8 @@ static int vc4_hvs_bind(struct device *d | ||
return PTR_ERR(hvs->regs); | ||
|
||
hvs->regset.base = hvs->regs; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -68,7 +68,7 @@ Signed-off-by: Maxime Ripard <[email protected]> | |
hvs->pdev = pdev; | ||
|
||
spin_lock_init(&hvs->mm_lock); | ||
@@ -1451,16 +1454,17 @@ static int vc4_hvs_bind(struct device *d | ||
@@ -1462,16 +1465,17 @@ static int vc4_hvs_bind(struct device *d | ||
struct drm_device *drm = dev_get_drvdata(master); | ||
struct vc4_dev *vc4 = to_vc4_dev(drm); | ||
struct vc4_hvs *hvs = NULL; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -30,7 +30,7 @@ Signed-off-by: Dom Cobley <[email protected]> | |
|
||
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c | ||
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c | ||
@@ -1872,6 +1872,7 @@ static void vc4_hdmi_encoder_post_crtc_e | ||
@@ -1868,6 +1868,7 @@ static void vc4_hdmi_encoder_post_crtc_e | ||
VC4_HD_VID_CTL_CLRRGB | | ||
VC4_HD_VID_CTL_UNDERFLOW_ENABLE | | ||
VC4_HD_VID_CTL_FRAME_COUNTER_RESET | | ||
|
Oops, something went wrong.