Skip to content

Commit 1fe61f0

Browse files
committed
panel: Drop custom {hfp,hbp,hsa}_power_mode variables
Can just check the DSI flags which are set the same way. No functional change.
1 parent f60b936 commit 1fe61f0

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

lk.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ def generate_video_info(p: Panel) -> str:
6464

6565
s += f'''\
6666
.hsync_pulse = {int('MIPI_DSI_MODE_VIDEO_HSE' in p.flags)},
67-
.hfp_power_mode = {int(p.hfp_power_mode)},
68-
.hbp_power_mode = {int(p.hbp_power_mode)},
69-
.hsa_power_mode = {int(p.hsa_power_mode)},
67+
.hfp_power_mode = {int('MIPI_DSI_MODE_VIDEO_NO_HFP' in p.flags)},
68+
.hbp_power_mode = {int('MIPI_DSI_MODE_VIDEO_NO_HBP' in p.flags)},
69+
.hsa_power_mode = {int('MIPI_DSI_MODE_VIDEO_NO_HSA' in p.flags)},
7070
.bllp_eof_power_mode = {int(p.bllp_eof_power_mode)},
7171
.bllp_power_mode = {int(p.bllp_power_mode)},
7272
.traffic_mode = {list(TrafficMode.__members__.values()).index(p.traffic_mode)},

panel.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -252,10 +252,10 @@ def __init__(self, name: str, fdt: Fdt2, node: int) -> None:
252252

253253
if fdt.getprop_or_none(node, 'qcom,mdss-dsi-hfp-power-mode') is not None:
254254
self.flags.append('MIPI_DSI_MODE_VIDEO_NO_HFP')
255-
if fdt.getprop_or_none(node, 'qcom,mdss-dsi-hsa-power-mode') is not None:
256-
self.flags.append('MIPI_DSI_MODE_VIDEO_NO_HSA')
257255
if fdt.getprop_or_none(node, 'qcom,mdss-dsi-hbp-power-mode') is not None:
258256
self.flags.append('MIPI_DSI_MODE_VIDEO_NO_HBP')
257+
if fdt.getprop_or_none(node, 'qcom,mdss-dsi-hsa-power-mode') is not None:
258+
self.flags.append('MIPI_DSI_MODE_VIDEO_NO_HSA')
259259

260260
reset_seq = fdt.getprop_or_none(node, 'qcom,mdss-dsi-reset-sequence')
261261
if reset_seq is not None:
@@ -303,9 +303,6 @@ def __init__(self, name: str, fdt: Fdt2, node: int) -> None:
303303

304304
# Additional weird values used by downstream and LK
305305
self.hsync_skew = fdt.getprop_uint32(node, 'qcom,mdss-dsi-h-sync-skew')
306-
self.hfp_power_mode = fdt.getprop_or_none(node, 'qcom,mdss-dsi-hfp-power-mode') is not None
307-
self.hsa_power_mode = fdt.getprop_or_none(node, 'qcom,mdss-dsi-hsa-power-mode') is not None
308-
self.hbp_power_mode = fdt.getprop_or_none(node, 'qcom,mdss-dsi-hbp-power-mode') is not None
309306
self.bllp_power_mode = fdt.getprop_or_none(node, 'qcom,mdss-dsi-bllp-power-mode') is not None
310307
self.bllp_eof_power_mode = fdt.getprop_or_none(node, 'qcom,mdss-dsi-bllp-eof-power-mode') is not None
311308
self.lp11_init = fdt.getprop_or_none(node, 'qcom,mdss-dsi-lp11-init') is not None

0 commit comments

Comments
 (0)