Commit d088b69f authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

drm/gma500: Use simple encoder 



The gma500 driver uses empty implementations for some of its encoders.
Replace the code with the generic simple encoder. As a side effect, the
patch also removes an indirection in the encoder setup for Medfield.

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20200305155950.2705-6-tzimmermann@suse.de
parent 3d5e73ab

drivers/gpu/drm/gma500/cdv_intel_crt.c

+3 −11
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ 
#include <linux/i2c.h>

#include <linux/pm_runtime.h>



#include <drm/drm_simple_kms_helper.h>



#include "cdv_device.h"

#include "intel_bios.h"

#include "power.h"
@@ -237,15 +239,6 @@ static const struct drm_connector_helper_funcs 
	.best_encoder = gma_best_encoder,

};



static void cdv_intel_crt_enc_destroy(struct drm_encoder *encoder)

{

	drm_encoder_cleanup(encoder);

}



static const struct drm_encoder_funcs cdv_intel_crt_enc_funcs = {

	.destroy = cdv_intel_crt_enc_destroy,

};



void cdv_intel_crt_init(struct drm_device *dev,

			struct psb_intel_mode_device *mode_dev)

{
@@ -271,8 +264,7 @@ 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_simple_encoder_init(dev, encoder, DRM_MODE_ENCODER_DAC);



	gma_connector_attach_encoder(gma_connector, gma_encoder);

drivers/gpu/drm/gma500/cdv_intel_dp.c

+3 −13
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include <drm/drm_crtc.h>

#include <drm/drm_crtc_helper.h>

#include <drm/drm_dp_helper.h>

#include <drm/drm_simple_kms_helper.h>



#include "gma_display.h"

#include "psb_drv.h"
@@ -1908,11 +1909,6 @@ cdv_intel_dp_destroy(struct drm_connector *connector) 
	kfree(connector);

}



static void cdv_intel_dp_encoder_destroy(struct drm_encoder *encoder)

{

	drm_encoder_cleanup(encoder);

}



static const struct drm_encoder_helper_funcs cdv_intel_dp_helper_funcs = {

	.dpms = cdv_intel_dp_dpms,

	.mode_fixup = cdv_intel_dp_mode_fixup,
@@ -1935,11 +1931,6 @@ static const struct drm_connector_helper_funcs cdv_intel_dp_connector_helper_fun 
	.best_encoder = gma_best_encoder,

};



static const struct drm_encoder_funcs cdv_intel_dp_enc_funcs = {

	.destroy = cdv_intel_dp_encoder_destroy,

};





static void cdv_intel_dp_add_properties(struct drm_connector *connector)

{

	cdv_intel_attach_force_audio_property(connector);
@@ -2016,8 +2007,7 @@ 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_simple_encoder_init(dev, encoder, DRM_MODE_ENCODER_TMDS);



	gma_connector_attach_encoder(gma_connector, gma_encoder);
@@ -2120,7 +2110,7 @@ cdv_intel_dp_init(struct drm_device *dev, struct psb_intel_mode_device *mode_dev 
		if (ret == 0) {

			/* if this fails, presume the device is a ghost */

			DRM_INFO("failed to retrieve link info, disabling eDP\n");

			cdv_intel_dp_encoder_destroy(encoder);

			drm_encoder_cleanup(encoder);

			cdv_intel_dp_destroy(connector);

			goto err_priv;

		} else {

drivers/gpu/drm/gma500/cdv_intel_hdmi.c

+2 −2
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include <drm/drm.h>

#include <drm/drm_crtc.h>

#include <drm/drm_edid.h>

#include <drm/drm_simple_kms_helper.h>



#include "cdv_device.h"

#include "psb_drv.h"
@@ -311,8 +312,7 @@ 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_simple_encoder_init(dev, encoder, DRM_MODE_ENCODER_TMDS);



	gma_connector_attach_encoder(gma_connector, gma_encoder);

	gma_encoder->type = INTEL_OUTPUT_HDMI;

drivers/gpu/drm/gma500/cdv_intel_lvds.c

+3 −14
Original line number Diff line number Diff line
@@ -12,6 +12,8 @@ 
#include <linux/i2c.h>

#include <linux/pm_runtime.h>



#include <drm/drm_simple_kms_helper.h>



#include "cdv_device.h"

#include "intel_bios.h"

#include "power.h"
@@ -499,16 +501,6 @@ static const struct drm_connector_funcs cdv_intel_lvds_connector_funcs = { 
	.destroy = cdv_intel_lvds_destroy,

};





static void cdv_intel_lvds_enc_destroy(struct drm_encoder *encoder)

{

	drm_encoder_cleanup(encoder);

}



static const struct drm_encoder_funcs cdv_intel_lvds_enc_funcs = {

	.destroy = cdv_intel_lvds_enc_destroy,

};



/*

 * Enumerate the child dev array parsed from VBT to check whether

 * the LVDS is present.
@@ -616,10 +608,7 @@ 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_simple_encoder_init(dev, encoder, DRM_MODE_ENCODER_LVDS);



	gma_connector_attach_encoder(gma_connector, gma_encoder);

	gma_encoder->type = INTEL_OUTPUT_LVDS;

drivers/gpu/drm/gma500/mdfld_dsi_dpi.c

+3 −4
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ 


#include <linux/delay.h>



#include <drm/drm_simple_kms_helper.h>



#include "mdfld_dsi_dpi.h"

#include "mdfld_dsi_pkg_sender.h"

#include "mdfld_output.h"
@@ -993,10 +995,7 @@ 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_simple_encoder_init(dev, encoder, DRM_MODE_ENCODER_LVDS);

	drm_encoder_helper_add(encoder,

				p_funcs->encoder_helper_funcs);

CRA Git | Maintained and supported by SUSTech CRA and CCSE