mirror of
https://github.com/hardkernel/kernel_common_drivers.git
synced 2026-06-25 12:03:48 +09:00
Revert "ODROID-COMMON: drm/hdmitx: add support custom display timing from device tree"
This reverts commit 7c13bbb7e1.
Change-Id: I97381ebe92de00c0edd079a3f107dd4cc82ff4d2
This commit is contained in:
@@ -128,9 +128,4 @@ config ODROID_CUSTOM_DISPLAY_MODES_CMDLINE
|
||||
bool "Custom display modes from kernel command line"
|
||||
default n
|
||||
select ODROID_CUSTOM_DISPLAY_MODES
|
||||
config ODROID_CUSTOM_DISPLAY_MODES_DEVICETREE
|
||||
bool "Load custom display mode from device tree"
|
||||
default n
|
||||
select ODROID_CUSTOM_DISPLAY_MODES
|
||||
|
||||
endif
|
||||
|
||||
@@ -87,7 +87,4 @@ endif
|
||||
ifneq ($(CONFIG_ODROID_CUSTOM_DISPLAY_MODES_CMDLINE),)
|
||||
$(MESON_DRM_MODULE_NAME)-y += odroid_helper_cmdline.o
|
||||
endif
|
||||
ifneq ($(CONFIG_ODROID_CUSTOM_DISPLAY_MODES_DEVICETREE),)
|
||||
$(MESON_DRM_MODULE_NAME)-y += odroid_helper_dt.o
|
||||
endif
|
||||
endif
|
||||
|
||||
@@ -544,9 +544,6 @@ int meson_hdmitx_get_modes(struct drm_connector *connector)
|
||||
int *tmp;
|
||||
int num_group = 0;
|
||||
u64 sequence_id = 0;
|
||||
#if defined(CONFIG_ODROID_CUSTOM_DISPLAY_MODES_DEVICETREE)
|
||||
struct device *dev = connector->dev->dev;
|
||||
#endif
|
||||
|
||||
if (!connector) {
|
||||
DRM_ERROR("connector is NULL!\n");
|
||||
@@ -650,9 +647,6 @@ int meson_hdmitx_get_modes(struct drm_connector *connector)
|
||||
#if defined(CONFIG_ODROID_CUSTOM_DISPLAY_MODES_CMDLINE)
|
||||
count += load_odroid_modeline_from_commandline(connector);
|
||||
#endif
|
||||
#if defined(CONFIG_ODROID_CUSTOM_DISPLAY_MODES_DEVICETREE)
|
||||
count += load_odroid_display_mode_from_dt(connector, dev->of_node);
|
||||
#endif
|
||||
|
||||
connector->display_info.monitor_range.max_vfreq = am_hdmitx->max_vfreq;
|
||||
connector->display_info.monitor_range.min_vfreq = am_hdmitx->min_vfreq;
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
#include <linux/fs.h>
|
||||
#include <linux/gcd.h>
|
||||
#include <video/display_timing.h>
|
||||
|
||||
#include "odroid_helper.h"
|
||||
|
||||
|
||||
@@ -17,6 +17,4 @@ extern int update_odroid_custom_hdmi_timing(
|
||||
|
||||
extern int load_odroid_modelines(struct drm_connector *connector);
|
||||
extern int load_odroid_modeline_from_commandline(struct drm_connector *connector);
|
||||
extern int load_odroid_display_mode_from_dt(struct drm_connector *connector,
|
||||
struct device_node *node);
|
||||
#endif
|
||||
|
||||
@@ -1,33 +0,0 @@
|
||||
#include <video/of_display_timing.h>
|
||||
#include <video/videomode.h>
|
||||
|
||||
#include "odroid_helper.h"
|
||||
|
||||
int load_odroid_display_mode_from_dt(struct drm_connector *connector,
|
||||
struct device_node *node)
|
||||
{
|
||||
struct display_timings *disp = of_get_display_timings(node);
|
||||
int i;
|
||||
int count = 0;
|
||||
|
||||
if (!disp)
|
||||
return 0;
|
||||
|
||||
for (i = 0; i < disp->num_timings; i++) {
|
||||
struct drm_display_mode mode;
|
||||
int ret;
|
||||
ret = of_get_drm_display_mode(node, &mode, NULL, i);
|
||||
if (ret)
|
||||
continue;
|
||||
|
||||
mode.type = DRM_MODE_TYPE_USERDEF;
|
||||
mode.hskew = 0;
|
||||
mode.vscan = 0;
|
||||
|
||||
ret = append_replace_drm_display_mode(connector, &mode);
|
||||
if (ret == 0)
|
||||
count++;
|
||||
}
|
||||
|
||||
return count;
|
||||
}
|
||||
Reference in New Issue
Block a user