drm: mxsfb: Simplify LCDIF clock handling
Subsystems (4)
Marek Vasut
maintainerPATCH 1/1 drm: mxsfb: Simplify LCDIF clock handling
The current clock handling in the LCDIF driver is a convoluted mess. Implement runtime PM ops which turn the clock ON and OFF and let the pm_runtime_get_sync()/pm_runtime_put_sync() calls in .atomic_enable and .atomic_disable callbacks turn the clock ON and OFF at the right time.
--- drivers/gpu/drm/mxsfb/mxsfb_drv.c | 85 ++++++++++++++++++------------- drivers/gpu/drm/mxsfb/mxsfb_kms.c | 18 ++----- 2 files changed, 54 insertions(+), 49 deletions(-)
drivers/gpu/drm/mxsfb/mxsfb_drv.c +50 -35
@@ -72,18 +72,6 @@ static const struct mxsfb_devdata mxsfb_devdata[] = { }, }; -void mxsfb_enable_axi_clk (struct mxsfb_drm_private *mxsfb) -{ -if (mxsfb->clk_axi) -clk_prepare_enable (mxsfb->clk_axi); -} - -void mxsfb_disable_axi_clk (struct mxsfb_drm_private *mxsfb) -{ -if (mxsfb->clk_axi) -clk_disable_unprepare (mxsfb->clk_axi); -} -static struct drm_framebuffer *mxsfb_fb_create (struct drm_device *dev,struct drm_file *file_priv,const struct drm_mode_fb_cmd2 *mode_cmd)
@@ -224,33 +212,31 @@ static int mxsfb_load(struct drm_device *drm,if (IS_ERR (mxsfb->clk))return PTR_ERR (mxsfb->clk); - mxsfb->clk_axi =devm_clk_get (drm->dev,"axi" ); + mxsfb->clk_axi =devm_clk_get_optional (drm->dev,"axi" );if (IS_ERR (mxsfb->clk_axi)) - mxsfb->clk_axi =NULL ; +return PTR_ERR (mxsfb->clk_axi); - mxsfb->clk_disp_axi =devm_clk_get (drm->dev,"disp_axi" ); + mxsfb->clk_disp_axi =devm_clk_get_optional (drm->dev,"disp_axi" );if (IS_ERR (mxsfb->clk_disp_axi)) - mxsfb->clk_disp_axi =NULL ; +return PTR_ERR (mxsfb->clk_disp_axi); ret =dma_set_mask_and_coherent (drm->dev,DMA_BIT_MASK (32 ));if (ret)return ret; -pm_runtime_enable (drm->dev); -/* Modeset init */ drm_mode_config_init (drm); ret =mxsfb_kms_init (mxsfb);if (ret <0 ) {dev_err (drm->dev,"Failed to initialize KMS pipeline\n" ); - goto err_vblank; +return ret; } ret =drm_vblank_init (drm, drm->mode_config.num_crtc);if (ret <0 ) {dev_err (drm->dev,"Failed to initialise vblank\n" ); - goto err_vblank; +return ret; }/* Start with vertical blanking interrupt reporting disabled. */
@@ -260,7 +246,7 @@ static int mxsfb_load(struct drm_device *drm,if (ret) {if (ret != -EPROBE_DEFER )dev_err (drm->dev,"Cannot connect bridge: %d\n" , ret); - goto err_vblank; +return ret; } drm->mode_config.min_width =MXSFB_MIN_XRES ;
@@ -277,13 +263,10 @@ static int mxsfb_load(struct drm_device *drm, goto err_vblank; mxsfb->irq = ret; -pm_runtime_get_sync (drm->dev); ret =mxsfb_irq_install (drm, mxsfb->irq); -pm_runtime_put_sync (drm->dev); -if (ret <0 ) {dev_err (drm->dev,"Failed to install IRQ handler\n" ); - goto err_vblank; +return ret; }drm_kms_helper_poll_init (drm);
@@ -292,12 +275,9 @@ static int mxsfb_load(struct drm_device *drm,drm_helper_hpd_irq_event (drm); -return 0 ; - -err_vblank: -pm_runtime_disable (drm->dev); +pm_runtime_enable (drm->dev); -return ret; +return 0 ; }static void mxsfb_unload (struct drm_device *drm)
@@ -305,9 +285,7 @@ static void mxsfb_unload(struct drm_device *drm)drm_kms_helper_poll_fini (drm);drm_mode_config_cleanup (drm); -pm_runtime_get_sync (drm->dev);mxsfb_irq_uninstall (drm); -pm_runtime_put_sync (drm->dev); drm->dev_private =NULL ;
@@ -388,23 +366,60 @@ static void mxsfb_shutdown(struct platform_device *pdev)drm_atomic_helper_shutdown (drm); } -#ifdef CONFIG_PM_SLEEP +static int mxsfb_rpm_suspend (struct device *dev) +{ +struct drm_device *drm =dev_get_drvdata (dev); +struct mxsfb_drm_private *mxsfb = drm->dev_private; + +/* These clock supply the DISPLAY CLOCK Domain */ +clk_disable_unprepare (mxsfb->clk); +/* These clock supply the System Bus, AXI, Write Path, LFIFO */ +clk_disable_unprepare (mxsfb->clk_disp_axi); +/* These clock supply the Control Bus, APB, APBH Ctrl Registers */ +clk_disable_unprepare (mxsfb->clk_axi); + +return 0 ; +} + +static int mxsfb_rpm_resume (struct device *dev) +{ +struct drm_device *drm =dev_get_drvdata (dev); +struct mxsfb_drm_private *mxsfb = drm->dev_private; + +/* These clock supply the Control Bus, APB, APBH Ctrl Registers */ +clk_prepare_enable (mxsfb->clk_axi); +/* These clock supply the System Bus, AXI, Write Path, LFIFO */ +clk_prepare_enable (mxsfb->clk_disp_axi); +/* These clock supply the DISPLAY CLOCK Domain */ +clk_prepare_enable (mxsfb->clk); + +return 0 ; +} +static int mxsfb_suspend (struct device *dev) {struct drm_device *drm =dev_get_drvdata (dev); +int ret; -return drm_mode_config_helper_suspend (drm); + ret =drm_mode_config_helper_suspend (drm); +if (ret) +return ret; + +return mxsfb_rpm_suspend (dev); }static int mxsfb_resume (struct device *dev) {struct drm_device *drm =dev_get_drvdata (dev); +mxsfb_rpm_resume (dev); +return drm_mode_config_helper_resume (drm); } -#endif static const struct dev_pm_ops mxsfb_pm_ops = { + .runtime_suspend = mxsfb_rpm_suspend, + .runtime_resume = mxsfb_rpm_resume,SET_SYSTEM_SLEEP_PM_OPS (mxsfb_suspend, mxsfb_resume) };
drivers/gpu/drm/mxsfb/mxsfb_kms.c +4 -14
@@ -100,10 +100,6 @@ static void mxsfb_enable_controller(struct mxsfb_drm_private *mxsfb) {u32 reg; -if (mxsfb->clk_disp_axi) -clk_prepare_enable (mxsfb->clk_disp_axi); -clk_prepare_enable (mxsfb->clk); -/* Increase number of outstanding requests on all supported IPs */ if (mxsfb->devdata->has_ctrl2) { reg =readl (mxsfb->base +LCDC_V4_CTRL2 );
@@ -168,10 +164,6 @@ static void mxsfb_disable_controller(struct mxsfb_drm_private *mxsfb) reg =readl (mxsfb->base +LCDC_VDCTRL4 ); reg &= ~VDCTRL4_SYNC_SIGNALS_ON ;writel (reg, mxsfb->base +LCDC_VDCTRL4 ); - -clk_disable_unprepare (mxsfb->clk); -if (mxsfb->clk_disp_axi) -clk_disable_unprepare (mxsfb->clk_disp_axi); }/*
@@ -352,9 +344,6 @@ static void mxsfb_crtc_atomic_enable(struct drm_crtc *crtc,dma_addr_t paddr;pm_runtime_get_sync (drm->dev); -mxsfb_enable_axi_clk (mxsfb); - -drm_crtc_vblank_on (crtc);/* If there is a bridge attached to the LCDIF, use its bus format */ if (mxsfb->bridge) {
@@ -388,6 +377,8 @@ static void mxsfb_crtc_atomic_enable(struct drm_crtc *crtc, }mxsfb_enable_controller (mxsfb); + +drm_crtc_vblank_on (crtc); } static void mxsfb_crtc_atomic_disable(struct drm_crtc *crtc,
@@ -397,6 +388,8 @@ static void mxsfb_crtc_atomic_disable(struct drm_crtc *crtc,struct drm_device *drm = mxsfb->drm;struct drm_pending_vblank_event *event; +drm_crtc_vblank_off (crtc); +mxsfb_disable_controller (mxsfb);spin_lock_irq (&drm->event_lock);
@@ -407,9 +400,6 @@ static void mxsfb_crtc_atomic_disable(struct drm_crtc *crtc, }spin_unlock_irq (&drm->event_lock); -drm_crtc_vblank_off (crtc); - -mxsfb_disable_axi_clk (mxsfb);pm_runtime_put_sync (drm->dev); }
Signature · 1 line
2.34.1
kernel test robot
build botI love your patch! Yet something to improve:
Hi Marek,
I love your patch! Yet something to improve:
[auto build test ERROR on drm/drm-next]
[also build test ERROR on next-20220204]
[cannot apply to drm-intel/for-linux-next drm-tip/drm-tip drm-exynos/exynos-drm-next tegra-drm/drm/tegra/for-next v5.17-rc2] [If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Marek-Vasut/drm-mxsfb-Simplify-LCDIF-clock-handling/20220207-025717 base: git://anongit.freedesktop.org/drm/drm drm-next config: h8300-randconfig-r025-20220206 (https://download.01.org/0day-ci/archive/20220207/202202070442.Bio2oCXj-lkp(a)intel.com/config) compiler: h8300-linux-gcc (GCC) 11.2.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/7e48d24c5ec466eddb1bfbb6f39daaf061d2a84b
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Marek-Vasut/drm-mxsfb-Simplify-LCDIF-clock-handling/20220207-025717 git checkout 7e48d24c5ec466eddb1bfbb6f39daaf061d2a84b
# save the config file to linux build tree
mkdir build_dir
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-11.2.0 make.cross O=build_dir ARCH=h8300 SHELL=/bin/bash drivers/gpu/drm/mxsfb/
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
drivers/gpu/drm/mxsfb/mxsfb_drv.c: In function 'mxsfb_load':
>> drivers/gpu/drm/mxsfb/mxsfb_drv.c:263:17: error: label 'err_vblank' used but not defined
263 | goto err_vblank;
| ^~~~ At top level:
drivers/gpu/drm/mxsfb/mxsfb_drv.c:411:12: warning: 'mxsfb_resume' defined but not used [-Wunused-function]
411 | static int mxsfb_resume(struct device *dev)
| ^~~~~~~~~~~~
drivers/gpu/drm/mxsfb/mxsfb_drv.c:399:12: warning: 'mxsfb_suspend' defined but not used [-Wunused-function]
399 | static int mxsfb_suspend(struct device *dev)
| ^~~~~~~~~~~~~
vim +/err_vblank +263 drivers/gpu/drm/mxsfb/mxsfb_drv.c
5fc40f41c137cc Thomas Zimmermann 2021-08-03 189
c6ddee8220bf8a Laurent Pinchart 2020-07-27 190 static int mxsfb_load(struct drm_device *drm,
c6ddee8220bf8a Laurent Pinchart 2020-07-27 191 const struct mxsfb_devdata *devdata)
45d59d704080cc Marek Vasut 2016-08-18 192 {
45d59d704080cc Marek Vasut 2016-08-18 193 struct platform_device *pdev = to_platform_device(drm->dev);
45d59d704080cc Marek Vasut 2016-08-18 194 struct mxsfb_drm_private *mxsfb;
45d59d704080cc Marek Vasut 2016-08-18 195 struct resource *res;
45d59d704080cc Marek Vasut 2016-08-18 196 int ret;
45d59d704080cc Marek Vasut 2016-08-18 197
45d59d704080cc Marek Vasut 2016-08-18 198 mxsfb = devm_kzalloc(&pdev->dev, sizeof(*mxsfb), GFP_KERNEL);
45d59d704080cc Marek Vasut 2016-08-18 199 if (!mxsfb)
45d59d704080cc Marek Vasut 2016-08-18 200 return -ENOMEM;
45d59d704080cc Marek Vasut 2016-08-18 201
c42001e357f7de Laurent Pinchart 2020-07-27 202 mxsfb->drm = drm;
45d59d704080cc Marek Vasut 2016-08-18 203 drm->dev_private = mxsfb;
c6ddee8220bf8a Laurent Pinchart 2020-07-27 204 mxsfb->devdata = devdata;
45d59d704080cc Marek Vasut 2016-08-18 205
45d59d704080cc Marek Vasut 2016-08-18 206 res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
45d59d704080cc Marek Vasut 2016-08-18 207 mxsfb->base = devm_ioremap_resource(drm->dev, res);
45d59d704080cc Marek Vasut 2016-08-18 208 if (IS_ERR(mxsfb->base))
45d59d704080cc Marek Vasut 2016-08-18 209 return PTR_ERR(mxsfb->base);
45d59d704080cc Marek Vasut 2016-08-18 210
45d59d704080cc Marek Vasut 2016-08-18 211 mxsfb->clk = devm_clk_get(drm->dev, NULL);
45d59d704080cc Marek Vasut 2016-08-18 212 if (IS_ERR(mxsfb->clk))
45d59d704080cc Marek Vasut 2016-08-18 213 return PTR_ERR(mxsfb->clk);
45d59d704080cc Marek Vasut 2016-08-18 214
7e48d24c5ec466 Marek Vasut 2022-02-06 215 mxsfb->clk_axi = devm_clk_get_optional(drm->dev, "axi");
45d59d704080cc Marek Vasut 2016-08-18 216 if (IS_ERR(mxsfb->clk_axi))
7e48d24c5ec466 Marek Vasut 2022-02-06 217 return PTR_ERR(mxsfb->clk_axi);
45d59d704080cc Marek Vasut 2016-08-18 218
7e48d24c5ec466 Marek Vasut 2022-02-06 219 mxsfb->clk_disp_axi = devm_clk_get_optional(drm->dev, "disp_axi");
45d59d704080cc Marek Vasut 2016-08-18 220 if (IS_ERR(mxsfb->clk_disp_axi))
7e48d24c5ec466 Marek Vasut 2022-02-06 221 return PTR_ERR(mxsfb->clk_disp_axi);
45d59d704080cc Marek Vasut 2016-08-18 222
45d59d704080cc Marek Vasut 2016-08-18 223 ret = dma_set_mask_and_coherent(drm->dev, DMA_BIT_MASK(32));
45d59d704080cc Marek Vasut 2016-08-18 224 if (ret)
45d59d704080cc Marek Vasut 2016-08-18 225 return ret;
45d59d704080cc Marek Vasut 2016-08-18 226
45d59d704080cc Marek Vasut 2016-08-18 227 /* Modeset init */
45d59d704080cc Marek Vasut 2016-08-18 228 drm_mode_config_init(drm);
45d59d704080cc Marek Vasut 2016-08-18 229
ae1ed009328193 Laurent Pinchart 2020-07-27 230 ret = mxsfb_kms_init(mxsfb);
45d59d704080cc Marek Vasut 2016-08-18 231 if (ret < 0) {
ae1ed009328193 Laurent Pinchart 2020-07-27 232 dev_err(drm->dev, "Failed to initialize KMS pipeline\n");
7e48d24c5ec466 Marek Vasut 2022-02-06 233 return ret;
45d59d704080cc Marek Vasut 2016-08-18 234 }
45d59d704080cc Marek Vasut 2016-08-18 235
b9f5937680a8f1 Laurent Pinchart 2020-07-27 236 ret = drm_vblank_init(drm, drm->mode_config.num_crtc);
b9f5937680a8f1 Laurent Pinchart 2020-07-27 237 if (ret < 0) {
b9f5937680a8f1 Laurent Pinchart 2020-07-27 238 dev_err(drm->dev, "Failed to initialise vblank\n");
7e48d24c5ec466 Marek Vasut 2022-02-06 239 return ret;
b9f5937680a8f1 Laurent Pinchart 2020-07-27 240 }
b9f5937680a8f1 Laurent Pinchart 2020-07-27 241
b9f5937680a8f1 Laurent Pinchart 2020-07-27 242 /* Start with vertical blanking interrupt reporting disabled. */
b9f5937680a8f1 Laurent Pinchart 2020-07-27 243 drm_crtc_vblank_off(&mxsfb->crtc);
b9f5937680a8f1 Laurent Pinchart 2020-07-27 244
c42001e357f7de Laurent Pinchart 2020-07-27 245 ret = mxsfb_attach_bridge(mxsfb);
45d59d704080cc Marek Vasut 2016-08-18 246 if (ret) {
ee46d16d2e40be Guido Günther 2020-12-15 247 if (ret != -EPROBE_DEFER)
d02340436695cb Robert Chiras 2019-08-29 248 dev_err(drm->dev, "Cannot connect bridge: %d\n", ret);
7e48d24c5ec466 Marek Vasut 2022-02-06 249 return ret;
45d59d704080cc Marek Vasut 2016-08-18 250 }
45d59d704080cc Marek Vasut 2016-08-18 251
45d59d704080cc Marek Vasut 2016-08-18 252 drm->mode_config.min_width = MXSFB_MIN_XRES;
45d59d704080cc Marek Vasut 2016-08-18 253 drm->mode_config.min_height = MXSFB_MIN_YRES;
45d59d704080cc Marek Vasut 2016-08-18 254 drm->mode_config.max_width = MXSFB_MAX_XRES;
45d59d704080cc Marek Vasut 2016-08-18 255 drm->mode_config.max_height = MXSFB_MAX_YRES;
45d59d704080cc Marek Vasut 2016-08-18 256 drm->mode_config.funcs = &mxsfb_mode_config_funcs;
9f19fd3bd894d6 Leonard Crestez 2018-09-17 257 drm->mode_config.helper_private = &mxsfb_mode_config_helpers;
45d59d704080cc Marek Vasut 2016-08-18 258
45d59d704080cc Marek Vasut 2016-08-18 259 drm_mode_config_reset(drm);
45d59d704080cc Marek Vasut 2016-08-18 260
5fc40f41c137cc Thomas Zimmermann 2021-08-03 261 ret = platform_get_irq(pdev, 0);
5fc40f41c137cc Thomas Zimmermann 2021-08-03 262 if (ret < 0)
5fc40f41c137cc Thomas Zimmermann 2021-08-03 @263 goto err_vblank;
5fc40f41c137cc Thomas Zimmermann 2021-08-03 264 mxsfb->irq = ret;
5fc40f41c137cc Thomas Zimmermann 2021-08-03 265
5fc40f41c137cc Thomas Zimmermann 2021-08-03 266 ret = mxsfb_irq_install(drm, mxsfb->irq);
45d59d704080cc Marek Vasut 2016-08-18 267 if (ret < 0) {
45d59d704080cc Marek Vasut 2016-08-18 268 dev_err(drm->dev, "Failed to install IRQ handler\n");
7e48d24c5ec466 Marek Vasut 2022-02-06 269 return ret;
45d59d704080cc Marek Vasut 2016-08-18 270 }
45d59d704080cc Marek Vasut 2016-08-18 271
45d59d704080cc Marek Vasut 2016-08-18 272 drm_kms_helper_poll_init(drm);
45d59d704080cc Marek Vasut 2016-08-18 273
45d59d704080cc Marek Vasut 2016-08-18 274 platform_set_drvdata(pdev, drm);
45d59d704080cc Marek Vasut 2016-08-18 275
45d59d704080cc Marek Vasut 2016-08-18 276 drm_helper_hpd_irq_event(drm);
45d59d704080cc Marek Vasut 2016-08-18 277
7e48d24c5ec466 Marek Vasut 2022-02-06 278 pm_runtime_enable(drm->dev);
45d59d704080cc Marek Vasut 2016-08-18 279
7e48d24c5ec466 Marek Vasut 2022-02-06 280 return 0;
45d59d704080cc Marek Vasut 2016-08-18 281 }
45d59d704080cc Marek Vasut 2016-08-18 282 ---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
kernel test robot
build botI love your patch! Yet something to improve:
Hi Marek,
I love your patch! Yet something to improve:
[auto build test ERROR on drm/drm-next]
[also build test ERROR on next-20220204]
[cannot apply to drm-intel/for-linux-next drm-tip/drm-tip drm-exynos/exynos-drm-next tegra-drm/drm/tegra/for-next airlied/drm-next v5.17-rc2] [If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Marek-Vasut/drm-mxsfb-Simplify-LCDIF-clock-handling/20220207-025717 base: git://anongit.freedesktop.org/drm/drm drm-next config: riscv-randconfig-r031-20220207 (https://download.01.org/0day-ci/archive/20220207/202202070554.XjbmgTB8-lkp(a)intel.com/config) compiler: clang version 15.0.0 (https://github.com/llvm/llvm-project 6daaf5a44925592c764c59219b0024ee06317028)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# install riscv cross compiling tool for clang build
# apt-get install binutils-riscv64-linux-gnu
# https://github.com/0day-ci/linux/commit/7e48d24c5ec466eddb1bfbb6f39daaf061d2a84b
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Marek-Vasut/drm-mxsfb-Simplify-LCDIF-clock-handling/20220207-025717 git checkout 7e48d24c5ec466eddb1bfbb6f39daaf061d2a84b
# save the config file to linux build tree
mkdir build_dir
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=riscv SHELL=/bin/bash drivers/gpu/drm/mxsfb/
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
>> drivers/gpu/drm/mxsfb/mxsfb_drv.c:263:8: error: use of undeclared label 'err_vblank'
goto err_vblank;
^1 error generated.
vim +/err_vblank +263 drivers/gpu/drm/mxsfb/mxsfb_drv.c
5fc40f41c137cc Thomas Zimmermann 2021-08-03 189
c6ddee8220bf8a Laurent Pinchart 2020-07-27 190 static int mxsfb_load(struct drm_device *drm,
c6ddee8220bf8a Laurent Pinchart 2020-07-27 191 const struct mxsfb_devdata *devdata)
45d59d704080cc Marek Vasut 2016-08-18 192 {
45d59d704080cc Marek Vasut 2016-08-18 193 struct platform_device *pdev = to_platform_device(drm->dev);
45d59d704080cc Marek Vasut 2016-08-18 194 struct mxsfb_drm_private *mxsfb;
45d59d704080cc Marek Vasut 2016-08-18 195 struct resource *res;
45d59d704080cc Marek Vasut 2016-08-18 196 int ret;
45d59d704080cc Marek Vasut 2016-08-18 197
45d59d704080cc Marek Vasut 2016-08-18 198 mxsfb = devm_kzalloc(&pdev->dev, sizeof(*mxsfb), GFP_KERNEL);
45d59d704080cc Marek Vasut 2016-08-18 199 if (!mxsfb)
45d59d704080cc Marek Vasut 2016-08-18 200 return -ENOMEM;
45d59d704080cc Marek Vasut 2016-08-18 201
c42001e357f7de Laurent Pinchart 2020-07-27 202 mxsfb->drm = drm;
45d59d704080cc Marek Vasut 2016-08-18 203 drm->dev_private = mxsfb;
c6ddee8220bf8a Laurent Pinchart 2020-07-27 204 mxsfb->devdata = devdata;
45d59d704080cc Marek Vasut 2016-08-18 205
45d59d704080cc Marek Vasut 2016-08-18 206 res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
45d59d704080cc Marek Vasut 2016-08-18 207 mxsfb->base = devm_ioremap_resource(drm->dev, res);
45d59d704080cc Marek Vasut 2016-08-18 208 if (IS_ERR(mxsfb->base))
45d59d704080cc Marek Vasut 2016-08-18 209 return PTR_ERR(mxsfb->base);
45d59d704080cc Marek Vasut 2016-08-18 210
45d59d704080cc Marek Vasut 2016-08-18 211 mxsfb->clk = devm_clk_get(drm->dev, NULL);
45d59d704080cc Marek Vasut 2016-08-18 212 if (IS_ERR(mxsfb->clk))
45d59d704080cc Marek Vasut 2016-08-18 213 return PTR_ERR(mxsfb->clk);
45d59d704080cc Marek Vasut 2016-08-18 214
7e48d24c5ec466 Marek Vasut 2022-02-06 215 mxsfb->clk_axi = devm_clk_get_optional(drm->dev, "axi");
45d59d704080cc Marek Vasut 2016-08-18 216 if (IS_ERR(mxsfb->clk_axi))
7e48d24c5ec466 Marek Vasut 2022-02-06 217 return PTR_ERR(mxsfb->clk_axi);
45d59d704080cc Marek Vasut 2016-08-18 218
7e48d24c5ec466 Marek Vasut 2022-02-06 219 mxsfb->clk_disp_axi = devm_clk_get_optional(drm->dev, "disp_axi");
45d59d704080cc Marek Vasut 2016-08-18 220 if (IS_ERR(mxsfb->clk_disp_axi))
7e48d24c5ec466 Marek Vasut 2022-02-06 221 return PTR_ERR(mxsfb->clk_disp_axi);
45d59d704080cc Marek Vasut 2016-08-18 222
45d59d704080cc Marek Vasut 2016-08-18 223 ret = dma_set_mask_and_coherent(drm->dev, DMA_BIT_MASK(32));
45d59d704080cc Marek Vasut 2016-08-18 224 if (ret)
45d59d704080cc Marek Vasut 2016-08-18 225 return ret;
45d59d704080cc Marek Vasut 2016-08-18 226
45d59d704080cc Marek Vasut 2016-08-18 227 /* Modeset init */
45d59d704080cc Marek Vasut 2016-08-18 228 drm_mode_config_init(drm);
45d59d704080cc Marek Vasut 2016-08-18 229
ae1ed009328193 Laurent Pinchart 2020-07-27 230 ret = mxsfb_kms_init(mxsfb);
45d59d704080cc Marek Vasut 2016-08-18 231 if (ret < 0) {
ae1ed009328193 Laurent Pinchart 2020-07-27 232 dev_err(drm->dev, "Failed to initialize KMS pipeline\n");
7e48d24c5ec466 Marek Vasut 2022-02-06 233 return ret;
45d59d704080cc Marek Vasut 2016-08-18 234 }
45d59d704080cc Marek Vasut 2016-08-18 235
b9f5937680a8f1 Laurent Pinchart 2020-07-27 236 ret = drm_vblank_init(drm, drm->mode_config.num_crtc);
b9f5937680a8f1 Laurent Pinchart 2020-07-27 237 if (ret < 0) {
b9f5937680a8f1 Laurent Pinchart 2020-07-27 238 dev_err(drm->dev, "Failed to initialise vblank\n");
7e48d24c5ec466 Marek Vasut 2022-02-06 239 return ret;
b9f5937680a8f1 Laurent Pinchart 2020-07-27 240 }
b9f5937680a8f1 Laurent Pinchart 2020-07-27 241
b9f5937680a8f1 Laurent Pinchart 2020-07-27 242 /* Start with vertical blanking interrupt reporting disabled. */
b9f5937680a8f1 Laurent Pinchart 2020-07-27 243 drm_crtc_vblank_off(&mxsfb->crtc);
b9f5937680a8f1 Laurent Pinchart 2020-07-27 244
c42001e357f7de Laurent Pinchart 2020-07-27 245 ret = mxsfb_attach_bridge(mxsfb);
45d59d704080cc Marek Vasut 2016-08-18 246 if (ret) {
ee46d16d2e40be Guido Günther 2020-12-15 247 if (ret != -EPROBE_DEFER)
d02340436695cb Robert Chiras 2019-08-29 248 dev_err(drm->dev, "Cannot connect bridge: %d\n", ret);
7e48d24c5ec466 Marek Vasut 2022-02-06 249 return ret;
45d59d704080cc Marek Vasut 2016-08-18 250 }
45d59d704080cc Marek Vasut 2016-08-18 251
45d59d704080cc Marek Vasut 2016-08-18 252 drm->mode_config.min_width = MXSFB_MIN_XRES;
45d59d704080cc Marek Vasut 2016-08-18 253 drm->mode_config.min_height = MXSFB_MIN_YRES;
45d59d704080cc Marek Vasut 2016-08-18 254 drm->mode_config.max_width = MXSFB_MAX_XRES;
45d59d704080cc Marek Vasut 2016-08-18 255 drm->mode_config.max_height = MXSFB_MAX_YRES;
45d59d704080cc Marek Vasut 2016-08-18 256 drm->mode_config.funcs = &mxsfb_mode_config_funcs;
9f19fd3bd894d6 Leonard Crestez 2018-09-17 257 drm->mode_config.helper_private = &mxsfb_mode_config_helpers;
45d59d704080cc Marek Vasut 2016-08-18 258
45d59d704080cc Marek Vasut 2016-08-18 259 drm_mode_config_reset(drm);
45d59d704080cc Marek Vasut 2016-08-18 260
5fc40f41c137cc Thomas Zimmermann 2021-08-03 261 ret = platform_get_irq(pdev, 0);
5fc40f41c137cc Thomas Zimmermann 2021-08-03 262 if (ret < 0)
5fc40f41c137cc Thomas Zimmermann 2021-08-03 @263 goto err_vblank;
5fc40f41c137cc Thomas Zimmermann 2021-08-03 264 mxsfb->irq = ret;
5fc40f41c137cc Thomas Zimmermann 2021-08-03 265
5fc40f41c137cc Thomas Zimmermann 2021-08-03 266 ret = mxsfb_irq_install(drm, mxsfb->irq);
45d59d704080cc Marek Vasut 2016-08-18 267 if (ret < 0) {
45d59d704080cc Marek Vasut 2016-08-18 268 dev_err(drm->dev, "Failed to install IRQ handler\n");
7e48d24c5ec466 Marek Vasut 2022-02-06 269 return ret;
45d59d704080cc Marek Vasut 2016-08-18 270 }
45d59d704080cc Marek Vasut 2016-08-18 271
45d59d704080cc Marek Vasut 2016-08-18 272 drm_kms_helper_poll_init(drm);
45d59d704080cc Marek Vasut 2016-08-18 273
45d59d704080cc Marek Vasut 2016-08-18 274 platform_set_drvdata(pdev, drm);
45d59d704080cc Marek Vasut 2016-08-18 275
45d59d704080cc Marek Vasut 2016-08-18 276 drm_helper_hpd_irq_event(drm);
45d59d704080cc Marek Vasut 2016-08-18 277
7e48d24c5ec466 Marek Vasut 2022-02-06 278 pm_runtime_enable(drm->dev);
45d59d704080cc Marek Vasut 2016-08-18 279
7e48d24c5ec466 Marek Vasut 2022-02-06 280 return 0;
45d59d704080cc Marek Vasut 2016-08-18 281 }
45d59d704080cc Marek Vasut 2016-08-18 282 ---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
Re: (EXT) [PATCH] drm: mxsfb: Simplify LCDIF clock handling
In reply to Marek VasutHi Marek,
I like the overall idea. Thanks for the effort.
Am Sonntag, 6. Februar 2022, 19:55:55 CET schrieb Marek Vasut:
Quoted 30 lines
The current clock handling in the LCDIF driver is a convoluted mess. Implement runtime PM ops which turn the clock ON and OFF and let the pm_runtime_get_sync()/pm_runtime_put_sync() calls in .atomic_enable and .atomic_disable callbacks turn the clock ON and OFF at the right time.
Signed-off-by Marek Vasut <[email protected]>Cc Alexander Stein <[email protected]>Cc Laurent Pinchart <[email protected]>Cc Lucas Stach <[email protected]>Cc Peng Fan <[email protected]>Cc Robby Cai <[email protected]>Cc Sam Ravnborg <[email protected]>Cc Stefan Agner <[email protected]>--- drivers/gpu/drm/mxsfb/mxsfb_drv.c | 85 ++++++++++++++++++------------- drivers/gpu/drm/mxsfb/mxsfb_kms.c | 18 ++----- 2 files changed, 54 insertions(+), 49 deletions(-)(quoted diff) +0
-0
b/drivers/gpu/drm/mxsfb/mxsfb_drv.cindex375f26d4a4172..4ff3c6195dd0c100644drivers/gpu/drm/mxsfb/mxsfb_drv.c +0
-2@@ -72,18 +72,6 @@ static const struct mxsfb_devdata mxsfb_devdata[] = { }, }; -void mxsfb_enable_axi_clk (struct mxsfb_drm_private *mxsfb) -{
drivers/gpu/drm/mxsfb/mxsfb_drv.c static const struct mxsfb_devdata mxsfb_devdata[] = { · line 86
Quoted 10 lines
drivers/gpu/drm/mxsfb/mxsfb_drv.c +0
-10-if (mxsfb->clk_axi) -clk_prepare_enable (mxsfb->clk_axi); -} - -void mxsfb_disable_axi_clk (struct mxsfb_drm_private *mxsfb) -{ -if (mxsfb->clk_axi) -clk_disable_unprepare (mxsfb->clk_axi); -} -
The declarations for mxsfb_enable_axi_clk() and mxsfb_disable_axi_clk() are still in drivers/gpu/drm/mxsfb/mxsfb_drv.h. Please remove them as well. You will then notice that they are still used at some places.
Quoted 21 lines
drivers/gpu/drm/mxsfb/mxsfb_drv.c +4
-4static struct drm_framebuffer *mxsfb_fb_create (struct drm_device *dev,struct drm_file *file_priv,const struct drm_mode_fb_cmd2 *mode_cmd)@@ -224,33 +212,31 @@ static int mxsfb_load(struct drm_device *drm,if (IS_ERR (mxsfb->clk))return PTR_ERR (mxsfb->clk); - mxsfb->clk_axi =devm_clk_get (drm->dev,"axi" ); + mxsfb->clk_axi =devm_clk_get_optional (drm->dev,"axi" );if (IS_ERR (mxsfb->clk_axi)) - mxsfb->clk_axi =NULL ; +return PTR_ERR (mxsfb->clk_axi); - mxsfb->clk_disp_axi =devm_clk_get (drm->dev,"disp_axi" ); + mxsfb->clk_disp_axi =devm_clk_get_optional (drm->dev,"disp_axi" );if (IS_ERR (mxsfb->clk_disp_axi)) - mxsfb->clk_disp_axi =NULL ; +return PTR_ERR (mxsfb->clk_disp_axi); ret =dma_set_mask_and_coherent (drm->dev,DMA_BIT_MASK (32 ));if (ret)
drivers/gpu/drm/mxsfb/mxsfb_drv.c static int mxsfb_load(struct drm_device *drm, · line 232
Quoted 10 lines
drivers/gpu/drm/mxsfb/mxsfb_drv.c +0
-2return ret; -pm_runtime_enable (drm->dev); -/* Modeset init */ drm_mode_config_init (drm); ret =mxsfb_kms_init (mxsfb);if (ret <0 ) { dev_err(drm->dev, "Failed to initialize KMS
pipeline\n");
Quoted 13 lines
drivers/gpu/drm/mxsfb/mxsfb_drv.c +2
-2- goto err_vblank; +return ret; } ret =drm_vblank_init (drm, drm->mode_config.num_crtc);if (ret <0 ) {dev_err (drm->dev,"Failed to initialise vblank\n" ); - goto err_vblank; +return ret; }/* Start with vertical blanking interrupt reporting disabled. */
drivers/gpu/drm/mxsfb/mxsfb_drv.c static int mxsfb_load(struct drm_device *drm, · line 248
Quoted 3 lines
drivers/gpu/drm/mxsfb/mxsfb_drv.c +0
-0@@ -260,7 +246,7 @@ static int mxsfb_load(struct drm_device *drm,if (ret) {if (ret != -EPROBE_DEFER ) dev_err(drm->dev, "Cannot connect bridge:
%d\n", ret);
drivers/gpu/drm/mxsfb/mxsfb_drv.c static int mxsfb_load(struct drm_device *drm, · line 263
Quoted 7 lines
drivers/gpu/drm/mxsfb/mxsfb_drv.c +1
-1- goto err_vblank; +return ret; } drm->mode_config.min_width =MXSFB_MIN_XRES ;@@ -277,13 +263,10 @@ static int mxsfb_load(struct drm_device *drm, goto err_vblank;
You are still using err_vblank here which gets removed below.
Alexander
Quoted 130 lines
drivers/gpu/drm/mxsfb/mxsfb_drv.c +43
-14mxsfb->irq = ret; -pm_runtime_get_sync (drm->dev); ret =mxsfb_irq_install (drm, mxsfb->irq); -pm_runtime_put_sync (drm->dev); -if (ret <0 ) {dev_err (drm->dev,"Failed to install IRQ handler\n" ); - goto err_vblank; +return ret; }drm_kms_helper_poll_init (drm);@@ -292,12 +275,9 @@ static int mxsfb_load(struct drm_device *drm,drm_helper_hpd_irq_event (drm); -return 0 ; - -err_vblank: -pm_runtime_disable (drm->dev); +pm_runtime_enable (drm->dev); -return ret; +return 0 ; }static void mxsfb_unload (struct drm_device *drm)@@ -305,9 +285,7 @@ static void mxsfb_unload(struct drm_device *drm)drm_kms_helper_poll_fini (drm);drm_mode_config_cleanup (drm); -pm_runtime_get_sync (drm->dev);mxsfb_irq_uninstall (drm); -pm_runtime_put_sync (drm->dev); drm->dev_private =NULL ;@@ -388,23 +366,60 @@ static void mxsfb_shutdown(struct platform_device *pdev) drm_atomic_helper_shutdown(drm); } -#ifdef CONFIG_PM_SLEEP +static int mxsfb_rpm_suspend (struct device *dev) +{ +struct drm_device *drm =dev_get_drvdata (dev); +struct mxsfb_drm_private *mxsfb = drm->dev_private; + +/* These clock supply the DISPLAY CLOCK Domain */ +clk_disable_unprepare (mxsfb->clk); +/* These clock supply the System Bus, AXI, Write Path, LFIFO */ +clk_disable_unprepare (mxsfb->clk_disp_axi); +/* These clock supply the Control Bus, APB, APBH Ctrl Registers */ +clk_disable_unprepare (mxsfb->clk_axi); + +return 0 ; +} + +static int mxsfb_rpm_resume (struct device *dev) +{ +struct drm_device *drm =dev_get_drvdata (dev); +struct mxsfb_drm_private *mxsfb = drm->dev_private; + +/* These clock supply the Control Bus, APB, APBH Ctrl Registers */ +clk_prepare_enable (mxsfb->clk_axi); +/* These clock supply the System Bus, AXI, Write Path, LFIFO */ +clk_prepare_enable (mxsfb->clk_disp_axi); +/* These clock supply the DISPLAY CLOCK Domain */ +clk_prepare_enable (mxsfb->clk); + +return 0 ; +} +static int mxsfb_suspend (struct device *dev) {struct drm_device *drm =dev_get_drvdata (dev); +int ret; -return drm_mode_config_helper_suspend (drm); + ret =drm_mode_config_helper_suspend (drm); +if (ret) +return ret; + +return mxsfb_rpm_suspend (dev); }static int mxsfb_resume (struct device *dev) {struct drm_device *drm =dev_get_drvdata (dev); +mxsfb_rpm_resume (dev); +return drm_mode_config_helper_resume (drm); } -#endif static const struct dev_pm_ops mxsfb_pm_ops = { + .runtime_suspend = mxsfb_rpm_suspend, + .runtime_resume = mxsfb_rpm_resume,SET_SYSTEM_SLEEP_PM_OPS (mxsfb_suspend, mxsfb_resume) };(quoted diff) +0
-0
b/drivers/gpu/drm/mxsfb/mxsfb_kms.cindex0655582ae8ed6..03743a84c8e79100644drivers/gpu/drm/mxsfb/mxsfb_kms.c +0
-8@@ -100,10 +100,6 @@ static void mxsfb_enable_controller(struct mxsfb_drm_private *mxsfb) {u32 reg; -if (mxsfb->clk_disp_axi) -clk_prepare_enable (mxsfb->clk_disp_axi); -clk_prepare_enable (mxsfb->clk); -/* Increase number of outstanding requests on all supported IPs */ if (mxsfb->devdata->has_ctrl2) { reg =readl (mxsfb->base +LCDC_V4_CTRL2 );@@ -168,10 +164,6 @@ static void mxsfb_disable_controller(struct mxsfb_drm_private *mxsfb) reg = readl(mxsfb->base + LCDC_VDCTRL4); reg &= ~VDCTRL4_SYNC_SIGNALS_ON ;writel (reg, mxsfb->base +LCDC_VDCTRL4 ); - -clk_disable_unprepare (mxsfb->clk); -if (mxsfb->clk_disp_axi) -clk_disable_unprepare (mxsfb->clk_disp_axi); }/*
drivers/gpu/drm/mxsfb/mxsfb_kms.c static void mxsfb_crtc_atomic_enable(struct drm_crtc · line 348
Quoted 8 lines
drivers/gpu/drm/mxsfb/mxsfb_kms.c +0
-3@@ -352,9 +344,6 @@ static void mxsfb_crtc_atomic_enable(struct drm_crtc *crtc, dma_addr_t paddr;pm_runtime_get_sync (drm->dev); -mxsfb_enable_axi_clk (mxsfb); - -drm_crtc_vblank_on (crtc);/* If there is a bridge attached to the LCDIF, use its bus format
*/
Quoted 28 lines
drivers/gpu/drm/mxsfb/mxsfb_kms.c +4
-3if (mxsfb->bridge) {@@ -388,6 +377,8 @@ static void mxsfb_crtc_atomic_enable(struct drm_crtc *crtc, }mxsfb_enable_controller (mxsfb); + +drm_crtc_vblank_on (crtc); } static void mxsfb_crtc_atomic_disable(struct drm_crtc *crtc,@@ -397,6 +388,8 @@ static void mxsfb_crtc_atomic_disable(struct drm_crtc *crtc, struct drm_device *drm = mxsfb->drm;struct drm_pending_vblank_event *event; +drm_crtc_vblank_off (crtc); +mxsfb_disable_controller (mxsfb);spin_lock_irq (&drm->event_lock);@@ -407,9 +400,6 @@ static void mxsfb_crtc_atomic_disable(struct drm_crtc *crtc, }spin_unlock_irq (&drm->event_lock); -drm_crtc_vblank_off (crtc); - -mxsfb_disable_axi_clk (mxsfb);pm_runtime_put_sync (drm->dev); }