Switch to use of drm_connector_helper_get_modes_fixed helper for get_modes operation.
Signed-off-by: Svyatoslav Ryhel <[email protected]> --- drivers/gpu/drm/panel/Kconfig | 2 ++ drivers/gpu/drm/panel/panel-renesas-r61307.c | 17 +++-------------- drivers/gpu/drm/panel/panel-renesas-r69328.c | 17 +++-------------- 3 files changed, 8 insertions(+), 28 deletions(-) diff --git a/drivers/gpu/drm/panel/Kconfig b/drivers/gpu/drm/panel/Kconfig index 477c54c90b01..47de5f6a9143 100644 --- a/drivers/gpu/drm/panel/Kconfig +++ b/drivers/gpu/drm/panel/Kconfig @@ -700,6 +700,7 @@ config DRM_PANEL_RENESAS_R61307 depends on OF depends on DRM_MIPI_DSI depends on BACKLIGHT_CLASS_DEVICE + select VIDEOMODE_HELPERS help Say Y here if you want to enable support for KOE tx13d100vm0eaa IPS-LCD module with Renesas R69328 IC. The panel has a 1024x768 @@ -713,6 +714,7 @@ config DRM_PANEL_RENESAS_R69328 depends on OF depends on DRM_MIPI_DSI depends on BACKLIGHT_CLASS_DEVICE + select VIDEOMODE_HELPERS help Say Y here if you want to enable support for JDI dx12d100vm0eaa IPS-LCD module with Renesas R69328 IC. The panel has a 720x1280 diff --git a/drivers/gpu/drm/panel/panel-renesas-r61307.c b/drivers/gpu/drm/panel/panel-renesas-r61307.c index 873ef856184b..45afa44af114 100644 --- a/drivers/gpu/drm/panel/panel-renesas-r61307.c +++ b/drivers/gpu/drm/panel/panel-renesas-r61307.c @@ -14,6 +14,7 @@ #include <drm/drm_mipi_dsi.h> #include <drm/drm_modes.h> #include <drm/drm_panel.h> +#include <drm/drm_probe_helper.h> #define R61307_MACP 0xb0 /* Manufacturer CMD Protect */ #define R61307_MACP_ON 0x03 @@ -202,25 +203,13 @@ static const struct drm_display_mode renesas_r61307_mode = { .vtotal = 1024 + 24 + 8 + 2, .width_mm = 76, .height_mm = 101, + .type = DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED, }; static int renesas_r61307_get_modes(struct drm_panel *panel, struct drm_connector *connector) { - struct drm_display_mode *mode; - - mode = drm_mode_duplicate(connector->dev, &renesas_r61307_mode); - if (!mode) - return -ENOMEM; - - drm_mode_set_name(mode); - - mode->type = DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED; - connector->display_info.width_mm = mode->width_mm; - connector->display_info.height_mm = mode->height_mm; - drm_mode_probed_add(connector, mode); - - return 1; + return drm_connector_helper_get_modes_fixed(connector, &renesas_r61307_mode); } static const struct drm_panel_funcs renesas_r61307_panel_funcs = { diff --git a/drivers/gpu/drm/panel/panel-renesas-r69328.c b/drivers/gpu/drm/panel/panel-renesas-r69328.c index 46287ab04c30..b40bfd702fac 100644 --- a/drivers/gpu/drm/panel/panel-renesas-r69328.c +++ b/drivers/gpu/drm/panel/panel-renesas-r69328.c @@ -14,6 +14,7 @@ #include <drm/drm_mipi_dsi.h> #include <drm/drm_modes.h> #include <drm/drm_panel.h> +#include <drm/drm_probe_helper.h> #define R69328_MACP 0xb0 /* Manufacturer Access CMD Protect */ #define R69328_MACP_ON 0x03 @@ -167,25 +168,13 @@ static const struct drm_display_mode renesas_r69328_mode = { .vtotal = 1280 + 6 + 3 + 1, .width_mm = 59, .height_mm = 105, + .type = DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED, }; static int renesas_r69328_get_modes(struct drm_panel *panel, struct drm_connector *connector) { - struct drm_display_mode *mode; - - mode = drm_mode_duplicate(connector->dev, &renesas_r69328_mode); - if (!mode) - return -ENOMEM; - - drm_mode_set_name(mode); - - mode->type = DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED; - connector->display_info.width_mm = mode->width_mm; - connector->display_info.height_mm = mode->height_mm; - drm_mode_probed_add(connector, mode); - - return 1; + return drm_connector_helper_get_modes_fixed(connector, &renesas_r69328_mode); } static const struct drm_panel_funcs renesas_r69328_panel_funcs = { -- 2.51.0
