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] Signed-off-by: Marty Jones <[email protected]>
- Loading branch information
Showing
84 changed files
with
254 additions
and
407 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 = .63 | ||
LINUX_KERNEL_HASH-6.6.63 = d1054ab4803413efe2850f50f1a84349c091631ec50a1cf9e891d1b1f9061835 | ||
LINUX_VERSION-6.6 = .64 | ||
LINUX_KERNEL_HASH-6.6.64 = 065fd93fa6cb422f650fb563f15d3e0107c85009f766405993d795fd39796ab1 |
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 |
---|---|---|
|
@@ -220,7 +220,7 @@ Signed-off-by: Dave Stevenson <[email protected]> | |
|
||
struct vc4_hang_state *hang_state; | ||
|
||
@@ -963,6 +967,9 @@ extern struct platform_driver vc4_dsi_dr | ||
@@ -964,6 +968,9 @@ extern struct platform_driver vc4_dsi_dr | ||
/* vc4_fence.c */ | ||
extern const struct dma_fence_ops vc4_fence_ops; | ||
|
||
|
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 |
---|---|---|
|
@@ -83,7 +83,7 @@ Signed-off-by: Maxime Ripard <[email protected]> | |
|
||
struct drm_device; | ||
struct drm_gem_object; | ||
@@ -494,6 +495,17 @@ struct drm_encoder *vc4_find_encoder_by_ | ||
@@ -495,6 +496,17 @@ struct drm_encoder *vc4_find_encoder_by_ | ||
return NULL; | ||
} | ||
|
||
|
@@ -101,7 +101,7 @@ Signed-off-by: Maxime Ripard <[email protected]> | |
struct vc4_crtc_data { | ||
const char *name; | ||
|
||
@@ -538,9 +550,19 @@ struct vc4_crtc { | ||
@@ -539,9 +551,19 @@ struct vc4_crtc { | ||
/* Timestamp at start of vblank irq - unaffected by lock delays. */ | ||
ktime_t t_vblank; | ||
|
||
|
@@ -126,7 +126,7 @@ Signed-off-by: Maxime Ripard <[email protected]> | |
|
||
--- a/drivers/gpu/drm/vc4/vc4_hvs.c | ||
+++ b/drivers/gpu/drm/vc4/vc4_hvs.c | ||
@@ -243,7 +243,8 @@ static void vc4_hvs_lut_load(struct vc4_ | ||
@@ -248,7 +248,8 @@ static void vc4_hvs_lut_load(struct vc4_ | ||
static void vc4_hvs_update_gamma_lut(struct vc4_hvs *hvs, | ||
struct vc4_crtc *vc4_crtc) | ||
{ | ||
|
@@ -136,7 +136,7 @@ Signed-off-by: Maxime Ripard <[email protected]> | |
struct drm_color_lut *lut = crtc_state->gamma_lut->data; | ||
u32 length = drm_color_lut_size(crtc_state->gamma_lut); | ||
u32 i; | ||
@@ -257,6 +258,81 @@ static void vc4_hvs_update_gamma_lut(str | ||
@@ -262,6 +263,81 @@ static void vc4_hvs_update_gamma_lut(str | ||
vc4_hvs_lut_load(hvs, vc4_crtc); | ||
} | ||
|
||
|
@@ -218,7 +218,7 @@ Signed-off-by: Maxime Ripard <[email protected]> | |
u8 vc4_hvs_get_fifo_frame_count(struct vc4_hvs *hvs, unsigned int fifo) | ||
{ | ||
struct drm_device *drm = &hvs->vc4->base; | ||
@@ -400,7 +476,10 @@ static int vc4_hvs_init_channel(struct v | ||
@@ -405,7 +481,10 @@ static int vc4_hvs_init_channel(struct v | ||
/* Reload the LUT, since the SRAMs would have been disabled if | ||
* all CRTCs had SCALER_DISPBKGND_GAMMA unset at once. | ||
*/ | ||
|
@@ -230,7 +230,7 @@ Signed-off-by: Maxime Ripard <[email protected]> | |
|
||
drm_dev_exit(idx); | ||
|
||
@@ -646,7 +725,11 @@ void vc4_hvs_atomic_flush(struct drm_crt | ||
@@ -649,7 +728,11 @@ void vc4_hvs_atomic_flush(struct drm_crt | ||
u32 dispbkgndx = HVS_READ(SCALER_DISPBKGNDX(channel)); | ||
|
||
if (crtc->state->gamma_lut) { | ||
|
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 |
---|---|---|
|
@@ -17,7 +17,7 @@ Signed-off-by: Maxime Ripard <[email protected]> | |
|
||
--- a/drivers/gpu/drm/vc4/vc4_hvs.c | ||
+++ b/drivers/gpu/drm/vc4/vc4_hvs.c | ||
@@ -143,6 +143,85 @@ static int vc4_hvs_debugfs_dlist(struct | ||
@@ -145,6 +145,85 @@ static int vc4_hvs_debugfs_dlist(struct | ||
return 0; | ||
} | ||
|
||
|
@@ -103,7 +103,7 @@ Signed-off-by: Maxime Ripard <[email protected]> | |
/* The filter kernel is composed of dwords each containing 3 9-bit | ||
* signed integers packed next to each other. | ||
*/ | ||
@@ -850,11 +929,15 @@ int vc4_hvs_debugfs_init(struct drm_mino | ||
@@ -854,11 +933,15 @@ int vc4_hvs_debugfs_init(struct drm_mino | ||
if (!vc4->hvs) | ||
return -ENODEV; | ||
|
||
|
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,7 +45,7 @@ Signed-off-by: Maxime Ripard <[email protected]> | |
struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc); | ||
--- a/drivers/gpu/drm/vc4/vc4_drv.h | ||
+++ b/drivers/gpu/drm/vc4/vc4_drv.h | ||
@@ -613,6 +613,9 @@ vc4_crtc_to_vc4_pv_data(const struct vc4 | ||
@@ -614,6 +614,9 @@ vc4_crtc_to_vc4_pv_data(const struct vc4 | ||
return container_of_const(data, struct vc4_pv_data, base); | ||
} | ||
|
||
|
@@ -57,7 +57,7 @@ Signed-off-by: Maxime Ripard <[email protected]> | |
|
||
--- a/drivers/gpu/drm/vc4/vc4_hvs.c | ||
+++ b/drivers/gpu/drm/vc4/vc4_hvs.c | ||
@@ -596,6 +596,36 @@ out: | ||
@@ -599,6 +599,36 @@ out: | ||
drm_dev_exit(idx); | ||
} | ||
|
||
|
@@ -94,7 +94,7 @@ Signed-off-by: Maxime Ripard <[email protected]> | |
int vc4_hvs_atomic_check(struct drm_crtc *crtc, struct drm_atomic_state *state) | ||
{ | ||
struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state, crtc); | ||
@@ -626,7 +656,7 @@ int vc4_hvs_atomic_check(struct drm_crtc | ||
@@ -629,7 +659,7 @@ int vc4_hvs_atomic_check(struct drm_crtc | ||
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 |
---|---|---|
|
@@ -20,7 +20,7 @@ Signed-off-by: Dave Stevenson <[email protected]> | |
|
||
--- a/drivers/gpu/drm/vc4/vc4_hvs.c | ||
+++ b/drivers/gpu/drm/vc4/vc4_hvs.c | ||
@@ -548,8 +548,11 @@ static int vc4_hvs_init_channel(struct v | ||
@@ -553,8 +553,11 @@ static int vc4_hvs_init_channel(struct v | ||
dispbkgndx &= ~SCALER_DISPBKGND_GAMMA; | ||
dispbkgndx &= ~SCALER_DISPBKGND_INTERLACE; | ||
|
||
|
@@ -33,7 +33,7 @@ Signed-off-by: Dave Stevenson <[email protected]> | |
(interlace ? SCALER_DISPBKGND_INTERLACE : 0)); | ||
|
||
/* Reload the LUT, since the SRAMs would have been disabled if | ||
@@ -834,18 +837,25 @@ void vc4_hvs_atomic_flush(struct drm_crt | ||
@@ -837,18 +840,25 @@ void vc4_hvs_atomic_flush(struct drm_crt | ||
u32 dispbkgndx = HVS_READ(SCALER_DISPBKGNDX(channel)); | ||
|
||
if (crtc->state->gamma_lut) { | ||
|
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,7 +13,7 @@ Signed-off-by: Dave Stevenson <[email protected]> | |
|
||
--- a/drivers/gpu/drm/vc4/vc4_hvs.c | ||
+++ b/drivers/gpu/drm/vc4/vc4_hvs.c | ||
@@ -614,6 +614,16 @@ static int vc4_hvs_gamma_check(struct dr | ||
@@ -617,6 +617,16 @@ static int vc4_hvs_gamma_check(struct dr | ||
if (!crtc_state->color_mgmt_changed) | ||
return 0; | ||
|
||
|
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 |
---|---|---|
|
@@ -12,7 +12,7 @@ Signed-off-by: Dom Cobley <[email protected]> | |
|
||
--- a/drivers/gpu/drm/vc4/vc4_drv.h | ||
+++ b/drivers/gpu/drm/vc4/vc4_drv.h | ||
@@ -408,7 +408,7 @@ struct vc4_plane_state { | ||
@@ -409,7 +409,7 @@ struct vc4_plane_state { | ||
|
||
/* Clipped coordinates of the plane on the display. */ | ||
int crtc_x, crtc_y, crtc_w, crtc_h; | ||
|
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 |
---|---|---|
|
@@ -42,7 +42,7 @@ Signed-off-by: Dave Stevenson <[email protected]> | |
|
||
--- a/drivers/gpu/drm/vc4/vc4_drv.h | ||
+++ b/drivers/gpu/drm/vc4/vc4_drv.h | ||
@@ -626,12 +626,7 @@ struct vc4_crtc_state { | ||
@@ -627,12 +627,7 @@ struct vc4_crtc_state { | ||
bool txp_armed; | ||
unsigned int assigned_channel; | ||
|
||
|
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,7 +13,7 @@ Signed-off-by: Maxime Ripard <[email protected]> | |
|
||
--- a/drivers/gpu/drm/vc4/vc4_hvs.c | ||
+++ b/drivers/gpu/drm/vc4/vc4_hvs.c | ||
@@ -976,6 +976,9 @@ int vc4_hvs_debugfs_init(struct drm_mino | ||
@@ -980,6 +980,9 @@ int vc4_hvs_debugfs_init(struct drm_mino | ||
struct vc4_dev *vc4 = to_vc4_dev(drm); | ||
struct vc4_hvs *hvs = vc4->hvs; | ||
|
||
|
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,7 +45,7 @@ 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", | ||
@@ -478,7 +484,9 @@ static int vc4_hdmi_connector_detect_ctx | ||
@@ -482,7 +488,9 @@ static int vc4_hdmi_connector_detect_ctx | ||
return connector_status_unknown; | ||
} | ||
|
||
|
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 | ||
@@ -2400,7 +2400,7 @@ static int vc4_hdmi_audio_startup(struct | ||
@@ -2404,7 +2404,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 |
---|---|---|
|
@@ -98,7 +98,7 @@ Signed-off-by: Maxime Ripard <[email protected]> | |
} | ||
--- a/drivers/gpu/drm/vc4/vc4_drv.h | ||
+++ b/drivers/gpu/drm/vc4/vc4_drv.h | ||
@@ -332,6 +332,9 @@ struct vc4_hvs { | ||
@@ -333,6 +333,9 @@ struct vc4_hvs { | ||
struct drm_mm lbm_mm; | ||
spinlock_t mm_lock; | ||
|
||
|
@@ -108,7 +108,7 @@ Signed-off-by: Maxime Ripard <[email protected]> | |
struct drm_mm_node mitchell_netravali_filter; | ||
|
||
struct debugfs_regset32 regset; | ||
@@ -619,10 +622,16 @@ struct drm_connector *vc4_get_crtc_conne | ||
@@ -620,10 +623,16 @@ struct drm_connector *vc4_get_crtc_conne | ||
struct drm_encoder *vc4_get_crtc_encoder(struct drm_crtc *crtc, | ||
struct drm_crtc_state *state); | ||
|
||
|
@@ -127,7 +127,7 @@ Signed-off-by: Maxime Ripard <[email protected]> | |
bool txp_armed; | ||
unsigned int assigned_channel; | ||
|
||
@@ -1032,6 +1041,8 @@ struct vc4_hvs *__vc4_hvs_alloc(struct v | ||
@@ -1033,6 +1042,8 @@ struct vc4_hvs *__vc4_hvs_alloc(struct v | ||
void vc4_hvs_stop_channel(struct vc4_hvs *hvs, unsigned int output); | ||
int vc4_hvs_get_fifo_from_output(struct vc4_hvs *hvs, unsigned int output); | ||
u8 vc4_hvs_get_fifo_frame_count(struct vc4_hvs *hvs, unsigned int fifo); | ||
|
@@ -138,7 +138,7 @@ Signed-off-by: Maxime Ripard <[email protected]> | |
void vc4_hvs_atomic_enable(struct drm_crtc *crtc, struct drm_atomic_state *state); | ||
--- a/drivers/gpu/drm/vc4/vc4_hvs.c | ||
+++ b/drivers/gpu/drm/vc4/vc4_hvs.c | ||
@@ -412,6 +412,152 @@ static void vc5_hvs_update_gamma_lut(str | ||
@@ -417,6 +417,152 @@ static void vc5_hvs_update_gamma_lut(str | ||
vc5_hvs_lut_load(hvs, vc4_crtc); | ||
} | ||
|
||
|
@@ -291,7 +291,7 @@ Signed-off-by: Maxime Ripard <[email protected]> | |
u8 vc4_hvs_get_fifo_frame_count(struct vc4_hvs *hvs, unsigned int fifo) | ||
{ | ||
struct drm_device *drm = &hvs->vc4->base; | ||
@@ -643,13 +789,12 @@ int vc4_hvs_atomic_check(struct drm_crtc | ||
@@ -646,13 +792,12 @@ int vc4_hvs_atomic_check(struct drm_crtc | ||
{ | ||
struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state, crtc); | ||
struct vc4_crtc_state *vc4_state = to_vc4_crtc_state(crtc_state); | ||
|
@@ -306,7 +306,7 @@ Signed-off-by: Maxime Ripard <[email protected]> | |
|
||
/* The pixelvalve can only feed one encoder (and encoders are | ||
* 1:1 with connectors.) | ||
@@ -662,12 +807,11 @@ int vc4_hvs_atomic_check(struct drm_crtc | ||
@@ -665,12 +810,11 @@ int vc4_hvs_atomic_check(struct drm_crtc | ||
|
||
dlist_count++; /* Account for SCALER_CTL0_END. */ | ||
|
||
|
@@ -324,7 +324,7 @@ Signed-off-by: Maxime Ripard <[email protected]> | |
|
||
return vc4_hvs_gamma_check(crtc, state); | ||
} | ||
@@ -683,8 +827,9 @@ static void vc4_hvs_install_dlist(struct | ||
@@ -686,8 +830,9 @@ static void vc4_hvs_install_dlist(struct | ||
if (!drm_dev_enter(dev, &idx)) | ||
return; | ||
|
||
|
@@ -335,7 +335,7 @@ Signed-off-by: Maxime Ripard <[email protected]> | |
|
||
drm_dev_exit(idx); | ||
} | ||
@@ -711,8 +856,10 @@ static void vc4_hvs_update_dlist(struct | ||
@@ -714,8 +859,10 @@ static void vc4_hvs_update_dlist(struct | ||
spin_unlock_irqrestore(&dev->event_lock, flags); | ||
} | ||
|
||
|
@@ -347,7 +347,7 @@ Signed-off-by: Maxime Ripard <[email protected]> | |
spin_unlock_irqrestore(&vc4_crtc->irq_lock, flags); | ||
} | ||
|
||
@@ -769,8 +916,7 @@ void vc4_hvs_atomic_flush(struct drm_crt | ||
@@ -772,8 +919,7 @@ void vc4_hvs_atomic_flush(struct drm_crt | ||
struct vc4_plane_state *vc4_plane_state; | ||
bool debug_dump_regs = false; | ||
bool enable_bg_fill = false; | ||
|
@@ -357,7 +357,7 @@ Signed-off-by: Maxime Ripard <[email protected]> | |
unsigned int zpos = 0; | ||
bool found = false; | ||
int idx; | ||
@@ -788,6 +934,9 @@ void vc4_hvs_atomic_flush(struct drm_crt | ||
@@ -791,6 +937,9 @@ void vc4_hvs_atomic_flush(struct drm_crt | ||
vc4_hvs_dump_state(hvs); | ||
} | ||
|
||
|
@@ -367,7 +367,7 @@ Signed-off-by: Maxime Ripard <[email protected]> | |
/* Copy all the active planes' dlist contents to the hardware dlist. */ | ||
do { | ||
found = false; | ||
@@ -821,7 +970,8 @@ void vc4_hvs_atomic_flush(struct drm_crt | ||
@@ -824,7 +973,8 @@ void vc4_hvs_atomic_flush(struct drm_crt | ||
writel(SCALER_CTL0_END, dlist_next); | ||
dlist_next++; | ||
|
||
|
@@ -377,7 +377,7 @@ Signed-off-by: Maxime Ripard <[email protected]> | |
|
||
if (enable_bg_fill) | ||
/* This sets a black background color fill, as is the case | ||
@@ -960,6 +1110,11 @@ static irqreturn_t vc4_hvs_irq_handler(i | ||
@@ -964,6 +1114,11 @@ static irqreturn_t vc4_hvs_irq_handler(i | ||
|
||
irqret = IRQ_HANDLED; | ||
} | ||
|
@@ -389,7 +389,7 @@ Signed-off-by: Maxime Ripard <[email protected]> | |
} | ||
|
||
/* Clear every per-channel interrupt flag. */ | ||
@@ -1014,6 +1169,9 @@ struct vc4_hvs *__vc4_hvs_alloc(struct v | ||
@@ -1018,6 +1173,9 @@ struct vc4_hvs *__vc4_hvs_alloc(struct v | ||
|
||
spin_lock_init(&hvs->mm_lock); | ||
|
||
|
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: Maxime Ripard <[email protected]> | |
|
||
--- a/drivers/gpu/drm/vc4/vc4_hvs.c | ||
+++ b/drivers/gpu/drm/vc4/vc4_hvs.c | ||
@@ -452,6 +452,8 @@ vc4_hvs_alloc_dlist_entry(struct vc4_hvs | ||
@@ -457,6 +457,8 @@ vc4_hvs_alloc_dlist_entry(struct vc4_hvs | ||
if (!alloc) | ||
return ERR_PTR(-ENOMEM); | ||
|
||
|
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: Maxime Ripard <[email protected]> | |
|
||
--- a/drivers/gpu/drm/vc4/vc4_hvs.c | ||
+++ b/drivers/gpu/drm/vc4/vc4_hvs.c | ||
@@ -466,6 +466,18 @@ vc4_hvs_alloc_dlist_entry(struct vc4_hvs | ||
@@ -471,6 +471,18 @@ vc4_hvs_alloc_dlist_entry(struct vc4_hvs | ||
return alloc; | ||
} | ||
|
||
|
@@ -33,7 +33,7 @@ Signed-off-by: Maxime Ripard <[email protected]> | |
void vc4_hvs_mark_dlist_entry_stale(struct vc4_hvs *hvs, | ||
struct vc4_hvs_dlist_allocation *alloc) | ||
{ | ||
@@ -553,9 +565,7 @@ static void vc4_hvs_dlist_free_work(stru | ||
@@ -558,9 +570,7 @@ static void vc4_hvs_dlist_free_work(stru | ||
if (!vc4_hvs_frcnt_lte(cur->target_frame_count, frcnt)) | ||
continue; | ||
|
||
|
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 |
---|---|---|
|
@@ -27,7 +27,7 @@ Signed-off-by: Maxime Ripard <[email protected]> | |
|
||
--- a/drivers/gpu/drm/vc4/vc4_hvs.c | ||
+++ b/drivers/gpu/drm/vc4/vc4_hvs.c | ||
@@ -490,6 +490,18 @@ void vc4_hvs_mark_dlist_entry_stale(stru | ||
@@ -495,6 +495,18 @@ void vc4_hvs_mark_dlist_entry_stale(stru | ||
if (!drm_mm_node_allocated(&alloc->mm_node)) | ||
return; | ||
|
||
|
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 | ||
@@ -2132,7 +2132,7 @@ vc4_hdmi_encoder_compute_config(const st | ||
@@ -2136,7 +2136,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 |
---|---|---|
|
@@ -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 | ||
@@ -1363,6 +1363,17 @@ static int vc4_hvs_bind(struct device *d | ||
@@ -1368,6 +1368,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
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 | ||
@@ -1958,9 +1958,6 @@ vc4_hdmi_sink_supports_format_bpc(const | ||
@@ -1962,9 +1962,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 | ||
@@ -762,7 +762,6 @@ static int vc4_hdmi_connector_init(struc | ||
@@ -766,7 +766,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); | ||
@@ -771,8 +770,12 @@ static int vc4_hdmi_connector_init(struc | ||
@@ -775,8 +774,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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,7 +10,7 @@ Signed-off-by: Maxime Ripard <[email protected]> | |
|
||
--- a/arch/arm64/kernel/setup.c | ||
+++ b/arch/arm64/kernel/setup.c | ||
@@ -225,9 +225,9 @@ static void __init request_standard_reso | ||
@@ -229,9 +229,9 @@ static void __init request_standard_reso | ||
size_t res_size; | ||
|
||
kernel_code.start = __pa_symbol(_stext); | ||
|
Oops, something went wrong.