drm/i915: Do not call hsw_set_frame_start_delay for dsi
Subsystems (3)
PATCH 1/1 drm/i915: Do not call hsw_set_frame_start_delay for dsi
This should fix the boot oops for dsi
--- drivers/gpu/drm/i915/display/intel_display.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +2 -2
@@ -7211,7 +7211,7 @@ static void hsw_crtc_enable(struct intel_atomic_state *state,if (INTEL_GEN (dev_priv) >=9 ||IS_BROADWELL (dev_priv))bdw_set_pipemisc (new_crtc_state); -if (!new_crtc_state->bigjoiner_slave || !transcoder_is_dsi (cpu_transcoder)) { +if (!new_crtc_state->bigjoiner_slave && !transcoder_is_dsi (cpu_transcoder)) {if (!transcoder_is_dsi (cpu_transcoder))intel_set_transcoder_timings (new_crtc_state);
@@ -7224,7 +7224,7 @@ static void hsw_crtc_enable(struct intel_atomic_state *state,intel_cpu_transcoder_set_m_n (new_crtc_state, &new_crtc_state->fdi_m_n,NULL ); -hsw_set_frame_start_delay (new_crtc_state); +hsw_set_frame_start_delay (new_crtc_state); }if (!transcoder_is_dsi (cpu_transcoder))
Signature · 6 lines
2.19.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 22 lines · Manasi Navare
This should fix the boot oops for dsi
Fixes 4e3cdb4535e7 ("drm/i915/dp: Master/Slave enable/disable sequence for bigjoiner")Signed-off-by Manasi Navare <[email protected]>--- drivers/gpu/drm/i915/display/intel_display.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/display/intel_display.c +1
-1@@ -7211,7 +7211,7 @@ static void hsw_crtc_enable(struct intel_atomic_state *state,if (INTEL_GEN (dev_priv) >=9 ||IS_BROADWELL (dev_priv))bdw_set_pipemisc (new_crtc_state); -if (!new_crtc_state->bigjoiner_slave || !transcoder_is_dsi (cpu_transcoder)) { +if (!new_crtc_state->bigjoiner_slave && !transcoder_is_dsi (cpu_transcoder)) {if (!transcoder_is_dsi (cpu_transcoder))intel_set_transcoder_timings (new_crtc_state);
drivers/gpu/drm/i915/display/intel_display.c static void hsw_crtc_enable(struct intel_atomic_state *state, · line 7227
Quoted 5 lines
drivers/gpu/drm/i915/display/intel_display.c +1
-1@@ -7224,7 +7224,7 @@ static void hsw_crtc_enable(struct intel_atomic_state *state,intel_cpu_transcoder_set_m_n (new_crtc_state, &new_crtc_state->fdi_m_n,NULL ); -hsw_set_frame_start_delay (new_crtc_state); +hsw_set_frame_start_delay (new_crtc_state);
Indentation for this is wrong now.
Signature · 5 lines
Petri Latvala _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Hi,
Quoted 13 lines · Manasi Navare
This should fix the boot oops for dsi
Fixes 4e3cdb4535e7 ("drm/i915/dp: Master/Slave enable/disable sequence for bigjoiner")Signed-off-by Manasi Navare <[email protected]>--- drivers/gpu/drm/i915/display/intel_display.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/display/intel_display.c +0
-0
drivers/gpu/drm/i915/display/intel_display.c static void hsw_crtc_enable(struct intel_atomic_state *state, · line 7215
Quoted 6 lines
drivers/gpu/drm/i915/display/intel_display.c +1
-1@@ -7211,7 +7211,7 @@ static void hsw_crtc_enable(struct intel_atomic_state *state,if (INTEL_GEN (dev_priv) >=9 ||IS_BROADWELL (dev_priv))bdw_set_pipemisc (new_crtc_state); -if (!new_crtc_state->bigjoiner_slave || !transcoder_is_dsi (cpu_transcoder)) { +if (!new_crtc_state->bigjoiner_slave && !transcoder_is_dsi (cpu_transcoder)) {if (!transcoder_is_dsi (cpu_transcoder))
This condition is now always true so this nested if can be dropped now and the code it guards can be executed unconditionally now (within the parent if).
Regards,
Hans
drivers/gpu/drm/i915/display/intel_display.c static void hsw_crtc_enable(struct intel_atomic_state *state, · line 7230
Quoted 12 lines
drivers/gpu/drm/i915/display/intel_display.c +1
-1intel_set_transcoder_timings (new_crtc_state);@@ -7224,7 +7224,7 @@ static void hsw_crtc_enable(struct intel_atomic_state *state,intel_cpu_transcoder_set_m_n (new_crtc_state, &new_crtc_state->fdi_m_n,NULL ); -hsw_set_frame_start_delay (new_crtc_state); +hsw_set_frame_start_delay (new_crtc_state); }if (!transcoder_is_dsi (cpu_transcoder))
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915: Do not call hsw_set_frame_start_delay for dsi
In reply to Manasi Navare== Series Details ==
== Series Details ==
Series: drm/i915: Do not call hsw_set_frame_start_delay for dsi
URL : https://patchwork.freedesktop.org/series/84039/
State : failure
== Summary ==
CALL scripts/checksyscalls.sh
CALL scripts/atomic/check-atomics.sh
DESCEND objtool
CHK include/generated/compile.h
CC [M] drivers/gpu/drm/i915/display/intel_display.odrivers/gpu/drm/i915/display/intel_display.c: In function ‘hsw_crtc_enable’:drivers/gpu/drm/i915/display/intel_display.c:7223:3: error: this ‘if’ clause does not guard... [-Werror=misleading-indentation]
if (new_crtc_state->has_pch_encoder)
^~drivers/gpu/drm/i915/display/intel_display.c:7227:4: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the ‘if’
hsw_set_frame_start_delay(new_crtc_state);
^~~~~~~~~~~~~~~~~~~~~~~~~cc1: all warnings being treated as errorsscripts/Makefile.build:283: recipe for target 'drivers/gpu/drm/i915/display/intel_display.o' failed make[4]: *** [drivers/gpu/drm/i915/display/intel_display.o] Error 1 scripts/Makefile.build:500: recipe for target 'drivers/gpu/drm/i915' failed make[3]: *** [drivers/gpu/drm/i915] Error 2scripts/Makefile.build:500: recipe for target 'drivers/gpu/drm' failed
make[2]: *** [drivers/gpu/drm] Error 2scripts/Makefile.build:500: recipe for target 'drivers/gpu' failed
make[1]: *** [drivers/gpu] Error 2
Makefile:1799: recipe for target 'drivers' failed
make: *** [drivers] Error 2
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx