drm: drm_encoder_init() => drm_encoder_init_funcs()
Subsystems (46)
cover drm: drm_encoder_init() => drm_encoder_init_funcs()
Thomas Zimmermann had made a nice patch-set that introduced drm_simple_encoder_init() which is already present in drm-misc-next.
While looking at this it was suddenly obvious to me that this was functionalty that really should be included in drm_encoder.c The case where the core could handle the callback is pretty common and not part of the simple pipe line.
So after some dialog on dri-devel the conclusion was to go for a change like this:
drm_encoder_init_funcs() for all users that specified a drm_encoder_funcs to extend the functionality.
drm_encoder_init() for all users that did not
need to extend the basic functionality with
drm_encoder_funcs.
A similar approach with a _funcs() prefix is used elsewhere in drm/
This required a rename of the existing users, and a follow-up patch that moves drm_simple_encoder_init() to drm_encoder.c
Patches 3 in this set demonstrate the use of drm_encoder_init(). There are many more drivers that can be converted as Thomas has already demonstrated.
This is all based on work done by Thomas Zimmermann, I just wanted to implement my suggestion so we could select the best way forward.
Note: Daniel Vetter has hinted the approach implemented here smelled like middle-layer.
IMO this is not so, it is just a way to handle cleanup for the simple cases.
Sam
Sam Ravnborg (3):
drm: drm_encoder_init() => drm_encoder_init_funcs()
drm: drm_simple_encoder_init() => drm_encoder_init() drm/atmel-hlcdc: Use drm_encoder_init()
drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 28 ++++++------- drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 28 ++++++------- drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 28 ++++++------- drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 28 ++++++------- drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 4 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 10 ++--- .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 10 ++--- drivers/gpu/drm/arc/arcpgu_hdmi.c | 4 +- drivers/gpu/drm/arc/arcpgu_sim.c | 4 +- drivers/gpu/drm/ast/ast_mode.c | 3 +- drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c | 8 +--- drivers/gpu/drm/drm_encoder.c | 49 +++++++++++++++++++--- drivers/gpu/drm/drm_encoder_slave.c | 2 +- drivers/gpu/drm/drm_simple_kms_helper.c | 45 +------------------- drivers/gpu/drm/drm_writeback.c | 6 +-- drivers/gpu/drm/exynos/exynos_dp.c | 4 +- drivers/gpu/drm/exynos/exynos_drm_dpi.c | 4 +- drivers/gpu/drm/exynos/exynos_drm_dsi.c | 4 +- drivers/gpu/drm/exynos/exynos_drm_vidi.c | 4 +- drivers/gpu/drm/exynos/exynos_hdmi.c | 4 +- drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 4 +- drivers/gpu/drm/gma500/cdv_intel_crt.c | 5 ++- drivers/gpu/drm/gma500/cdv_intel_dp.c | 4 +- drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 4 +- drivers/gpu/drm/gma500/cdv_intel_lvds.c | 6 +-- drivers/gpu/drm/gma500/mdfld_dsi_dpi.c | 7 ++-- drivers/gpu/drm/gma500/oaktrail_hdmi.c | 6 +-- drivers/gpu/drm/gma500/oaktrail_lvds.c | 4 +- drivers/gpu/drm/gma500/psb_intel_lvds.c | 6 +-- drivers/gpu/drm/gma500/psb_intel_sdvo.c | 4 +- drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c | 4 +- drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c | 4 +- drivers/gpu/drm/i2c/tda998x_drv.c | 5 ++- drivers/gpu/drm/i915/display/icl_dsi.c | 4 +- drivers/gpu/drm/i915/display/intel_crt.c | 5 ++- drivers/gpu/drm/i915/display/intel_ddi.c | 6 ++- drivers/gpu/drm/i915/display/intel_dp.c | 6 +-- drivers/gpu/drm/i915/display/intel_dp_mst.c | 6 ++- drivers/gpu/drm/i915/display/intel_dvo.c | 6 +-- drivers/gpu/drm/i915/display/intel_hdmi.c | 6 +-- drivers/gpu/drm/i915/display/intel_lvds.c | 4 +- drivers/gpu/drm/i915/display/intel_sdvo.c | 6 +-- drivers/gpu/drm/i915/display/intel_tv.c | 4 +- drivers/gpu/drm/i915/display/vlv_dsi.c | 5 ++- drivers/gpu/drm/imx/dw_hdmi-imx.c | 4 +- drivers/gpu/drm/imx/imx-ldb.c | 4 +- drivers/gpu/drm/imx/imx-tve.c | 4 +- drivers/gpu/drm/imx/parallel-display.c | 4 +- drivers/gpu/drm/ingenic/ingenic-drm.c | 5 ++- drivers/gpu/drm/mediatek/mtk_dpi.c | 5 ++- drivers/gpu/drm/mediatek/mtk_dsi.c | 4 +- drivers/gpu/drm/meson/meson_dw_hdmi.c | 5 ++- drivers/gpu/drm/meson/meson_venc_cvbs.c | 5 ++- drivers/gpu/drm/mgag200/mgag200_mode.c | 7 +--- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 4 +- drivers/gpu/drm/msm/disp/mdp4/mdp4_dsi_encoder.c | 4 +- drivers/gpu/drm/msm/disp/mdp4/mdp4_dtv_encoder.c | 4 +- drivers/gpu/drm/msm/disp/mdp4/mdp4_lcdc_encoder.c | 4 +- drivers/gpu/drm/msm/disp/mdp5/mdp5_encoder.c | 3 +- drivers/gpu/drm/nouveau/dispnv04/dac.c | 4 +- drivers/gpu/drm/nouveau/dispnv04/dfp.c | 3 +- drivers/gpu/drm/nouveau/dispnv04/tvnv04.c | 4 +- drivers/gpu/drm/nouveau/dispnv04/tvnv17.c | 4 +- drivers/gpu/drm/nouveau/dispnv50/disp.c | 16 +++---- drivers/gpu/drm/omapdrm/omap_encoder.c | 4 +- drivers/gpu/drm/qxl/qxl_display.c | 7 +--- drivers/gpu/drm/radeon/atombios_encoders.c | 40 +++++++++--------- drivers/gpu/drm/radeon/radeon_dp_mst.c | 4 +- drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 20 ++++----- drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 4 +- drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 5 ++- drivers/gpu/drm/rockchip/cdn-dp-core.c | 4 +- drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 5 ++- drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 4 +- drivers/gpu/drm/rockchip/inno_hdmi.c | 4 +- drivers/gpu/drm/rockchip/rk3066_hdmi.c | 4 +- drivers/gpu/drm/rockchip/rockchip_lvds.c | 5 ++- drivers/gpu/drm/rockchip/rockchip_rgb.c | 5 ++- drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 4 +- drivers/gpu/drm/sti/sti_tvout.c | 16 +++---- drivers/gpu/drm/stm/ltdc.c | 4 +- drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 10 ++--- drivers/gpu/drm/sun4i/sun4i_lvds.c | 10 ++--- drivers/gpu/drm/sun4i/sun4i_rgb.c | 10 ++--- drivers/gpu/drm/sun4i/sun4i_tv.c | 10 ++--- drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 10 ++--- drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c | 4 +- drivers/gpu/drm/tegra/dsi.c | 6 +-- drivers/gpu/drm/tegra/hdmi.c | 5 ++- drivers/gpu/drm/tegra/rgb.c | 4 +- drivers/gpu/drm/tegra/sor.c | 4 +- drivers/gpu/drm/tidss/tidss_encoder.c | 4 +- drivers/gpu/drm/tilcdc/tilcdc_external.c | 8 ++-- drivers/gpu/drm/tilcdc/tilcdc_panel.c | 4 +- drivers/gpu/drm/vboxvideo/vbox_mode.c | 4 +- drivers/gpu/drm/vc4/vc4_dpi.c | 4 +- drivers/gpu/drm/vc4/vc4_dsi.c | 4 +- drivers/gpu/drm/vc4/vc4_hdmi.c | 4 +- drivers/gpu/drm/vc4/vc4_vec.c | 4 +- drivers/gpu/drm/virtio/virtgpu_display.c | 4 +- drivers/gpu/drm/vkms/vkms_output.c | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 5 ++- drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 4 +- drivers/gpu/drm/zte/zx_hdmi.c | 4 +- drivers/gpu/drm/zte/zx_tvenc.c | 4 +- drivers/gpu/drm/zte/zx_vga.c | 4 +- include/drm/drm_encoder.h | 9 ++-- include/drm/drm_simple_kms_helper.h | 4 -- 109 files changed, 394 insertions(+), 395 deletions(-)
PATCH 1/3 drm: drm_encoder_init() => drm_encoder_init_funcs()
Many callers of drm_encoder_init use a drm_encoder_funcs that contains only a drm_encoder_cleanup() callback.
drm_simple_encoder_init() was introduced to cover the common case where an encoder with only basic functionality was needed. But it really do not belong in drm_simple_*
Rename drm_encoder_init() to drm_encoder_funcs(),
so we can then in a subsequent patch rename drm_simple_encoder_init() to drm_encoder_init().
And then move the functionality to drm_encoder where it bleongs.
checkpatch complains about long lines in amd and radeon. Surrounding lines are too long too, so warnings were ignored.
--- drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 28 ++++++------- drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 28 ++++++------- drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 28 ++++++------- drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 28 ++++++------- drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 4 +- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 10 ++--- .../display/amdgpu_dm/amdgpu_dm_mst_types.c | 10 ++--- drivers/gpu/drm/arc/arcpgu_hdmi.c | 4 +- drivers/gpu/drm/arc/arcpgu_sim.c | 4 +- .../gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c | 6 +-- drivers/gpu/drm/drm_encoder.c | 14 +++---- drivers/gpu/drm/drm_encoder_slave.c | 2 +- drivers/gpu/drm/drm_simple_kms_helper.c | 6 +-- drivers/gpu/drm/drm_writeback.c | 6 +-- drivers/gpu/drm/exynos/exynos_dp.c | 4 +- drivers/gpu/drm/exynos/exynos_drm_dpi.c | 4 +- drivers/gpu/drm/exynos/exynos_drm_dsi.c | 4 +- drivers/gpu/drm/exynos/exynos_drm_vidi.c | 4 +- drivers/gpu/drm/exynos/exynos_hdmi.c | 4 +- drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 4 +- drivers/gpu/drm/gma500/cdv_intel_crt.c | 5 ++- drivers/gpu/drm/gma500/cdv_intel_dp.c | 4 +- drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 4 +- drivers/gpu/drm/gma500/cdv_intel_lvds.c | 6 +-- drivers/gpu/drm/gma500/mdfld_dsi_dpi.c | 7 ++-- drivers/gpu/drm/gma500/oaktrail_hdmi.c | 6 +-- drivers/gpu/drm/gma500/oaktrail_lvds.c | 4 +- drivers/gpu/drm/gma500/psb_intel_lvds.c | 6 +-- drivers/gpu/drm/gma500/psb_intel_sdvo.c | 4 +- .../gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c | 4 +- drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c | 4 +- drivers/gpu/drm/i2c/tda998x_drv.c | 5 ++- drivers/gpu/drm/i915/display/icl_dsi.c | 4 +- drivers/gpu/drm/i915/display/intel_crt.c | 5 ++- drivers/gpu/drm/i915/display/intel_ddi.c | 6 ++- drivers/gpu/drm/i915/display/intel_dp.c | 6 +-- drivers/gpu/drm/i915/display/intel_dp_mst.c | 6 ++- drivers/gpu/drm/i915/display/intel_dvo.c | 6 +-- drivers/gpu/drm/i915/display/intel_hdmi.c | 6 +-- drivers/gpu/drm/i915/display/intel_lvds.c | 4 +- drivers/gpu/drm/i915/display/intel_sdvo.c | 6 +-- drivers/gpu/drm/i915/display/intel_tv.c | 4 +- drivers/gpu/drm/i915/display/vlv_dsi.c | 5 ++- drivers/gpu/drm/imx/dw_hdmi-imx.c | 4 +- drivers/gpu/drm/imx/imx-ldb.c | 4 +- drivers/gpu/drm/imx/imx-tve.c | 4 +- drivers/gpu/drm/imx/parallel-display.c | 4 +- drivers/gpu/drm/ingenic/ingenic-drm.c | 5 ++- drivers/gpu/drm/mediatek/mtk_dpi.c | 5 ++- drivers/gpu/drm/mediatek/mtk_dsi.c | 4 +- drivers/gpu/drm/meson/meson_dw_hdmi.c | 5 ++- drivers/gpu/drm/meson/meson_venc_cvbs.c | 5 ++- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 4 +- .../gpu/drm/msm/disp/mdp4/mdp4_dsi_encoder.c | 4 +- .../gpu/drm/msm/disp/mdp4/mdp4_dtv_encoder.c | 4 +- .../gpu/drm/msm/disp/mdp4/mdp4_lcdc_encoder.c | 4 +- drivers/gpu/drm/msm/disp/mdp5/mdp5_encoder.c | 3 +- drivers/gpu/drm/nouveau/dispnv04/dac.c | 4 +- drivers/gpu/drm/nouveau/dispnv04/dfp.c | 3 +- drivers/gpu/drm/nouveau/dispnv04/tvnv04.c | 4 +- drivers/gpu/drm/nouveau/dispnv04/tvnv17.c | 4 +- drivers/gpu/drm/nouveau/dispnv50/disp.c | 16 ++++---- drivers/gpu/drm/omapdrm/omap_encoder.c | 4 +- drivers/gpu/drm/radeon/atombios_encoders.c | 40 +++++++++---------- drivers/gpu/drm/radeon/radeon_dp_mst.c | 4 +- .../gpu/drm/radeon/radeon_legacy_encoders.c | 20 +++++----- drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 4 +- .../gpu/drm/rockchip/analogix_dp-rockchip.c | 5 ++- drivers/gpu/drm/rockchip/cdn-dp-core.c | 4 +- .../gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 5 ++- drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 4 +- drivers/gpu/drm/rockchip/inno_hdmi.c | 4 +- drivers/gpu/drm/rockchip/rk3066_hdmi.c | 4 +- drivers/gpu/drm/rockchip/rockchip_lvds.c | 5 ++- drivers/gpu/drm/rockchip/rockchip_rgb.c | 5 ++- drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 4 +- drivers/gpu/drm/sti/sti_tvout.c | 16 ++++---- drivers/gpu/drm/stm/ltdc.c | 4 +- drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 10 ++--- drivers/gpu/drm/sun4i/sun4i_lvds.c | 10 ++--- drivers/gpu/drm/sun4i/sun4i_rgb.c | 10 ++--- drivers/gpu/drm/sun4i/sun4i_tv.c | 10 ++--- drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 10 ++--- drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c | 4 +- drivers/gpu/drm/tegra/dsi.c | 6 +-- drivers/gpu/drm/tegra/hdmi.c | 5 ++- drivers/gpu/drm/tegra/rgb.c | 4 +- drivers/gpu/drm/tegra/sor.c | 4 +- drivers/gpu/drm/tidss/tidss_encoder.c | 4 +- drivers/gpu/drm/tilcdc/tilcdc_external.c | 8 ++-- drivers/gpu/drm/tilcdc/tilcdc_panel.c | 4 +- drivers/gpu/drm/vboxvideo/vbox_mode.c | 4 +- drivers/gpu/drm/vc4/vc4_dpi.c | 4 +- drivers/gpu/drm/vc4/vc4_dsi.c | 4 +- drivers/gpu/drm/vc4/vc4_hdmi.c | 4 +- drivers/gpu/drm/vc4/vc4_vec.c | 4 +- drivers/gpu/drm/virtio/virtgpu_display.c | 4 +- drivers/gpu/drm/vkms/vkms_output.c | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 5 ++- drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 4 +- drivers/gpu/drm/zte/zx_hdmi.c | 4 +- drivers/gpu/drm/zte/zx_tvenc.c | 4 +- drivers/gpu/drm/zte/zx_vga.c | 4 +- include/drm/drm_encoder.h | 8 ++-- 105 files changed, 355 insertions(+), 336 deletions(-)
drivers/gpu/drm/amd/amdgpu/dce_v10_0.c +14 -14
@@ -3534,8 +3534,8 @@ static void dce_v10_0_encoder_add(struct amdgpu_device *adev,switch (amdgpu_encoder->encoder_id) {case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC1 :case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC2 : -drm_encoder_init (dev, encoder, &dce_v10_0_encoder_funcs, -DRM_MODE_ENCODER_DAC ,NULL ); +drm_encoder_init_funcs (dev, encoder, &dce_v10_0_encoder_funcs, +DRM_MODE_ENCODER_DAC ,NULL );drm_encoder_helper_add (encoder, &dce_v10_0_dac_helper_funcs);break ;case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DVO1 :
@@ -3545,16 +3545,16 @@ static void dce_v10_0_encoder_add(struct amdgpu_device *adev,case ENCODER_OBJECT_ID_INTERNAL_UNIPHY3 :if (amdgpu_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT )) { amdgpu_encoder->rmx_type =RMX_FULL ; -drm_encoder_init (dev, encoder, &dce_v10_0_encoder_funcs, -DRM_MODE_ENCODER_LVDS ,NULL ); +drm_encoder_init_funcs (dev, encoder, &dce_v10_0_encoder_funcs, +DRM_MODE_ENCODER_LVDS ,NULL ); amdgpu_encoder->enc_priv =amdgpu_atombios_encoder_get_lcd_info (amdgpu_encoder); }else if (amdgpu_encoder->devices & (ATOM_DEVICE_CRT_SUPPORT )) { -drm_encoder_init (dev, encoder, &dce_v10_0_encoder_funcs, -DRM_MODE_ENCODER_DAC ,NULL ); +drm_encoder_init_funcs (dev, encoder, &dce_v10_0_encoder_funcs, +DRM_MODE_ENCODER_DAC ,NULL ); amdgpu_encoder->enc_priv =amdgpu_atombios_encoder_get_dig_info (amdgpu_encoder); }else { -drm_encoder_init (dev, encoder, &dce_v10_0_encoder_funcs, -DRM_MODE_ENCODER_TMDS ,NULL ); +drm_encoder_init_funcs (dev, encoder, &dce_v10_0_encoder_funcs, +DRM_MODE_ENCODER_TMDS ,NULL ); amdgpu_encoder->enc_priv =amdgpu_atombios_encoder_get_dig_info (amdgpu_encoder); }drm_encoder_helper_add (encoder, &dce_v10_0_dig_helper_funcs);
@@ -3571,14 +3571,14 @@ static void dce_v10_0_encoder_add(struct amdgpu_device *adev,/* these are handled by the primary encoders */ amdgpu_encoder->is_ext_encoder = true;if (amdgpu_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT )) -drm_encoder_init (dev, encoder, &dce_v10_0_encoder_funcs, -DRM_MODE_ENCODER_LVDS ,NULL ); +drm_encoder_init_funcs (dev, encoder, &dce_v10_0_encoder_funcs, +DRM_MODE_ENCODER_LVDS ,NULL );else if (amdgpu_encoder->devices & (ATOM_DEVICE_CRT_SUPPORT )) -drm_encoder_init (dev, encoder, &dce_v10_0_encoder_funcs, -DRM_MODE_ENCODER_DAC ,NULL ); +drm_encoder_init_funcs (dev, encoder, &dce_v10_0_encoder_funcs, +DRM_MODE_ENCODER_DAC ,NULL );else -drm_encoder_init (dev, encoder, &dce_v10_0_encoder_funcs, -DRM_MODE_ENCODER_TMDS ,NULL ); +drm_encoder_init_funcs (dev, encoder, &dce_v10_0_encoder_funcs, +DRM_MODE_ENCODER_TMDS ,NULL );drm_encoder_helper_add (encoder, &dce_v10_0_ext_helper_funcs);break ; }
drivers/gpu/drm/amd/amdgpu/dce_v11_0.c +14 -14
@@ -3666,8 +3666,8 @@ static void dce_v11_0_encoder_add(struct amdgpu_device *adev,switch (amdgpu_encoder->encoder_id) {case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC1 :case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC2 : -drm_encoder_init (dev, encoder, &dce_v11_0_encoder_funcs, -DRM_MODE_ENCODER_DAC ,NULL ); +drm_encoder_init_funcs (dev, encoder, &dce_v11_0_encoder_funcs, +DRM_MODE_ENCODER_DAC ,NULL );drm_encoder_helper_add (encoder, &dce_v11_0_dac_helper_funcs);break ;case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DVO1 :
@@ -3677,16 +3677,16 @@ static void dce_v11_0_encoder_add(struct amdgpu_device *adev,case ENCODER_OBJECT_ID_INTERNAL_UNIPHY3 :if (amdgpu_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT )) { amdgpu_encoder->rmx_type =RMX_FULL ; -drm_encoder_init (dev, encoder, &dce_v11_0_encoder_funcs, -DRM_MODE_ENCODER_LVDS ,NULL ); +drm_encoder_init_funcs (dev, encoder, &dce_v11_0_encoder_funcs, +DRM_MODE_ENCODER_LVDS ,NULL ); amdgpu_encoder->enc_priv =amdgpu_atombios_encoder_get_lcd_info (amdgpu_encoder); }else if (amdgpu_encoder->devices & (ATOM_DEVICE_CRT_SUPPORT )) { -drm_encoder_init (dev, encoder, &dce_v11_0_encoder_funcs, -DRM_MODE_ENCODER_DAC ,NULL ); +drm_encoder_init_funcs (dev, encoder, &dce_v11_0_encoder_funcs, +DRM_MODE_ENCODER_DAC ,NULL ); amdgpu_encoder->enc_priv =amdgpu_atombios_encoder_get_dig_info (amdgpu_encoder); }else { -drm_encoder_init (dev, encoder, &dce_v11_0_encoder_funcs, -DRM_MODE_ENCODER_TMDS ,NULL ); +drm_encoder_init_funcs (dev, encoder, &dce_v11_0_encoder_funcs, +DRM_MODE_ENCODER_TMDS ,NULL ); amdgpu_encoder->enc_priv =amdgpu_atombios_encoder_get_dig_info (amdgpu_encoder); }drm_encoder_helper_add (encoder, &dce_v11_0_dig_helper_funcs);
@@ -3703,14 +3703,14 @@ static void dce_v11_0_encoder_add(struct amdgpu_device *adev,/* these are handled by the primary encoders */ amdgpu_encoder->is_ext_encoder = true;if (amdgpu_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT )) -drm_encoder_init (dev, encoder, &dce_v11_0_encoder_funcs, -DRM_MODE_ENCODER_LVDS ,NULL ); +drm_encoder_init_funcs (dev, encoder, &dce_v11_0_encoder_funcs, +DRM_MODE_ENCODER_LVDS ,NULL );else if (amdgpu_encoder->devices & (ATOM_DEVICE_CRT_SUPPORT )) -drm_encoder_init (dev, encoder, &dce_v11_0_encoder_funcs, -DRM_MODE_ENCODER_DAC ,NULL ); +drm_encoder_init_funcs (dev, encoder, &dce_v11_0_encoder_funcs, +DRM_MODE_ENCODER_DAC ,NULL );else -drm_encoder_init (dev, encoder, &dce_v11_0_encoder_funcs, -DRM_MODE_ENCODER_TMDS ,NULL ); +drm_encoder_init_funcs (dev, encoder, &dce_v11_0_encoder_funcs, +DRM_MODE_ENCODER_TMDS ,NULL );drm_encoder_helper_add (encoder, &dce_v11_0_ext_helper_funcs);break ; }
drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +14 -14
@@ -3345,8 +3345,8 @@ static void dce_v6_0_encoder_add(struct amdgpu_device *adev,switch (amdgpu_encoder->encoder_id) {case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC1 :case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC2 : -drm_encoder_init (dev, encoder, &dce_v6_0_encoder_funcs, -DRM_MODE_ENCODER_DAC ,NULL ); +drm_encoder_init_funcs (dev, encoder, &dce_v6_0_encoder_funcs, +DRM_MODE_ENCODER_DAC ,NULL );drm_encoder_helper_add (encoder, &dce_v6_0_dac_helper_funcs);break ;case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DVO1 :
@@ -3356,16 +3356,16 @@ static void dce_v6_0_encoder_add(struct amdgpu_device *adev,case ENCODER_OBJECT_ID_INTERNAL_UNIPHY3 :if (amdgpu_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT )) { amdgpu_encoder->rmx_type =RMX_FULL ; -drm_encoder_init (dev, encoder, &dce_v6_0_encoder_funcs, -DRM_MODE_ENCODER_LVDS ,NULL ); +drm_encoder_init_funcs (dev, encoder, &dce_v6_0_encoder_funcs, +DRM_MODE_ENCODER_LVDS ,NULL ); amdgpu_encoder->enc_priv =amdgpu_atombios_encoder_get_lcd_info (amdgpu_encoder); }else if (amdgpu_encoder->devices & (ATOM_DEVICE_CRT_SUPPORT )) { -drm_encoder_init (dev, encoder, &dce_v6_0_encoder_funcs, -DRM_MODE_ENCODER_DAC ,NULL ); +drm_encoder_init_funcs (dev, encoder, &dce_v6_0_encoder_funcs, +DRM_MODE_ENCODER_DAC ,NULL ); amdgpu_encoder->enc_priv =amdgpu_atombios_encoder_get_dig_info (amdgpu_encoder); }else { -drm_encoder_init (dev, encoder, &dce_v6_0_encoder_funcs, -DRM_MODE_ENCODER_TMDS ,NULL ); +drm_encoder_init_funcs (dev, encoder, &dce_v6_0_encoder_funcs, +DRM_MODE_ENCODER_TMDS ,NULL ); amdgpu_encoder->enc_priv =amdgpu_atombios_encoder_get_dig_info (amdgpu_encoder); }drm_encoder_helper_add (encoder, &dce_v6_0_dig_helper_funcs);
@@ -3382,14 +3382,14 @@ static void dce_v6_0_encoder_add(struct amdgpu_device *adev,/* these are handled by the primary encoders */ amdgpu_encoder->is_ext_encoder = true;if (amdgpu_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT )) -drm_encoder_init (dev, encoder, &dce_v6_0_encoder_funcs, -DRM_MODE_ENCODER_LVDS ,NULL ); +drm_encoder_init_funcs (dev, encoder, &dce_v6_0_encoder_funcs, +DRM_MODE_ENCODER_LVDS ,NULL );else if (amdgpu_encoder->devices & (ATOM_DEVICE_CRT_SUPPORT )) -drm_encoder_init (dev, encoder, &dce_v6_0_encoder_funcs, -DRM_MODE_ENCODER_DAC ,NULL ); +drm_encoder_init_funcs (dev, encoder, &dce_v6_0_encoder_funcs, +DRM_MODE_ENCODER_DAC ,NULL );else -drm_encoder_init (dev, encoder, &dce_v6_0_encoder_funcs, -DRM_MODE_ENCODER_TMDS ,NULL ); +drm_encoder_init_funcs (dev, encoder, &dce_v6_0_encoder_funcs, +DRM_MODE_ENCODER_TMDS ,NULL );drm_encoder_helper_add (encoder, &dce_v6_0_ext_helper_funcs);break ; }
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c +14 -14
@@ -3422,8 +3422,8 @@ static void dce_v8_0_encoder_add(struct amdgpu_device *adev,switch (amdgpu_encoder->encoder_id) {case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC1 :case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC2 : -drm_encoder_init (dev, encoder, &dce_v8_0_encoder_funcs, -DRM_MODE_ENCODER_DAC ,NULL ); +drm_encoder_init_funcs (dev, encoder, &dce_v8_0_encoder_funcs, +DRM_MODE_ENCODER_DAC ,NULL );drm_encoder_helper_add (encoder, &dce_v8_0_dac_helper_funcs);break ;case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DVO1 :
@@ -3433,16 +3433,16 @@ static void dce_v8_0_encoder_add(struct amdgpu_device *adev,case ENCODER_OBJECT_ID_INTERNAL_UNIPHY3 :if (amdgpu_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT )) { amdgpu_encoder->rmx_type =RMX_FULL ; -drm_encoder_init (dev, encoder, &dce_v8_0_encoder_funcs, -DRM_MODE_ENCODER_LVDS ,NULL ); +drm_encoder_init_funcs (dev, encoder, &dce_v8_0_encoder_funcs, +DRM_MODE_ENCODER_LVDS ,NULL ); amdgpu_encoder->enc_priv =amdgpu_atombios_encoder_get_lcd_info (amdgpu_encoder); }else if (amdgpu_encoder->devices & (ATOM_DEVICE_CRT_SUPPORT )) { -drm_encoder_init (dev, encoder, &dce_v8_0_encoder_funcs, -DRM_MODE_ENCODER_DAC ,NULL ); +drm_encoder_init_funcs (dev, encoder, &dce_v8_0_encoder_funcs, +DRM_MODE_ENCODER_DAC ,NULL ); amdgpu_encoder->enc_priv =amdgpu_atombios_encoder_get_dig_info (amdgpu_encoder); }else { -drm_encoder_init (dev, encoder, &dce_v8_0_encoder_funcs, -DRM_MODE_ENCODER_TMDS ,NULL ); +drm_encoder_init_funcs (dev, encoder, &dce_v8_0_encoder_funcs, +DRM_MODE_ENCODER_TMDS ,NULL ); amdgpu_encoder->enc_priv =amdgpu_atombios_encoder_get_dig_info (amdgpu_encoder); }drm_encoder_helper_add (encoder, &dce_v8_0_dig_helper_funcs);
@@ -3459,14 +3459,14 @@ static void dce_v8_0_encoder_add(struct amdgpu_device *adev,/* these are handled by the primary encoders */ amdgpu_encoder->is_ext_encoder = true;if (amdgpu_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT )) -drm_encoder_init (dev, encoder, &dce_v8_0_encoder_funcs, -DRM_MODE_ENCODER_LVDS ,NULL ); +drm_encoder_init_funcs (dev, encoder, &dce_v8_0_encoder_funcs, +DRM_MODE_ENCODER_LVDS ,NULL );else if (amdgpu_encoder->devices & (ATOM_DEVICE_CRT_SUPPORT )) -drm_encoder_init (dev, encoder, &dce_v8_0_encoder_funcs, -DRM_MODE_ENCODER_DAC ,NULL ); +drm_encoder_init_funcs (dev, encoder, &dce_v8_0_encoder_funcs, +DRM_MODE_ENCODER_DAC ,NULL );else -drm_encoder_init (dev, encoder, &dce_v8_0_encoder_funcs, -DRM_MODE_ENCODER_TMDS ,NULL ); +drm_encoder_init_funcs (dev, encoder, &dce_v8_0_encoder_funcs, +DRM_MODE_ENCODER_TMDS ,NULL );drm_encoder_helper_add (encoder, &dce_v8_0_ext_helper_funcs);break ; }
drivers/gpu/drm/amd/amdgpu/dce_virtual.c +2 -2
@@ -597,8 +597,8 @@ static int dce_virtual_connector_encoder_init(struct amdgpu_device *adev,if (!encoder)return -ENOMEM ; encoder->possible_crtcs =1 << index; -drm_encoder_init (adev->ddev, encoder, &dce_virtual_encoder_funcs, -DRM_MODE_ENCODER_VIRTUAL ,NULL ); +drm_encoder_init_funcs (adev->ddev, encoder, &dce_virtual_encoder_funcs, +DRM_MODE_ENCODER_VIRTUAL ,NULL );drm_encoder_helper_add (encoder, &dce_virtual_encoder_helper_funcs); connector =kzalloc (sizeof (struct drm_connector ),GFP_KERNEL );
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +5 -5
@@ -6021,11 +6021,11 @@ static int amdgpu_dm_encoder_init(struct drm_device *dev, {struct amdgpu_device *adev = dev->dev_private; -int res =drm_encoder_init (dev, - &aencoder->base, - &amdgpu_dm_encoder_funcs, -DRM_MODE_ENCODER_TMDS , -NULL ); +int res =drm_encoder_init_funcs (dev, + &aencoder->base, + &amdgpu_dm_encoder_funcs, +DRM_MODE_ENCODER_TMDS , +NULL ); aencoder->base.possible_crtcs =amdgpu_dm_get_encoder_crtc_mask (adev);
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +4 -6
@@ -358,12 +358,10 @@ dm_dp_create_fake_mst_encoder(struct amdgpu_dm_connector *connector) encoder = &amdgpu_encoder->base; encoder->possible_crtcs =amdgpu_dm_get_encoder_crtc_mask (adev); -drm_encoder_init ( - dev, - &amdgpu_encoder->base, - &amdgpu_dm_encoder_funcs, -DRM_MODE_ENCODER_DPMST , -NULL ); +drm_encoder_init_funcs (dev, &amdgpu_encoder->base, + &amdgpu_dm_encoder_funcs, +DRM_MODE_ENCODER_DPMST , +NULL );drm_encoder_helper_add (encoder, &amdgpu_dm_encoder_helper_funcs);
drivers/gpu/drm/arc/arcpgu_hdmi.c +2 -2
@@ -34,8 +34,8 @@ int arcpgu_drm_hdmi_init(struct drm_device *drm, struct device_node *np) encoder->possible_crtcs =1 ; encoder->possible_clones =0 ; - ret =drm_encoder_init (drm, encoder, &arcpgu_drm_encoder_funcs, -DRM_MODE_ENCODER_TMDS ,NULL ); + ret =drm_encoder_init_funcs (drm, encoder, &arcpgu_drm_encoder_funcs, +DRM_MODE_ENCODER_TMDS ,NULL );if (ret)return ret;
drivers/gpu/drm/arc/arcpgu_sim.c +2 -2
@@ -68,8 +68,8 @@ int arcpgu_drm_sim_init(struct drm_device *drm, struct device_node *np) encoder->possible_crtcs =1 ; encoder->possible_clones =0 ; - ret =drm_encoder_init (drm, encoder, &arcpgu_drm_encoder_funcs, -DRM_MODE_ENCODER_VIRTUAL ,NULL ); + ret =drm_encoder_init_funcs (drm, encoder, &arcpgu_drm_encoder_funcs, +DRM_MODE_ENCODER_VIRTUAL ,NULL );if (ret)return ret;
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c +3 -3
@@ -98,9 +98,9 @@ static int atmel_hlcdc_attach_endpoint(struct drm_device *dev, int endpoint)return -EINVAL ; } - ret =drm_encoder_init (dev, &output->encoder, - &atmel_hlcdc_panel_encoder_funcs, -DRM_MODE_ENCODER_NONE ,NULL ); + ret =drm_encoder_init_funcs (dev, &output->encoder, + &atmel_hlcdc_panel_encoder_funcs, +DRM_MODE_ENCODER_NONE ,NULL );if (ret)return ret;
drivers/gpu/drm/drm_encoder.c +7 -7
@@ -51,7 +51,7 @@* encoders, bridges also have the benefit of being purely an internal * abstraction since they are not exposed to userspace at all. * -* Encoders are initialized with drm_encoder_init() and cleaned up using +* Encoders are initialized with drm_encoder_init_funcs() and cleaned up using * drm_encoder_cleanup(). */ static const struct drm_prop_enum_list drm_encoder_enum_list[] = {
@@ -92,7 +92,7 @@ void drm_encoder_unregister_all(struct drm_device *dev) }/** -* drm_encoder_init - Init a preallocated encoder +* drm_encoder_init_funcs - Init a preallocated encoder * @dev: drm device * @encoder: the encoder to init * @funcs: callbacks for this encoder
@@ -106,10 +106,10 @@ void drm_encoder_unregister_all(struct drm_device *dev)* Returns: * Zero on success, error code on failure. */ -int drm_encoder_init (struct drm_device *dev, -struct drm_encoder *encoder, -const struct drm_encoder_funcs *funcs, -int encoder_type,const char *name, ...) +int drm_encoder_init_funcs (struct drm_device *dev, +struct drm_encoder *encoder, +const struct drm_encoder_funcs *funcs, +int encoder_type,const char *name, ...) {int ret;
@@ -150,7 +150,7 @@ int drm_encoder_init(struct drm_device *dev,return ret; } -EXPORT_SYMBOL (drm_encoder_init); +EXPORT_SYMBOL (drm_encoder_init_funcs);/** * drm_encoder_cleanup - cleans up an initialised encoder
drivers/gpu/drm/drm_encoder_slave.c +1 -1
@@ -32,7 +32,7 @@* drm_i2c_encoder_init - Initialize an I2C slave encoder * @dev: DRM device. * @encoder: Encoder to be attached to the I2C device. You aren't -* required to have called drm_encoder_init() before. +* required to have called drm_encoder_init_funcs() before. * @adap: I2C adapter that will be used to communicate with * the device. * @info: Information that will be used to create the I2C device.
drivers/gpu/drm/drm_simple_kms_helper.c +3 -3
@@ -65,9 +65,9 @@ int drm_simple_encoder_init(struct drm_device *dev, struct drm_encoder *encoder, int encoder_type) { -return drm_encoder_init (dev, encoder, - &drm_simple_encoder_funcs_cleanup, - encoder_type,NULL ); +return drm_encoder_init_funcs (dev, encoder, + &drm_simple_encoder_funcs_cleanup, + encoder_type,NULL ); }EXPORT_SYMBOL (drm_simple_encoder_init);
drivers/gpu/drm/drm_writeback.c +3 -3
@@ -191,9 +191,9 @@ 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_encoder_init_funcs (dev, &wb_connector->encoder, + &drm_writeback_encoder_funcs, +DRM_MODE_ENCODER_VIRTUAL ,NULL );if (ret) goto fail;
drivers/gpu/drm/exynos/exynos_dp.c +2 -2
@@ -174,8 +174,8 @@ static int exynos_dp_bind(struct device *dev, struct device *master, void *data)return ret; } -drm_encoder_init (drm_dev, encoder, &exynos_dp_encoder_funcs, -DRM_MODE_ENCODER_TMDS ,NULL ); +drm_encoder_init_funcs (drm_dev, encoder, &exynos_dp_encoder_funcs, +DRM_MODE_ENCODER_TMDS ,NULL );drm_encoder_helper_add (encoder, &exynos_dp_encoder_helper_funcs);
drivers/gpu/drm/exynos/exynos_drm_dpi.c +2 -2
@@ -201,8 +201,8 @@ int exynos_dpi_bind(struct drm_device *dev, struct drm_encoder *encoder) {int ret; -drm_encoder_init (dev, encoder, &exynos_dpi_encoder_funcs, -DRM_MODE_ENCODER_TMDS ,NULL ); +drm_encoder_init_funcs (dev, encoder, &exynos_dpi_encoder_funcs, +DRM_MODE_ENCODER_TMDS ,NULL );drm_encoder_helper_add (encoder, &exynos_dpi_encoder_helper_funcs);
drivers/gpu/drm/exynos/exynos_drm_dsi.c +2 -2
@@ -1704,8 +1704,8 @@ static int exynos_dsi_bind(struct device *dev, struct device *master,struct drm_bridge *in_bridge;int ret; -drm_encoder_init (drm_dev, encoder, &exynos_dsi_encoder_funcs, -DRM_MODE_ENCODER_TMDS ,NULL ); +drm_encoder_init_funcs (drm_dev, encoder, &exynos_dsi_encoder_funcs, +DRM_MODE_ENCODER_TMDS ,NULL );drm_encoder_helper_add (encoder, &exynos_dsi_encoder_helper_funcs);
drivers/gpu/drm/exynos/exynos_drm_vidi.c +2 -2
@@ -406,8 +406,8 @@ static int vidi_bind(struct device *dev, struct device *master, void *data)return PTR_ERR (ctx->crtc); } -drm_encoder_init (drm_dev, encoder, &exynos_vidi_encoder_funcs, -DRM_MODE_ENCODER_TMDS ,NULL ); +drm_encoder_init_funcs (drm_dev, encoder, &exynos_vidi_encoder_funcs, +DRM_MODE_ENCODER_TMDS ,NULL );drm_encoder_helper_add (encoder, &exynos_vidi_encoder_helper_funcs);
drivers/gpu/drm/exynos/exynos_hdmi.c +2 -2
@@ -1851,8 +1851,8 @@ static int hdmi_bind(struct device *dev, struct device *master, void *data) hdata->phy_clk.enable = hdmiphy_clk_enable; -drm_encoder_init (drm_dev, encoder, &exynos_hdmi_encoder_funcs, -DRM_MODE_ENCODER_TMDS ,NULL ); +drm_encoder_init_funcs (drm_dev, encoder, &exynos_hdmi_encoder_funcs, +DRM_MODE_ENCODER_TMDS ,NULL );drm_encoder_helper_add (encoder, &exynos_hdmi_encoder_helper_funcs);
drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c +2 -2
@@ -38,8 +38,8 @@ int fsl_dcu_drm_encoder_create(struct fsl_dcu_drm_device *fsl_dev,if (fsl_dev->tcon)fsl_tcon_bypass_enable (fsl_dev->tcon); - ret =drm_encoder_init (fsl_dev->drm, encoder, &encoder_funcs, -DRM_MODE_ENCODER_LVDS ,NULL ); + ret =drm_encoder_init_funcs (fsl_dev->drm, encoder, &encoder_funcs, +DRM_MODE_ENCODER_LVDS ,NULL );if (ret <0 )return ret;
drivers/gpu/drm/gma500/cdv_intel_crt.c +3 -2
@@ -271,8 +271,9 @@ void cdv_intel_crt_init(struct drm_device *dev, &cdv_intel_crt_connector_funcs, DRM_MODE_CONNECTOR_VGA); encoder = &gma_encoder->base; -drm_encoder_init (dev, encoder, - &cdv_intel_crt_enc_funcs,DRM_MODE_ENCODER_DAC ,NULL ); +drm_encoder_init_funcs (dev, encoder, + &cdv_intel_crt_enc_funcs, +DRM_MODE_ENCODER_DAC ,NULL );gma_connector_attach_encoder (gma_connector, gma_encoder);
drivers/gpu/drm/gma500/cdv_intel_dp.c +2 -2
@@ -2016,8 +2016,8 @@ cdv_intel_dp_init(struct drm_device *dev, struct psb_intel_mode_device *mode_dev encoder = &gma_encoder->base;drm_connector_init (dev, connector, &cdv_intel_dp_connector_funcs, type); -drm_encoder_init (dev, encoder, &cdv_intel_dp_enc_funcs, -DRM_MODE_ENCODER_TMDS ,NULL ); +drm_encoder_init_funcs (dev, encoder, &cdv_intel_dp_enc_funcs, +DRM_MODE_ENCODER_TMDS ,NULL );gma_connector_attach_encoder (gma_connector, gma_encoder);
drivers/gpu/drm/gma500/cdv_intel_hdmi.c +2 -2
@@ -311,8 +311,8 @@ void cdv_hdmi_init(struct drm_device *dev, &cdv_hdmi_connector_funcs, DRM_MODE_CONNECTOR_DVID); -drm_encoder_init (dev, encoder, &psb_intel_lvds_enc_funcs, -DRM_MODE_ENCODER_TMDS ,NULL ); +drm_encoder_init_funcs (dev, encoder, &psb_intel_lvds_enc_funcs, +DRM_MODE_ENCODER_TMDS ,NULL );gma_connector_attach_encoder (gma_connector, gma_encoder); gma_encoder->type =INTEL_OUTPUT_HDMI ;
drivers/gpu/drm/gma500/cdv_intel_lvds.c +3 -3
@@ -616,9 +616,9 @@ void cdv_intel_lvds_init(struct drm_device *dev, &cdv_intel_lvds_connector_funcs, DRM_MODE_CONNECTOR_LVDS); -drm_encoder_init (dev, encoder, - &cdv_intel_lvds_enc_funcs, -DRM_MODE_ENCODER_LVDS ,NULL ); +drm_encoder_init_funcs (dev, encoder, + &cdv_intel_lvds_enc_funcs, +DRM_MODE_ENCODER_LVDS ,NULL );gma_connector_attach_encoder (gma_connector, gma_encoder);
drivers/gpu/drm/gma500/mdfld_dsi_dpi.c +3 -4
@@ -993,10 +993,9 @@ struct mdfld_dsi_encoder *mdfld_dsi_dpi_init(struct drm_device *dev,/*create drm encoder object*/ connector = &dsi_connector->base.base; encoder = &dpi_output->base.base.base; -drm_encoder_init (dev, - encoder, - p_funcs->encoder_funcs, -DRM_MODE_ENCODER_LVDS ,NULL ); +drm_encoder_init_funcs (dev, encoder, + p_funcs->encoder_funcs, +DRM_MODE_ENCODER_LVDS ,NULL );drm_encoder_helper_add (encoder, p_funcs->encoder_helper_funcs);
drivers/gpu/drm/gma500/oaktrail_hdmi.c +3 -3
@@ -651,9 +651,9 @@ void oaktrail_hdmi_init(struct drm_device *dev, &oaktrail_hdmi_connector_funcs, DRM_MODE_CONNECTOR_DVID); -drm_encoder_init (dev, encoder, - &oaktrail_hdmi_enc_funcs, -DRM_MODE_ENCODER_TMDS ,NULL ); +drm_encoder_init_funcs (dev, encoder, + &oaktrail_hdmi_enc_funcs, +DRM_MODE_ENCODER_TMDS ,NULL );gma_connector_attach_encoder (gma_connector, gma_encoder);
drivers/gpu/drm/gma500/oaktrail_lvds.c +2 -2
@@ -311,8 +311,8 @@ void oaktrail_lvds_init(struct drm_device *dev, &psb_intel_lvds_connector_funcs, DRM_MODE_CONNECTOR_LVDS); -drm_encoder_init (dev, encoder, &psb_intel_lvds_enc_funcs, -DRM_MODE_ENCODER_LVDS ,NULL ); +drm_encoder_init_funcs (dev, encoder, &psb_intel_lvds_enc_funcs, +DRM_MODE_ENCODER_LVDS ,NULL );gma_connector_attach_encoder (gma_connector, gma_encoder); gma_encoder->type =INTEL_OUTPUT_LVDS ;
drivers/gpu/drm/gma500/psb_intel_lvds.c +3 -3
@@ -683,9 +683,9 @@ void psb_intel_lvds_init(struct drm_device *dev, &psb_intel_lvds_connector_funcs, DRM_MODE_CONNECTOR_LVDS); -drm_encoder_init (dev, encoder, - &psb_intel_lvds_enc_funcs, -DRM_MODE_ENCODER_LVDS ,NULL ); +drm_encoder_init_funcs (dev, encoder, + &psb_intel_lvds_enc_funcs, +DRM_MODE_ENCODER_LVDS ,NULL );gma_connector_attach_encoder (gma_connector, gma_encoder); gma_encoder->type =INTEL_OUTPUT_LVDS ;
drivers/gpu/drm/gma500/psb_intel_sdvo.c +2 -2
@@ -2533,8 +2533,8 @@ bool psb_intel_sdvo_init(struct drm_device *dev, int sdvo_reg)/* encoder type will be decided later */ gma_encoder = &psb_intel_sdvo->base; gma_encoder->type =INTEL_OUTPUT_SDVO ; -drm_encoder_init (dev, &gma_encoder->base, &psb_intel_sdvo_enc_funcs, -0 ,NULL ); +drm_encoder_init_funcs (dev, &gma_encoder->base, + &psb_intel_sdvo_enc_funcs,0 ,NULL );/* Read the regs to test if we can talk to the device */ for (i =0 ; i <0x40 ; i++) {
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c +2 -2
@@ -123,8 +123,8 @@ int hibmc_vdac_init(struct hibmc_drm_private *priv) } encoder->possible_crtcs =0x1 ; - ret =drm_encoder_init (dev, encoder, &hibmc_encoder_funcs, -DRM_MODE_ENCODER_DAC ,NULL ); + ret =drm_encoder_init_funcs (dev, encoder, &hibmc_encoder_funcs, +DRM_MODE_ENCODER_DAC ,NULL );if (ret) {DRM_ERROR ("failed to init encoder: %d\n" , ret);return ret;
drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c +2 -2
@@ -713,8 +713,8 @@ static int dw_drm_encoder_init(struct device *dev, } encoder->possible_crtcs = crtc_mask; - ret =drm_encoder_init (drm_dev, encoder, &dw_encoder_funcs, -DRM_MODE_ENCODER_DSI ,NULL ); + ret =drm_encoder_init_funcs (drm_dev, encoder, &dw_encoder_funcs, +DRM_MODE_ENCODER_DSI ,NULL );if (ret) {DRM_ERROR ("failed to init dsi encoder\n" );return ret;
drivers/gpu/drm/i2c/tda998x_drv.c +3 -2
@@ -2023,8 +2023,9 @@ static int tda998x_encoder_init(struct device *dev, struct drm_device *drm) priv->encoder.possible_crtcs = crtcs; - ret =drm_encoder_init (drm, &priv->encoder, &tda998x_encoder_funcs, -DRM_MODE_ENCODER_TMDS ,NULL ); + ret =drm_encoder_init_funcs (drm, &priv->encoder, + &tda998x_encoder_funcs, +DRM_MODE_ENCODER_TMDS ,NULL );if (ret) goto err_encoder;
drivers/gpu/drm/i915/display/icl_dsi.c +2 -2
@@ -1752,8 +1752,8 @@ void icl_dsi_init(struct drm_i915_private *dev_priv) connector = &intel_connector->base;/* register DSI encoder with DRM subsystem */ -drm_encoder_init (dev, &encoder->base, &gen11_dsi_encoder_funcs, -DRM_MODE_ENCODER_DSI ,"DSI %c" ,port_name (port)); +drm_encoder_init_funcs (dev, &encoder->base, &gen11_dsi_encoder_funcs, +DRM_MODE_ENCODER_DSI ,"DSI %c" ,port_name (port)); encoder->pre_pll_enable = gen11_dsi_pre_pll_enable; encoder->pre_enable = gen11_dsi_pre_enable;
drivers/gpu/drm/i915/display/intel_crt.c +3 -2
@@ -1020,8 +1020,9 @@ void intel_crt_init(struct drm_i915_private *dev_priv)drm_connector_init (&dev_priv->drm, &intel_connector->base, &intel_crt_connector_funcs,DRM_MODE_CONNECTOR_VGA ); -drm_encoder_init (&dev_priv->drm, &crt->base.base, &intel_crt_enc_funcs, -DRM_MODE_ENCODER_DAC ,"CRT" ); +drm_encoder_init_funcs (&dev_priv->drm, &crt->base.base, + &intel_crt_enc_funcs, +DRM_MODE_ENCODER_DAC ,"CRT" );intel_connector_attach_encoder (intel_connector, &crt->base);
drivers/gpu/drm/i915/display/intel_ddi.c +4 -2
@@ -4875,8 +4875,10 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port) encoder = &intel_dig_port->base; -drm_encoder_init (&dev_priv->drm, &encoder->base, &intel_ddi_funcs, -DRM_MODE_ENCODER_TMDS ,"DDI %c" ,port_name (port)); +drm_encoder_init_funcs (&dev_priv->drm, &encoder->base, + &intel_ddi_funcs, +DRM_MODE_ENCODER_TMDS ,"DDI %c" , +port_name (port)); encoder->hotplug = intel_ddi_hotplug; encoder->compute_output_type = intel_ddi_compute_output_type;
drivers/gpu/drm/i915/display/intel_dp.c +3 -3
@@ -7798,9 +7798,9 @@ bool intel_dp_init(struct drm_i915_private *dev_priv, intel_encoder = &intel_dig_port->base; encoder = &intel_encoder->base; -if (drm_encoder_init (&dev_priv->drm, &intel_encoder->base, - &intel_dp_enc_funcs,DRM_MODE_ENCODER_TMDS , -"DP %c" ,port_name (port))) +if (drm_encoder_init_funcs (&dev_priv->drm, &intel_encoder->base, + &intel_dp_enc_funcs,DRM_MODE_ENCODER_TMDS , +"DP %c" ,port_name (port))) goto err_encoder_init; intel_encoder->hotplug = intel_dp_hotplug;
drivers/gpu/drm/i915/display/intel_dp_mst.c +4 -2
@@ -739,8 +739,10 @@ intel_dp_create_fake_mst_encoder(struct intel_digital_port *intel_dig_port, enum intel_encoder = &intel_mst->base; intel_mst->primary = intel_dig_port; -drm_encoder_init (dev, &intel_encoder->base, &intel_dp_mst_enc_funcs, -DRM_MODE_ENCODER_DPMST ,"DP-MST %c" ,pipe_name (pipe)); +drm_encoder_init_funcs (dev, &intel_encoder->base, + &intel_dp_mst_enc_funcs, +DRM_MODE_ENCODER_DPMST ,"DP-MST %c" , +pipe_name (pipe)); intel_encoder->type =INTEL_OUTPUT_DP_MST ; intel_encoder->power_domain = intel_dig_port->base.power_domain;
drivers/gpu/drm/i915/display/intel_dvo.c +3 -3
@@ -499,9 +499,9 @@ void intel_dvo_init(struct drm_i915_private *dev_priv)continue ; port =intel_dvo_port (dvo->dvo_reg); -drm_encoder_init (&dev_priv->drm, &intel_encoder->base, - &intel_dvo_enc_funcs, encoder_type, -"DVO %c" ,port_name (port)); +drm_encoder_init_funcs (&dev_priv->drm, &intel_encoder->base, + &intel_dvo_enc_funcs, encoder_type, +"DVO %c" ,port_name (port)); intel_encoder->type =INTEL_OUTPUT_DVO ; intel_encoder->power_domain =POWER_DOMAIN_PORT_OTHER ;
drivers/gpu/drm/i915/display/intel_hdmi.c +3 -3
@@ -3259,9 +3259,9 @@ void intel_hdmi_init(struct drm_i915_private *dev_priv, intel_encoder = &intel_dig_port->base; -drm_encoder_init (&dev_priv->drm, &intel_encoder->base, - &intel_hdmi_enc_funcs,DRM_MODE_ENCODER_TMDS , -"HDMI %c" ,port_name (port)); +drm_encoder_init_funcs (&dev_priv->drm, &intel_encoder->base, + &intel_hdmi_enc_funcs,DRM_MODE_ENCODER_TMDS , +"HDMI %c" ,port_name (port)); intel_encoder->hotplug = intel_hdmi_hotplug; intel_encoder->compute_config = intel_hdmi_compute_config;
drivers/gpu/drm/i915/display/intel_lvds.c +2 -2
@@ -876,8 +876,8 @@ void intel_lvds_init(struct drm_i915_private *dev_priv)drm_connector_init (dev, &intel_connector->base, &intel_lvds_connector_funcs,DRM_MODE_CONNECTOR_LVDS ); -drm_encoder_init (dev, &intel_encoder->base, &intel_lvds_enc_funcs, -DRM_MODE_ENCODER_LVDS ,"LVDS" ); +drm_encoder_init_funcs (dev, &intel_encoder->base, &intel_lvds_enc_funcs, +DRM_MODE_ENCODER_LVDS ,"LVDS" ); intel_encoder->enable = intel_enable_lvds; intel_encoder->pre_enable = intel_pre_enable_lvds;
drivers/gpu/drm/i915/display/intel_sdvo.c +3 -3
@@ -3273,9 +3273,9 @@ bool intel_sdvo_init(struct drm_i915_private *dev_priv, intel_encoder->type =INTEL_OUTPUT_SDVO ; intel_encoder->power_domain =POWER_DOMAIN_PORT_OTHER ; intel_encoder->port = port; -drm_encoder_init (&dev_priv->drm, &intel_encoder->base, - &intel_sdvo_enc_funcs,0 , -"SDVO %c" ,port_name (port)); +drm_encoder_init_funcs (&dev_priv->drm, &intel_encoder->base, + &intel_sdvo_enc_funcs,0 , +"SDVO %c" ,port_name (port));/* Read the regs to test if we can talk to the device */ for (i =0 ; i <0x40 ; i++) {
drivers/gpu/drm/i915/display/intel_tv.c +2 -2
@@ -1941,8 +1941,8 @@ intel_tv_init(struct drm_i915_private *dev_priv)drm_connector_init (dev, connector, &intel_tv_connector_funcs,DRM_MODE_CONNECTOR_SVIDEO ); -drm_encoder_init (dev, &intel_encoder->base, &intel_tv_enc_funcs, -DRM_MODE_ENCODER_TVDAC ,"TV" ); +drm_encoder_init_funcs (dev, &intel_encoder->base, &intel_tv_enc_funcs, +DRM_MODE_ENCODER_TVDAC ,"TV" ); intel_encoder->compute_config = intel_tv_compute_config; intel_encoder->get_config = intel_tv_get_config;
drivers/gpu/drm/i915/display/vlv_dsi.c +3 -2
@@ -1879,8 +1879,9 @@ void vlv_dsi_init(struct drm_i915_private *dev_priv) connector = &intel_connector->base; -drm_encoder_init (dev, encoder, &intel_dsi_funcs,DRM_MODE_ENCODER_DSI , -"DSI %c" ,port_name (port)); +drm_encoder_init_funcs (dev, encoder, &intel_dsi_funcs, +DRM_MODE_ENCODER_DSI , +"DSI %c" ,port_name (port)); intel_encoder->compute_config = intel_dsi_compute_config; intel_encoder->pre_enable = intel_dsi_pre_enable;
drivers/gpu/drm/imx/dw_hdmi-imx.c +2 -2
@@ -236,8 +236,8 @@ static int dw_hdmi_imx_bind(struct device *dev, struct device *master,return ret;drm_encoder_helper_add (encoder, &dw_hdmi_imx_encoder_helper_funcs); -drm_encoder_init (drm, encoder, &dw_hdmi_imx_encoder_funcs, -DRM_MODE_ENCODER_TMDS ,NULL ); +drm_encoder_init_funcs (drm, encoder, &dw_hdmi_imx_encoder_funcs, +DRM_MODE_ENCODER_TMDS ,NULL );platform_set_drvdata (pdev, hdmi);
drivers/gpu/drm/imx/imx-ldb.c +2 -2
@@ -441,8 +441,8 @@ static int imx_ldb_register(struct drm_device *drm, }drm_encoder_helper_add (encoder, &imx_ldb_encoder_helper_funcs); -drm_encoder_init (drm, encoder, &imx_ldb_encoder_funcs, -DRM_MODE_ENCODER_LVDS ,NULL ); +drm_encoder_init_funcs (drm, encoder, &imx_ldb_encoder_funcs, +DRM_MODE_ENCODER_LVDS ,NULL );if (imx_ldb_ch->bridge) { ret = drm_bridge_attach(&imx_ldb_ch->encoder,
drivers/gpu/drm/imx/imx-tve.c +2 -2
@@ -479,8 +479,8 @@ static int imx_tve_register(struct drm_device *drm, struct imx_tve *tve)return ret;drm_encoder_helper_add (&tve->encoder, &imx_tve_encoder_helper_funcs); -drm_encoder_init (drm, &tve->encoder, &imx_tve_encoder_funcs, - encoder_type,NULL ); +drm_encoder_init_funcs (drm, &tve->encoder, &imx_tve_encoder_funcs, + encoder_type,NULL );drm_connector_helper_add (&tve->connector, &imx_tve_connector_helper_funcs);
drivers/gpu/drm/imx/parallel-display.c +2 -2
@@ -288,8 +288,8 @@ static int imx_pd_register(struct drm_device *drm,*/ imxpd->connector.dpms =DRM_MODE_DPMS_OFF ; -drm_encoder_init (drm, encoder, &imx_pd_encoder_funcs, -DRM_MODE_ENCODER_NONE ,NULL ); +drm_encoder_init_funcs (drm, encoder, &imx_pd_encoder_funcs, +DRM_MODE_ENCODER_NONE ,NULL ); imxpd->bridge.funcs = &imx_pd_bridge_funcs;drm_bridge_attach (encoder, &imxpd->bridge,NULL ,0 );
drivers/gpu/drm/ingenic/ingenic-drm.c +3 -2
@@ -730,8 +730,9 @@ static int ingenic_drm_probe(struct platform_device *pdev)drm_encoder_helper_add (&priv->encoder, &ingenic_drm_encoder_helper_funcs); - ret =drm_encoder_init (drm, &priv->encoder, &ingenic_drm_encoder_funcs, -DRM_MODE_ENCODER_DPI ,NULL ); + ret =drm_encoder_init_funcs (drm, &priv->encoder, + &ingenic_drm_encoder_funcs, +DRM_MODE_ENCODER_DPI ,NULL );if (ret) {dev_err (dev,"Failed to init encoder: %i" , ret);return ret;
drivers/gpu/drm/mediatek/mtk_dpi.c +3 -2
@@ -596,8 +596,9 @@ static int mtk_dpi_bind(struct device *dev, struct device *master, void *data)return ret; } - ret =drm_encoder_init (drm_dev, &dpi->encoder, &mtk_dpi_encoder_funcs, -DRM_MODE_ENCODER_TMDS ,NULL ); + ret =drm_encoder_init_funcs (drm_dev, &dpi->encoder, + &mtk_dpi_encoder_funcs, +DRM_MODE_ENCODER_TMDS ,NULL );if (ret) {dev_err (dev,"Failed to initialize decoder: %d\n" , ret); goto err_unregister;
drivers/gpu/drm/mediatek/mtk_dsi.c +2 -2
@@ -888,8 +888,8 @@ static int mtk_dsi_create_conn_enc(struct drm_device *drm, struct mtk_dsi *dsi) {int ret; - ret =drm_encoder_init (drm, &dsi->encoder, &mtk_dsi_encoder_funcs, -DRM_MODE_ENCODER_DSI ,NULL ); + ret =drm_encoder_init_funcs (drm, &dsi->encoder, &mtk_dsi_encoder_funcs, +DRM_MODE_ENCODER_DSI ,NULL );if (ret) {DRM_ERROR ("Failed to encoder init to drm\n" );return ret;
drivers/gpu/drm/meson/meson_dw_hdmi.c +3 -2
@@ -1049,8 +1049,9 @@ static int meson_dw_hdmi_bind(struct device *dev, struct device *master,/* Encoder */ - ret =drm_encoder_init (drm, encoder, &meson_venc_hdmi_encoder_funcs, -DRM_MODE_ENCODER_TMDS ,"meson_hdmi" ); + ret =drm_encoder_init_funcs (drm, encoder, + &meson_venc_hdmi_encoder_funcs, +DRM_MODE_ENCODER_TMDS ,"meson_hdmi" );if (ret) {dev_err (priv->dev,"Failed to init HDMI encoder\n" );return ret;
drivers/gpu/drm/meson/meson_venc_cvbs.c +3 -2
@@ -280,8 +280,9 @@ int meson_venc_cvbs_create(struct meson_drm *priv)drm_encoder_helper_add (encoder, &meson_venc_cvbs_encoder_helper_funcs); - ret =drm_encoder_init (drm, encoder, &meson_venc_cvbs_encoder_funcs, -DRM_MODE_ENCODER_TVDAC ,"meson_venc_cvbs" ); + ret =drm_encoder_init_funcs (drm, encoder, + &meson_venc_cvbs_encoder_funcs, +DRM_MODE_ENCODER_TVDAC ,"meson_venc_cvbs" );if (ret) {dev_err (priv->dev,"Failed to init CVBS encoder\n" );return ret;
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +2 -2
@@ -2193,8 +2193,8 @@ struct drm_encoder *dpu_encoder_init(struct drm_device *dev,if (!dpu_enc)return ERR_PTR (ENOMEM ); - rc =drm_encoder_init (dev, &dpu_enc->base, &dpu_encoder_funcs, - drm_enc_mode,NULL ); + rc =drm_encoder_init_funcs (dev, &dpu_enc->base, &dpu_encoder_funcs, + drm_enc_mode,NULL );if (rc) {devm_kfree (dev->dev, dpu_enc);return ERR_PTR (rc);
drivers/gpu/drm/msm/disp/mdp4/mdp4_dsi_encoder.c +2 -2
@@ -158,8 +158,8 @@ struct drm_encoder *mdp4_dsi_encoder_init(struct drm_device *dev) encoder = &mdp4_dsi_encoder->base; -drm_encoder_init (dev, encoder, &mdp4_dsi_encoder_funcs, -DRM_MODE_ENCODER_DSI ,NULL ); +drm_encoder_init_funcs (dev, encoder, &mdp4_dsi_encoder_funcs, +DRM_MODE_ENCODER_DSI ,NULL );drm_encoder_helper_add (encoder, &mdp4_dsi_encoder_helper_funcs);return encoder;
drivers/gpu/drm/msm/disp/mdp4/mdp4_dtv_encoder.c +2 -2
@@ -234,8 +234,8 @@ struct drm_encoder *mdp4_dtv_encoder_init(struct drm_device *dev) encoder = &mdp4_dtv_encoder->base; -drm_encoder_init (dev, encoder, &mdp4_dtv_encoder_funcs, -DRM_MODE_ENCODER_TMDS ,NULL ); +drm_encoder_init_funcs (dev, encoder, &mdp4_dtv_encoder_funcs, +DRM_MODE_ENCODER_TMDS ,NULL );drm_encoder_helper_add (encoder, &mdp4_dtv_encoder_helper_funcs); mdp4_dtv_encoder->hdmi_clk =devm_clk_get (dev->dev,"hdmi_clk" );
drivers/gpu/drm/msm/disp/mdp4/mdp4_lcdc_encoder.c +2 -2
@@ -443,8 +443,8 @@ struct drm_encoder *mdp4_lcdc_encoder_init(struct drm_device *dev, encoder = &mdp4_lcdc_encoder->base; -drm_encoder_init (dev, encoder, &mdp4_lcdc_encoder_funcs, -DRM_MODE_ENCODER_LVDS ,NULL ); +drm_encoder_init_funcs (dev, encoder, &mdp4_lcdc_encoder_funcs, +DRM_MODE_ENCODER_LVDS ,NULL );drm_encoder_helper_add (encoder, &mdp4_lcdc_encoder_helper_funcs);/* TODO: do we need different pll in other cases? */
drivers/gpu/drm/msm/disp/mdp5/mdp5_encoder.c +2 -1
@@ -422,7 +422,8 @@ struct drm_encoder *mdp5_encoder_init(struct drm_device *dev,spin_lock_init (&mdp5_encoder->intf_lock); -drm_encoder_init (dev, encoder, &mdp5_encoder_funcs, enc_type,NULL ); +drm_encoder_init_funcs (dev, encoder, &mdp5_encoder_funcs, enc_type, +NULL );drm_encoder_helper_add (encoder, &mdp5_encoder_helper_funcs);
drivers/gpu/drm/nouveau/dispnv04/dac.c +2 -2
@@ -548,8 +548,8 @@ nv04_dac_create(struct drm_connector *connector, struct dcb_output *entry)else helper = &nv04_dac_helper_funcs; -drm_encoder_init (dev, encoder, &nv04_dac_funcs,DRM_MODE_ENCODER_DAC , -NULL ); +drm_encoder_init_funcs (dev, encoder, &nv04_dac_funcs, +DRM_MODE_ENCODER_DAC ,NULL );drm_encoder_helper_add (encoder, helper); encoder->possible_crtcs = entry->heads;
drivers/gpu/drm/nouveau/dispnv04/dfp.c +2 -1
@@ -706,7 +706,8 @@ nv04_dfp_create(struct drm_connector *connector, struct dcb_output *entry) nv_encoder->dcb = entry; nv_encoder->or =ffs (entry->or) -1 ; -drm_encoder_init (connector->dev, encoder, &nv04_dfp_funcs, type,NULL ); +drm_encoder_init_funcs (connector->dev, encoder, &nv04_dfp_funcs, type, +NULL );drm_encoder_helper_add (encoder, helper); encoder->possible_crtcs = entry->heads;
drivers/gpu/drm/nouveau/dispnv04/tvnv04.c +2 -2
@@ -222,8 +222,8 @@ nv04_tv_create(struct drm_connector *connector, struct dcb_output *entry)/* Initialize the common members */ encoder =to_drm_encoder (nv_encoder); -drm_encoder_init (dev, encoder, &nv04_tv_funcs,DRM_MODE_ENCODER_TVDAC , -NULL ); +drm_encoder_init_funcs (dev, encoder, &nv04_tv_funcs, +DRM_MODE_ENCODER_TVDAC ,NULL );drm_encoder_helper_add (encoder, &nv04_tv_helper_funcs); nv_encoder->enc_save = drm_i2c_encoder_save;
drivers/gpu/drm/nouveau/dispnv04/tvnv17.c +2 -2
@@ -808,8 +808,8 @@ nv17_tv_create(struct drm_connector *connector, struct dcb_output *entry) tv_enc->base.dcb = entry; tv_enc->base.or =ffs (entry->or) -1 ; -drm_encoder_init (dev, encoder, &nv17_tv_funcs,DRM_MODE_ENCODER_TVDAC , -NULL ); +drm_encoder_init_funcs (dev, encoder, &nv17_tv_funcs, +DRM_MODE_ENCODER_TVDAC ,NULL );drm_encoder_helper_add (encoder, &nv17_tv_helper_funcs);to_encoder_slave (encoder)->slave_funcs = &nv17_tv_slave_funcs;
drivers/gpu/drm/nouveau/dispnv50/disp.c +8 -8
@@ -469,8 +469,8 @@ nv50_dac_create(struct drm_connector *connector, struct dcb_output *dcbe) encoder =to_drm_encoder (nv_encoder); encoder->possible_crtcs = dcbe->heads; encoder->possible_clones =0 ; -drm_encoder_init (connector->dev, encoder, &nv50_dac_func, type, -"dac-%04x-%04x" , dcbe->hasht, dcbe->hashm); +drm_encoder_init_funcs (connector->dev, encoder, &nv50_dac_func, type, +"dac-%04x-%04x" , dcbe->hasht, dcbe->hashm);drm_encoder_helper_add (encoder, &nv50_dac_help);drm_connector_attach_encoder (connector, encoder);
@@ -1027,8 +1027,8 @@ nv50_msto_new(struct drm_device *dev, struct nv50_head *head, int id)if (!msto)return ERR_PTR (-ENOMEM ); - ret =drm_encoder_init (dev, &msto->encoder, &nv50_msto, -DRM_MODE_ENCODER_DPMST ,"mst-%d" , id); + ret =drm_encoder_init_funcs (dev, &msto->encoder, &nv50_msto, +DRM_MODE_ENCODER_DPMST ,"mst-%d" , id);if (ret) {kfree (msto);return ERR_PTR (ret);
@@ -1678,8 +1678,8 @@ nv50_sor_create(struct drm_connector *connector, struct dcb_output *dcbe) encoder =to_drm_encoder (nv_encoder); encoder->possible_crtcs = dcbe->heads; encoder->possible_clones =0 ; -drm_encoder_init (connector->dev, encoder, &nv50_sor_func, type, -"sor-%04x-%04x" , dcbe->hasht, dcbe->hashm); +drm_encoder_init_funcs (connector->dev, encoder, &nv50_sor_func, type, +"sor-%04x-%04x" , dcbe->hasht, dcbe->hashm);drm_encoder_helper_add (encoder, &nv50_sor_help);drm_connector_attach_encoder (connector, encoder);
@@ -1834,8 +1834,8 @@ nv50_pior_create(struct drm_connector *connector, struct dcb_output *dcbe) encoder =to_drm_encoder (nv_encoder); encoder->possible_crtcs = dcbe->heads; encoder->possible_clones =0 ; -drm_encoder_init (connector->dev, encoder, &nv50_pior_func, type, -"pior-%04x-%04x" , dcbe->hasht, dcbe->hashm); +drm_encoder_init_funcs (connector->dev, encoder, &nv50_pior_func, type, +"pior-%04x-%04x" , dcbe->hasht, dcbe->hashm);drm_encoder_helper_add (encoder, &nv50_pior_help);drm_connector_attach_encoder (connector, encoder);
drivers/gpu/drm/omapdrm/omap_encoder.c +2 -2
@@ -189,8 +189,8 @@ struct drm_encoder *omap_encoder_init(struct drm_device *dev, encoder = &omap_encoder->base; -drm_encoder_init (dev, encoder, &omap_encoder_funcs, -DRM_MODE_ENCODER_TMDS ,NULL ); +drm_encoder_init_funcs (dev, encoder, &omap_encoder_funcs, +DRM_MODE_ENCODER_TMDS ,NULL );drm_encoder_helper_add (encoder, &omap_encoder_helper_funcs);return encoder;
drivers/gpu/drm/radeon/atombios_encoders.c +20 -20
@@ -2779,27 +2779,27 @@ radeon_add_atom_encoder(struct drm_device *dev,case ENCODER_OBJECT_ID_INTERNAL_LVTM1 :if (radeon_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT )) { radeon_encoder->rmx_type =RMX_FULL ; -drm_encoder_init (dev, encoder, &radeon_atom_enc_funcs, -DRM_MODE_ENCODER_LVDS ,NULL ); +drm_encoder_init_funcs (dev, encoder, &radeon_atom_enc_funcs, +DRM_MODE_ENCODER_LVDS ,NULL ); radeon_encoder->enc_priv =radeon_atombios_get_lvds_info (radeon_encoder); }else { -drm_encoder_init (dev, encoder, &radeon_atom_enc_funcs, -DRM_MODE_ENCODER_TMDS ,NULL ); +drm_encoder_init_funcs (dev, encoder, &radeon_atom_enc_funcs, +DRM_MODE_ENCODER_TMDS ,NULL ); radeon_encoder->enc_priv =radeon_atombios_set_dig_info (radeon_encoder); }drm_encoder_helper_add (encoder, &radeon_atom_dig_helper_funcs);break ;case ENCODER_OBJECT_ID_INTERNAL_DAC1 : -drm_encoder_init (dev, encoder, &radeon_atom_enc_funcs, -DRM_MODE_ENCODER_DAC ,NULL ); +drm_encoder_init_funcs (dev, encoder, &radeon_atom_enc_funcs, +DRM_MODE_ENCODER_DAC ,NULL ); radeon_encoder->enc_priv =radeon_atombios_set_dac_info (radeon_encoder);drm_encoder_helper_add (encoder, &radeon_atom_dac_helper_funcs);break ;case ENCODER_OBJECT_ID_INTERNAL_DAC2 :case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC1 :case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC2 : -drm_encoder_init (dev, encoder, &radeon_atom_enc_funcs, -DRM_MODE_ENCODER_TVDAC ,NULL ); +drm_encoder_init_funcs (dev, encoder, &radeon_atom_enc_funcs, +DRM_MODE_ENCODER_TVDAC ,NULL ); radeon_encoder->enc_priv =radeon_atombios_set_dac_info (radeon_encoder);drm_encoder_helper_add (encoder, &radeon_atom_dac_helper_funcs);break ;
@@ -2813,16 +2813,16 @@ radeon_add_atom_encoder(struct drm_device *dev,case ENCODER_OBJECT_ID_INTERNAL_UNIPHY3 :if (radeon_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT )) { radeon_encoder->rmx_type =RMX_FULL ; -drm_encoder_init (dev, encoder, &radeon_atom_enc_funcs, -DRM_MODE_ENCODER_LVDS ,NULL ); +drm_encoder_init_funcs (dev, encoder, &radeon_atom_enc_funcs, +DRM_MODE_ENCODER_LVDS ,NULL ); radeon_encoder->enc_priv =radeon_atombios_get_lvds_info (radeon_encoder); }else if (radeon_encoder->devices & (ATOM_DEVICE_CRT_SUPPORT )) { -drm_encoder_init (dev, encoder, &radeon_atom_enc_funcs, -DRM_MODE_ENCODER_DAC ,NULL ); +drm_encoder_init_funcs (dev, encoder, &radeon_atom_enc_funcs, +DRM_MODE_ENCODER_DAC ,NULL ); radeon_encoder->enc_priv =radeon_atombios_set_dig_info (radeon_encoder); }else { -drm_encoder_init (dev, encoder, &radeon_atom_enc_funcs, -DRM_MODE_ENCODER_TMDS ,NULL ); +drm_encoder_init_funcs (dev, encoder, &radeon_atom_enc_funcs, +DRM_MODE_ENCODER_TMDS ,NULL ); radeon_encoder->enc_priv =radeon_atombios_set_dig_info (radeon_encoder); }drm_encoder_helper_add (encoder, &radeon_atom_dig_helper_funcs);
@@ -2839,14 +2839,14 @@ radeon_add_atom_encoder(struct drm_device *dev,/* these are handled by the primary encoders */ radeon_encoder->is_ext_encoder = true;if (radeon_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT )) -drm_encoder_init (dev, encoder, &radeon_atom_enc_funcs, -DRM_MODE_ENCODER_LVDS ,NULL ); +drm_encoder_init_funcs (dev, encoder, &radeon_atom_enc_funcs, +DRM_MODE_ENCODER_LVDS ,NULL );else if (radeon_encoder->devices & (ATOM_DEVICE_CRT_SUPPORT )) -drm_encoder_init (dev, encoder, &radeon_atom_enc_funcs, -DRM_MODE_ENCODER_DAC ,NULL ); +drm_encoder_init_funcs (dev, encoder, &radeon_atom_enc_funcs, +DRM_MODE_ENCODER_DAC ,NULL );else -drm_encoder_init (dev, encoder, &radeon_atom_enc_funcs, -DRM_MODE_ENCODER_TMDS ,NULL ); +drm_encoder_init_funcs (dev, encoder, &radeon_atom_enc_funcs, +DRM_MODE_ENCODER_TMDS ,NULL );drm_encoder_helper_add (encoder, &radeon_atom_ext_helper_funcs);break ; }
drivers/gpu/drm/radeon/radeon_dp_mst.c +2 -2
@@ -612,8 +612,8 @@ radeon_dp_create_fake_mst_encoder(struct radeon_connector *connector)break ; } -drm_encoder_init (dev, &radeon_encoder->base, &radeon_dp_mst_enc_funcs, -DRM_MODE_ENCODER_DPMST ,NULL ); +drm_encoder_init_funcs (dev, &radeon_encoder->base, &radeon_dp_mst_enc_funcs, +DRM_MODE_ENCODER_DPMST ,NULL );drm_encoder_helper_add (encoder, &radeon_mst_helper_funcs); mst_enc = radeon_encoder->enc_priv;
drivers/gpu/drm/radeon/radeon_legacy_encoders.c +10 -10
@@ -1779,8 +1779,8 @@ radeon_add_legacy_encoder(struct drm_device *dev, uint32_t encoder_enum, uint32_switch (radeon_encoder->encoder_id) {case ENCODER_OBJECT_ID_INTERNAL_LVDS : encoder->possible_crtcs =0x1 ; -drm_encoder_init (dev, encoder, &radeon_legacy_lvds_enc_funcs, -DRM_MODE_ENCODER_LVDS ,NULL ); +drm_encoder_init_funcs (dev, encoder, &radeon_legacy_lvds_enc_funcs, +DRM_MODE_ENCODER_LVDS ,NULL );drm_encoder_helper_add (encoder, &radeon_legacy_lvds_helper_funcs);if (rdev->is_atom_bios) radeon_encoder->enc_priv =radeon_atombios_get_lvds_info (radeon_encoder);
@@ -1789,14 +1789,14 @@ radeon_add_legacy_encoder(struct drm_device *dev, uint32_t encoder_enum, uint32_ radeon_encoder->rmx_type =RMX_FULL ;break ;case ENCODER_OBJECT_ID_INTERNAL_TMDS1 : -drm_encoder_init (dev, encoder, &radeon_legacy_tmds_int_enc_funcs, -DRM_MODE_ENCODER_TMDS ,NULL ); +drm_encoder_init_funcs (dev, encoder, &radeon_legacy_tmds_int_enc_funcs, +DRM_MODE_ENCODER_TMDS ,NULL );drm_encoder_helper_add (encoder, &radeon_legacy_tmds_int_helper_funcs); radeon_encoder->enc_priv =radeon_legacy_get_tmds_info (radeon_encoder);break ;case ENCODER_OBJECT_ID_INTERNAL_DAC1 : -drm_encoder_init (dev, encoder, &radeon_legacy_primary_dac_enc_funcs, -DRM_MODE_ENCODER_DAC ,NULL ); +drm_encoder_init_funcs (dev, encoder, &radeon_legacy_primary_dac_enc_funcs, +DRM_MODE_ENCODER_DAC ,NULL );drm_encoder_helper_add (encoder, &radeon_legacy_primary_dac_helper_funcs);if (rdev->is_atom_bios) radeon_encoder->enc_priv =radeon_atombios_get_primary_dac_info (radeon_encoder);
@@ -1804,8 +1804,8 @@ radeon_add_legacy_encoder(struct drm_device *dev, uint32_t encoder_enum, uint32_ radeon_encoder->enc_priv =radeon_combios_get_primary_dac_info (radeon_encoder);break ;case ENCODER_OBJECT_ID_INTERNAL_DAC2 : -drm_encoder_init (dev, encoder, &radeon_legacy_tv_dac_enc_funcs, -DRM_MODE_ENCODER_TVDAC ,NULL ); +drm_encoder_init_funcs (dev, encoder, &radeon_legacy_tv_dac_enc_funcs, +DRM_MODE_ENCODER_TVDAC ,NULL );drm_encoder_helper_add (encoder, &radeon_legacy_tv_dac_helper_funcs);if (rdev->is_atom_bios) radeon_encoder->enc_priv =radeon_atombios_get_tv_dac_info (radeon_encoder);
@@ -1813,8 +1813,8 @@ radeon_add_legacy_encoder(struct drm_device *dev, uint32_t encoder_enum, uint32_ radeon_encoder->enc_priv =radeon_combios_get_tv_dac_info (radeon_encoder);break ;case ENCODER_OBJECT_ID_INTERNAL_DVO1 : -drm_encoder_init (dev, encoder, &radeon_legacy_tmds_ext_enc_funcs, -DRM_MODE_ENCODER_TMDS ,NULL ); +drm_encoder_init_funcs (dev, encoder, &radeon_legacy_tmds_ext_enc_funcs, +DRM_MODE_ENCODER_TMDS ,NULL );drm_encoder_helper_add (encoder, &radeon_legacy_tmds_ext_helper_funcs);if (!rdev->is_atom_bios) radeon_encoder->enc_priv =radeon_legacy_get_ext_tmds_info (radeon_encoder);
drivers/gpu/drm/rcar-du/rcar_du_encoder.c +2 -2
@@ -110,8 +110,8 @@ int rcar_du_encoder_init(struct rcar_du_device *rcdu, } } - ret =drm_encoder_init (rcdu->ddev, encoder, &encoder_funcs, -DRM_MODE_ENCODER_NONE ,NULL ); + ret =drm_encoder_init_funcs (rcdu->ddev, encoder, &encoder_funcs, +DRM_MODE_ENCODER_NONE ,NULL );if (ret <0 ) goto done;
drivers/gpu/drm/rockchip/analogix_dp-rockchip.c +3 -2
@@ -309,8 +309,9 @@ static int rockchip_dp_drm_create_encoder(struct rockchip_dp_device *dp) dev->of_node);DRM_DEBUG_KMS ("possible_crtcs = 0x%x\n" , encoder->possible_crtcs); - ret =drm_encoder_init (drm_dev, encoder, &rockchip_dp_encoder_funcs, -DRM_MODE_ENCODER_TMDS ,NULL ); + ret =drm_encoder_init_funcs (drm_dev, encoder, + &rockchip_dp_encoder_funcs, +DRM_MODE_ENCODER_TMDS ,NULL );if (ret) {DRM_ERROR ("failed to initialize encoder with drm\n" );return ret;
drivers/gpu/drm/rockchip/cdn-dp-core.c +2 -2
@@ -1030,8 +1030,8 @@ static int cdn_dp_bind(struct device *dev, struct device *master, void *data) dev->of_node);DRM_DEBUG_KMS ("possible_crtcs = 0x%x\n" , encoder->possible_crtcs); - ret =drm_encoder_init (drm_dev, encoder, &cdn_dp_encoder_funcs, -DRM_MODE_ENCODER_TMDS ,NULL ); + ret =drm_encoder_init_funcs (drm_dev, encoder, &cdn_dp_encoder_funcs, +DRM_MODE_ENCODER_TMDS ,NULL );if (ret) {DRM_ERROR ("failed to initialize encoder with drm\n" );return ret;
drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c +3 -2
@@ -802,8 +802,9 @@ static int rockchip_dsi_drm_create_encoder(struct dw_mipi_dsi_rockchip *dsi, encoder->possible_crtcs =drm_of_find_possible_crtcs (drm_dev, dsi->dev->of_node); - ret =drm_encoder_init (drm_dev, encoder, &dw_mipi_dsi_encoder_funcs, -DRM_MODE_ENCODER_DSI ,NULL ); + ret =drm_encoder_init_funcs (drm_dev, encoder, + &dw_mipi_dsi_encoder_funcs, +DRM_MODE_ENCODER_DSI ,NULL );if (ret) {DRM_ERROR ("Failed to initialize encoder with drm\n" );return ret;
drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c +2 -2
@@ -546,8 +546,8 @@ static int dw_hdmi_rockchip_bind(struct device *dev, struct device *master, }drm_encoder_helper_add (encoder, &dw_hdmi_rockchip_encoder_helper_funcs); -drm_encoder_init (drm, encoder, &dw_hdmi_rockchip_encoder_funcs, -DRM_MODE_ENCODER_TMDS ,NULL ); +drm_encoder_init_funcs (drm, encoder, &dw_hdmi_rockchip_encoder_funcs, +DRM_MODE_ENCODER_TMDS ,NULL );platform_set_drvdata (pdev, hdmi);
drivers/gpu/drm/rockchip/inno_hdmi.c +2 -2
@@ -617,8 +617,8 @@ static int inno_hdmi_register(struct drm_device *drm, struct inno_hdmi *hdmi)return -EPROBE_DEFER ;drm_encoder_helper_add (encoder, &inno_hdmi_encoder_helper_funcs); -drm_encoder_init (drm, encoder, &inno_hdmi_encoder_funcs, -DRM_MODE_ENCODER_TMDS ,NULL ); +drm_encoder_init_funcs (drm, encoder, &inno_hdmi_encoder_funcs, +DRM_MODE_ENCODER_TMDS ,NULL ); hdmi->connector.polled =DRM_CONNECTOR_POLL_HPD ;
drivers/gpu/drm/rockchip/rk3066_hdmi.c +2 -2
@@ -557,8 +557,8 @@ rk3066_hdmi_register(struct drm_device *drm, struct rk3066_hdmi *hdmi)return -EPROBE_DEFER ;drm_encoder_helper_add (encoder, &rk3066_hdmi_encoder_helper_funcs); -drm_encoder_init (drm, encoder, &rk3066_hdmi_encoder_funcs, -DRM_MODE_ENCODER_TMDS ,NULL ); +drm_encoder_init_funcs (drm, encoder, &rk3066_hdmi_encoder_funcs, +DRM_MODE_ENCODER_TMDS ,NULL ); hdmi->connector.polled =DRM_CONNECTOR_POLL_HPD ;
drivers/gpu/drm/rockchip/rockchip_lvds.c +3 -2
@@ -607,8 +607,9 @@ static int rockchip_lvds_bind(struct device *dev, struct device *master, encoder->possible_crtcs =drm_of_find_possible_crtcs (drm_dev, dev->of_node); - ret =drm_encoder_init (drm_dev, encoder, &rockchip_lvds_encoder_funcs, -DRM_MODE_ENCODER_LVDS ,NULL ); + ret =drm_encoder_init_funcs (drm_dev, encoder, + &rockchip_lvds_encoder_funcs, +DRM_MODE_ENCODER_LVDS ,NULL );if (ret <0 ) {DRM_DEV_ERROR (drm_dev->dev,"failed to initialize encoder: %d\n" , ret);
drivers/gpu/drm/rockchip/rockchip_rgb.c +3 -2
@@ -126,8 +126,9 @@ struct rockchip_rgb *rockchip_rgb_init(struct device *dev, encoder = &rgb->encoder; encoder->possible_crtcs =drm_crtc_mask (crtc); - ret =drm_encoder_init (drm_dev, encoder, &rockchip_rgb_encoder_funcs, -DRM_MODE_ENCODER_NONE ,NULL ); + ret =drm_encoder_init_funcs (drm_dev, encoder, + &rockchip_rgb_encoder_funcs, +DRM_MODE_ENCODER_NONE ,NULL );if (ret <0 ) {DRM_DEV_ERROR (drm_dev->dev,"failed to initialize encoder: %d\n" , ret);
drivers/gpu/drm/shmobile/shmob_drm_crtc.c +2 -2
@@ -576,8 +576,8 @@ int shmob_drm_encoder_create(struct shmob_drm_device *sdev) encoder->possible_crtcs =1 ; - ret =drm_encoder_init (sdev->ddev, encoder, &encoder_funcs, -DRM_MODE_ENCODER_LVDS ,NULL ); + ret =drm_encoder_init_funcs (sdev->ddev, encoder, &encoder_funcs, +DRM_MODE_ENCODER_LVDS ,NULL );if (ret <0 )return ret;
drivers/gpu/drm/sti/sti_tvout.c +9 -7
@@ -673,9 +673,9 @@ sti_tvout_create_dvo_encoder(struct drm_device *dev, drm_encoder->possible_crtcs =ENCODER_CRTC_MASK ; -drm_encoder_init (dev, drm_encoder, - &sti_tvout_encoder_funcs,DRM_MODE_ENCODER_LVDS , -NULL ); +drm_encoder_init_funcs (dev, drm_encoder, + &sti_tvout_encoder_funcs,DRM_MODE_ENCODER_LVDS , +NULL );drm_encoder_helper_add (drm_encoder, &sti_dvo_encoder_helper_funcs);
@@ -725,8 +725,9 @@ static struct drm_encoder *sti_tvout_create_hda_encoder(struct drm_device *dev, drm_encoder->possible_crtcs =ENCODER_CRTC_MASK ; -drm_encoder_init (dev, drm_encoder, - &sti_tvout_encoder_funcs,DRM_MODE_ENCODER_DAC ,NULL ); +drm_encoder_init_funcs (dev, drm_encoder, + &sti_tvout_encoder_funcs,DRM_MODE_ENCODER_DAC , +NULL );drm_encoder_helper_add (drm_encoder, &sti_hda_encoder_helper_funcs);
@@ -773,8 +774,9 @@ static struct drm_encoder *sti_tvout_create_hdmi_encoder(struct drm_device *dev, drm_encoder->possible_crtcs =ENCODER_CRTC_MASK ; -drm_encoder_init (dev, drm_encoder, - &sti_tvout_encoder_funcs,DRM_MODE_ENCODER_TMDS ,NULL ); +drm_encoder_init_funcs (dev, drm_encoder, + &sti_tvout_encoder_funcs, +DRM_MODE_ENCODER_TMDS ,NULL );drm_encoder_helper_add (drm_encoder, &sti_hdmi_encoder_helper_funcs);
drivers/gpu/drm/stm/ltdc.c +2 -2
@@ -1104,8 +1104,8 @@ static int ltdc_encoder_init(struct drm_device *ddev, struct drm_bridge *bridge) encoder->possible_crtcs =CRTC_MASK ; encoder->possible_clones =0 ;/* No cloning support */ -drm_encoder_init (ddev, encoder, <dc_encoder_funcs, -DRM_MODE_ENCODER_DPI ,NULL ); +drm_encoder_init_funcs (ddev, encoder, <dc_encoder_funcs, +DRM_MODE_ENCODER_DPI ,NULL );drm_encoder_helper_add (encoder, <dc_encoder_helper_funcs);
drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c +5 -5
@@ -611,11 +611,11 @@ static int sun4i_hdmi_bind(struct device *dev, struct device *master,drm_encoder_helper_add (&hdmi->encoder, &sun4i_hdmi_helper_funcs); - ret =drm_encoder_init (drm, - &hdmi->encoder, - &sun4i_hdmi_funcs, -DRM_MODE_ENCODER_TMDS , -NULL ); + ret =drm_encoder_init_funcs (drm, + &hdmi->encoder, + &sun4i_hdmi_funcs, +DRM_MODE_ENCODER_TMDS , +NULL );if (ret) {dev_err (dev,"Couldn't initialise the HDMI encoder\n" ); goto err_put_ddc_i2c;
drivers/gpu/drm/sun4i/sun4i_lvds.c +5 -5
@@ -121,11 +121,11 @@ int sun4i_lvds_init(struct drm_device *drm, struct sun4i_tcon *tcon)drm_encoder_helper_add (&lvds->encoder, &sun4i_lvds_enc_helper_funcs); - ret =drm_encoder_init (drm, - &lvds->encoder, - &sun4i_lvds_enc_funcs, -DRM_MODE_ENCODER_LVDS , -NULL ); + ret =drm_encoder_init_funcs (drm, + &lvds->encoder, + &sun4i_lvds_enc_funcs, +DRM_MODE_ENCODER_LVDS , +NULL );if (ret) {dev_err (drm->dev,"Couldn't initialise the lvds encoder\n" ); goto err_out;
drivers/gpu/drm/sun4i/sun4i_rgb.c +5 -5
@@ -218,11 +218,11 @@ int sun4i_rgb_init(struct drm_device *drm, struct sun4i_tcon *tcon)drm_encoder_helper_add (&rgb->encoder, &sun4i_rgb_enc_helper_funcs); - ret =drm_encoder_init (drm, - &rgb->encoder, - &sun4i_rgb_enc_funcs, -DRM_MODE_ENCODER_NONE , -NULL ); + ret =drm_encoder_init_funcs (drm, + &rgb->encoder, + &sun4i_rgb_enc_funcs, +DRM_MODE_ENCODER_NONE , +NULL );if (ret) {dev_err (drm->dev,"Couldn't initialise the rgb encoder\n" ); goto err_out;
drivers/gpu/drm/sun4i/sun4i_tv.c +5 -5
@@ -592,11 +592,11 @@ static int sun4i_tv_bind(struct device *dev, struct device *master,drm_encoder_helper_add (&tv->encoder, &sun4i_tv_helper_funcs); - ret =drm_encoder_init (drm, - &tv->encoder, - &sun4i_tv_funcs, -DRM_MODE_ENCODER_TVDAC , -NULL ); + ret =drm_encoder_init_funcs (drm, + &tv->encoder, + &sun4i_tv_funcs, +DRM_MODE_ENCODER_TVDAC , +NULL );if (ret) {dev_err (dev,"Couldn't initialise the TV encoder\n" ); goto err_disable_clk;
drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c +5 -5
@@ -1062,11 +1062,11 @@ static int sun6i_dsi_bind(struct device *dev, struct device *master,drm_encoder_helper_add (&dsi->encoder, &sun6i_dsi_enc_helper_funcs); - ret =drm_encoder_init (drm, - &dsi->encoder, - &sun6i_dsi_enc_funcs, -DRM_MODE_ENCODER_DSI , -NULL ); + ret =drm_encoder_init_funcs (drm, + &dsi->encoder, + &sun6i_dsi_enc_funcs, +DRM_MODE_ENCODER_DSI , +NULL );if (ret) {dev_err (dsi->dev,"Couldn't initialise the DSI encoder\n" );return ret;
drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c +2 -2
@@ -220,8 +220,8 @@ static int sun8i_dw_hdmi_bind(struct device *dev, struct device *master, }drm_encoder_helper_add (encoder, &sun8i_dw_hdmi_encoder_helper_funcs); -drm_encoder_init (drm, encoder, &sun8i_dw_hdmi_encoder_funcs, -DRM_MODE_ENCODER_TMDS ,NULL ); +drm_encoder_init_funcs (drm, encoder, &sun8i_dw_hdmi_encoder_funcs, +DRM_MODE_ENCODER_TMDS ,NULL );sun8i_hdmi_phy_init (hdmi->phy);
drivers/gpu/drm/tegra/dsi.c +3 -3
@@ -1058,9 +1058,9 @@ static int tegra_dsi_init(struct host1x_client *client) &tegra_dsi_connector_helper_funcs); dsi->output.connector.dpms =DRM_MODE_DPMS_OFF ; -drm_encoder_init (drm, &dsi->output.encoder, - &tegra_dsi_encoder_funcs, -DRM_MODE_ENCODER_DSI ,NULL ); +drm_encoder_init_funcs (drm, &dsi->output.encoder, + &tegra_dsi_encoder_funcs, +DRM_MODE_ENCODER_DSI ,NULL );drm_encoder_helper_add (&dsi->output.encoder, &tegra_dsi_encoder_helper_funcs);
drivers/gpu/drm/tegra/hdmi.c +3 -2
@@ -1445,8 +1445,9 @@ static int tegra_hdmi_init(struct host1x_client *client) &tegra_hdmi_connector_helper_funcs); hdmi->output.connector.dpms =DRM_MODE_DPMS_OFF ; -drm_encoder_init (drm, &hdmi->output.encoder, &tegra_hdmi_encoder_funcs, -DRM_MODE_ENCODER_TMDS ,NULL ); +drm_encoder_init_funcs (drm, &hdmi->output.encoder, + &tegra_hdmi_encoder_funcs, +DRM_MODE_ENCODER_TMDS ,NULL );drm_encoder_helper_add (&hdmi->output.encoder, &tegra_hdmi_encoder_helper_funcs);
drivers/gpu/drm/tegra/rgb.c +2 -2
@@ -281,8 +281,8 @@ int tegra_dc_rgb_init(struct drm_device *drm, struct tegra_dc *dc) &tegra_rgb_connector_helper_funcs); output->connector.dpms =DRM_MODE_DPMS_OFF ; -drm_encoder_init (drm, &output->encoder, &tegra_rgb_encoder_funcs, -DRM_MODE_ENCODER_LVDS ,NULL ); +drm_encoder_init_funcs (drm, &output->encoder, &tegra_rgb_encoder_funcs, +DRM_MODE_ENCODER_LVDS ,NULL );drm_encoder_helper_add (&output->encoder, &tegra_rgb_encoder_helper_funcs);
drivers/gpu/drm/tegra/sor.c +2 -2
@@ -3102,8 +3102,8 @@ static int tegra_sor_init(struct host1x_client *client) &tegra_sor_connector_helper_funcs); sor->output.connector.dpms =DRM_MODE_DPMS_OFF ; -drm_encoder_init (drm, &sor->output.encoder, &tegra_sor_encoder_funcs, - encoder,NULL ); +drm_encoder_init_funcs (drm, &sor->output.encoder, + &tegra_sor_encoder_funcs, encoder,NULL );drm_encoder_helper_add (&sor->output.encoder, helpers); drm_connector_attach_encoder(&sor->output.connector,
drivers/gpu/drm/tidss/tidss_encoder.c +2 -2
@@ -75,8 +75,8 @@ struct drm_encoder *tidss_encoder_create(struct tidss_device *tidss, enc->possible_crtcs = possible_crtcs; - ret =drm_encoder_init (&tidss->ddev, enc, &encoder_funcs, - encoder_type,NULL ); + ret =drm_encoder_init_funcs (&tidss->ddev, enc, &encoder_funcs, + encoder_type,NULL );if (ret <0 )return ERR_PTR (ret);
drivers/gpu/drm/tilcdc/tilcdc_external.c +4 -4
@@ -131,11 +131,11 @@ int tilcdc_attach_external_device(struct drm_device *ddev)if (!priv->external_encoder)return -ENOMEM ; - ret =drm_encoder_init (ddev, priv->external_encoder, - &tilcdc_external_encoder_funcs, -DRM_MODE_ENCODER_NONE ,NULL ); + ret =drm_encoder_init_funcs (ddev, priv->external_encoder, + &tilcdc_external_encoder_funcs, +DRM_MODE_ENCODER_NONE ,NULL );if (ret) { -dev_err (ddev->dev,"drm_encoder_init() failed %d\n" , ret); +dev_err (ddev->dev,"drm_encoder_init_funcs() failed %d\n" , ret);return ret; }
drivers/gpu/drm/tilcdc/tilcdc_panel.c +2 -2
@@ -102,8 +102,8 @@ static struct drm_encoder *panel_encoder_create(struct drm_device *dev, encoder = &panel_encoder->base; encoder->possible_crtcs =1 ; - ret =drm_encoder_init (dev, encoder, &panel_encoder_funcs, -DRM_MODE_ENCODER_LVDS ,NULL ); + ret =drm_encoder_init_funcs (dev, encoder, &panel_encoder_funcs, +DRM_MODE_ENCODER_LVDS ,NULL );if (ret <0 ) goto fail;
drivers/gpu/drm/vboxvideo/vbox_mode.c +2 -2
@@ -617,8 +617,8 @@ static struct drm_encoder *vbox_encoder_init(struct drm_device *dev,if (!vbox_encoder)return NULL ; -drm_encoder_init (dev, &vbox_encoder->base, &vbox_enc_funcs, -DRM_MODE_ENCODER_DAC ,NULL ); +drm_encoder_init_funcs (dev, &vbox_encoder->base, &vbox_enc_funcs, +DRM_MODE_ENCODER_DAC ,NULL ); vbox_encoder->base.possible_crtcs =1 << i;return &vbox_encoder->base;
drivers/gpu/drm/vc4/vc4_dpi.c +2 -2
@@ -309,8 +309,8 @@ static int vc4_dpi_bind(struct device *dev, struct device *master, void *data)if (ret)DRM_ERROR ("Failed to turn on core clock: %d\n" , ret); -drm_encoder_init (drm, dpi->encoder, &vc4_dpi_encoder_funcs, -DRM_MODE_ENCODER_DPI ,NULL ); +drm_encoder_init_funcs (drm, dpi->encoder, &vc4_dpi_encoder_funcs, +DRM_MODE_ENCODER_DPI ,NULL );drm_encoder_helper_add (dpi->encoder, &vc4_dpi_encoder_helper_funcs); ret =vc4_dpi_init_bridge (dpi);
drivers/gpu/drm/vc4/vc4_dsi.c +2 -2
@@ -1615,8 +1615,8 @@ static int vc4_dsi_bind(struct device *dev, struct device *master, void *data)if (dsi->port ==1 ) vc4->dsi1 = dsi; -drm_encoder_init (drm, dsi->encoder, &vc4_dsi_encoder_funcs, -DRM_MODE_ENCODER_DSI ,NULL ); +drm_encoder_init_funcs (drm, dsi->encoder, &vc4_dsi_encoder_funcs, +DRM_MODE_ENCODER_DSI ,NULL );drm_encoder_helper_add (dsi->encoder, &vc4_dsi_encoder_helper_funcs); ret =drm_bridge_attach (dsi->encoder, dsi->bridge,NULL ,0 );
drivers/gpu/drm/vc4/vc4_hdmi.c +2 -2
@@ -1394,8 +1394,8 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) }pm_runtime_enable (dev); -drm_encoder_init (drm, hdmi->encoder, &vc4_hdmi_encoder_funcs, -DRM_MODE_ENCODER_TMDS ,NULL ); +drm_encoder_init_funcs (drm, hdmi->encoder, &vc4_hdmi_encoder_funcs, +DRM_MODE_ENCODER_TMDS ,NULL );drm_encoder_helper_add (hdmi->encoder, &vc4_hdmi_encoder_helper_funcs); hdmi->connector =
drivers/gpu/drm/vc4/vc4_vec.c +2 -2
@@ -566,8 +566,8 @@ static int vc4_vec_bind(struct device *dev, struct device *master, void *data)pm_runtime_enable (dev); -drm_encoder_init (drm, vec->encoder, &vc4_vec_encoder_funcs, -DRM_MODE_ENCODER_TVDAC ,NULL ); +drm_encoder_init_funcs (drm, vec->encoder, &vc4_vec_encoder_funcs, +DRM_MODE_ENCODER_TVDAC ,NULL );drm_encoder_helper_add (vec->encoder, &vc4_vec_encoder_helper_funcs); vec->connector =vc4_vec_connector_init (drm, vec);
drivers/gpu/drm/virtio/virtgpu_display.c +2 -2
@@ -276,8 +276,8 @@ static int vgdev_output_init(struct virtio_gpu_device *vgdev, int index)if (vgdev->has_edid)drm_connector_attach_edid_property (connector); -drm_encoder_init (dev, encoder, &virtio_gpu_enc_funcs, -DRM_MODE_ENCODER_VIRTUAL ,NULL ); +drm_encoder_init_funcs (dev, encoder, &virtio_gpu_enc_funcs, +DRM_MODE_ENCODER_VIRTUAL ,NULL );drm_encoder_helper_add (encoder, &virtio_gpu_enc_helper_funcs); encoder->possible_crtcs =1 << index;
drivers/gpu/drm/vkms/vkms_output.c +2 -2
@@ -70,8 +70,8 @@ int vkms_output_init(struct vkms_device *vkmsdev, int index)drm_connector_helper_add (connector, &vkms_conn_helper_funcs); - ret =drm_encoder_init (dev, encoder, &vkms_encoder_funcs, -DRM_MODE_ENCODER_VIRTUAL ,NULL ); + ret =drm_encoder_init_funcs (dev, encoder, &vkms_encoder_funcs, +DRM_MODE_ENCODER_VIRTUAL ,NULL );if (ret) {DRM_ERROR ("Failed to init encoder\n" ); goto err_encoder;
drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c +2 -2
@@ -429,8 +429,8 @@ static int vmw_ldu_init(struct vmw_private *dev_priv, unsigned unit)drm_connector_helper_add (connector, &vmw_ldu_connector_helper_funcs); connector->status =vmw_du_connector_detect (connector, true); - ret =drm_encoder_init (dev, encoder, &vmw_legacy_encoder_funcs, -DRM_MODE_ENCODER_VIRTUAL ,NULL ); + ret =drm_encoder_init_funcs (dev, encoder, &vmw_legacy_encoder_funcs, +DRM_MODE_ENCODER_VIRTUAL ,NULL );if (ret) {DRM_ERROR ("Failed to initialize encoder\n" ); goto err_free_connector;
drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c +3 -2
@@ -901,8 +901,9 @@ static int vmw_sou_init(struct vmw_private *dev_priv, unsigned unit)drm_connector_helper_add (connector, &vmw_sou_connector_helper_funcs); connector->status =vmw_du_connector_detect (connector, true); - ret =drm_encoder_init (dev, encoder, &vmw_screen_object_encoder_funcs, -DRM_MODE_ENCODER_VIRTUAL ,NULL ); + ret =drm_encoder_init_funcs (dev, encoder, + &vmw_screen_object_encoder_funcs, +DRM_MODE_ENCODER_VIRTUAL ,NULL );if (ret) {DRM_ERROR ("Failed to initialize encoder\n" ); goto err_free_connector;
drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c +2 -2
@@ -1796,8 +1796,8 @@ static int vmw_stdu_init(struct vmw_private *dev_priv, unsigned unit)drm_connector_helper_add (connector, &vmw_stdu_connector_helper_funcs); connector->status =vmw_du_connector_detect (connector, false); - ret =drm_encoder_init (dev, encoder, &vmw_stdu_encoder_funcs, -DRM_MODE_ENCODER_VIRTUAL ,NULL ); + ret =drm_encoder_init_funcs (dev, encoder, &vmw_stdu_encoder_funcs, +DRM_MODE_ENCODER_VIRTUAL ,NULL );if (ret) {DRM_ERROR ("Failed to initialize encoder\n" ); goto err_free_connector;
drivers/gpu/drm/zte/zx_hdmi.c +2 -2
@@ -313,8 +313,8 @@ static int zx_hdmi_register(struct drm_device *drm, struct zx_hdmi *hdmi) encoder->possible_crtcs =VOU_CRTC_MASK ; -drm_encoder_init (drm, encoder, &zx_hdmi_encoder_funcs, -DRM_MODE_ENCODER_TMDS ,NULL ); +drm_encoder_init_funcs (drm, encoder, &zx_hdmi_encoder_funcs, +DRM_MODE_ENCODER_TMDS ,NULL );drm_encoder_helper_add (encoder, &zx_hdmi_encoder_helper_funcs); hdmi->connector.polled =DRM_CONNECTOR_POLL_HPD ;
drivers/gpu/drm/zte/zx_tvenc.c +2 -2
@@ -285,8 +285,8 @@ static int zx_tvenc_register(struct drm_device *drm, struct zx_tvenc *tvenc)*/ encoder->possible_crtcs =BIT (1 ); -drm_encoder_init (drm, encoder, &zx_tvenc_encoder_funcs, -DRM_MODE_ENCODER_TVDAC ,NULL ); +drm_encoder_init_funcs (drm, encoder, &zx_tvenc_encoder_funcs, +DRM_MODE_ENCODER_TVDAC ,NULL );drm_encoder_helper_add (encoder, &zx_tvenc_encoder_helper_funcs); connector->interlace_allowed = true;
drivers/gpu/drm/zte/zx_vga.c +2 -2
@@ -154,8 +154,8 @@ static int zx_vga_register(struct drm_device *drm, struct zx_vga *vga) encoder->possible_crtcs =VOU_CRTC_MASK ; - ret =drm_encoder_init (drm, encoder, &zx_vga_encoder_funcs, -DRM_MODE_ENCODER_DAC ,NULL ); + ret =drm_encoder_init_funcs (drm, encoder, &zx_vga_encoder_funcs, +DRM_MODE_ENCODER_DAC ,NULL );if (ret) {DRM_DEV_ERROR (dev,"failed to init encoder: %d\n" , ret);return ret;
include/drm/drm_encoder.h +4 -4
@@ -186,10 +186,10 @@ struct drm_encoder {#define obj_to_encoder (x) container_of(x, struct drm_encoder, base) __printf(5, 6) -int drm_encoder_init (struct drm_device *dev, -struct drm_encoder *encoder, -const struct drm_encoder_funcs *funcs, -int encoder_type,const char *name, ...); +int drm_encoder_init_funcs (struct drm_device *dev, +struct drm_encoder *encoder, +const struct drm_encoder_funcs *funcs, +int encoder_type,const char *name, ...);/** * drm_encoder_index - find the index of a registered encoder
Signature · 1 line
2.20.1
PATCH 2/3 drm: drm_simple_encoder_init() => drm_encoder_init()
In reply to Sam RavnborgA lot of drivers requires only a basic encoder with no need to extend the functionality.
This was previously implemented in drm_simple_kms_helper.c but encoders are not necessarily simple despite no need for a drm_encoder_funcs for adding functionality.
Move the init function to drm_encoder.c to reflect this. And adjust the name to drm_encoder_init().
Drop include of drm_simple_kms_helper.h in the touched drivers as it is no logner required.
--- drivers/gpu/drm/ast/ast_mode.c | 3 +- drivers/gpu/drm/drm_encoder.c | 37 ++++++++++++++++++++ drivers/gpu/drm/drm_simple_kms_helper.c | 45 +------------------------ drivers/gpu/drm/mgag200/mgag200_mode.c | 7 ++-- drivers/gpu/drm/qxl/qxl_display.c | 7 ++-- include/drm/drm_encoder.h | 3 ++ include/drm/drm_simple_kms_helper.h | 4 --- 7 files changed, 46 insertions(+), 60 deletions(-)
drivers/gpu/drm/ast/ast_mode.c +1 -2
@@ -40,7 +40,6 @@#include <drm/drm_gem_vram_helper.h> #include <drm/drm_plane_helper.h> #include <drm/drm_probe_helper.h> -#include <drm/drm_simple_kms_helper.h> #include "ast_drv.h" #include "ast_tables.h"
@@ -964,7 +963,7 @@ static int ast_encoder_init(struct drm_device *dev)struct drm_encoder *encoder = &ast->encoder;int ret; - ret =drm_simple_encoder_init (dev, encoder,DRM_MODE_ENCODER_DAC ); + ret =drm_encoder_init (dev, encoder,DRM_MODE_ENCODER_DAC );if (ret)return ret;
drivers/gpu/drm/drm_encoder.c +37 -0
@@ -152,6 +152,43 @@ int drm_encoder_init_funcs(struct drm_device *dev, }EXPORT_SYMBOL (drm_encoder_init_funcs); +static const struct drm_encoder_funcs drm_simple_encoder_funcs_cleanup = { + .destroy = drm_encoder_cleanup, +}; + +/** +* drm_simple_init - Initialize a preallocated encoder with basic functionality. +* @dev: drm device +* @encoder: the encoder to initialize +* @encoder_type: user visible type of the encoder +* +* Initialises a preallocated encoder that has no further functionality. +* Settings for possible CRTC and clones are left to their initial values. +* The encoder will be cleaned up automatically as part of the mode-setting +* cleanup. +* +* The caller of drm_encoder_init() is responsible for freeing +* the encoder's memory after the encoder has been cleaned up. At the +* moment this only works reliably if the encoder data structure is +* stored in the device structure. Free the encoder's memory as part of +* the device release function. +* +* FIXME: Later improvements to DRM's resource management may allow for +* an automated kfree() of the encoder's memory. +* +* Returns: +* Zero on success, error code on failure. +*/ +int drm_simple_init (struct drm_device *dev, +struct drm_encoder *encoder, +int encoder_type) +{ +return drm_encoder_init_funcs (dev, encoder, + &drm_simple_encoder_funcs_cleanup, + encoder_type,NULL ); +} +EXPORT_SYMBOL (drm_encoder_init); +/** * drm_encoder_cleanup - cleans up an initialised encoder * @encoder: encoder to cleanup
drivers/gpu/drm/drm_simple_kms_helper.c +1 -44
59 lines not on this page · raw message
drivers/gpu/drm/mgag200/mgag200_mode.c +2 -5
@@ -15,7 +15,6 @@#include <drm/drm_fourcc.h> #include <drm/drm_plane_helper.h> #include <drm/drm_probe_helper.h> -#include <drm/drm_simple_kms_helper.h> #include "mgag200_drv.h"
@@ -1630,12 +1629,10 @@ int mgag200_modeset_init(struct mga_device *mdev)mga_crtc_init (mdev); - ret =drm_simple_encoder_init (mdev->dev, encoder, -DRM_MODE_ENCODER_DAC ); + ret =drm_encoder_init (mdev->dev, encoder,DRM_MODE_ENCODER_DAC );if (ret) {drm_err (mdev->dev, -"drm_simple_encoder_init() failed, error %d\n" , - ret); +"drm_encoder_init() failed, error %d\n" , ret);return ret; } encoder->possible_crtcs =0x1 ;
drivers/gpu/drm/qxl/qxl_display.c +2 -5
@@ -31,7 +31,6 @@#include <drm/drm_gem_framebuffer_helper.h> #include <drm/drm_plane_helper.h> #include <drm/drm_probe_helper.h> -#include <drm/drm_simple_kms_helper.h> #include "qxl_drv.h" #include "qxl_object.h"
@@ -1088,11 +1087,9 @@ static int qdev_output_init(struct drm_device *dev, int num_output)drm_connector_init (dev, &qxl_output->base, &qxl_connector_funcs,DRM_MODE_CONNECTOR_VIRTUAL ); - ret =drm_simple_encoder_init (dev, &qxl_output->enc, -DRM_MODE_ENCODER_VIRTUAL ); + ret =drm_encoder_init (dev, &qxl_output->enc,DRM_MODE_ENCODER_VIRTUAL );if (ret) { -drm_err (dev,"drm_simple_encoder_init() failed, error %d\n" , - ret); +drm_err (dev,"drm_encoder_init() failed, error %d\n" , ret); goto err_drm_connector_cleanup; }
include/drm/drm_encoder.h +3 -0
@@ -191,6 +191,9 @@ int drm_encoder_init_funcs(struct drm_device *dev,const struct drm_encoder_funcs *funcs, int encoder_type, const char *name, ...); +int drm_encoder_init (struct drm_device *dev, +struct drm_encoder *encoder, +int encoder_type);/** * drm_encoder_index - find the index of a registered encoder * @encoder: encoder to find index for
include/drm/drm_simple_kms_helper.h +0 -4
@@ -181,8 +181,4 @@ int drm_simple_display_pipe_init(struct drm_device *dev,const uint64_t *format_modifiers, struct drm_connector *connector); -int drm_simple_encoder_init (struct drm_device *dev, -struct drm_encoder *encoder, -int encoder_type); -#endif /* __LINUX_DRM_SIMPLE_KMS_HELPER_H */
Signature · 1 line
2.20.1
PATCH 3/3 drm/atmel-hlcdc: Use drm_encoder_init()
In reply to Sam Ravnborgatmel-hlcdc has no need to extend the functionality of the encoder, so use drm_encoder_init().
--- drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c +1 -7
@@ -22,10 +22,6 @@ struct atmel_hlcdc_rgb_output {int bus_fmt; }; -static const struct drm_encoder_funcs atmel_hlcdc_panel_encoder_funcs = { - .destroy = drm_encoder_cleanup, -}; -static struct atmel_hlcdc_rgb_output *atmel_hlcdc_encoder_to_rgb_output (struct drm_encoder *encoder) {
@@ -98,9 +94,7 @@ static int atmel_hlcdc_attach_endpoint(struct drm_device *dev, int endpoint)return -EINVAL ; } - ret =drm_encoder_init_funcs (dev, &output->encoder, - &atmel_hlcdc_panel_encoder_funcs, -DRM_MODE_ENCODER_NONE ,NULL ); + ret =drm_encoder_init (dev, &output->encoder,DRM_MODE_ENCODER_NONE );if (ret)return ret;
Signature · 1 line
2.20.1
Quoted 28 lines · Sam Ravnborg
Thomas Zimmermann had made a nice patch-set that introduced
drm_simple_encoder_init()which is already present in drm-misc-next.While looking at this it was suddenly obvious to me that this was functionalty that really should be included in
drm_encoder.cThe case where the core could handle the callback is pretty common and not part of the simple pipe line.So after some dialog on dri-devel the conclusion was to go for a change like this:
drm_encoder_init_funcs()for all users that specified adrm_encoder_funcsto extend the functionality.
drm_encoder_init()for all users that did not
need to extend the basic functionality with
drm_encoder_funcs.A similar approach with a
_funcs()prefix is used elsewhere in drm/This required a rename of the existing users, and a follow-up patch that moves
drm_simple_encoder_init()todrm_encoder.cPatches 3 in this set demonstrate the use of
drm_encoder_init(). There are many more drivers that can be converted as Thomas has already demonstrated.
Quoted 8 lines
This is all based on work done by Thomas Zimmermann, I just wanted to implement my suggestion so we could select the best way forward.
Note: Daniel Vetter has hinted the approach implemented here smelled like middle-layer.
IMO this is not so, it is just a way to handle cleanup for the simple cases.
We discussed this patch-set briefly on irc.
With the upcoming drmm_ changes and such this is bad timing.. And in the end this may be pointless code-chrunch.
Patch-set shelfed for now - may re-visit it later.
Sam
Quoted 33 lines · Sam Ravnborg
Quoted 32 lines · Sam Ravnborg
Thomas Zimmermann had made a nice patch-set that introduced
drm_simple_encoder_init()which is already present in drm-misc-next.While looking at this it was suddenly obvious to me that this was functionalty that really should be included in
drm_encoder.cThe case where the core could handle the callback is pretty common and not part of the simple pipe line.So after some dialog on dri-devel the conclusion was to go for a change like this:
drm_encoder_init_funcs()for all users that specified adrm_encoder_funcsto extend the functionality.
drm_encoder_init()for all users that did not
need to extend the basic functionality with
drm_encoder_funcs.A similar approach with a
_funcs()prefix is used elsewhere in drm/This required a rename of the existing users, and a follow-up patch that moves
drm_simple_encoder_init()todrm_encoder.cPatches 3 in this set demonstrate the use of
drm_encoder_init(). There are many more drivers that can be converted as Thomas has already demonstrated.This is all based on work done by Thomas Zimmermann, I just wanted to implement my suggestion so we could select the best way forward.
Quoted 6 lines
Quoted 4 lines
Note: Daniel Vetter has hinted the approach implemented here smelled like middle-layer.
IMO this is not so, it is just a way to handle cleanup for the simple cases.We discussed this patch-set briefly on irc.
Just to clarify, we in this context was Daniel Vetter & me.
Sam
Quoted 10 lines
With the upcoming
drmm_changes and such this is bad timing.. And in the end this may be pointless code-chrunch.Patch-set shelfed for now - may re-visit it later.
Sam
_______________________________________________
dri-devel mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerHi Sam
Am 13.03.20 um 21:17 schrieb Sam Ravnborg:
Quoted 7 lines
Thomas Zimmermann had made a nice patch-set that introduced
drm_simple_encoder_init()which is already present in drm-misc-next.While looking at this it was suddenly obvious to me that this was functionalty that really should be included in
drm_encoder.cThe case where the core could handle the callback is pretty common and not part of the simple pipe line.
The original patchset put the new function into the core implementation and was shot down for this. So it ended up in the simple-KMS helpers.
Quoted 10 lines
So after some dialog on dri-devel the conclusion was to go for a change like this:
drm_encoder_init_funcs()for all users that specified adrm_encoder_funcsto extend the functionality.
drm_encoder_init()for all users that did not
need to extend the basic functionality with
drm_encoder_funcs.
TBH, my take-away was to keep the core as it is ans maybe rename drm_simple_encoder_init() to some better name.
Quoted 2 lines
A similar approach with a
_funcs()prefix is used elsewhere in drm/
IMHO, there are a few things to consider:
From grepping, I could only find drm_gem_fb_create_with_funcs(). And the proposed change would make the encoder's function name inconsistent with drm_connector_init(), drm_crtc_init(), and others. Finally, drm_connector_init_with_ddc() was criticiced for being mid-layerish and could lead to many combinations of postfixes (e.g., _with_funcs(), with_ddc(), _with_ddc_and_funcs(), etc).
If there is consent that the drm_simple_encoder_init() should go away, I'd propose to change drm_encoder_init(). It could use a default implementation for funcs, if no funcs argument has been specified. We already have such behavior for some GEM callbacks. In later patches, drm_gem_fb_create_with_funcs() and drm_connector_init_with_ddc() could go away as well.
Best regards
Thomas
Quoted 143 lines
This required a rename of the existing users, and a follow-up patch that moves
drm_simple_encoder_init()todrm_encoder.cPatches 3 in this set demonstrate the use of
drm_encoder_init(). There are many more drivers that can be converted as Thomas has already demonstrated.This is all based on work done by Thomas Zimmermann, I just wanted to implement my suggestion so we could select the best way forward.
Note: Daniel Vetter has hinted the approach implemented here smelled like middle-layer.
IMO this is not so, it is just a way to handle cleanup for the simple cases.Sam
Sam Ravnborg (3):
drm:drm_encoder_init()=>drm_encoder_init_funcs()
drm:drm_simple_encoder_init()=>drm_encoder_init()drm/atmel-hlcdc: Usedrm_encoder_init()drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 28 ++++++------- drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 28 ++++++------- drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 28 ++++++------- drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 28 ++++++------- drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 4 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 10 ++--- .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 10 ++--- drivers/gpu/drm/arc/arcpgu_hdmi.c | 4 +- drivers/gpu/drm/arc/arcpgu_sim.c | 4 +- drivers/gpu/drm/ast/ast_mode.c | 3 +- drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c | 8 +--- drivers/gpu/drm/drm_encoder.c | 49 +++++++++++++++++++--- drivers/gpu/drm/drm_encoder_slave.c | 2 +- drivers/gpu/drm/drm_simple_kms_helper.c | 45 +------------------- drivers/gpu/drm/drm_writeback.c | 6 +-- drivers/gpu/drm/exynos/exynos_dp.c | 4 +- drivers/gpu/drm/exynos/exynos_drm_dpi.c | 4 +- drivers/gpu/drm/exynos/exynos_drm_dsi.c | 4 +- drivers/gpu/drm/exynos/exynos_drm_vidi.c | 4 +- drivers/gpu/drm/exynos/exynos_hdmi.c | 4 +- drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 4 +- drivers/gpu/drm/gma500/cdv_intel_crt.c | 5 ++- drivers/gpu/drm/gma500/cdv_intel_dp.c | 4 +- drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 4 +- drivers/gpu/drm/gma500/cdv_intel_lvds.c | 6 +-- drivers/gpu/drm/gma500/mdfld_dsi_dpi.c | 7 ++-- drivers/gpu/drm/gma500/oaktrail_hdmi.c | 6 +-- drivers/gpu/drm/gma500/oaktrail_lvds.c | 4 +- drivers/gpu/drm/gma500/psb_intel_lvds.c | 6 +-- drivers/gpu/drm/gma500/psb_intel_sdvo.c | 4 +- drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c | 4 +- drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c | 4 +- drivers/gpu/drm/i2c/tda998x_drv.c | 5 ++- drivers/gpu/drm/i915/display/icl_dsi.c | 4 +- drivers/gpu/drm/i915/display/intel_crt.c | 5 ++- drivers/gpu/drm/i915/display/intel_ddi.c | 6 ++- drivers/gpu/drm/i915/display/intel_dp.c | 6 +-- drivers/gpu/drm/i915/display/intel_dp_mst.c | 6 ++- drivers/gpu/drm/i915/display/intel_dvo.c | 6 +-- drivers/gpu/drm/i915/display/intel_hdmi.c | 6 +-- drivers/gpu/drm/i915/display/intel_lvds.c | 4 +- drivers/gpu/drm/i915/display/intel_sdvo.c | 6 +-- drivers/gpu/drm/i915/display/intel_tv.c | 4 +- drivers/gpu/drm/i915/display/vlv_dsi.c | 5 ++- drivers/gpu/drm/imx/dw_hdmi-imx.c | 4 +- drivers/gpu/drm/imx/imx-ldb.c | 4 +- drivers/gpu/drm/imx/imx-tve.c | 4 +- drivers/gpu/drm/imx/parallel-display.c | 4 +- drivers/gpu/drm/ingenic/ingenic-drm.c | 5 ++- drivers/gpu/drm/mediatek/mtk_dpi.c | 5 ++- drivers/gpu/drm/mediatek/mtk_dsi.c | 4 +- drivers/gpu/drm/meson/meson_dw_hdmi.c | 5 ++- drivers/gpu/drm/meson/meson_venc_cvbs.c | 5 ++- drivers/gpu/drm/mgag200/mgag200_mode.c | 7 +--- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 4 +- drivers/gpu/drm/msm/disp/mdp4/mdp4_dsi_encoder.c | 4 +- drivers/gpu/drm/msm/disp/mdp4/mdp4_dtv_encoder.c | 4 +- drivers/gpu/drm/msm/disp/mdp4/mdp4_lcdc_encoder.c | 4 +- drivers/gpu/drm/msm/disp/mdp5/mdp5_encoder.c | 3 +- drivers/gpu/drm/nouveau/dispnv04/dac.c | 4 +- drivers/gpu/drm/nouveau/dispnv04/dfp.c | 3 +- drivers/gpu/drm/nouveau/dispnv04/tvnv04.c | 4 +- drivers/gpu/drm/nouveau/dispnv04/tvnv17.c | 4 +- drivers/gpu/drm/nouveau/dispnv50/disp.c | 16 +++---- drivers/gpu/drm/omapdrm/omap_encoder.c | 4 +- drivers/gpu/drm/qxl/qxl_display.c | 7 +--- drivers/gpu/drm/radeon/atombios_encoders.c | 40 +++++++++--------- drivers/gpu/drm/radeon/radeon_dp_mst.c | 4 +- drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 20 ++++----- drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 4 +- drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 5 ++- drivers/gpu/drm/rockchip/cdn-dp-core.c | 4 +- drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 5 ++- drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 4 +- drivers/gpu/drm/rockchip/inno_hdmi.c | 4 +- drivers/gpu/drm/rockchip/rk3066_hdmi.c | 4 +- drivers/gpu/drm/rockchip/rockchip_lvds.c | 5 ++- drivers/gpu/drm/rockchip/rockchip_rgb.c | 5 ++- drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 4 +- drivers/gpu/drm/sti/sti_tvout.c | 16 +++---- drivers/gpu/drm/stm/ltdc.c | 4 +- drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 10 ++--- drivers/gpu/drm/sun4i/sun4i_lvds.c | 10 ++--- drivers/gpu/drm/sun4i/sun4i_rgb.c | 10 ++--- drivers/gpu/drm/sun4i/sun4i_tv.c | 10 ++--- drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 10 ++--- drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c | 4 +- drivers/gpu/drm/tegra/dsi.c | 6 +-- drivers/gpu/drm/tegra/hdmi.c | 5 ++- drivers/gpu/drm/tegra/rgb.c | 4 +- drivers/gpu/drm/tegra/sor.c | 4 +- drivers/gpu/drm/tidss/tidss_encoder.c | 4 +- drivers/gpu/drm/tilcdc/tilcdc_external.c | 8 ++-- drivers/gpu/drm/tilcdc/tilcdc_panel.c | 4 +- drivers/gpu/drm/vboxvideo/vbox_mode.c | 4 +- drivers/gpu/drm/vc4/vc4_dpi.c | 4 +- drivers/gpu/drm/vc4/vc4_dsi.c | 4 +- drivers/gpu/drm/vc4/vc4_hdmi.c | 4 +- drivers/gpu/drm/vc4/vc4_vec.c | 4 +- drivers/gpu/drm/virtio/virtgpu_display.c | 4 +- drivers/gpu/drm/vkms/vkms_output.c | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 5 ++- drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 4 +- drivers/gpu/drm/zte/zx_hdmi.c | 4 +- drivers/gpu/drm/zte/zx_tvenc.c | 4 +- drivers/gpu/drm/zte/zx_vga.c | 4 +- include/drm/drm_encoder.h | 9 ++-- include/drm/drm_simple_kms_helper.h | 4 -- 109 files changed, 394 insertions(+), 395 deletions(-)_______________________________________________
dri-devel mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 6 lines
Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Maxfeldstr. 5, 90409 Nürnberg, Germany (HRB 36809, AG Nürnberg) Geschäftsführer: Felix Imendörffer