forked from openwrt/openwrt
-
Notifications
You must be signed in to change notification settings - Fork 47
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
https://lore.kernel.org/all/[email protected] https://lore.kernel.org/all/[email protected] Signed-off-by: Marty Jones <[email protected]>
- Loading branch information
Showing
34 changed files
with
74 additions
and
141 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 = .53 | ||
LINUX_KERNEL_HASH-6.6.53 = 285d181d1b252b0bf905f040d094215cf183ac98c31a17f9cce9f3537ef4d779 | ||
LINUX_VERSION-6.6 = .54 | ||
LINUX_KERNEL_HASH-6.6.54 = 5fae869d6a24055c16ffc2d92669e3fb2b258e34d36c850bb8cf9def417ecfa0 |
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 |
---|---|---|
|
@@ -45,9 +45,9 @@ Signed-off-by: Dom Cobley <[email protected]> | |
static const char * const output_format_str[] = { | ||
[VC4_HDMI_OUTPUT_RGB] = "RGB", | ||
[VC4_HDMI_OUTPUT_YUV420] = "YUV 4:2:0", | ||
@@ -472,7 +478,9 @@ static int vc4_hdmi_connector_detect_ctx | ||
|
||
WARN_ON(pm_runtime_resume_and_get(&vc4_hdmi->pdev->dev)); | ||
@@ -478,7 +484,9 @@ static int vc4_hdmi_connector_detect_ctx | ||
return connector_status_unknown; | ||
} | ||
|
||
- if (vc4_hdmi->hpd_gpio) { | ||
+ if (force_hotplug & BIT(vc4_hdmi->encoder.type - VC4_ENCODER_TYPE_HDMI0)) | ||
|
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 | ||
@@ -2394,7 +2394,7 @@ static int vc4_hdmi_audio_startup(struct | ||
@@ -2400,7 +2400,7 @@ static int vc4_hdmi_audio_startup(struct | ||
} | ||
|
||
if (!vc4_hdmi_audio_can_stream(vc4_hdmi)) { | ||
|
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 |
---|---|---|
|
@@ -18,7 +18,7 @@ Signed-off-by: Matthias Reichl <[email protected]> | |
|
||
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c | ||
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c | ||
@@ -2126,7 +2126,7 @@ vc4_hdmi_encoder_compute_config(const st | ||
@@ -2132,7 +2132,7 @@ vc4_hdmi_encoder_compute_config(const st | ||
{ | ||
struct drm_device *dev = vc4_hdmi->connector.dev; | ||
struct drm_connector_state *conn_state = &vc4_state->base; | ||
|
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: Matthias Reichl <[email protected]> | |
|
||
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c | ||
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c | ||
@@ -1952,9 +1952,6 @@ vc4_hdmi_sink_supports_format_bpc(const | ||
@@ -1958,9 +1958,6 @@ vc4_hdmi_sink_supports_format_bpc(const | ||
case VC4_HDMI_OUTPUT_RGB: | ||
drm_dbg(dev, "RGB Format, checking the constraints.\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 |
---|---|---|
|
@@ -13,15 +13,15 @@ Signed-off-by: Dave Stevenson <[email protected]> | |
|
||
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c | ||
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c | ||
@@ -756,7 +756,6 @@ static int vc4_hdmi_connector_init(struc | ||
@@ -762,7 +762,6 @@ static int vc4_hdmi_connector_init(struc | ||
|
||
drm_connector_attach_colorspace_property(connector); | ||
drm_connector_attach_tv_margin_properties(connector); | ||
- drm_connector_attach_max_bpc_property(connector, 8, 12); | ||
|
||
connector->polled = (DRM_CONNECTOR_POLL_CONNECT | | ||
DRM_CONNECTOR_POLL_DISCONNECT); | ||
@@ -765,8 +764,12 @@ static int vc4_hdmi_connector_init(struc | ||
@@ -771,8 +770,12 @@ static int vc4_hdmi_connector_init(struc | ||
connector->doublescan_allowed = 0; | ||
connector->stereo_allowed = 1; | ||
|
||
|
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
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,15 +16,15 @@ Signed-off-by: Dom Cobley <[email protected]> | |
|
||
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c | ||
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c | ||
@@ -2521,6 +2521,7 @@ static int vc4_hdmi_audio_prepare(struct | ||
@@ -2527,6 +2527,7 @@ static int vc4_hdmi_audio_prepare(struct | ||
{ | ||
struct vc4_hdmi *vc4_hdmi = dev_get_drvdata(dev); | ||
struct drm_device *drm = vc4_hdmi->connector.dev; | ||
+ struct vc4_dev *vc4 = to_vc4_dev(drm); | ||
struct drm_encoder *encoder = &vc4_hdmi->encoder.base; | ||
unsigned int sample_rate = params->sample_rate; | ||
unsigned int channels = params->channels; | ||
@@ -2579,11 +2580,18 @@ static int vc4_hdmi_audio_prepare(struct | ||
@@ -2585,11 +2586,18 @@ static int vc4_hdmi_audio_prepare(struct | ||
VC4_HDMI_AUDIO_PACKET_CEA_MASK); | ||
|
||
/* Set the MAI threshold */ | ||
|
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 |
---|---|---|
|
@@ -52,7 +52,7 @@ Signed-off-by: Jonathan Bell <[email protected]> | |
erst_base = xhci_read_64(xhci, &ir->ir_set->erst_base); | ||
--- a/drivers/usb/host/xhci.h | ||
+++ b/drivers/usb/host/xhci.h | ||
@@ -1680,8 +1680,9 @@ struct urb_priv { | ||
@@ -1681,8 +1681,9 @@ struct urb_priv { | ||
* Each segment table entry is 4*32bits long. 1K seems like an ok size: | ||
* (1K bytes * 8bytes/bit) / (4*32 bits) = 64 segment entries in the table, | ||
* meaning 64 ring segments. | ||
|
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 | ||
@@ -489,6 +489,7 @@ static void xhci_pci_quirks(struct devic | ||
@@ -492,6 +492,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 | ||
@@ -1915,6 +1915,9 @@ struct xhci_hcd { | ||
#define XHCI_ZHAOXIN_TRB_FETCH BIT_ULL(45) | ||
#define XHCI_ZHAOXIN_HOST BIT_ULL(46) | ||
@@ -1918,6 +1918,9 @@ struct xhci_hcd { | ||
#define XHCI_WRITE_64_HI_LO BIT_ULL(47) | ||
#define XHCI_CDNS_SCTX_QUIRK BIT_ULL(48) | ||
|
||
+/* 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 | ||
@@ -490,6 +490,7 @@ static void xhci_pci_quirks(struct devic | ||
@@ -493,6 +493,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 | ||
@@ -491,6 +491,7 @@ static void xhci_pci_quirks(struct devic | ||
@@ -494,6 +494,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 | ||
@@ -1917,6 +1917,7 @@ struct xhci_hcd { | ||
@@ -1920,6 +1920,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 |
---|---|---|
|
@@ -47,7 +47,7 @@ Signed-off-by: Jonathan Bell <[email protected]> | |
/* Device for a quirk */ | ||
#define PCI_VENDOR_ID_FRESCO_LOGIC 0x1b73 | ||
#define PCI_DEVICE_ID_FRESCO_LOGIC_PDK 0x1000 | ||
@@ -291,6 +293,16 @@ static int xhci_pci_reinit(struct xhci_h | ||
@@ -294,6 +296,16 @@ static int xhci_pci_reinit(struct xhci_h | ||
return 0; | ||
} | ||
|
||
|
@@ -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); | ||
@@ -492,6 +504,8 @@ static void xhci_pci_quirks(struct devic | ||
@@ -495,6 +507,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 | ||
@@ -3657,6 +3657,48 @@ static int xhci_align_td(struct xhci_hcd | ||
@@ -3671,6 +3671,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) | ||
@@ -3813,6 +3855,8 @@ int xhci_queue_bulk_tx(struct xhci_hcd * | ||
@@ -3827,6 +3869,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; | ||
@@ -3948,6 +3992,8 @@ int xhci_queue_ctrl_tx(struct xhci_hcd * | ||
@@ -3962,6 +4006,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 | ||
@@ -1918,6 +1918,7 @@ struct xhci_hcd { | ||
@@ -1921,6 +1921,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 |
---|---|---|
|
@@ -18,15 +18,15 @@ Signed-off-by: Maxime Ripard <[email protected]> | |
|
||
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c | ||
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c | ||
@@ -3589,6 +3589,7 @@ static int vc4_hdmi_runtime_suspend(stru | ||
@@ -3595,6 +3595,7 @@ static int vc4_hdmi_runtime_suspend(stru | ||
{ | ||
struct vc4_hdmi *vc4_hdmi = dev_get_drvdata(dev); | ||
|
||
+ clk_disable_unprepare(vc4_hdmi->audio_clock); | ||
clk_disable_unprepare(vc4_hdmi->hsm_clock); | ||
|
||
return 0; | ||
@@ -3621,6 +3622,10 @@ static int vc4_hdmi_runtime_resume(struc | ||
@@ -3627,6 +3628,10 @@ static int vc4_hdmi_runtime_resume(struc | ||
goto err_disable_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 |
---|---|---|
|
@@ -470,7 +470,7 @@ Signed-off-by: Maxime Ripard <[email protected]> | |
switch (args->madv) { | ||
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c | ||
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c | ||
@@ -2580,7 +2580,7 @@ static int vc4_hdmi_audio_prepare(struct | ||
@@ -2586,7 +2586,7 @@ static int vc4_hdmi_audio_prepare(struct | ||
VC4_HDMI_AUDIO_PACKET_CEA_MASK); | ||
|
||
/* Set the MAI threshold */ | ||
|
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 | ||
@@ -1862,6 +1862,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 | | ||
|
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: Maxime Ripard <[email protected]> | |
|
||
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c | ||
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c | ||
@@ -1102,6 +1102,7 @@ static void vc4_hdmi_encoder_post_crtc_d | ||
@@ -1108,6 +1108,7 @@ static void vc4_hdmi_encoder_post_crtc_d | ||
{ | ||
struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder); | ||
struct drm_device *drm = vc4_hdmi->connector.dev; | ||
+ struct vc4_dev *vc4 = to_vc4_dev(drm); | ||
unsigned long flags; | ||
int idx; | ||
|
||
@@ -1118,14 +1119,25 @@ static void vc4_hdmi_encoder_post_crtc_d | ||
@@ -1124,14 +1125,25 @@ static void vc4_hdmi_encoder_post_crtc_d | ||
|
||
HDMI_WRITE(HDMI_VID_CTL, HDMI_READ(HDMI_VID_CTL) | VC4_HD_VID_CTL_CLRRGB); | ||
|
||
|
@@ -58,23 +58,23 @@ Signed-off-by: Maxime Ripard <[email protected]> | |
|
||
vc4_hdmi_disable_scrambling(encoder); | ||
|
||
@@ -1753,7 +1765,6 @@ static void vc4_hdmi_encoder_pre_crtc_co | ||
@@ -1759,7 +1771,6 @@ static void vc4_hdmi_encoder_pre_crtc_co | ||
goto err_put_runtime_pm; | ||
} | ||
|
||
- | ||
vc4_hdmi_cec_update_clk_div(vc4_hdmi); | ||
|
||
if (tmds_char_rate > 297000000) | ||
@@ -1858,6 +1869,7 @@ static void vc4_hdmi_encoder_post_crtc_e | ||
@@ -1864,6 +1875,7 @@ static void vc4_hdmi_encoder_post_crtc_e | ||
spin_lock_irqsave(&vc4_hdmi->hw_lock, flags); | ||
|
||
HDMI_WRITE(HDMI_VID_CTL, | ||
+ HDMI_READ(HDMI_VID_CTL) | | ||
VC4_HD_VID_CTL_ENABLE | | ||
VC4_HD_VID_CTL_CLRRGB | | ||
VC4_HD_VID_CTL_UNDERFLOW_ENABLE | | ||
@@ -3751,7 +3763,9 @@ static int vc4_hdmi_bind(struct device * | ||
@@ -3757,7 +3769,9 @@ static int vc4_hdmi_bind(struct device * | ||
return ret; | ||
|
||
if ((of_device_is_compatible(dev->of_node, "brcm,bcm2711-hdmi0") || | ||
|
@@ -85,7 +85,7 @@ Signed-off-by: Maxime Ripard <[email protected]> | |
HDMI_READ(HDMI_VID_CTL) & VC4_HD_VID_CTL_ENABLE) { | ||
clk_prepare_enable(vc4_hdmi->pixel_clock); | ||
clk_prepare_enable(vc4_hdmi->hsm_clock); | ||
@@ -3885,10 +3899,66 @@ static const struct vc4_hdmi_variant bcm | ||
@@ -3891,10 +3905,66 @@ static const struct vc4_hdmi_variant bcm | ||
.hp_detect = vc5_hdmi_hp_detect, | ||
}; | ||
|
||
|
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 |
---|---|---|
|
@@ -75,7 +75,7 @@ Signed-off-by: Dom Cobley <[email protected]> | |
}, | ||
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c | ||
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c | ||
@@ -3912,7 +3912,7 @@ static const struct vc4_hdmi_variant bcm | ||
@@ -3918,7 +3918,7 @@ static const struct vc4_hdmi_variant bcm | ||
PHY_LANE_2, | ||
PHY_LANE_CK, | ||
}, | ||
|
@@ -84,7 +84,7 @@ Signed-off-by: Dom Cobley <[email protected]> | |
.external_irq_controller = true, | ||
|
||
.init_resources = vc5_hdmi_init_resources, | ||
@@ -3939,7 +3939,7 @@ static const struct vc4_hdmi_variant bcm | ||
@@ -3945,7 +3945,7 @@ static const struct vc4_hdmi_variant bcm | ||
PHY_LANE_2, | ||
PHY_LANE_CK, | ||
}, | ||
|
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 |
---|---|---|
|
@@ -14,7 +14,7 @@ Signed-off-by: Dom Cobley <[email protected]> | |
|
||
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c | ||
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c | ||
@@ -2597,7 +2597,13 @@ static int vc4_hdmi_audio_prepare(struct | ||
@@ -2603,7 +2603,13 @@ static int vc4_hdmi_audio_prepare(struct | ||
VC4_HDMI_AUDIO_PACKET_CEA_MASK); | ||
|
||
/* Set the MAI threshold */ | ||
|
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 |
---|---|---|
|
@@ -58,7 +58,7 @@ Signed-off-by: David Turner <[email protected]> | |
if (!edid) | ||
return; | ||
|
||
@@ -2691,8 +2705,23 @@ static int vc4_hdmi_audio_get_eld(struct | ||
@@ -2697,8 +2711,23 @@ static int vc4_hdmi_audio_get_eld(struct | ||
return 0; | ||
} | ||
|
||
|
@@ -82,7 +82,7 @@ Signed-off-by: David Turner <[email protected]> | |
.prepare = vc4_hdmi_audio_prepare, | ||
.audio_shutdown = vc4_hdmi_audio_shutdown, | ||
.audio_startup = vc4_hdmi_audio_startup, | ||
@@ -2712,6 +2741,22 @@ static void vc4_hdmi_audio_codec_release | ||
@@ -2718,6 +2747,22 @@ static void vc4_hdmi_audio_codec_release | ||
vc4_hdmi->audio.codec_pdev = NULL; | ||
} | ||
|
||
|
@@ -105,7 +105,7 @@ Signed-off-by: David Turner <[email protected]> | |
static int vc4_hdmi_audio_init(struct vc4_hdmi *vc4_hdmi) | ||
{ | ||
const struct vc4_hdmi_register *mai_data = | ||
@@ -2841,6 +2886,8 @@ static int vc4_hdmi_audio_init(struct vc | ||
@@ -2847,6 +2892,8 @@ static int vc4_hdmi_audio_init(struct vc | ||
dai_link->codecs->name = dev_name(&codec_pdev->dev); | ||
dai_link->platforms->name = dev_name(dev); | ||
|
||
|
@@ -114,7 +114,7 @@ Signed-off-by: David Turner <[email protected]> | |
card->dai_link = dai_link; | ||
card->num_links = 1; | ||
card->name = vc4_hdmi->variant->card_name; | ||
@@ -3701,6 +3748,8 @@ static int vc4_hdmi_bind(struct device * | ||
@@ -3707,6 +3754,8 @@ static int vc4_hdmi_bind(struct device * | ||
if (ret) | ||
return ret; | ||
|
||
|
@@ -123,7 +123,7 @@ Signed-off-by: David Turner <[email protected]> | |
spin_lock_init(&vc4_hdmi->hw_lock); | ||
INIT_DELAYED_WORK(&vc4_hdmi->scrambling_work, vc4_hdmi_scrambling_wq); | ||
|
||
@@ -3813,8 +3862,16 @@ err_put_runtime_pm: | ||
@@ -3819,8 +3868,16 @@ err_put_runtime_pm: | ||
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 |
---|---|---|
|
@@ -31,7 +31,7 @@ Signed-off-by: Dom Cobley <[email protected]> | |
|
||
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c | ||
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c | ||
@@ -2917,7 +2917,7 @@ static irqreturn_t vc4_hdmi_hpd_irq_thre | ||
@@ -2923,7 +2923,7 @@ static irqreturn_t vc4_hdmi_hpd_irq_thre | ||
struct drm_connector *connector = &vc4_hdmi->connector; | ||
struct drm_device *dev = connector->dev; | ||
|
||
|
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,7 +20,7 @@ Signed-off-by: Michiel Vanbiervliet <[email protected]> | |
|
||
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c | ||
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c | ||
@@ -1883,14 +1883,15 @@ static void vc4_hdmi_encoder_post_crtc_e | ||
@@ -1889,14 +1889,15 @@ static void vc4_hdmi_encoder_post_crtc_e | ||
spin_lock_irqsave(&vc4_hdmi->hw_lock, flags); | ||
|
||
HDMI_WRITE(HDMI_VID_CTL, | ||
|
Oops, something went wrong.