diff options
author | Yakir Yang <ykk@rock-chips.com> | 2016-06-29 05:15:35 -0400 |
---|---|---|
committer | Yakir Yang <ykk@rock-chips.com> | 2016-07-05 09:53:38 -0400 |
commit | fcc150c5152d0c7aa3d37b77226e79ce5fc34cf8 (patch) | |
tree | d3cfd3d85c07c7318de52d88efaea1d063bb946a | |
parent | eb87c91c73f825ea377bdd229cf1cf6ef54e1372 (diff) |
drm/bridge: analogix_dp: passing the connector as an argument in .get_modes()
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@rock-chips.com>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Reviewed-by: Tomasz Figa <tomasz.figa@chromium.com>
-rw-r--r-- | drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/exynos/exynos_dp.c | 4 | ||||
-rw-r--r-- | 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 ed798e3c8744..32715daf73cb 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) | |||
938 | num_modes += drm_panel_get_modes(dp->plat_data->panel); | 938 | num_modes += drm_panel_get_modes(dp->plat_data->panel); |
939 | 939 | ||
940 | if (dp->plat_data->get_modes) | 940 | if (dp->plat_data->get_modes) |
941 | num_modes += dp->plat_data->get_modes(dp->plat_data); | 941 | num_modes += dp->plat_data->get_modes(dp->plat_data, connector); |
942 | 942 | ||
943 | return num_modes; | 943 | return num_modes; |
944 | } | 944 | } |
diff --git a/drivers/gpu/drm/exynos/exynos_dp.c b/drivers/gpu/drm/exynos/exynos_dp.c index 4c1fb3f8b5a6..4f0850585b8e 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) | |||
67 | return exynos_dp_crtc_clock_enable(plat_data, false); | 67 | return exynos_dp_crtc_clock_enable(plat_data, false); |
68 | } | 68 | } |
69 | 69 | ||
70 | static int exynos_dp_get_modes(struct analogix_dp_plat_data *plat_data) | 70 | static int exynos_dp_get_modes(struct analogix_dp_plat_data *plat_data, |
71 | struct drm_connector *connector) | ||
71 | { | 72 | { |
72 | struct exynos_dp_device *dp = to_dp(plat_data); | 73 | struct exynos_dp_device *dp = to_dp(plat_data); |
73 | struct drm_connector *connector = dp->connector; | ||
74 | struct drm_display_mode *mode; | 74 | struct drm_display_mode *mode; |
75 | int num_modes = 0; | 75 | int num_modes = 0; |
76 | 76 | ||
diff --git a/include/drm/bridge/analogix_dp.h b/include/drm/bridge/analogix_dp.h index fc4aea39822d..261b86d20e77 100644 --- a/include/drm/bridge/analogix_dp.h +++ b/include/drm/bridge/analogix_dp.h | |||
@@ -34,7 +34,8 @@ struct analogix_dp_plat_data { | |||
34 | int (*power_off)(struct analogix_dp_plat_data *); | 34 | int (*power_off)(struct analogix_dp_plat_data *); |
35 | int (*attach)(struct analogix_dp_plat_data *, struct drm_bridge *, | 35 | int (*attach)(struct analogix_dp_plat_data *, struct drm_bridge *, |
36 | struct drm_connector *); | 36 | struct drm_connector *); |
37 | int (*get_modes)(struct analogix_dp_plat_data *); | 37 | int (*get_modes)(struct analogix_dp_plat_data *, |
38 | struct drm_connector *); | ||
38 | }; | 39 | }; |
39 | 40 | ||
40 | int analogix_dp_resume(struct device *dev); | 41 | int analogix_dp_resume(struct device *dev); |