Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/panel: boe-himax8279d: Stop tracking prepared/enabled

As talked about in commit d2aacaf07395 ("drm/panel: Check for already
prepared/enabled in drm_panel"), we want to remove needless code from
panel drivers that was storing and double-checking the
prepared/enabled state. Even if someone was relying on the
double-check before, that double-check is now in the core and not
needed in individual drivers.

NOTE: as part of this, transition the panel's direct calls to its
disable/unprepare functions in shutdown/remove to call through DRM
panel.

Cc: Jerry Han <jerry.han.hq@gmail.com>
Cc: Jitao Shi <jitao.shi@mediatek.com>
Cc: Rock Wang <rock_wang@himax.com.cn>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Maxime Ripard <mripard@kernel.org>
Signed-off-by: Douglas Anderson <dianders@chromium.org>
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Link: https://lore.kernel.org/r/20240604172305.v3.1.Ia3f254ab6e04e4f7afba6c066454498c8fb01324@changeid
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20240604172305.v3.1.Ia3f254ab6e04e4f7afba6c066454498c8fb01324@changeid

authored by

Douglas Anderson and committed by
Neil Armstrong
12866fdc 8814444e

+4 -27
+4 -27
drivers/gpu/drm/panel/panel-boe-himax8279d.c
··· 47 47 struct gpio_desc *enable_gpio; 48 48 struct gpio_desc *pp33_gpio; 49 49 struct gpio_desc *pp18_gpio; 50 - 51 - bool prepared; 52 - bool enabled; 53 50 }; 54 51 55 52 static inline struct panel_info *to_panel_info(struct drm_panel *panel) ··· 83 86 struct panel_info *pinfo = to_panel_info(panel); 84 87 int err; 85 88 86 - if (!pinfo->enabled) 87 - return 0; 88 - 89 89 err = mipi_dsi_dcs_set_display_off(pinfo->link); 90 90 if (err < 0) { 91 91 dev_err(panel->dev, "failed to set display off: %d\n", err); 92 92 return err; 93 93 } 94 - 95 - pinfo->enabled = false; 96 94 97 95 return 0; 98 96 } ··· 96 104 { 97 105 struct panel_info *pinfo = to_panel_info(panel); 98 106 int err; 99 - 100 - if (!pinfo->prepared) 101 - return 0; 102 107 103 108 err = mipi_dsi_dcs_set_display_off(pinfo->link); 104 109 if (err < 0) ··· 110 121 111 122 disable_gpios(pinfo); 112 123 113 - pinfo->prepared = false; 114 - 115 124 return 0; 116 125 } 117 126 ··· 117 130 { 118 131 struct panel_info *pinfo = to_panel_info(panel); 119 132 int err; 120 - 121 - if (pinfo->prepared) 122 - return 0; 123 133 124 134 gpiod_set_value(pinfo->pp18_gpio, 1); 125 135 /* T1: 5ms - 6ms */ ··· 164 180 /* T7: 20ms - 21ms */ 165 181 usleep_range(20000, 21000); 166 182 167 - pinfo->prepared = true; 168 - 169 183 return 0; 170 184 171 185 poweroff: ··· 176 194 struct panel_info *pinfo = to_panel_info(panel); 177 195 int ret; 178 196 179 - if (pinfo->enabled) 180 - return 0; 181 - 182 197 usleep_range(120000, 121000); 183 198 184 199 ret = mipi_dsi_dcs_set_display_on(pinfo->link); ··· 183 204 dev_err(panel->dev, "failed to set display on: %d\n", ret); 184 205 return ret; 185 206 } 186 - 187 - pinfo->enabled = true; 188 207 189 208 return 0; 190 209 } ··· 894 917 struct panel_info *pinfo = mipi_dsi_get_drvdata(dsi); 895 918 int err; 896 919 897 - err = boe_panel_disable(&pinfo->base); 920 + err = drm_panel_disable(&pinfo->base); 898 921 if (err < 0) 899 922 dev_err(&dsi->dev, "failed to disable panel: %d\n", err); 900 923 901 - err = boe_panel_unprepare(&pinfo->base); 924 + err = drm_panel_unprepare(&pinfo->base); 902 925 if (err < 0) 903 926 dev_err(&dsi->dev, "failed to unprepare panel: %d\n", err); 904 927 ··· 913 936 { 914 937 struct panel_info *pinfo = mipi_dsi_get_drvdata(dsi); 915 938 916 - boe_panel_disable(&pinfo->base); 917 - boe_panel_unprepare(&pinfo->base); 939 + drm_panel_disable(&pinfo->base); 940 + drm_panel_unprepare(&pinfo->base); 918 941 } 919 942 920 943 static struct mipi_dsi_driver panel_driver = {