tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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: 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>

Dmitry Baryshkov 785324db c44a0faf

+10 -11
+2 -2
drivers/gpu/drm/msm/dp/dp_display.c
··· 1467 1467 1468 1468 dp_priv = container_of(dp_display, struct dp_display_private, dp_display); 1469 1469 1470 - ret = dp_bridge_init(dp_display, dev, encoder); 1470 + ret = dp_bridge_init(dp_display, dev, encoder, yuv_supported); 1471 1471 if (ret) { 1472 1472 DRM_DEV_ERROR(dev->dev, 1473 1473 "failed to create dp bridge: %d\n", ret); 1474 1474 return ret; 1475 1475 } 1476 1476 1477 - dp_display->connector = dp_drm_connector_init(dp_display, encoder, yuv_supported); 1477 + dp_display->connector = dp_drm_connector_init(dp_display, encoder); 1478 1478 if (IS_ERR(dp_display->connector)) { 1479 1479 ret = PTR_ERR(dp_display->connector); 1480 1480 DRM_DEV_ERROR(dev->dev,
+4 -6
drivers/gpu/drm/msm/dp/dp_drm.c
··· 289 289 }; 290 290 291 291 int dp_bridge_init(struct msm_dp *dp_display, struct drm_device *dev, 292 - struct drm_encoder *encoder) 292 + struct drm_encoder *encoder, bool yuv_supported) 293 293 { 294 294 int rc; 295 295 struct msm_dp_bridge *dp_bridge; ··· 304 304 bridge = &dp_bridge->bridge; 305 305 bridge->funcs = dp_display->is_edp ? &edp_bridge_ops : &dp_bridge_ops; 306 306 bridge->type = dp_display->connector_type; 307 + bridge->ycbcr_420_allowed = yuv_supported; 307 308 308 309 /* 309 310 * Many ops only make sense for DP. Why? ··· 352 351 } 353 352 354 353 /* connector initialization */ 355 - struct drm_connector *dp_drm_connector_init(struct msm_dp *dp_display, struct drm_encoder *encoder, 356 - bool yuv_supported) 354 + struct drm_connector *dp_drm_connector_init(struct msm_dp *dp_display, 355 + struct drm_encoder *encoder) 357 356 { 358 357 struct drm_connector *connector = NULL; 359 358 ··· 363 362 364 363 if (!dp_display->is_edp) 365 364 drm_connector_attach_dp_subconnector_property(connector); 366 - 367 - if (yuv_supported) 368 - connector->ycbcr_420_allowed = true; 369 365 370 366 drm_connector_attach_encoder(connector, encoder); 371 367
+4 -3
drivers/gpu/drm/msm/dp/dp_drm.h
··· 19 19 20 20 #define to_dp_bridge(x) container_of((x), struct msm_dp_bridge, bridge) 21 21 22 - struct drm_connector *dp_drm_connector_init(struct msm_dp *dp_display, struct drm_encoder *encoder, 23 - bool yuv_supported); 22 + struct drm_connector *dp_drm_connector_init(struct msm_dp *dp_display, 23 + struct drm_encoder *encoder); 24 24 int dp_bridge_init(struct msm_dp *dp_display, struct drm_device *dev, 25 - struct drm_encoder *encoder); 25 + struct drm_encoder *encoder, 26 + bool yuv_supported); 26 27 27 28 void dp_bridge_atomic_enable(struct drm_bridge *drm_bridge, 28 29 struct drm_bridge_state *old_bridge_state);