Commit 1aae5263 authored by Daniel Vetter's avatar Daniel Vetter

drm/arc: Embedd a drm_connector for sim case

Removes the last devm_kzalloc, which means we're now prepared to use
drmm_mode_config_cleanup!
Acked-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
Cc: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Cc: Alexey Brodkin <abrodkin@synopsys.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210112084358.2771527-5-daniel.vetter@ffwll.ch
parent 418fa908
...@@ -15,6 +15,7 @@ struct arcpgu_drm_private { ...@@ -15,6 +15,7 @@ struct arcpgu_drm_private {
void __iomem *regs; void __iomem *regs;
struct clk *clk; struct clk *clk;
struct drm_simple_display_pipe pipe; struct drm_simple_display_pipe pipe;
struct drm_connector sim_conn;
}; };
#define dev_to_arcpgu(x) container_of(x, struct arcpgu_drm_private, drm) #define dev_to_arcpgu(x) container_of(x, struct arcpgu_drm_private, drm)
......
...@@ -18,10 +18,6 @@ ...@@ -18,10 +18,6 @@
#define YRES_MAX 8192 #define YRES_MAX 8192
struct arcpgu_drm_connector {
struct drm_connector connector;
};
static int arcpgu_drm_connector_get_modes(struct drm_connector *connector) static int arcpgu_drm_connector_get_modes(struct drm_connector *connector)
{ {
int count; int count;
...@@ -57,7 +53,6 @@ static struct drm_encoder_funcs arcpgu_drm_encoder_funcs = { ...@@ -57,7 +53,6 @@ static struct drm_encoder_funcs arcpgu_drm_encoder_funcs = {
int arcpgu_drm_sim_init(struct drm_device *drm, struct device_node *np) int arcpgu_drm_sim_init(struct drm_device *drm, struct device_node *np)
{ {
struct arcpgu_drm_private *arcpgu = dev_to_arcpgu(drm); struct arcpgu_drm_private *arcpgu = dev_to_arcpgu(drm);
struct arcpgu_drm_connector *arcpgu_connector;
struct drm_encoder *encoder; struct drm_encoder *encoder;
struct drm_connector *connector; struct drm_connector *connector;
int ret; int ret;
...@@ -72,14 +67,7 @@ int arcpgu_drm_sim_init(struct drm_device *drm, struct device_node *np) ...@@ -72,14 +67,7 @@ int arcpgu_drm_sim_init(struct drm_device *drm, struct device_node *np)
if (ret) if (ret)
return ret; return ret;
arcpgu_connector = devm_kzalloc(drm->dev, sizeof(*arcpgu_connector), connector = &arcpgu->sim_conn;
GFP_KERNEL);
if (!arcpgu_connector) {
ret = -ENOMEM;
goto error_encoder_cleanup;
}
connector = &arcpgu_connector->connector;
drm_connector_helper_add(connector, &arcpgu_drm_connector_helper_funcs); drm_connector_helper_add(connector, &arcpgu_drm_connector_helper_funcs);
ret = drm_connector_init(drm, connector, &arcpgu_drm_connector_funcs, ret = drm_connector_init(drm, connector, &arcpgu_drm_connector_funcs,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment