On 06/15/2016 12:28 AM, Daniel Vetter wrote: > On Tue, Jun 14, 2016 at 06:26:56PM +0200, Daniel Vetter wrote: >> On Tue, Jun 14, 2016 at 07:46:29PM +0800, Yakir Yang wrote: >>> It's better to pass the connector to platform driver in .get_modes() >>> callback, just like what the .get_modes() helper function designed. >>> >>> Signed-off-by: Yakir Yang <ykk at rock-chips.com> >> Also please drop the analogix prefix from the subject, this is for all >> drm_bridge drivers. > Ok, strike all my comments, I was blind and didn't realize that this was a > private interface for only rockchip/exynos. :) > -Daniel > >> -Daniel >> >>> --- >>> Changes in v3: >>> - Avoid to change any internal driver state in .mode_valid interface. (Tomasz, reviewed at Google Gerrit) >>> [https://chromium-review.googlesource.com/#/c/346318/10/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c at 113] >>> >>> Changes in v2: None >>> >>> drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 2 +- >>> drivers/gpu/drm/exynos/exynos_dp.c | 4 ++-- >>> include/drm/bridge/analogix_dp.h | 3 ++- >>> 3 files changed, 5 insertions(+), 4 deletions(-) >>> >>> diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c >>> index 4a1b3b8..1a890fa 100644 >>> --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c >>> +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c >>> @@ -938,7 +938,7 @@ int analogix_dp_get_modes(struct drm_connector *connector) >>> num_modes += drm_panel_get_modes(dp->plat_data->panel); >>> >>> if (dp->plat_data->get_modes) >>> - num_modes += dp->plat_data->get_modes(dp->plat_data); >>> + num_modes += dp->plat_data->get_modes(dp->plat_data, connector); >>> >>> return num_modes; >>> } >>> diff --git a/drivers/gpu/drm/exynos/exynos_dp.c b/drivers/gpu/drm/exynos/exynos_dp.c >>> index 468498e..8a555ed 100644 >>> --- a/drivers/gpu/drm/exynos/exynos_dp.c >>> +++ b/drivers/gpu/drm/exynos/exynos_dp.c >>> @@ -67,10 +67,10 @@ static int exynos_dp_poweroff(struct analogix_dp_plat_data *plat_data) >>> return exynos_dp_crtc_clock_enable(plat_data, false); >>> } >>> >>> -static int exynos_dp_get_modes(struct analogix_dp_plat_data *plat_data) >>> +static int exynos_dp_get_modes(struct analogix_dp_plat_data *plat_data, >>> + struct drm_connector *connector) >>> { >>> struct exynos_dp_device *dp = to_dp(plat_data); >>> - struct drm_connector *connector = &dp->connector; >>> struct drm_display_mode *mode; >>> int num_modes = 0; >>> >>> diff --git a/include/drm/bridge/analogix_dp.h b/include/drm/bridge/analogix_dp.h >>> index 82b8135..181db09 100644 >>> --- a/include/drm/bridge/analogix_dp.h >>> +++ b/include/drm/bridge/analogix_dp.h >>> @@ -34,7 +34,8 @@ struct analogix_dp_plat_data { >>> int (*power_off)(struct analogix_dp_plat_data *); >>> int (*attach)(struct analogix_dp_plat_data *, struct drm_bridge *, >>> struct drm_connector *); >>> - int (*get_modes)(struct analogix_dp_plat_data *); >>> + int (*get_modes)(struct analogix_dp_plat_data *, >>> + struct drm_connector *); >>> }; >>> >>> int analogix_dp_resume(struct device *dev); >>> -- >>> 1.9.1 >>> >>> >> -- >> Daniel Vetter >> Software Engineer, Intel Corporation >> http://blog.ffwll.ch
