Skip to content

Commit

Permalink
drm/msm/dp: migrate the ycbcr_420_allowed to drm_bridge
Browse files Browse the repository at this point in the history
Instead of forcing the ycbcr_420_allowed flag to be set on the created
drm_connector, set it on the drm_bridge instance and allow
drm_bridge_connecgtor to propagate it to the drm_connector.

Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Acked-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
Reviewed-by: Maxime Ripard <mripard@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20241019-bridge-yuv420-v1-5-d74efac9e4e6@linaro.org
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
  • Loading branch information
Dmitry Baryshkov committed Oct 24, 2024
1 parent c44a0fa commit 785324d
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 11 deletions.
4 changes: 2 additions & 2 deletions drivers/gpu/drm/msm/dp/dp_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -1467,14 +1467,14 @@ int msm_dp_modeset_init(struct msm_dp *dp_display, struct drm_device *dev,

dp_priv = container_of(dp_display, struct dp_display_private, dp_display);

ret = dp_bridge_init(dp_display, dev, encoder);
ret = dp_bridge_init(dp_display, dev, encoder, yuv_supported);
if (ret) {
DRM_DEV_ERROR(dev->dev,
"failed to create dp bridge: %d\n", ret);
return ret;
}

dp_display->connector = dp_drm_connector_init(dp_display, encoder, yuv_supported);
dp_display->connector = dp_drm_connector_init(dp_display, encoder);
if (IS_ERR(dp_display->connector)) {
ret = PTR_ERR(dp_display->connector);
DRM_DEV_ERROR(dev->dev,
Expand Down
10 changes: 4 additions & 6 deletions drivers/gpu/drm/msm/dp/dp_drm.c
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ static const struct drm_bridge_funcs edp_bridge_ops = {
};

int dp_bridge_init(struct msm_dp *dp_display, struct drm_device *dev,
struct drm_encoder *encoder)
struct drm_encoder *encoder, bool yuv_supported)
{
int rc;
struct msm_dp_bridge *dp_bridge;
Expand All @@ -304,6 +304,7 @@ int dp_bridge_init(struct msm_dp *dp_display, struct drm_device *dev,
bridge = &dp_bridge->bridge;
bridge->funcs = dp_display->is_edp ? &edp_bridge_ops : &dp_bridge_ops;
bridge->type = dp_display->connector_type;
bridge->ycbcr_420_allowed = yuv_supported;

/*
* Many ops only make sense for DP. Why?
Expand Down Expand Up @@ -351,8 +352,8 @@ int dp_bridge_init(struct msm_dp *dp_display, struct drm_device *dev,
}

/* connector initialization */
struct drm_connector *dp_drm_connector_init(struct msm_dp *dp_display, struct drm_encoder *encoder,
bool yuv_supported)
struct drm_connector *dp_drm_connector_init(struct msm_dp *dp_display,
struct drm_encoder *encoder)
{
struct drm_connector *connector = NULL;

Expand All @@ -363,9 +364,6 @@ struct drm_connector *dp_drm_connector_init(struct msm_dp *dp_display, struct dr
if (!dp_display->is_edp)
drm_connector_attach_dp_subconnector_property(connector);

if (yuv_supported)
connector->ycbcr_420_allowed = true;

drm_connector_attach_encoder(connector, encoder);

return connector;
Expand Down
7 changes: 4 additions & 3 deletions drivers/gpu/drm/msm/dp/dp_drm.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,11 @@ struct msm_dp_bridge {

#define to_dp_bridge(x) container_of((x), struct msm_dp_bridge, bridge)

struct drm_connector *dp_drm_connector_init(struct msm_dp *dp_display, struct drm_encoder *encoder,
bool yuv_supported);
struct drm_connector *dp_drm_connector_init(struct msm_dp *dp_display,
struct drm_encoder *encoder);
int dp_bridge_init(struct msm_dp *dp_display, struct drm_device *dev,
struct drm_encoder *encoder);
struct drm_encoder *encoder,
bool yuv_supported);

void dp_bridge_atomic_enable(struct drm_bridge *drm_bridge,
struct drm_bridge_state *old_bridge_state);
Expand Down

0 comments on commit 785324d

Please sign in to comment.