The driver uses empty implementations for its encoders. Replace the code with the generic simple encoder.
Signed-off-by: Tian Tao tiantao6@hisilicon.com --- drivers/gpu/drm/drm_writeback.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/drm_writeback.c b/drivers/gpu/drm/drm_writeback.c index dccf4504..dea9b25 100644 --- a/drivers/gpu/drm/drm_writeback.c +++ b/drivers/gpu/drm/drm_writeback.c @@ -16,6 +16,7 @@ #include <drm/drm_drv.h> #include <drm/drm_modeset_helper_vtables.h> #include <drm/drm_property.h> +#include <drm/drm_simple_kms_helper.h> #include <drm/drm_writeback.h>
/** @@ -145,10 +146,6 @@ static int create_writeback_properties(struct drm_device *dev) return 0; }
-static const struct drm_encoder_funcs drm_writeback_encoder_funcs = { - .destroy = drm_encoder_cleanup, -}; - /** * drm_writeback_connector_init - Initialize a writeback connector and its properties * @dev: DRM device @@ -190,9 +187,8 @@ int drm_writeback_connector_init(struct drm_device *dev, return PTR_ERR(blob);
drm_encoder_helper_add(&wb_connector->encoder, enc_helper_funcs); - ret = drm_encoder_init(dev, &wb_connector->encoder, - &drm_writeback_encoder_funcs, - DRM_MODE_ENCODER_VIRTUAL, NULL); + ret = drm_simple_encoder_init(dev, &wb_connector->encoder, + DRM_MODE_ENCODER_VIRTUAL); if (ret) goto fail;