summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorJacob McLemore <jmclemore.lkml@gmail.com>2026-05-22 20:26:24 -0500
committerThierry Reding <treding@nvidia.com>2026-05-28 17:19:28 +0200
commit05a07a31deda59b60483b5359b5c0ccb693d7311 (patch)
tree5aae4bc87c06591a47b8ac15ac5ca1627c40401f /drivers
parentf85d5a59b3d08c117b5e9629b356bc2fbda4a5e3 (diff)
downloadlinux-next-05a07a31deda59b60483b5359b5c0ccb693d7311.tar.gz
linux-next-05a07a31deda59b60483b5359b5c0ccb693d7311.zip
drm/tegra: sor: Remove usage of drm_simple_encoder_init()
Remove the deprecated trivial helper drm_simple_encoder_init(). Inline the call to drm_encoder_init and add instance of drm_encoder_funcs. Signed-off-by: Jacob McLemore <jmclemore.lkml@gmail.com> Signed-off-by: Thierry Reding <treding@nvidia.com> Link: https://patch.msgid.link/20260523012824.81043-1-jmclemore.lkml@gmail.com
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/tegra/sor.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c
index 93e5ffd4f206..865b211ae752 100644
--- a/drivers/gpu/drm/tegra/sor.c
+++ b/drivers/gpu/drm/tegra/sor.c
@@ -23,10 +23,10 @@
#include <drm/drm_debugfs.h>
#include <drm/drm_edid.h>
#include <drm/drm_eld.h>
+#include <drm/drm_encoder.h>
#include <drm/drm_file.h>
#include <drm/drm_panel.h>
#include <drm/drm_print.h>
-#include <drm/drm_simple_kms_helper.h>
#include "dc.h"
#include "dp.h"
@@ -3039,6 +3039,10 @@ static const struct tegra_sor_ops tegra_sor_dp_ops = {
.probe = tegra_sor_dp_probe,
};
+static const struct drm_encoder_funcs tegra_sor_encoder_funcs_cleanup = {
+ .destroy = drm_encoder_cleanup,
+};
+
static int tegra_sor_init(struct host1x_client *client)
{
struct drm_device *drm = dev_get_drvdata(client->host);
@@ -3082,7 +3086,8 @@ static int tegra_sor_init(struct host1x_client *client)
&tegra_sor_connector_helper_funcs);
sor->output.connector.dpms = DRM_MODE_DPMS_OFF;
- drm_simple_encoder_init(drm, &sor->output.encoder, encoder);
+ drm_encoder_init(drm, &sor->output.encoder,
+ &tegra_sor_encoder_funcs_cleanup, encoder, NULL);
drm_encoder_helper_add(&sor->output.encoder, helpers);
drm_connector_attach_encoder(&sor->output.connector,