[PATCH 02/15] drm/xlnx/zynqmp_dpsub: remove dependency on DRM simple helpers
Diogo Silva <[email protected]>
| Newsgroups | dev.linux.lists.virtualization,dev.linux.lists.imx,org.freedesktop.lists.dri-devel,org.infradead.lists.linux-amlogic,org.infradead.lists.linux-mediatek,org.kernel.vger.linux-doc,org.kernel.vger.linux-kernel,org.kernel.vger.linux-renesas-soc,org.kernel.vger.linux-samsung-soc,org.kernel.vger.linux-tegra |
|---|---|
| Message-ID | <[email protected]> |
The simple KMS helpers are deprecated because they only add an intermediate layer between drivers and atomic modesetting. Open-code drm_simple_encoder_init() by calling drm_encoder_init() directly and providing driver-local drm_encoder_funcs. Also check the return value from drm_encoder_init() to avoid silent failures. Signed-off-by: Diogo Silva <[email protected]> --- drivers/gpu/drm/xlnx/zynqmp_kms.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/xlnx/zynqmp_kms.c b/drivers/gpu/drm/xlnx/zynqmp_kms.c index d5f922450565..1d194c2824e3 100644 --- a/drivers/gpu/drm/xlnx/zynqmp_kms.c +++ b/drivers/gpu/drm/xlnx/zynqmp_kms.c @@ -30,7 +30,6 @@ #include <drm/drm_mode_config.h> #include <drm/drm_plane.h> #include <drm/drm_probe_helper.h> -#include <drm/drm_simple_kms_helper.h> #include <drm/drm_vblank.h> #include <linux/clk.h> @@ -417,6 +416,10 @@ static const struct drm_driver zynqmp_dpsub_drm_driver = { .minor = 0, }; +static const struct drm_encoder_funcs zynqmp_dpsub_encoder_funcs = { + .destroy = drm_encoder_cleanup, +}; + static int zynqmp_dpsub_kms_init(struct zynqmp_dpsub *dpsub) { struct drm_encoder *encoder = &dpsub->drm->encoder; @@ -436,7 +439,13 @@ static int zynqmp_dpsub_kms_init(struct zynqmp_dpsub *dpsub) /* Create the encoder and attach the bridge. */ encoder->possible_crtcs |= drm_crtc_mask(&dpsub->drm->crtc); - drm_simple_encoder_init(&dpsub->drm->dev, encoder, DRM_MODE_ENCODER_NONE); + ret = drm_encoder_init(&dpsub->drm->dev, encoder, + &zynqmp_dpsub_encoder_funcs, + DRM_MODE_ENCODER_NONE, NULL); + if (ret) { + dev_err(dpsub->dev, "failed to initialize encoder\n"); + return ret; + } ret = drm_bridge_attach(encoder, dpsub->bridge, NULL, DRM_BRIDGE_ATTACH_NO_CONNECTOR); -- 2.54.0