Commit 785324db authored by Dmitry Baryshkov's avatar Dmitry Baryshkov
Browse files

drm/msm/dp: migrate the ycbcr_420_allowed to drm_bridge 



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: default avatarNeil Armstrong <neil.armstrong@linaro.org>
Acked-by: default avatarAbhinav Kumar <quic_abhinavk@quicinc.com>
Reviewed-by: default avatarMaxime Ripard <mripard@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20241019-bridge-yuv420-v1-5-d74efac9e4e6@linaro.org


Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
parent c44a0faf

drivers/gpu/drm/msm/dp/dp_display.c

+2 −2
Original line number Diff line number Diff line
@@ -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,

drivers/gpu/drm/msm/dp/dp_drm.c

+4 −6
Original line number Diff line number Diff line
@@ -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;
@@ -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?
@@ -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;
@@ -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;

drivers/gpu/drm/msm/dp/dp_drm.h

+4 −3
Original line number Diff line number Diff line
@@ -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);

int dp_bridge_init(struct msm_dp *dp_display, struct drm_device *dev,

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,

		   bool yuv_supported);



void dp_bridge_atomic_enable(struct drm_bridge *drm_bridge,

			     struct drm_bridge_state *old_bridge_state);