Skip to content

L
linux
Commit 5417750d authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files
Options

drm: renesas: shmobile: Embed drm_device in shmob_drm_device 

Embedding drm_device in shmob_drm_device allows us to use the DRM
managed API to allocate both structures in one go, simplifying error
handling.
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/abbf95021191824f44cc8c52e4afbde93d44363a.1694767209.git.geert+renesas@glider.be
parent 3d77d2ac
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 44 deletions
drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c
View file @ 5417750d
...@@ -116,7 +116,7 @@ static void shmob_drm_crtc_start(struct shmob_drm_crtc *scrtc) ...@@ -116,7 +116,7 @@ static void shmob_drm_crtc_start(struct shmob_drm_crtc *scrtc)
struct shmob_drm_device *sdev = crtc->dev->dev_private; struct shmob_drm_device *sdev = crtc->dev->dev_private;
const struct shmob_drm_interface_data *idata = &sdev->pdata->iface; const struct shmob_drm_interface_data *idata = &sdev->pdata->iface;
const struct shmob_drm_format_info *format; const struct shmob_drm_format_info *format;
struct drm_device *dev = sdev->ddev; struct drm_device *dev = &sdev->ddev;
struct drm_plane *plane; struct drm_plane *plane;
u32 value; u32 value;
int ret; int ret;
...@@ -439,7 +439,7 @@ int shmob_drm_crtc_create(struct shmob_drm_device *sdev) ...@@ -439,7 +439,7 @@ int shmob_drm_crtc_create(struct shmob_drm_device *sdev)
sdev->crtc.dpms = DRM_MODE_DPMS_OFF; sdev->crtc.dpms = DRM_MODE_DPMS_OFF;
primary = __drm_universal_plane_alloc(sdev->ddev, sizeof(*primary), 0, primary = __drm_universal_plane_alloc(&sdev->ddev, sizeof(*primary), 0,
0, &primary_plane_funcs, 0, &primary_plane_funcs,
modeset_formats, modeset_formats,
ARRAY_SIZE(modeset_formats), ARRAY_SIZE(modeset_formats),
...@@ -448,7 +448,7 @@ int shmob_drm_crtc_create(struct shmob_drm_device *sdev) ...@@ -448,7 +448,7 @@ int shmob_drm_crtc_create(struct shmob_drm_device *sdev)
if (IS_ERR(primary)) if (IS_ERR(primary))
return PTR_ERR(primary); return PTR_ERR(primary);
ret = drm_crtc_init_with_planes(sdev->ddev, crtc, primary, NULL, ret = drm_crtc_init_with_planes(&sdev->ddev, crtc, primary, NULL,
&crtc_funcs, NULL); &crtc_funcs, NULL);
if (ret < 0) { if (ret < 0) {
drm_plane_cleanup(primary); drm_plane_cleanup(primary);
...@@ -524,7 +524,7 @@ int shmob_drm_encoder_create(struct shmob_drm_device *sdev) ...@@ -524,7 +524,7 @@ int shmob_drm_encoder_create(struct shmob_drm_device *sdev)
encoder->possible_crtcs = 1; encoder->possible_crtcs = 1;
ret = drm_simple_encoder_init(sdev->ddev, encoder, ret = drm_simple_encoder_init(&sdev->ddev, encoder,
DRM_MODE_ENCODER_DPI); DRM_MODE_ENCODER_DPI);
if (ret < 0) if (ret < 0)
return ret; return ret;
...@@ -604,7 +604,7 @@ int shmob_drm_connector_create(struct shmob_drm_device *sdev, ...@@ -604,7 +604,7 @@ int shmob_drm_connector_create(struct shmob_drm_device *sdev,
connector->display_info.width_mm = sdev->pdata->panel.width_mm; connector->display_info.width_mm = sdev->pdata->panel.width_mm;
connector->display_info.height_mm = sdev->pdata->panel.height_mm; connector->display_info.height_mm = sdev->pdata->panel.height_mm;
ret = drm_connector_init(sdev->ddev, connector, &connector_funcs, ret = drm_connector_init(&sdev->ddev, connector, &connector_funcs,
DRM_MODE_CONNECTOR_DPI); DRM_MODE_CONNECTOR_DPI);
if (ret < 0) if (ret < 0)
return ret; return ret;
...@@ -617,7 +617,7 @@ int shmob_drm_connector_create(struct shmob_drm_device *sdev, ...@@ -617,7 +617,7 @@ int shmob_drm_connector_create(struct shmob_drm_device *sdev,
drm_helper_connector_dpms(connector, DRM_MODE_DPMS_OFF); drm_helper_connector_dpms(connector, DRM_MODE_DPMS_OFF);
drm_object_property_set_value(&connector->base, drm_object_property_set_value(&connector->base,
sdev->ddev->mode_config.dpms_property, DRM_MODE_DPMS_OFF); sdev->ddev.mode_config.dpms_property, DRM_MODE_DPMS_OFF);
return 0; return 0;
......
drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c
View file @ 5417750d
...@@ -137,7 +137,7 @@ static int shmob_drm_pm_suspend(struct device *dev) ...@@ -137,7 +137,7 @@ static int shmob_drm_pm_suspend(struct device *dev)
{ {
struct shmob_drm_device *sdev = dev_get_drvdata(dev); struct shmob_drm_device *sdev = dev_get_drvdata(dev);
drm_kms_helper_poll_disable(sdev->ddev); drm_kms_helper_poll_disable(&sdev->ddev);
shmob_drm_crtc_suspend(&sdev->crtc); shmob_drm_crtc_suspend(&sdev->crtc);
return 0; return 0;
...@@ -147,11 +147,11 @@ static int shmob_drm_pm_resume(struct device *dev) ...@@ -147,11 +147,11 @@ static int shmob_drm_pm_resume(struct device *dev)
{ {
struct shmob_drm_device *sdev = dev_get_drvdata(dev); struct shmob_drm_device *sdev = dev_get_drvdata(dev);
drm_modeset_lock_all(sdev->ddev); drm_modeset_lock_all(&sdev->ddev);
shmob_drm_crtc_resume(&sdev->crtc); shmob_drm_crtc_resume(&sdev->crtc);
drm_modeset_unlock_all(sdev->ddev); drm_modeset_unlock_all(&sdev->ddev);
drm_kms_helper_poll_enable(sdev->ddev); drm_kms_helper_poll_enable(&sdev->ddev);
return 0; return 0;
} }
...@@ -192,11 +192,10 @@ static const struct dev_pm_ops shmob_drm_pm_ops = { ...@@ -192,11 +192,10 @@ static const struct dev_pm_ops shmob_drm_pm_ops = {
static void shmob_drm_remove(struct platform_device *pdev) static void shmob_drm_remove(struct platform_device *pdev)
{ {
struct shmob_drm_device *sdev = platform_get_drvdata(pdev); struct shmob_drm_device *sdev = platform_get_drvdata(pdev);
struct drm_device *ddev = sdev->ddev; struct drm_device *ddev = &sdev->ddev;
drm_dev_unregister(ddev); drm_dev_unregister(ddev);
drm_kms_helper_poll_fini(ddev); drm_kms_helper_poll_fini(ddev);
drm_dev_put(ddev);
} }
static int shmob_drm_probe(struct platform_device *pdev) static int shmob_drm_probe(struct platform_device *pdev)
...@@ -213,13 +212,15 @@ static int shmob_drm_probe(struct platform_device *pdev) ...@@ -213,13 +212,15 @@ static int shmob_drm_probe(struct platform_device *pdev)
} }
/* /*
* Allocate and initialize the driver private data, I/O resources and * Allocate and initialize the DRM device, driver private data, I/O
* clocks. * resources and clocks.
*/ */
sdev = devm_kzalloc(&pdev->dev, sizeof(*sdev), GFP_KERNEL); sdev = devm_drm_dev_alloc(&pdev->dev, &shmob_drm_driver,
if (sdev == NULL) struct shmob_drm_device, ddev);
return -ENOMEM; if (IS_ERR(sdev))
return PTR_ERR(sdev);
ddev = &sdev->ddev;
sdev->dev = &pdev->dev; sdev->dev = &pdev->dev;
sdev->pdata = pdata; sdev->pdata = pdata;
spin_lock_init(&sdev->irq_lock); spin_lock_init(&sdev->irq_lock);
...@@ -242,20 +243,12 @@ static int shmob_drm_probe(struct platform_device *pdev) ...@@ -242,20 +243,12 @@ static int shmob_drm_probe(struct platform_device *pdev)
if (ret < 0) if (ret < 0)
return ret; return ret;
/* Allocate and initialize the DRM device. */
ddev = drm_dev_alloc(&shmob_drm_driver, &pdev->dev);
if (IS_ERR(ddev))
return PTR_ERR(ddev);
sdev->ddev = ddev;
ddev->dev_private = sdev; ddev->dev_private = sdev;
ret = shmob_drm_modeset_init(sdev); ret = shmob_drm_modeset_init(sdev);
if (ret < 0) { if (ret < 0)
dev_err_probe(&pdev->dev, ret, return dev_err_probe(&pdev->dev, ret,
"failed to initialize mode setting\n"); "failed to initialize mode setting\n");
goto err_free_drm_dev;
}
for (i = 0; i < 4; ++i) { for (i = 0; i < 4; ++i) {
ret = shmob_drm_plane_create(sdev, i); ret = shmob_drm_plane_create(sdev, i);
...@@ -297,9 +290,6 @@ static int shmob_drm_probe(struct platform_device *pdev) ...@@ -297,9 +290,6 @@ static int shmob_drm_probe(struct platform_device *pdev)
err_modeset_cleanup: err_modeset_cleanup:
drm_kms_helper_poll_fini(ddev); drm_kms_helper_poll_fini(ddev);
err_free_drm_dev:
drm_dev_put(ddev);
return ret; return ret;
} }
......
drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.h
View file @ 5417750d
...@@ -32,7 +32,7 @@ struct shmob_drm_device { ...@@ -32,7 +32,7 @@ struct shmob_drm_device {
unsigned int irq; unsigned int irq;
spinlock_t irq_lock; /* Protects hardware LDINTR register */ spinlock_t irq_lock; /* Protects hardware LDINTR register */
struct drm_device *ddev; struct drm_device ddev;
struct shmob_drm_crtc crtc; struct shmob_drm_crtc crtc;
struct drm_encoder encoder; struct drm_encoder encoder;
......
drivers/gpu/drm/renesas/shmobile/shmob_drm_kms.c
View file @ 5417750d
...@@ -153,7 +153,7 @@ int shmob_drm_modeset_init(struct shmob_drm_device *sdev) ...@@ -153,7 +153,7 @@ int shmob_drm_modeset_init(struct shmob_drm_device *sdev)
{ {
int ret; int ret;
ret = drmm_mode_config_init(sdev->ddev); ret = drmm_mode_config_init(&sdev->ddev);
if (ret) if (ret)
return ret; return ret;
...@@ -169,15 +169,15 @@ int shmob_drm_modeset_init(struct shmob_drm_device *sdev) ...@@ -169,15 +169,15 @@ int shmob_drm_modeset_init(struct shmob_drm_device *sdev)
if (ret < 0) if (ret < 0)
return ret; return ret;
drm_kms_helper_poll_init(sdev->ddev); drm_kms_helper_poll_init(&sdev->ddev);
sdev->ddev->mode_config.min_width = 0; sdev->ddev.mode_config.min_width = 0;
sdev->ddev->mode_config.min_height = 0; sdev->ddev.mode_config.min_height = 0;
sdev->ddev->mode_config.max_width = 4095; sdev->ddev.mode_config.max_width = 4095;
sdev->ddev->mode_config.max_height = 4095; sdev->ddev.mode_config.max_height = 4095;
sdev->ddev->mode_config.funcs = &shmob_drm_mode_config_funcs; sdev->ddev.mode_config.funcs = &shmob_drm_mode_config_funcs;
drm_helper_disable_unused_functions(sdev->ddev); drm_helper_disable_unused_functions(&sdev->ddev);
return 0; return 0;
} }
drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c
View file @ 5417750d
...@@ -68,7 +68,7 @@ static void __shmob_drm_plane_setup(struct shmob_drm_plane *splane, ...@@ -68,7 +68,7 @@ static void __shmob_drm_plane_setup(struct shmob_drm_plane *splane,
splane->format->ldbbsifr; splane->format->ldbbsifr;
#define plane_reg_dump(sdev, splane, reg) \ #define plane_reg_dump(sdev, splane, reg) \
dev_dbg(sdev->ddev->dev, "%s(%u): %s 0x%08x 0x%08x\n", __func__, \ dev_dbg(sdev->ddev.dev, "%s(%u): %s 0x%08x 0x%08x\n", __func__, \
splane->index, #reg, \ splane->index, #reg, \
lcdc_read(sdev, reg(splane->index)), \ lcdc_read(sdev, reg(splane->index)), \
lcdc_read(sdev, reg(splane->index) + LCDC_SIDE_B_OFFSET)) lcdc_read(sdev, reg(splane->index) + LCDC_SIDE_B_OFFSET))
...@@ -81,7 +81,7 @@ static void __shmob_drm_plane_setup(struct shmob_drm_plane *splane, ...@@ -81,7 +81,7 @@ static void __shmob_drm_plane_setup(struct shmob_drm_plane *splane,
plane_reg_dump(sdev, splane, LDBnBSACR); plane_reg_dump(sdev, splane, LDBnBSACR);
lcdc_write(sdev, LDBCR, LDBCR_UPC(splane->index)); lcdc_write(sdev, LDBCR, LDBCR_UPC(splane->index));
dev_dbg(sdev->ddev->dev, "%s(%u): %s 0x%08x\n", __func__, splane->index, dev_dbg(sdev->ddev.dev, "%s(%u): %s 0x%08x\n", __func__, splane->index,
"LDBCR", lcdc_read(sdev, LDBCR)); "LDBCR", lcdc_read(sdev, LDBCR));
lcdc_write(sdev, LDBnBSIFR(splane->index), format); lcdc_write(sdev, LDBnBSIFR(splane->index), format);
...@@ -103,7 +103,7 @@ static void __shmob_drm_plane_setup(struct shmob_drm_plane *splane, ...@@ -103,7 +103,7 @@ static void __shmob_drm_plane_setup(struct shmob_drm_plane *splane,
lcdc_write(sdev, LDBCR, lcdc_write(sdev, LDBCR,
LDBCR_UPF(splane->index) | LDBCR_UPD(splane->index)); LDBCR_UPF(splane->index) | LDBCR_UPD(splane->index));
dev_dbg(sdev->ddev->dev, "%s(%u): %s 0x%08x\n", __func__, splane->index, dev_dbg(sdev->ddev.dev, "%s(%u): %s 0x%08x\n", __func__, splane->index,
"LDBCR", lcdc_read(sdev, LDBCR)); "LDBCR", lcdc_read(sdev, LDBCR));
plane_reg_dump(sdev, splane, LDBnBSIFR); plane_reg_dump(sdev, splane, LDBnBSIFR);
...@@ -198,7 +198,7 @@ int shmob_drm_plane_create(struct shmob_drm_device *sdev, unsigned int index) ...@@ -198,7 +198,7 @@ int shmob_drm_plane_create(struct shmob_drm_device *sdev, unsigned int index)
{ {
struct shmob_drm_plane *splane; struct shmob_drm_plane *splane;
splane = drmm_universal_plane_alloc(sdev->ddev, struct shmob_drm_plane, splane = drmm_universal_plane_alloc(&sdev->ddev, struct shmob_drm_plane,
plane, 1, &shmob_drm_plane_funcs, plane, 1, &shmob_drm_plane_funcs,
formats, ARRAY_SIZE(formats), NULL, formats, ARRAY_SIZE(formats), NULL,
DRM_PLANE_TYPE_OVERLAY, NULL); DRM_PLANE_TYPE_OVERLAY, NULL);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7