tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

drm: Pass 'name' to drm_encoder_init()

Done with coccinelle for the most part. However, it thinks '...' is
part of the semantic patch, so I put an 'int DOTDOTDOT' placeholder
in its place and got rid of it with sed afterwards.

@@
identifier dev, encoder, funcs;
@@
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 DOTDOTDOT
)
{ ... }

@@
identifier dev, encoder, funcs;
@@
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 DOTDOTDOT
);

@@
expression E1, E2, E3, E4;
@@
drm_encoder_init(E1, E2, E3, E4
+ ,NULL
)

v2: Add ', or NULL...' to @name kernel doc (Jani)
Annotate the function with __printf() attribute (Jani)

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1449670818-2966-1-git-send-email-ville.syrjala@linux.intel.com

authored by

Ville Syrjälä and committed by
Daniel Vetter 13a3d91f b0b3b795

+135 -109
+7 -7
drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
··· 3729 3729 case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC1: 3730 3730 case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC2: 3731 3731 drm_encoder_init(dev, encoder, &dce_v10_0_encoder_funcs, 3732 - DRM_MODE_ENCODER_DAC); 3732 + DRM_MODE_ENCODER_DAC, NULL); 3733 3733 drm_encoder_helper_add(encoder, &dce_v10_0_dac_helper_funcs); 3734 3734 break; 3735 3735 case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DVO1: ··· 3740 3740 if (amdgpu_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) { 3741 3741 amdgpu_encoder->rmx_type = RMX_FULL; 3742 3742 drm_encoder_init(dev, encoder, &dce_v10_0_encoder_funcs, 3743 - DRM_MODE_ENCODER_LVDS); 3743 + DRM_MODE_ENCODER_LVDS, NULL); 3744 3744 amdgpu_encoder->enc_priv = amdgpu_atombios_encoder_get_lcd_info(amdgpu_encoder); 3745 3745 } else if (amdgpu_encoder->devices & (ATOM_DEVICE_CRT_SUPPORT)) { 3746 3746 drm_encoder_init(dev, encoder, &dce_v10_0_encoder_funcs, 3747 - DRM_MODE_ENCODER_DAC); 3747 + DRM_MODE_ENCODER_DAC, NULL); 3748 3748 amdgpu_encoder->enc_priv = amdgpu_atombios_encoder_get_dig_info(amdgpu_encoder); 3749 3749 } else { 3750 3750 drm_encoder_init(dev, encoder, &dce_v10_0_encoder_funcs, 3751 - DRM_MODE_ENCODER_TMDS); 3751 + DRM_MODE_ENCODER_TMDS, NULL); 3752 3752 amdgpu_encoder->enc_priv = amdgpu_atombios_encoder_get_dig_info(amdgpu_encoder); 3753 3753 } 3754 3754 drm_encoder_helper_add(encoder, &dce_v10_0_dig_helper_funcs); ··· 3766 3766 amdgpu_encoder->is_ext_encoder = true; 3767 3767 if (amdgpu_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) 3768 3768 drm_encoder_init(dev, encoder, &dce_v10_0_encoder_funcs, 3769 - DRM_MODE_ENCODER_LVDS); 3769 + DRM_MODE_ENCODER_LVDS, NULL); 3770 3770 else if (amdgpu_encoder->devices & (ATOM_DEVICE_CRT_SUPPORT)) 3771 3771 drm_encoder_init(dev, encoder, &dce_v10_0_encoder_funcs, 3772 - DRM_MODE_ENCODER_DAC); 3772 + DRM_MODE_ENCODER_DAC, NULL); 3773 3773 else 3774 3774 drm_encoder_init(dev, encoder, &dce_v10_0_encoder_funcs, 3775 - DRM_MODE_ENCODER_TMDS); 3775 + DRM_MODE_ENCODER_TMDS, NULL); 3776 3776 drm_encoder_helper_add(encoder, &dce_v10_0_ext_helper_funcs); 3777 3777 break; 3778 3778 }
+7 -7
drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
··· 3722 3722 case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC1: 3723 3723 case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC2: 3724 3724 drm_encoder_init(dev, encoder, &dce_v11_0_encoder_funcs, 3725 - DRM_MODE_ENCODER_DAC); 3725 + DRM_MODE_ENCODER_DAC, NULL); 3726 3726 drm_encoder_helper_add(encoder, &dce_v11_0_dac_helper_funcs); 3727 3727 break; 3728 3728 case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DVO1: ··· 3733 3733 if (amdgpu_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) { 3734 3734 amdgpu_encoder->rmx_type = RMX_FULL; 3735 3735 drm_encoder_init(dev, encoder, &dce_v11_0_encoder_funcs, 3736 - DRM_MODE_ENCODER_LVDS); 3736 + DRM_MODE_ENCODER_LVDS, NULL); 3737 3737 amdgpu_encoder->enc_priv = amdgpu_atombios_encoder_get_lcd_info(amdgpu_encoder); 3738 3738 } else if (amdgpu_encoder->devices & (ATOM_DEVICE_CRT_SUPPORT)) { 3739 3739 drm_encoder_init(dev, encoder, &dce_v11_0_encoder_funcs, 3740 - DRM_MODE_ENCODER_DAC); 3740 + DRM_MODE_ENCODER_DAC, NULL); 3741 3741 amdgpu_encoder->enc_priv = amdgpu_atombios_encoder_get_dig_info(amdgpu_encoder); 3742 3742 } else { 3743 3743 drm_encoder_init(dev, encoder, &dce_v11_0_encoder_funcs, 3744 - DRM_MODE_ENCODER_TMDS); 3744 + DRM_MODE_ENCODER_TMDS, NULL); 3745 3745 amdgpu_encoder->enc_priv = amdgpu_atombios_encoder_get_dig_info(amdgpu_encoder); 3746 3746 } 3747 3747 drm_encoder_helper_add(encoder, &dce_v11_0_dig_helper_funcs); ··· 3759 3759 amdgpu_encoder->is_ext_encoder = true; 3760 3760 if (amdgpu_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) 3761 3761 drm_encoder_init(dev, encoder, &dce_v11_0_encoder_funcs, 3762 - DRM_MODE_ENCODER_LVDS); 3762 + DRM_MODE_ENCODER_LVDS, NULL); 3763 3763 else if (amdgpu_encoder->devices & (ATOM_DEVICE_CRT_SUPPORT)) 3764 3764 drm_encoder_init(dev, encoder, &dce_v11_0_encoder_funcs, 3765 - DRM_MODE_ENCODER_DAC); 3765 + DRM_MODE_ENCODER_DAC, NULL); 3766 3766 else 3767 3767 drm_encoder_init(dev, encoder, &dce_v11_0_encoder_funcs, 3768 - DRM_MODE_ENCODER_TMDS); 3768 + DRM_MODE_ENCODER_TMDS, NULL); 3769 3769 drm_encoder_helper_add(encoder, &dce_v11_0_ext_helper_funcs); 3770 3770 break; 3771 3771 }
+7 -7
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
··· 3659 3659 case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC1: 3660 3660 case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC2: 3661 3661 drm_encoder_init(dev, encoder, &dce_v8_0_encoder_funcs, 3662 - DRM_MODE_ENCODER_DAC); 3662 + DRM_MODE_ENCODER_DAC, NULL); 3663 3663 drm_encoder_helper_add(encoder, &dce_v8_0_dac_helper_funcs); 3664 3664 break; 3665 3665 case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DVO1: ··· 3670 3670 if (amdgpu_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) { 3671 3671 amdgpu_encoder->rmx_type = RMX_FULL; 3672 3672 drm_encoder_init(dev, encoder, &dce_v8_0_encoder_funcs, 3673 - DRM_MODE_ENCODER_LVDS); 3673 + DRM_MODE_ENCODER_LVDS, NULL); 3674 3674 amdgpu_encoder->enc_priv = amdgpu_atombios_encoder_get_lcd_info(amdgpu_encoder); 3675 3675 } else if (amdgpu_encoder->devices & (ATOM_DEVICE_CRT_SUPPORT)) { 3676 3676 drm_encoder_init(dev, encoder, &dce_v8_0_encoder_funcs, 3677 - DRM_MODE_ENCODER_DAC); 3677 + DRM_MODE_ENCODER_DAC, NULL); 3678 3678 amdgpu_encoder->enc_priv = amdgpu_atombios_encoder_get_dig_info(amdgpu_encoder); 3679 3679 } else { 3680 3680 drm_encoder_init(dev, encoder, &dce_v8_0_encoder_funcs, 3681 - DRM_MODE_ENCODER_TMDS); 3681 + DRM_MODE_ENCODER_TMDS, NULL); 3682 3682 amdgpu_encoder->enc_priv = amdgpu_atombios_encoder_get_dig_info(amdgpu_encoder); 3683 3683 } 3684 3684 drm_encoder_helper_add(encoder, &dce_v8_0_dig_helper_funcs); ··· 3696 3696 amdgpu_encoder->is_ext_encoder = true; 3697 3697 if (amdgpu_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) 3698 3698 drm_encoder_init(dev, encoder, &dce_v8_0_encoder_funcs, 3699 - DRM_MODE_ENCODER_LVDS); 3699 + DRM_MODE_ENCODER_LVDS, NULL); 3700 3700 else if (amdgpu_encoder->devices & (ATOM_DEVICE_CRT_SUPPORT)) 3701 3701 drm_encoder_init(dev, encoder, &dce_v8_0_encoder_funcs, 3702 - DRM_MODE_ENCODER_DAC); 3702 + DRM_MODE_ENCODER_DAC, NULL); 3703 3703 else 3704 3704 drm_encoder_init(dev, encoder, &dce_v8_0_encoder_funcs, 3705 - DRM_MODE_ENCODER_TMDS); 3705 + DRM_MODE_ENCODER_TMDS, NULL); 3706 3706 drm_encoder_helper_add(encoder, &dce_v8_0_ext_helper_funcs); 3707 3707 break; 3708 3708 }
+1 -1
drivers/gpu/drm/ast/ast_mode.c
··· 751 751 return -ENOMEM; 752 752 753 753 drm_encoder_init(dev, &ast_encoder->base, &ast_enc_funcs, 754 - DRM_MODE_ENCODER_DAC); 754 + DRM_MODE_ENCODER_DAC, NULL); 755 755 drm_encoder_helper_add(&ast_encoder->base, &ast_enc_helper_funcs); 756 756 757 757 ast_encoder->base.possible_crtcs = 1;
+1 -1
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c
··· 256 256 &atmel_hlcdc_panel_encoder_helper_funcs); 257 257 ret = drm_encoder_init(dev, &panel->base.encoder, 258 258 &atmel_hlcdc_panel_encoder_funcs, 259 - DRM_MODE_ENCODER_LVDS); 259 + DRM_MODE_ENCODER_LVDS, NULL); 260 260 if (ret) 261 261 return ret; 262 262
+1 -1
drivers/gpu/drm/bochs/bochs_kms.c
··· 196 196 197 197 encoder->possible_crtcs = 0x1; 198 198 drm_encoder_init(dev, encoder, &bochs_encoder_encoder_funcs, 199 - DRM_MODE_ENCODER_DAC); 199 + DRM_MODE_ENCODER_DAC, NULL); 200 200 drm_encoder_helper_add(encoder, &bochs_encoder_helper_funcs); 201 201 } 202 202
+1 -1
drivers/gpu/drm/cirrus/cirrus_mode.c
··· 489 489 encoder->possible_crtcs = 0x1; 490 490 491 491 drm_encoder_init(dev, encoder, &cirrus_encoder_encoder_funcs, 492 - DRM_MODE_ENCODER_DAC); 492 + DRM_MODE_ENCODER_DAC, NULL); 493 493 drm_encoder_helper_add(encoder, &cirrus_encoder_helper_funcs); 494 494 495 495 return encoder;
+2 -1
drivers/gpu/drm/drm_crtc.c
··· 1077 1077 * @encoder: the encoder to init 1078 1078 * @funcs: callbacks for this encoder 1079 1079 * @encoder_type: user visible type of the encoder 1080 + * @name: printf style format string for the encoder name, or NULL for default name 1080 1081 * 1081 1082 * Initialises a preallocated encoder. Encoder should be 1082 1083 * subclassed as part of driver encoder objects. ··· 1088 1087 int drm_encoder_init(struct drm_device *dev, 1089 1088 struct drm_encoder *encoder, 1090 1089 const struct drm_encoder_funcs *funcs, 1091 - int encoder_type) 1090 + int encoder_type, const char *name, ...) 1092 1091 { 1093 1092 int ret; 1094 1093
+1 -1
drivers/gpu/drm/exynos/exynos_dp_core.c
··· 1313 1313 DRM_DEBUG_KMS("possible_crtcs = 0x%x\n", encoder->possible_crtcs); 1314 1314 1315 1315 drm_encoder_init(drm_dev, encoder, &exynos_dp_encoder_funcs, 1316 - DRM_MODE_ENCODER_TMDS); 1316 + DRM_MODE_ENCODER_TMDS, NULL); 1317 1317 1318 1318 drm_encoder_helper_add(encoder, &exynos_dp_encoder_helper_funcs); 1319 1319
+1 -1
drivers/gpu/drm/exynos/exynos_drm_dpi.c
··· 309 309 DRM_DEBUG_KMS("possible_crtcs = 0x%x\n", encoder->possible_crtcs); 310 310 311 311 drm_encoder_init(dev, encoder, &exynos_dpi_encoder_funcs, 312 - DRM_MODE_ENCODER_TMDS); 312 + DRM_MODE_ENCODER_TMDS, NULL); 313 313 314 314 drm_encoder_helper_add(encoder, &exynos_dpi_encoder_helper_funcs); 315 315
+1 -1
drivers/gpu/drm/exynos/exynos_drm_dsi.c
··· 1831 1831 DRM_DEBUG_KMS("possible_crtcs = 0x%x\n", encoder->possible_crtcs); 1832 1832 1833 1833 drm_encoder_init(drm_dev, encoder, &exynos_dsi_encoder_funcs, 1834 - DRM_MODE_ENCODER_TMDS); 1834 + DRM_MODE_ENCODER_TMDS, NULL); 1835 1835 1836 1836 drm_encoder_helper_add(encoder, &exynos_dsi_encoder_helper_funcs); 1837 1837
+1 -1
drivers/gpu/drm/exynos/exynos_drm_vidi.c
··· 473 473 DRM_DEBUG_KMS("possible_crtcs = 0x%x\n", encoder->possible_crtcs); 474 474 475 475 drm_encoder_init(drm_dev, encoder, &exynos_vidi_encoder_funcs, 476 - DRM_MODE_ENCODER_TMDS); 476 + DRM_MODE_ENCODER_TMDS, NULL); 477 477 478 478 drm_encoder_helper_add(encoder, &exynos_vidi_encoder_helper_funcs); 479 479
+1 -1
drivers/gpu/drm/exynos/exynos_hdmi.c
··· 1793 1793 DRM_DEBUG_KMS("possible_crtcs = 0x%x\n", encoder->possible_crtcs); 1794 1794 1795 1795 drm_encoder_init(drm_dev, encoder, &exynos_hdmi_encoder_funcs, 1796 - DRM_MODE_ENCODER_TMDS); 1796 + DRM_MODE_ENCODER_TMDS, NULL); 1797 1797 1798 1798 drm_encoder_helper_add(encoder, &exynos_hdmi_encoder_helper_funcs); 1799 1799
+1 -1
drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c
··· 57 57 58 58 encoder->possible_crtcs = 1; 59 59 ret = drm_encoder_init(fsl_dev->drm, encoder, &encoder_funcs, 60 - DRM_MODE_ENCODER_LVDS); 60 + DRM_MODE_ENCODER_LVDS, NULL); 61 61 if (ret < 0) 62 62 return ret; 63 63
+1 -1
drivers/gpu/drm/gma500/cdv_intel_crt.c
··· 273 273 274 274 encoder = &gma_encoder->base; 275 275 drm_encoder_init(dev, encoder, 276 - &cdv_intel_crt_enc_funcs, DRM_MODE_ENCODER_DAC); 276 + &cdv_intel_crt_enc_funcs, DRM_MODE_ENCODER_DAC, NULL); 277 277 278 278 gma_connector_attach_encoder(gma_connector, gma_encoder); 279 279
+2 -1
drivers/gpu/drm/gma500/cdv_intel_dp.c
··· 2020 2020 encoder = &gma_encoder->base; 2021 2021 2022 2022 drm_connector_init(dev, connector, &cdv_intel_dp_connector_funcs, type); 2023 - drm_encoder_init(dev, encoder, &cdv_intel_dp_enc_funcs, DRM_MODE_ENCODER_TMDS); 2023 + drm_encoder_init(dev, encoder, &cdv_intel_dp_enc_funcs, 2024 + DRM_MODE_ENCODER_TMDS, NULL); 2024 2025 2025 2026 gma_connector_attach_encoder(gma_connector, gma_encoder); 2026 2027
+1 -1
drivers/gpu/drm/gma500/cdv_intel_hdmi.c
··· 313 313 DRM_MODE_CONNECTOR_DVID); 314 314 315 315 drm_encoder_init(dev, encoder, &psb_intel_lvds_enc_funcs, 316 - DRM_MODE_ENCODER_TMDS); 316 + DRM_MODE_ENCODER_TMDS, NULL); 317 317 318 318 gma_connector_attach_encoder(gma_connector, gma_encoder); 319 319 gma_encoder->type = INTEL_OUTPUT_HDMI;
+1 -1
drivers/gpu/drm/gma500/cdv_intel_lvds.c
··· 652 652 653 653 drm_encoder_init(dev, encoder, 654 654 &cdv_intel_lvds_enc_funcs, 655 - DRM_MODE_ENCODER_LVDS); 655 + DRM_MODE_ENCODER_LVDS, NULL); 656 656 657 657 658 658 gma_connector_attach_encoder(gma_connector, gma_encoder);
+1 -1
drivers/gpu/drm/gma500/mdfld_dsi_dpi.c
··· 994 994 drm_encoder_init(dev, 995 995 encoder, 996 996 p_funcs->encoder_funcs, 997 - DRM_MODE_ENCODER_LVDS); 997 + DRM_MODE_ENCODER_LVDS, NULL); 998 998 drm_encoder_helper_add(encoder, 999 999 p_funcs->encoder_helper_funcs); 1000 1000
+1 -1
drivers/gpu/drm/gma500/oaktrail_hdmi.c
··· 654 654 655 655 drm_encoder_init(dev, encoder, 656 656 &oaktrail_hdmi_enc_funcs, 657 - DRM_MODE_ENCODER_TMDS); 657 + DRM_MODE_ENCODER_TMDS, NULL); 658 658 659 659 gma_connector_attach_encoder(gma_connector, gma_encoder); 660 660
+1 -1
drivers/gpu/drm/gma500/oaktrail_lvds.c
··· 323 323 DRM_MODE_CONNECTOR_LVDS); 324 324 325 325 drm_encoder_init(dev, encoder, &psb_intel_lvds_enc_funcs, 326 - DRM_MODE_ENCODER_LVDS); 326 + DRM_MODE_ENCODER_LVDS, NULL); 327 327 328 328 gma_connector_attach_encoder(gma_connector, gma_encoder); 329 329 gma_encoder->type = INTEL_OUTPUT_LVDS;
+1 -1
drivers/gpu/drm/gma500/psb_intel_lvds.c
··· 723 723 724 724 drm_encoder_init(dev, encoder, 725 725 &psb_intel_lvds_enc_funcs, 726 - DRM_MODE_ENCODER_LVDS); 726 + DRM_MODE_ENCODER_LVDS, NULL); 727 727 728 728 gma_connector_attach_encoder(gma_connector, gma_encoder); 729 729 gma_encoder->type = INTEL_OUTPUT_LVDS;
+2 -1
drivers/gpu/drm/gma500/psb_intel_sdvo.c
··· 2526 2526 /* encoder type will be decided later */ 2527 2527 gma_encoder = &psb_intel_sdvo->base; 2528 2528 gma_encoder->type = INTEL_OUTPUT_SDVO; 2529 - drm_encoder_init(dev, &gma_encoder->base, &psb_intel_sdvo_enc_funcs, 0); 2529 + drm_encoder_init(dev, &gma_encoder->base, &psb_intel_sdvo_enc_funcs, 2530 + 0, NULL); 2530 2531 2531 2532 /* Read the regs to test if we can talk to the device */ 2532 2533 for (i = 0; i < 0x40; i++) {
+1 -1
drivers/gpu/drm/i2c/tda998x_drv.c
··· 1423 1423 1424 1424 drm_encoder_helper_add(&priv->encoder, &tda998x_encoder_helper_funcs); 1425 1425 ret = drm_encoder_init(drm, &priv->encoder, &tda998x_encoder_funcs, 1426 - DRM_MODE_ENCODER_TMDS); 1426 + DRM_MODE_ENCODER_TMDS, NULL); 1427 1427 if (ret) 1428 1428 goto err_encoder; 1429 1429
+1 -1
drivers/gpu/drm/i915/intel_crt.c
··· 798 798 &intel_crt_connector_funcs, DRM_MODE_CONNECTOR_VGA); 799 799 800 800 drm_encoder_init(dev, &crt->base.base, &intel_crt_enc_funcs, 801 - DRM_MODE_ENCODER_DAC); 801 + DRM_MODE_ENCODER_DAC, NULL); 802 802 803 803 intel_connector_attach_encoder(intel_connector, &crt->base); 804 804
+1 -1
drivers/gpu/drm/i915/intel_ddi.c
··· 3284 3284 encoder = &intel_encoder->base; 3285 3285 3286 3286 drm_encoder_init(dev, encoder, &intel_ddi_funcs, 3287 - DRM_MODE_ENCODER_TMDS); 3287 + DRM_MODE_ENCODER_TMDS, NULL); 3288 3288 3289 3289 intel_encoder->compute_config = intel_ddi_compute_config; 3290 3290 intel_encoder->enable = intel_enable_ddi;
+1 -1
drivers/gpu/drm/i915/intel_dp.c
··· 5977 5977 encoder = &intel_encoder->base; 5978 5978 5979 5979 drm_encoder_init(dev, &intel_encoder->base, &intel_dp_enc_funcs, 5980 - DRM_MODE_ENCODER_TMDS); 5980 + DRM_MODE_ENCODER_TMDS, NULL); 5981 5981 5982 5982 intel_encoder->compute_config = intel_dp_compute_config; 5983 5983 intel_encoder->disable = intel_disable_dp;
+1 -1
drivers/gpu/drm/i915/intel_dp_mst.c
··· 536 536 intel_mst->primary = intel_dig_port; 537 537 538 538 drm_encoder_init(dev, &intel_encoder->base, &intel_dp_mst_enc_funcs, 539 - DRM_MODE_ENCODER_DPMST); 539 + DRM_MODE_ENCODER_DPMST, NULL); 540 540 541 541 intel_encoder->type = INTEL_OUTPUT_DP_MST; 542 542 intel_encoder->crtc_mask = 0x7;
+2 -1
drivers/gpu/drm/i915/intel_dsi.c
··· 1152 1152 1153 1153 connector = &intel_connector->base; 1154 1154 1155 - drm_encoder_init(dev, encoder, &intel_dsi_funcs, DRM_MODE_ENCODER_DSI); 1155 + drm_encoder_init(dev, encoder, &intel_dsi_funcs, DRM_MODE_ENCODER_DSI, 1156 + NULL); 1156 1157 1157 1158 /* XXX: very likely not all of these are needed */ 1158 1159 intel_encoder->compute_config = intel_dsi_compute_config;
+1 -1
drivers/gpu/drm/i915/intel_dvo.c
··· 429 429 430 430 intel_encoder = &intel_dvo->base; 431 431 drm_encoder_init(dev, &intel_encoder->base, 432 - &intel_dvo_enc_funcs, encoder_type); 432 + &intel_dvo_enc_funcs, encoder_type, NULL); 433 433 434 434 intel_encoder->disable = intel_disable_dvo; 435 435 intel_encoder->enable = intel_enable_dvo;
+1 -1
drivers/gpu/drm/i915/intel_hdmi.c
··· 2165 2165 intel_encoder = &intel_dig_port->base; 2166 2166 2167 2167 drm_encoder_init(dev, &intel_encoder->base, &intel_hdmi_enc_funcs, 2168 - DRM_MODE_ENCODER_TMDS); 2168 + DRM_MODE_ENCODER_TMDS, NULL); 2169 2169 2170 2170 intel_encoder->compute_config = intel_hdmi_compute_config; 2171 2171 if (HAS_PCH_SPLIT(dev)) {
+1 -1
drivers/gpu/drm/i915/intel_lvds.c
··· 1025 1025 DRM_MODE_CONNECTOR_LVDS); 1026 1026 1027 1027 drm_encoder_init(dev, &intel_encoder->base, &intel_lvds_enc_funcs, 1028 - DRM_MODE_ENCODER_LVDS); 1028 + DRM_MODE_ENCODER_LVDS, NULL); 1029 1029 1030 1030 intel_encoder->enable = intel_enable_lvds; 1031 1031 intel_encoder->pre_enable = intel_pre_enable_lvds;
+2 -1
drivers/gpu/drm/i915/intel_sdvo.c
··· 2978 2978 /* encoder type will be decided later */ 2979 2979 intel_encoder = &intel_sdvo->base; 2980 2980 intel_encoder->type = INTEL_OUTPUT_SDVO; 2981 - drm_encoder_init(dev, &intel_encoder->base, &intel_sdvo_enc_funcs, 0); 2981 + drm_encoder_init(dev, &intel_encoder->base, &intel_sdvo_enc_funcs, 0, 2982 + NULL); 2982 2983 2983 2984 /* Read the regs to test if we can talk to the device */ 2984 2985 for (i = 0; i < 0x40; i++) {
+1 -1
drivers/gpu/drm/i915/intel_tv.c
··· 1645 1645 DRM_MODE_CONNECTOR_SVIDEO); 1646 1646 1647 1647 drm_encoder_init(dev, &intel_encoder->base, &intel_tv_enc_funcs, 1648 - DRM_MODE_ENCODER_TVDAC); 1648 + DRM_MODE_ENCODER_TVDAC, NULL); 1649 1649 1650 1650 intel_encoder->compute_config = intel_tv_compute_config; 1651 1651 intel_encoder->get_config = intel_tv_get_config;
+1 -1
drivers/gpu/drm/imx/dw_hdmi-imx.c
··· 251 251 252 252 drm_encoder_helper_add(encoder, &dw_hdmi_imx_encoder_helper_funcs); 253 253 drm_encoder_init(drm, encoder, &dw_hdmi_imx_encoder_funcs, 254 - DRM_MODE_ENCODER_TMDS); 254 + DRM_MODE_ENCODER_TMDS, NULL); 255 255 256 256 return dw_hdmi_bind(dev, master, data, encoder, iores, irq, plat_data); 257 257 }
+1 -1
drivers/gpu/drm/imx/imx-ldb.c
··· 422 422 drm_encoder_helper_add(&imx_ldb_ch->encoder, 423 423 &imx_ldb_encoder_helper_funcs); 424 424 drm_encoder_init(drm, &imx_ldb_ch->encoder, &imx_ldb_encoder_funcs, 425 - DRM_MODE_ENCODER_LVDS); 425 + DRM_MODE_ENCODER_LVDS, NULL); 426 426 427 427 drm_connector_helper_add(&imx_ldb_ch->connector, 428 428 &imx_ldb_connector_helper_funcs);
+1 -1
drivers/gpu/drm/imx/imx-tve.c
··· 508 508 509 509 drm_encoder_helper_add(&tve->encoder, &imx_tve_encoder_helper_funcs); 510 510 drm_encoder_init(drm, &tve->encoder, &imx_tve_encoder_funcs, 511 - encoder_type); 511 + encoder_type, NULL); 512 512 513 513 drm_connector_helper_add(&tve->connector, 514 514 &imx_tve_connector_helper_funcs);
+1 -1
drivers/gpu/drm/imx/parallel-display.c
··· 192 192 193 193 drm_encoder_helper_add(&imxpd->encoder, &imx_pd_encoder_helper_funcs); 194 194 drm_encoder_init(drm, &imxpd->encoder, &imx_pd_encoder_funcs, 195 - DRM_MODE_ENCODER_NONE); 195 + DRM_MODE_ENCODER_NONE, NULL); 196 196 197 197 drm_connector_helper_add(&imxpd->connector, 198 198 &imx_pd_connector_helper_funcs);
+1 -1
drivers/gpu/drm/mgag200/mgag200_mode.c
··· 1538 1538 encoder->possible_crtcs = 0x1; 1539 1539 1540 1540 drm_encoder_init(dev, encoder, &mga_encoder_encoder_funcs, 1541 - DRM_MODE_ENCODER_DAC); 1541 + DRM_MODE_ENCODER_DAC, NULL); 1542 1542 drm_encoder_helper_add(encoder, &mga_encoder_helper_funcs); 1543 1543 1544 1544 return encoder;
+1 -1
drivers/gpu/drm/msm/mdp/mdp4/mdp4_dtv_encoder.c
··· 262 262 encoder = &mdp4_dtv_encoder->base; 263 263 264 264 drm_encoder_init(dev, encoder, &mdp4_dtv_encoder_funcs, 265 - DRM_MODE_ENCODER_TMDS); 265 + DRM_MODE_ENCODER_TMDS, NULL); 266 266 drm_encoder_helper_add(encoder, &mdp4_dtv_encoder_helper_funcs); 267 267 268 268 mdp4_dtv_encoder->src_clk = devm_clk_get(dev->dev, "src_clk");
+1 -1
drivers/gpu/drm/msm/mdp/mdp4/mdp4_lcdc_encoder.c
··· 460 460 encoder = &mdp4_lcdc_encoder->base; 461 461 462 462 drm_encoder_init(dev, encoder, &mdp4_lcdc_encoder_funcs, 463 - DRM_MODE_ENCODER_LVDS); 463 + DRM_MODE_ENCODER_LVDS, NULL); 464 464 drm_encoder_helper_add(encoder, &mdp4_lcdc_encoder_helper_funcs); 465 465 466 466 /* TODO: do we need different pll in other cases? */
+1 -1
drivers/gpu/drm/msm/mdp/mdp5/mdp5_cmd_encoder.c
··· 326 326 mdp5_cmd_enc->ctl = ctl; 327 327 328 328 drm_encoder_init(dev, encoder, &mdp5_cmd_encoder_funcs, 329 - DRM_MODE_ENCODER_DSI); 329 + DRM_MODE_ENCODER_DSI, NULL); 330 330 331 331 drm_encoder_helper_add(encoder, &mdp5_cmd_encoder_helper_funcs); 332 332
+1 -1
drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c
··· 354 354 355 355 spin_lock_init(&mdp5_encoder->intf_lock); 356 356 357 - drm_encoder_init(dev, encoder, &mdp5_encoder_funcs, enc_type); 357 + drm_encoder_init(dev, encoder, &mdp5_encoder_funcs, enc_type, NULL); 358 358 359 359 drm_encoder_helper_add(encoder, &mdp5_encoder_helper_funcs); 360 360
+2 -1
drivers/gpu/drm/nouveau/dispnv04/dac.c
··· 549 549 else 550 550 helper = &nv04_dac_helper_funcs; 551 551 552 - drm_encoder_init(dev, encoder, &nv04_dac_funcs, DRM_MODE_ENCODER_DAC); 552 + drm_encoder_init(dev, encoder, &nv04_dac_funcs, DRM_MODE_ENCODER_DAC, 553 + NULL); 553 554 drm_encoder_helper_add(encoder, helper); 554 555 555 556 encoder->possible_crtcs = entry->heads;
+1 -1
drivers/gpu/drm/nouveau/dispnv04/dfp.c
··· 705 705 nv_encoder->dcb = entry; 706 706 nv_encoder->or = ffs(entry->or) - 1; 707 707 708 - drm_encoder_init(connector->dev, encoder, &nv04_dfp_funcs, type); 708 + drm_encoder_init(connector->dev, encoder, &nv04_dfp_funcs, type, NULL); 709 709 drm_encoder_helper_add(encoder, helper); 710 710 711 711 encoder->possible_crtcs = entry->heads;
+2 -1
drivers/gpu/drm/nouveau/dispnv04/tvnv04.c
··· 223 223 /* Initialize the common members */ 224 224 encoder = to_drm_encoder(nv_encoder); 225 225 226 - drm_encoder_init(dev, encoder, &nv04_tv_funcs, DRM_MODE_ENCODER_TVDAC); 226 + drm_encoder_init(dev, encoder, &nv04_tv_funcs, DRM_MODE_ENCODER_TVDAC, 227 + NULL); 227 228 drm_encoder_helper_add(encoder, &nv04_tv_helper_funcs); 228 229 229 230 nv_encoder->enc_save = drm_i2c_encoder_save;
+2 -1
drivers/gpu/drm/nouveau/dispnv04/tvnv17.c
··· 814 814 tv_enc->base.dcb = entry; 815 815 tv_enc->base.or = ffs(entry->or) - 1; 816 816 817 - drm_encoder_init(dev, encoder, &nv17_tv_funcs, DRM_MODE_ENCODER_TVDAC); 817 + drm_encoder_init(dev, encoder, &nv17_tv_funcs, DRM_MODE_ENCODER_TVDAC, 818 + NULL); 818 819 drm_encoder_helper_add(encoder, &nv17_tv_helper_funcs); 819 820 to_encoder_slave(encoder)->slave_funcs = &nv17_tv_slave_funcs; 820 821
+3 -3
drivers/gpu/drm/nouveau/nv50_display.c
··· 1718 1718 encoder = to_drm_encoder(nv_encoder); 1719 1719 encoder->possible_crtcs = dcbe->heads; 1720 1720 encoder->possible_clones = 0; 1721 - drm_encoder_init(connector->dev, encoder, &nv50_dac_func, type); 1721 + drm_encoder_init(connector->dev, encoder, &nv50_dac_func, type, NULL); 1722 1722 drm_encoder_helper_add(encoder, &nv50_dac_hfunc); 1723 1723 1724 1724 drm_mode_connector_attach_encoder(connector, encoder); ··· 2126 2126 encoder = to_drm_encoder(nv_encoder); 2127 2127 encoder->possible_crtcs = dcbe->heads; 2128 2128 encoder->possible_clones = 0; 2129 - drm_encoder_init(connector->dev, encoder, &nv50_sor_func, type); 2129 + drm_encoder_init(connector->dev, encoder, &nv50_sor_func, type, NULL); 2130 2130 drm_encoder_helper_add(encoder, &nv50_sor_hfunc); 2131 2131 2132 2132 drm_mode_connector_attach_encoder(connector, encoder); ··· 2306 2306 encoder = to_drm_encoder(nv_encoder); 2307 2307 encoder->possible_crtcs = dcbe->heads; 2308 2308 encoder->possible_clones = 0; 2309 - drm_encoder_init(connector->dev, encoder, &nv50_pior_func, type); 2309 + drm_encoder_init(connector->dev, encoder, &nv50_pior_func, type, NULL); 2310 2310 drm_encoder_helper_add(encoder, &nv50_pior_hfunc); 2311 2311 2312 2312 drm_mode_connector_attach_encoder(connector, encoder);
+1 -1
drivers/gpu/drm/omapdrm/omap_encoder.c
··· 178 178 encoder = &omap_encoder->base; 179 179 180 180 drm_encoder_init(dev, encoder, &omap_encoder_funcs, 181 - DRM_MODE_ENCODER_TMDS); 181 + DRM_MODE_ENCODER_TMDS, NULL); 182 182 drm_encoder_helper_add(encoder, &omap_encoder_helper_funcs); 183 183 184 184 return encoder;
+1 -1
drivers/gpu/drm/qxl/qxl_display.c
··· 968 968 &qxl_connector_funcs, DRM_MODE_CONNECTOR_VIRTUAL); 969 969 970 970 drm_encoder_init(dev, &qxl_output->enc, &qxl_enc_funcs, 971 - DRM_MODE_ENCODER_VIRTUAL); 971 + DRM_MODE_ENCODER_VIRTUAL, NULL); 972 972 973 973 /* we get HPD via client monitors config */ 974 974 connector->polled = DRM_CONNECTOR_POLL_HPD;
+20 -10
drivers/gpu/drm/radeon/atombios_encoders.c
··· 2767 2767 case ENCODER_OBJECT_ID_INTERNAL_LVTM1: 2768 2768 if (radeon_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) { 2769 2769 radeon_encoder->rmx_type = RMX_FULL; 2770 - drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, DRM_MODE_ENCODER_LVDS); 2770 + drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, 2771 + DRM_MODE_ENCODER_LVDS, NULL); 2771 2772 radeon_encoder->enc_priv = radeon_atombios_get_lvds_info(radeon_encoder); 2772 2773 } else { 2773 - drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, DRM_MODE_ENCODER_TMDS); 2774 + drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, 2775 + DRM_MODE_ENCODER_TMDS, NULL); 2774 2776 radeon_encoder->enc_priv = radeon_atombios_set_dig_info(radeon_encoder); 2775 2777 } 2776 2778 drm_encoder_helper_add(encoder, &radeon_atom_dig_helper_funcs); 2777 2779 break; 2778 2780 case ENCODER_OBJECT_ID_INTERNAL_DAC1: 2779 - drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, DRM_MODE_ENCODER_DAC); 2781 + drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, 2782 + DRM_MODE_ENCODER_DAC, NULL); 2780 2783 radeon_encoder->enc_priv = radeon_atombios_set_dac_info(radeon_encoder); 2781 2784 drm_encoder_helper_add(encoder, &radeon_atom_dac_helper_funcs); 2782 2785 break; 2783 2786 case ENCODER_OBJECT_ID_INTERNAL_DAC2: 2784 2787 case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC1: 2785 2788 case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC2: 2786 - drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, DRM_MODE_ENCODER_TVDAC); 2789 + drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, 2790 + DRM_MODE_ENCODER_TVDAC, NULL); 2787 2791 radeon_encoder->enc_priv = radeon_atombios_set_dac_info(radeon_encoder); 2788 2792 drm_encoder_helper_add(encoder, &radeon_atom_dac_helper_funcs); 2789 2793 break; ··· 2801 2797 case ENCODER_OBJECT_ID_INTERNAL_UNIPHY3: 2802 2798 if (radeon_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) { 2803 2799 radeon_encoder->rmx_type = RMX_FULL; 2804 - drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, DRM_MODE_ENCODER_LVDS); 2800 + drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, 2801 + DRM_MODE_ENCODER_LVDS, NULL); 2805 2802 radeon_encoder->enc_priv = radeon_atombios_get_lvds_info(radeon_encoder); 2806 2803 } else if (radeon_encoder->devices & (ATOM_DEVICE_CRT_SUPPORT)) { 2807 - drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, DRM_MODE_ENCODER_DAC); 2804 + drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, 2805 + DRM_MODE_ENCODER_DAC, NULL); 2808 2806 radeon_encoder->enc_priv = radeon_atombios_set_dig_info(radeon_encoder); 2809 2807 } else { 2810 - drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, DRM_MODE_ENCODER_TMDS); 2808 + drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, 2809 + DRM_MODE_ENCODER_TMDS, NULL); 2811 2810 radeon_encoder->enc_priv = radeon_atombios_set_dig_info(radeon_encoder); 2812 2811 } 2813 2812 drm_encoder_helper_add(encoder, &radeon_atom_dig_helper_funcs); ··· 2827 2820 /* these are handled by the primary encoders */ 2828 2821 radeon_encoder->is_ext_encoder = true; 2829 2822 if (radeon_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) 2830 - drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, DRM_MODE_ENCODER_LVDS); 2823 + drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, 2824 + DRM_MODE_ENCODER_LVDS, NULL); 2831 2825 else if (radeon_encoder->devices & (ATOM_DEVICE_CRT_SUPPORT)) 2832 - drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, DRM_MODE_ENCODER_DAC); 2826 + drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, 2827 + DRM_MODE_ENCODER_DAC, NULL); 2833 2828 else 2834 - drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, DRM_MODE_ENCODER_TMDS); 2829 + drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, 2830 + DRM_MODE_ENCODER_TMDS, NULL); 2835 2831 drm_encoder_helper_add(encoder, &radeon_atom_ext_helper_funcs); 2836 2832 break; 2837 2833 }
+1 -1
drivers/gpu/drm/radeon/radeon_dp_mst.c
··· 641 641 } 642 642 643 643 drm_encoder_init(dev, &radeon_encoder->base, &radeon_dp_mst_enc_funcs, 644 - DRM_MODE_ENCODER_DPMST); 644 + DRM_MODE_ENCODER_DPMST, NULL); 645 645 drm_encoder_helper_add(encoder, &radeon_mst_helper_funcs); 646 646 647 647 mst_enc = radeon_encoder->enc_priv;
+10 -5
drivers/gpu/drm/radeon/radeon_legacy_encoders.c
··· 1772 1772 switch (radeon_encoder->encoder_id) { 1773 1773 case ENCODER_OBJECT_ID_INTERNAL_LVDS: 1774 1774 encoder->possible_crtcs = 0x1; 1775 - drm_encoder_init(dev, encoder, &radeon_legacy_lvds_enc_funcs, DRM_MODE_ENCODER_LVDS); 1775 + drm_encoder_init(dev, encoder, &radeon_legacy_lvds_enc_funcs, 1776 + DRM_MODE_ENCODER_LVDS, NULL); 1776 1777 drm_encoder_helper_add(encoder, &radeon_legacy_lvds_helper_funcs); 1777 1778 if (rdev->is_atom_bios) 1778 1779 radeon_encoder->enc_priv = radeon_atombios_get_lvds_info(radeon_encoder); ··· 1782 1781 radeon_encoder->rmx_type = RMX_FULL; 1783 1782 break; 1784 1783 case ENCODER_OBJECT_ID_INTERNAL_TMDS1: 1785 - drm_encoder_init(dev, encoder, &radeon_legacy_tmds_int_enc_funcs, DRM_MODE_ENCODER_TMDS); 1784 + drm_encoder_init(dev, encoder, &radeon_legacy_tmds_int_enc_funcs, 1785 + DRM_MODE_ENCODER_TMDS, NULL); 1786 1786 drm_encoder_helper_add(encoder, &radeon_legacy_tmds_int_helper_funcs); 1787 1787 radeon_encoder->enc_priv = radeon_legacy_get_tmds_info(radeon_encoder); 1788 1788 break; 1789 1789 case ENCODER_OBJECT_ID_INTERNAL_DAC1: 1790 - drm_encoder_init(dev, encoder, &radeon_legacy_primary_dac_enc_funcs, DRM_MODE_ENCODER_DAC); 1790 + drm_encoder_init(dev, encoder, &radeon_legacy_primary_dac_enc_funcs, 1791 + DRM_MODE_ENCODER_DAC, NULL); 1791 1792 drm_encoder_helper_add(encoder, &radeon_legacy_primary_dac_helper_funcs); 1792 1793 if (rdev->is_atom_bios) 1793 1794 radeon_encoder->enc_priv = radeon_atombios_get_primary_dac_info(radeon_encoder); ··· 1797 1794 radeon_encoder->enc_priv = radeon_combios_get_primary_dac_info(radeon_encoder); 1798 1795 break; 1799 1796 case ENCODER_OBJECT_ID_INTERNAL_DAC2: 1800 - drm_encoder_init(dev, encoder, &radeon_legacy_tv_dac_enc_funcs, DRM_MODE_ENCODER_TVDAC); 1797 + drm_encoder_init(dev, encoder, &radeon_legacy_tv_dac_enc_funcs, 1798 + DRM_MODE_ENCODER_TVDAC, NULL); 1801 1799 drm_encoder_helper_add(encoder, &radeon_legacy_tv_dac_helper_funcs); 1802 1800 if (rdev->is_atom_bios) 1803 1801 radeon_encoder->enc_priv = radeon_atombios_get_tv_dac_info(radeon_encoder); ··· 1806 1802 radeon_encoder->enc_priv = radeon_combios_get_tv_dac_info(radeon_encoder); 1807 1803 break; 1808 1804 case ENCODER_OBJECT_ID_INTERNAL_DVO1: 1809 - drm_encoder_init(dev, encoder, &radeon_legacy_tmds_ext_enc_funcs, DRM_MODE_ENCODER_TMDS); 1805 + drm_encoder_init(dev, encoder, &radeon_legacy_tmds_ext_enc_funcs, 1806 + DRM_MODE_ENCODER_TMDS, NULL); 1810 1807 drm_encoder_helper_add(encoder, &radeon_legacy_tmds_ext_helper_funcs); 1811 1808 if (!rdev->is_atom_bios) 1812 1809 radeon_encoder->enc_priv = radeon_legacy_get_ext_tmds_info(radeon_encoder);
+1 -1
drivers/gpu/drm/rcar-du/rcar_du_encoder.c
··· 173 173 goto done; 174 174 } else { 175 175 ret = drm_encoder_init(rcdu->ddev, encoder, &encoder_funcs, 176 - encoder_type); 176 + encoder_type, NULL); 177 177 if (ret < 0) 178 178 goto done; 179 179
+1 -1
drivers/gpu/drm/rcar-du/rcar_du_hdmienc.c
··· 151 151 goto error; 152 152 153 153 ret = drm_encoder_init(rcdu->ddev, encoder, &encoder_funcs, 154 - DRM_MODE_ENCODER_TMDS); 154 + DRM_MODE_ENCODER_TMDS, NULL); 155 155 if (ret < 0) 156 156 goto error; 157 157
+1 -1
drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
··· 295 295 296 296 drm_encoder_helper_add(encoder, &dw_hdmi_rockchip_encoder_helper_funcs); 297 297 drm_encoder_init(drm, encoder, &dw_hdmi_rockchip_encoder_funcs, 298 - DRM_MODE_ENCODER_TMDS); 298 + DRM_MODE_ENCODER_TMDS, NULL); 299 299 300 300 return dw_hdmi_bind(dev, master, data, encoder, iores, irq, plat_data); 301 301 }
+1 -1
drivers/gpu/drm/shmobile/shmob_drm_crtc.c
··· 613 613 encoder->possible_crtcs = 1; 614 614 615 615 ret = drm_encoder_init(sdev->ddev, encoder, &encoder_funcs, 616 - DRM_MODE_ENCODER_LVDS); 616 + DRM_MODE_ENCODER_LVDS, NULL); 617 617 if (ret < 0) 618 618 return ret; 619 619
+4 -3
drivers/gpu/drm/sti/sti_tvout.c
··· 512 512 drm_encoder->possible_clones = 1 << 0; 513 513 514 514 drm_encoder_init(dev, drm_encoder, 515 - &sti_tvout_encoder_funcs, DRM_MODE_ENCODER_LVDS); 515 + &sti_tvout_encoder_funcs, DRM_MODE_ENCODER_LVDS, 516 + NULL); 516 517 517 518 drm_encoder_helper_add(drm_encoder, &sti_dvo_encoder_helper_funcs); 518 519 ··· 565 564 drm_encoder->possible_clones = 1 << 0; 566 565 567 566 drm_encoder_init(dev, drm_encoder, 568 - &sti_tvout_encoder_funcs, DRM_MODE_ENCODER_DAC); 567 + &sti_tvout_encoder_funcs, DRM_MODE_ENCODER_DAC, NULL); 569 568 570 569 drm_encoder_helper_add(drm_encoder, &sti_hda_encoder_helper_funcs); 571 570 ··· 614 613 drm_encoder->possible_clones = 1 << 1; 615 614 616 615 drm_encoder_init(dev, drm_encoder, 617 - &sti_tvout_encoder_funcs, DRM_MODE_ENCODER_TMDS); 616 + &sti_tvout_encoder_funcs, DRM_MODE_ENCODER_TMDS, NULL); 618 617 619 618 drm_encoder_helper_add(drm_encoder, &sti_hdmi_encoder_helper_funcs); 620 619
+1 -1
drivers/gpu/drm/tegra/dsi.c
··· 1023 1023 1024 1024 drm_encoder_init(drm, &dsi->output.encoder, 1025 1025 &tegra_dsi_encoder_funcs, 1026 - DRM_MODE_ENCODER_DSI); 1026 + DRM_MODE_ENCODER_DSI, NULL); 1027 1027 drm_encoder_helper_add(&dsi->output.encoder, 1028 1028 &tegra_dsi_encoder_helper_funcs); 1029 1029
+1 -1
drivers/gpu/drm/tegra/hdmi.c
··· 1320 1320 hdmi->output.connector.dpms = DRM_MODE_DPMS_OFF; 1321 1321 1322 1322 drm_encoder_init(drm, &hdmi->output.encoder, &tegra_hdmi_encoder_funcs, 1323 - DRM_MODE_ENCODER_TMDS); 1323 + DRM_MODE_ENCODER_TMDS, NULL); 1324 1324 drm_encoder_helper_add(&hdmi->output.encoder, 1325 1325 &tegra_hdmi_encoder_helper_funcs); 1326 1326
+1 -1
drivers/gpu/drm/tegra/rgb.c
··· 287 287 output->connector.dpms = DRM_MODE_DPMS_OFF; 288 288 289 289 drm_encoder_init(drm, &output->encoder, &tegra_rgb_encoder_funcs, 290 - DRM_MODE_ENCODER_LVDS); 290 + DRM_MODE_ENCODER_LVDS, NULL); 291 291 drm_encoder_helper_add(&output->encoder, 292 292 &tegra_rgb_encoder_helper_funcs); 293 293
+1 -1
drivers/gpu/drm/tegra/sor.c
··· 2178 2178 sor->output.connector.dpms = DRM_MODE_DPMS_OFF; 2179 2179 2180 2180 drm_encoder_init(drm, &sor->output.encoder, &tegra_sor_encoder_funcs, 2181 - encoder); 2181 + encoder, NULL); 2182 2182 drm_encoder_helper_add(&sor->output.encoder, helpers); 2183 2183 2184 2184 drm_mode_connector_attach_encoder(&sor->output.connector,
+1 -1
drivers/gpu/drm/tilcdc/tilcdc_panel.c
··· 128 128 encoder->possible_crtcs = 1; 129 129 130 130 ret = drm_encoder_init(dev, encoder, &panel_encoder_funcs, 131 - DRM_MODE_ENCODER_LVDS); 131 + DRM_MODE_ENCODER_LVDS, NULL); 132 132 if (ret < 0) 133 133 goto fail; 134 134
+1 -1
drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
··· 138 138 encoder->possible_crtcs = 1; 139 139 140 140 ret = drm_encoder_init(dev, encoder, &tfp410_encoder_funcs, 141 - DRM_MODE_ENCODER_TMDS); 141 + DRM_MODE_ENCODER_TMDS, NULL); 142 142 if (ret < 0) 143 143 goto fail; 144 144
+2 -1
drivers/gpu/drm/udl/udl_encoder.c
··· 73 73 if (!encoder) 74 74 return NULL; 75 75 76 - drm_encoder_init(dev, encoder, &udl_enc_funcs, DRM_MODE_ENCODER_TMDS); 76 + drm_encoder_init(dev, encoder, &udl_enc_funcs, DRM_MODE_ENCODER_TMDS, 77 + NULL); 77 78 drm_encoder_helper_add(encoder, &udl_helper_funcs); 78 79 encoder->possible_crtcs = 1; 79 80 return encoder;
+1 -1
drivers/gpu/drm/vc4/vc4_hdmi.c
··· 519 519 WARN_ON_ONCE((HD_READ(VC4_HD_M_CTL) & VC4_HD_M_ENABLE) == 0); 520 520 521 521 drm_encoder_init(drm, hdmi->encoder, &vc4_hdmi_encoder_funcs, 522 - DRM_MODE_ENCODER_TMDS); 522 + DRM_MODE_ENCODER_TMDS, NULL); 523 523 drm_encoder_helper_add(hdmi->encoder, &vc4_hdmi_encoder_helper_funcs); 524 524 525 525 hdmi->connector = vc4_hdmi_connector_init(drm, hdmi->encoder);
+1 -1
drivers/gpu/drm/virtio/virtgpu_display.c
··· 441 441 drm_connector_helper_add(connector, &virtio_gpu_conn_helper_funcs); 442 442 443 443 drm_encoder_init(dev, encoder, &virtio_gpu_enc_funcs, 444 - DRM_MODE_ENCODER_VIRTUAL); 444 + DRM_MODE_ENCODER_VIRTUAL, NULL); 445 445 drm_encoder_helper_add(encoder, &virtio_gpu_enc_helper_funcs); 446 446 encoder->possible_crtcs = 1 << index; 447 447
+1 -1
drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
··· 363 363 connector->status = vmw_du_connector_detect(connector, true); 364 364 365 365 drm_encoder_init(dev, encoder, &vmw_legacy_encoder_funcs, 366 - DRM_MODE_ENCODER_VIRTUAL); 366 + DRM_MODE_ENCODER_VIRTUAL, NULL); 367 367 drm_mode_connector_attach_encoder(connector, encoder); 368 368 encoder->possible_crtcs = (1 << unit); 369 369 encoder->possible_clones = 0;
+1 -1
drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
··· 597 597 connector->status = vmw_du_connector_detect(connector, true); 598 598 599 599 drm_encoder_init(dev, encoder, &vmw_screen_object_encoder_funcs, 600 - DRM_MODE_ENCODER_VIRTUAL); 600 + DRM_MODE_ENCODER_VIRTUAL, NULL); 601 601 drm_mode_connector_attach_encoder(connector, encoder); 602 602 encoder->possible_crtcs = (1 << unit); 603 603 encoder->possible_clones = 0;
+1 -1
drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
··· 1145 1145 connector->status = vmw_du_connector_detect(connector, false); 1146 1146 1147 1147 drm_encoder_init(dev, encoder, &vmw_stdu_encoder_funcs, 1148 - DRM_MODE_ENCODER_VIRTUAL); 1148 + DRM_MODE_ENCODER_VIRTUAL, NULL); 1149 1149 drm_mode_connector_attach_encoder(connector, encoder); 1150 1150 encoder->possible_crtcs = (1 << unit); 1151 1151 encoder->possible_clones = 0;
+5 -4
include/drm/drm_crtc.h
··· 2196 2196 void drm_bridge_pre_enable(struct drm_bridge *bridge); 2197 2197 void drm_bridge_enable(struct drm_bridge *bridge); 2198 2198 2199 - extern int drm_encoder_init(struct drm_device *dev, 2200 - struct drm_encoder *encoder, 2201 - const struct drm_encoder_funcs *funcs, 2202 - int encoder_type); 2199 + extern __printf(5, 6) 2200 + int drm_encoder_init(struct drm_device *dev, 2201 + struct drm_encoder *encoder, 2202 + const struct drm_encoder_funcs *funcs, 2203 + int encoder_type, const char *name, ...); 2203 2204 2204 2205 /** 2205 2206 * drm_encoder_crtc_ok - can a given crtc drive a given encoder?