openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/sun4i: Use simple encoder 

The ingenic driver uses empty implementations for its encoders. Replace
the code with the generic simple encoder.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20200305155950.2705-15-tzimmermann@suse.de
This commit is contained in:
Thomas Zimmermann 2020-03-05 16:59:42 +01:00
parent 2d2e89dafc
commit f9f3a38d16
6 changed files with 17 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
View File

@ -22,6 +22,7 @@
#include <drm/drm_panel.h> #include <drm/drm_panel.h>
#include <drm/drm_print.h> #include <drm/drm_print.h>
#include <drm/drm_probe_helper.h> #include <drm/drm_probe_helper.h>
#include <drm/drm_simple_kms_helper.h>
#include "sun4i_backend.h" #include "sun4i_backend.h"
#include "sun4i_crtc.h" #include "sun4i_crtc.h"
@ -204,10 +205,6 @@ static const struct drm_encoder_helper_funcs sun4i_hdmi_helper_funcs = {
.mode_valid = sun4i_hdmi_mode_valid, .mode_valid = sun4i_hdmi_mode_valid,
}; };
static const struct drm_encoder_funcs sun4i_hdmi_funcs = {
.destroy = drm_encoder_cleanup,
};
static int sun4i_hdmi_get_modes(struct drm_connector *connector) static int sun4i_hdmi_get_modes(struct drm_connector *connector)
{ {
struct sun4i_hdmi *hdmi = drm_connector_to_sun4i_hdmi(connector); struct sun4i_hdmi *hdmi = drm_connector_to_sun4i_hdmi(connector);
@ -611,11 +608,8 @@ static int sun4i_hdmi_bind(struct device *dev, struct device *master,
drm_encoder_helper_add(&hdmi->encoder, drm_encoder_helper_add(&hdmi->encoder,
&sun4i_hdmi_helper_funcs); &sun4i_hdmi_helper_funcs);
ret = drm_encoder_init(drm, ret = drm_simple_encoder_init(drm, &hdmi->encoder,
&hdmi->encoder, DRM_MODE_ENCODER_TMDS);
&sun4i_hdmi_funcs,
DRM_MODE_ENCODER_TMDS,
NULL);
if (ret) { if (ret) {
dev_err(dev, "Couldn't initialise the HDMI encoder\n"); dev_err(dev, "Couldn't initialise the HDMI encoder\n");
goto err_put_ddc_i2c; goto err_put_ddc_i2c;

12
drivers/gpu/drm/sun4i/sun4i_lvds.c
View File

@ -12,6 +12,7 @@
#include <drm/drm_panel.h> #include <drm/drm_panel.h>
#include <drm/drm_print.h> #include <drm/drm_print.h>
#include <drm/drm_probe_helper.h> #include <drm/drm_probe_helper.h>
#include <drm/drm_simple_kms_helper.h>
#include "sun4i_crtc.h" #include "sun4i_crtc.h"
#include "sun4i_tcon.h" #include "sun4i_tcon.h"
@ -96,10 +97,6 @@ static const struct drm_encoder_helper_funcs sun4i_lvds_enc_helper_funcs = {
.enable = sun4i_lvds_encoder_enable, .enable = sun4i_lvds_encoder_enable,
}; };
static const struct drm_encoder_funcs sun4i_lvds_enc_funcs = {
.destroy = drm_encoder_cleanup,
};
int sun4i_lvds_init(struct drm_device *drm, struct sun4i_tcon *tcon) int sun4i_lvds_init(struct drm_device *drm, struct sun4i_tcon *tcon)
{ {
struct drm_encoder *encoder; struct drm_encoder *encoder;
@ -121,11 +118,8 @@ int sun4i_lvds_init(struct drm_device *drm, struct sun4i_tcon *tcon)
drm_encoder_helper_add(&lvds->encoder, drm_encoder_helper_add(&lvds->encoder,
&sun4i_lvds_enc_helper_funcs); &sun4i_lvds_enc_helper_funcs);
ret = drm_encoder_init(drm, ret = drm_simple_encoder_init(drm, &lvds->encoder,
&lvds->encoder, DRM_MODE_ENCODER_LVDS);
&sun4i_lvds_enc_funcs,
DRM_MODE_ENCODER_LVDS,
NULL);
if (ret) { if (ret) {
dev_err(drm->dev, "Couldn't initialise the lvds encoder\n"); dev_err(drm->dev, "Couldn't initialise the lvds encoder\n");
goto err_out; goto err_out;

17
drivers/gpu/drm/sun4i/sun4i_rgb.c
View File

@ -14,6 +14,7 @@
#include <drm/drm_panel.h> #include <drm/drm_panel.h>
#include <drm/drm_print.h> #include <drm/drm_print.h>
#include <drm/drm_probe_helper.h> #include <drm/drm_probe_helper.h>
#include <drm/drm_simple_kms_helper.h>
#include "sun4i_crtc.h" #include "sun4i_crtc.h"
#include "sun4i_tcon.h" #include "sun4i_tcon.h"
@ -188,15 +189,6 @@ static struct drm_encoder_helper_funcs sun4i_rgb_enc_helper_funcs = {
.mode_valid = sun4i_rgb_mode_valid, .mode_valid = sun4i_rgb_mode_valid,
}; };
static void sun4i_rgb_enc_destroy(struct drm_encoder *encoder)
{
drm_encoder_cleanup(encoder);
}
static struct drm_encoder_funcs sun4i_rgb_enc_funcs = {
.destroy = sun4i_rgb_enc_destroy,
};
int sun4i_rgb_init(struct drm_device *drm, struct sun4i_tcon *tcon) int sun4i_rgb_init(struct drm_device *drm, struct sun4i_tcon *tcon)
{ {
struct drm_encoder *encoder; struct drm_encoder *encoder;
@ -218,11 +210,8 @@ int sun4i_rgb_init(struct drm_device *drm, struct sun4i_tcon *tcon)
drm_encoder_helper_add(&rgb->encoder, drm_encoder_helper_add(&rgb->encoder,
&sun4i_rgb_enc_helper_funcs); &sun4i_rgb_enc_helper_funcs);
ret = drm_encoder_init(drm, ret = drm_simple_encoder_init(drm, &rgb->encoder,
&rgb->encoder, DRM_MODE_ENCODER_NONE);
&sun4i_rgb_enc_funcs,
DRM_MODE_ENCODER_NONE,
NULL);
if (ret) { if (ret) {
dev_err(drm->dev, "Couldn't initialise the rgb encoder\n"); dev_err(drm->dev, "Couldn't initialise the rgb encoder\n");
goto err_out; goto err_out;

17
drivers/gpu/drm/sun4i/sun4i_tv.c
View File

@ -19,6 +19,7 @@
#include <drm/drm_panel.h> #include <drm/drm_panel.h>
#include <drm/drm_print.h> #include <drm/drm_print.h>
#include <drm/drm_probe_helper.h> #include <drm/drm_probe_helper.h>
#include <drm/drm_simple_kms_helper.h>
#include "sun4i_crtc.h" #include "sun4i_crtc.h"
#include "sun4i_drv.h" #include "sun4i_drv.h"
@ -473,15 +474,6 @@ static struct drm_encoder_helper_funcs sun4i_tv_helper_funcs = {
.mode_set = sun4i_tv_mode_set, .mode_set = sun4i_tv_mode_set,
}; };
static void sun4i_tv_destroy(struct drm_encoder *encoder)
{
drm_encoder_cleanup(encoder);
}
static struct drm_encoder_funcs sun4i_tv_funcs = {
.destroy = sun4i_tv_destroy,
};
static int sun4i_tv_comp_get_modes(struct drm_connector *connector) static int sun4i_tv_comp_get_modes(struct drm_connector *connector)
{ {
int i; int i;
@ -592,11 +584,8 @@ static int sun4i_tv_bind(struct device *dev, struct device *master,
drm_encoder_helper_add(&tv->encoder, drm_encoder_helper_add(&tv->encoder,
&sun4i_tv_helper_funcs); &sun4i_tv_helper_funcs);
ret = drm_encoder_init(drm, ret = drm_simple_encoder_init(drm, &tv->encoder,
&tv->encoder, DRM_MODE_ENCODER_TVDAC);
&sun4i_tv_funcs,
DRM_MODE_ENCODER_TVDAC,
NULL);
if (ret) { if (ret) {
dev_err(dev, "Couldn't initialise the TV encoder\n"); dev_err(dev, "Couldn't initialise the TV encoder\n");
goto err_disable_clk; goto err_disable_clk;

12
drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c
View File

@ -24,6 +24,7 @@
#include <drm/drm_panel.h> #include <drm/drm_panel.h>
#include <drm/drm_print.h> #include <drm/drm_print.h>
#include <drm/drm_probe_helper.h> #include <drm/drm_probe_helper.h>
#include <drm/drm_simple_kms_helper.h>
#include "sun4i_crtc.h" #include "sun4i_crtc.h"
#include "sun4i_tcon.h" #include "sun4i_tcon.h"
@ -846,10 +847,6 @@ static const struct drm_encoder_helper_funcs sun6i_dsi_enc_helper_funcs = {
.enable = sun6i_dsi_encoder_enable, .enable = sun6i_dsi_encoder_enable,
}; };
static const struct drm_encoder_funcs sun6i_dsi_enc_funcs = {
.destroy = drm_encoder_cleanup,
};
static u32 sun6i_dsi_dcs_build_pkt_hdr(struct sun6i_dsi *dsi, static u32 sun6i_dsi_dcs_build_pkt_hdr(struct sun6i_dsi *dsi,
const struct mipi_dsi_msg *msg) const struct mipi_dsi_msg *msg)
{ {
@ -1062,11 +1059,8 @@ static int sun6i_dsi_bind(struct device *dev, struct device *master,
drm_encoder_helper_add(&dsi->encoder, drm_encoder_helper_add(&dsi->encoder,
&sun6i_dsi_enc_helper_funcs); &sun6i_dsi_enc_helper_funcs);
ret = drm_encoder_init(drm, ret = drm_simple_encoder_init(drm, &dsi->encoder,
&dsi->encoder, DRM_MODE_ENCODER_DSI);
&sun6i_dsi_enc_funcs,
DRM_MODE_ENCODER_DSI,
NULL);
if (ret) { if (ret) {
dev_err(dsi->dev, "Couldn't initialise the DSI encoder\n"); dev_err(dsi->dev, "Couldn't initialise the DSI encoder\n");
return ret; return ret;

8
drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c
View File

@ -10,6 +10,7 @@
#include <drm/drm_crtc_helper.h> #include <drm/drm_crtc_helper.h>
#include <drm/drm_of.h> #include <drm/drm_of.h>
#include <drm/drm_simple_kms_helper.h>
#include "sun8i_dw_hdmi.h" #include "sun8i_dw_hdmi.h"
#include "sun8i_tcon_top.h" #include "sun8i_tcon_top.h"
@ -29,10 +30,6 @@ sun8i_dw_hdmi_encoder_helper_funcs = {
.mode_set = sun8i_dw_hdmi_encoder_mode_set, .mode_set = sun8i_dw_hdmi_encoder_mode_set,
}; };
static const struct drm_encoder_funcs sun8i_dw_hdmi_encoder_funcs = {
.destroy = drm_encoder_cleanup,
};
static enum drm_mode_status static enum drm_mode_status
sun8i_dw_hdmi_mode_valid_a83t(struct drm_connector *connector, sun8i_dw_hdmi_mode_valid_a83t(struct drm_connector *connector,
const struct drm_display_mode *mode) const struct drm_display_mode *mode)
@ -220,8 +217,7 @@ 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_helper_add(encoder, &sun8i_dw_hdmi_encoder_helper_funcs);
drm_encoder_init(drm, encoder, &sun8i_dw_hdmi_encoder_funcs, drm_simple_encoder_init(drm, encoder, DRM_MODE_ENCODER_TMDS);
DRM_MODE_ENCODER_TMDS, NULL);
sun8i_hdmi_phy_init(hdmi->phy); sun8i_hdmi_phy_init(hdmi->phy);