Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 13a3d91f authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

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: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1449670818-2966-1-git-send-email-ville.syrjala@linux.intel.com
parent b0b3b795

drivers/gpu/drm/amd/amdgpu/dce_v10_0.c

+7 −7
Original line number Diff line number Diff line
@@ -3729,7 +3729,7 @@ static void dce_v10_0_encoder_add(struct amdgpu_device *adev, 
	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);

				 DRM_MODE_ENCODER_DAC, NULL);

		drm_encoder_helper_add(encoder, &dce_v10_0_dac_helper_funcs);

		break;

	case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DVO1:
@@ -3740,15 +3740,15 @@ static void dce_v10_0_encoder_add(struct amdgpu_device *adev, 
		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);

					 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);

					 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);

					 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);
@@ -3766,13 +3766,13 @@ static void dce_v10_0_encoder_add(struct amdgpu_device *adev, 
		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);

					 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);

					 DRM_MODE_ENCODER_DAC, NULL);

		else

			drm_encoder_init(dev, encoder, &dce_v10_0_encoder_funcs,

					 DRM_MODE_ENCODER_TMDS);

					 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

+7 −7
Original line number Diff line number Diff line
@@ -3722,7 +3722,7 @@ static void dce_v11_0_encoder_add(struct amdgpu_device *adev, 
	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);

				 DRM_MODE_ENCODER_DAC, NULL);

		drm_encoder_helper_add(encoder, &dce_v11_0_dac_helper_funcs);

		break;

	case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DVO1:
@@ -3733,15 +3733,15 @@ static void dce_v11_0_encoder_add(struct amdgpu_device *adev, 
		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);

					 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);

					 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);

					 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);
@@ -3759,13 +3759,13 @@ static void dce_v11_0_encoder_add(struct amdgpu_device *adev, 
		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);

					 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);

					 DRM_MODE_ENCODER_DAC, NULL);

		else

			drm_encoder_init(dev, encoder, &dce_v11_0_encoder_funcs,

					 DRM_MODE_ENCODER_TMDS);

					 DRM_MODE_ENCODER_TMDS, NULL);

		drm_encoder_helper_add(encoder, &dce_v11_0_ext_helper_funcs);

		break;

	}

drivers/gpu/drm/amd/amdgpu/dce_v8_0.c

+7 −7
Original line number Diff line number Diff line
@@ -3659,7 +3659,7 @@ static void dce_v8_0_encoder_add(struct amdgpu_device *adev, 
	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);

				 DRM_MODE_ENCODER_DAC, NULL);

		drm_encoder_helper_add(encoder, &dce_v8_0_dac_helper_funcs);

		break;

	case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DVO1:
@@ -3670,15 +3670,15 @@ static void dce_v8_0_encoder_add(struct amdgpu_device *adev, 
		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);

					 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);

					 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);

					 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);
@@ -3696,13 +3696,13 @@ static void dce_v8_0_encoder_add(struct amdgpu_device *adev, 
		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);

					 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);

					 DRM_MODE_ENCODER_DAC, NULL);

		else

			drm_encoder_init(dev, encoder, &dce_v8_0_encoder_funcs,

					 DRM_MODE_ENCODER_TMDS);

					 DRM_MODE_ENCODER_TMDS, NULL);

		drm_encoder_helper_add(encoder, &dce_v8_0_ext_helper_funcs);

		break;

	}

drivers/gpu/drm/ast/ast_mode.c

+1 −1
Original line number Diff line number Diff line
@@ -751,7 +751,7 @@ static int ast_encoder_init(struct drm_device *dev) 
		return -ENOMEM;



	drm_encoder_init(dev, &ast_encoder->base, &ast_enc_funcs,

			 DRM_MODE_ENCODER_DAC);

			 DRM_MODE_ENCODER_DAC, NULL);

	drm_encoder_helper_add(&ast_encoder->base, &ast_enc_helper_funcs);



	ast_encoder->base.possible_crtcs = 1;

drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c

+1 −1
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ static int atmel_hlcdc_create_panel_output(struct drm_device *dev, 
			       &atmel_hlcdc_panel_encoder_helper_funcs);

	ret = drm_encoder_init(dev, &panel->base.encoder,

			       &atmel_hlcdc_panel_encoder_funcs,

			       DRM_MODE_ENCODER_LVDS);

			       DRM_MODE_ENCODER_LVDS, NULL);

	if (ret)

		return ret;