Commit f8a852f1 authored by Michael Riesch's avatar Michael Riesch Committed by Heiko Stuebner

drm/rockchip: rgb: embed drm_encoder into rockchip_encoder

Commit 540b8f27 ("drm/rockchip: Embed drm_encoder into
rockchip_decoder") provides the means to pass the endpoint ID to the
VOP2 driver, which sets the interface MUX accordingly. However, this
step has not yet been carried out for the RGB output block. Embed the
drm_encoder structure into the rockchip_encoder structure and set the
endpoint ID correctly.
Signed-off-by: default avatarMichael Riesch <michael.riesch@wolfvision.net>
Reviewed-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20230124054706.3921383-3-michael.riesch@wolfvision.net
parent 368419a2
...@@ -22,13 +22,11 @@ ...@@ -22,13 +22,11 @@
#include "rockchip_drm_vop.h" #include "rockchip_drm_vop.h"
#include "rockchip_rgb.h" #include "rockchip_rgb.h"
#define encoder_to_rgb(c) container_of(c, struct rockchip_rgb, encoder)
struct rockchip_rgb { struct rockchip_rgb {
struct device *dev; struct device *dev;
struct drm_device *drm_dev; struct drm_device *drm_dev;
struct drm_bridge *bridge; struct drm_bridge *bridge;
struct drm_encoder encoder; struct rockchip_encoder encoder;
struct drm_connector connector; struct drm_connector connector;
int output_mode; int output_mode;
}; };
...@@ -125,7 +123,7 @@ struct rockchip_rgb *rockchip_rgb_init(struct device *dev, ...@@ -125,7 +123,7 @@ struct rockchip_rgb *rockchip_rgb_init(struct device *dev,
return ERR_PTR(ret); return ERR_PTR(ret);
} }
encoder = &rgb->encoder; encoder = &rgb->encoder.encoder;
encoder->possible_crtcs = drm_crtc_mask(crtc); encoder->possible_crtcs = drm_crtc_mask(crtc);
ret = drm_simple_encoder_init(drm_dev, encoder, DRM_MODE_ENCODER_NONE); ret = drm_simple_encoder_init(drm_dev, encoder, DRM_MODE_ENCODER_NONE);
...@@ -161,6 +159,8 @@ struct rockchip_rgb *rockchip_rgb_init(struct device *dev, ...@@ -161,6 +159,8 @@ struct rockchip_rgb *rockchip_rgb_init(struct device *dev,
goto err_free_encoder; goto err_free_encoder;
} }
rgb->encoder.crtc_endpoint_id = endpoint_id;
ret = drm_connector_attach_encoder(connector, encoder); ret = drm_connector_attach_encoder(connector, encoder);
if (ret < 0) { if (ret < 0) {
DRM_DEV_ERROR(drm_dev->dev, DRM_DEV_ERROR(drm_dev->dev,
...@@ -182,6 +182,6 @@ void rockchip_rgb_fini(struct rockchip_rgb *rgb) ...@@ -182,6 +182,6 @@ void rockchip_rgb_fini(struct rockchip_rgb *rgb)
{ {
drm_panel_bridge_remove(rgb->bridge); drm_panel_bridge_remove(rgb->bridge);
drm_connector_cleanup(&rgb->connector); drm_connector_cleanup(&rgb->connector);
drm_encoder_cleanup(&rgb->encoder); drm_encoder_cleanup(&rgb->encoder.encoder);
} }
EXPORT_SYMBOL_GPL(rockchip_rgb_fini); EXPORT_SYMBOL_GPL(rockchip_rgb_fini);
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