drm: of: Add drm_of_lvds_get_data_mapping
Subsystems (5)
PATCH 1/1 drm: of: Add drm_of_lvds_get_data_mapping
Add helper function to convert DT "data-mapping" property string value into media bus format value, and deduplicate the code in panel-lvds.c and lvds-codec.c .
--- drivers/gpu/drm/bridge/lvds-codec.c | 21 ++++++------------ drivers/gpu/drm/drm_of.c | 33 +++++++++++++++++++++++++++++ drivers/gpu/drm/panel/panel-lvds.c | 18 ++++------------ include/drm/drm_of.h | 7 ++++++ 4 files changed, 51 insertions(+), 28 deletions(-)
drivers/gpu/drm/bridge/lvds-codec.c +7 -14
@@ -14,6 +14,7 @@#include <drm/drm_atomic_helper.h> #include <drm/drm_bridge.h> +#include <drm/drm_of.h> #include <drm/drm_panel.h> struct lvds_codec {
@@ -118,7 +119,6 @@ static int lvds_codec_probe(struct platform_device *pdev)struct device_node *bus_node;struct drm_panel *panel;struct lvds_codec *lvds_codec; -const char *mapping;int ret; lvds_codec =devm_kzalloc (dev,sizeof (*lvds_codec),GFP_KERNEL );
@@ -174,22 +174,15 @@ static int lvds_codec_probe(struct platform_device *pdev)return -ENXIO ; } - ret =of_property_read_string (bus_node,"data-mapping" , - &mapping); + ret =drm_of_lvds_get_data_mapping (bus_node);of_node_put (bus_node); -if (ret <0 ) { +if (ret == -ENODEV ) {dev_warn (dev,"missing 'data-mapping' DT property\n" ); + }else if (ret) { +dev_err (dev,"invalid 'data-mapping' DT property\n" ); +return ret; }else { -if (!strcmp (mapping,"jeida-18" )) { - lvds_codec->bus_format =MEDIA_BUS_FMT_RGB666_1X7X3_SPWG ; - }else if (!strcmp (mapping,"jeida-24" )) { - lvds_codec->bus_format =MEDIA_BUS_FMT_RGB888_1X7X4_JEIDA ; - }else if (!strcmp (mapping,"vesa-24" )) { - lvds_codec->bus_format =MEDIA_BUS_FMT_RGB888_1X7X4_SPWG ; - }else { -dev_err (dev,"invalid 'data-mapping' DT property\n" ); -return -EINVAL ; - } + lvds_codec->bus_format = ret; lvds_codec->bridge.funcs = &funcs_decoder; } }
drivers/gpu/drm/drm_of.c +33 -0
@@ -402,3 +402,36 @@ int drm_of_lvds_get_dual_link_pixel_order(const struct device_node *port1,DRM_LVDS_DUAL_LINK_ODD_EVEN_PIXELS ; }EXPORT_SYMBOL_GPL (drm_of_lvds_get_dual_link_pixel_order); + +/** +* drm_of_lvds_get_data_mapping - Get LVDS data mapping +* @port: DT port node of the LVDS source or sink +* +* Convert DT "data-mapping" property string value into media bus format value. +* +* Return: +* MEDIA_BUS_FMT_RGB666_1X7X3_SPWG - data-mapping is "jeida-18" +* MEDIA_BUS_FMT_RGB888_1X7X4_JEIDA - data-mapping is "jeida-24" +* MEDIA_BUS_FMT_RGB888_1X7X4_SPWG - data-mapping is "vesa-24" +* -EINVAL - the "data-mapping" property is unsupported +* -ENODEV - the "data-mapping" property is missing +*/ +int drm_of_lvds_get_data_mapping (const struct device_node *port) +{ +const char *mapping; +int ret; + + ret =of_property_read_string (port,"data-mapping" , &mapping); +if (ret <0 ) +return -ENODEV ; + +if (!strcmp (mapping,"jeida-18" )) +return MEDIA_BUS_FMT_RGB666_1X7X3_SPWG ; +if (!strcmp (mapping,"jeida-24" )) +return MEDIA_BUS_FMT_RGB888_1X7X4_JEIDA ; +if (!strcmp (mapping,"vesa-24" )) +return MEDIA_BUS_FMT_RGB888_1X7X4_SPWG ; + +return -EINVAL ; +} +EXPORT_SYMBOL_GPL (drm_of_lvds_get_data_mapping);
drivers/gpu/drm/panel/panel-lvds.c +4 -14
@@ -20,6 +20,7 @@#include <video/videomode.h> #include <drm/drm_crtc.h> +#include <drm/drm_of.h> #include <drm/drm_panel.h> struct panel_lvds {
@@ -116,7 +117,6 @@ static int panel_lvds_parse_dt(struct panel_lvds *lvds) {struct device_node *np = lvds->dev->of_node;struct display_timing timing; -const char *mapping;int ret; ret =of_drm_get_panel_orientation (np, &lvds->orientation);
@@ -149,24 +149,14 @@ static int panel_lvds_parse_dt(struct panel_lvds *lvds)of_property_read_string (np,"label" , &lvds->label); - ret =of_property_read_string (np,"data-mapping" , &mapping); + ret =drm_of_lvds_get_data_mapping (np);if (ret <0 ) {dev_err (lvds->dev,"%pOF: invalid or missing %s DT property\n" , np,"data-mapping" ); -return -ENODEV ; +return ret; } -if (!strcmp (mapping,"jeida-18" )) { - lvds->bus_format =MEDIA_BUS_FMT_RGB666_1X7X3_SPWG ; - }else if (!strcmp (mapping,"jeida-24" )) { - lvds->bus_format =MEDIA_BUS_FMT_RGB888_1X7X4_JEIDA ; - }else if (!strcmp (mapping,"vesa-24" )) { - lvds->bus_format =MEDIA_BUS_FMT_RGB888_1X7X4_SPWG ; - }else { -dev_err (lvds->dev,"%pOF: invalid or missing %s DT property\n" , - np,"data-mapping" ); -return -EINVAL ; - } + lvds->bus_format = ret; lvds->data_mirror =of_property_read_bool (np,"data-mirror" );
include/drm/drm_of.h +7 -0
@@ -49,6 +49,7 @@ int drm_of_find_panel_or_bridge(const struct device_node *np, struct drm_bridge **bridge);int drm_of_lvds_get_dual_link_pixel_order (const struct device_node *port1,const struct device_node *port2); +int drm_of_lvds_get_data_mapping (const struct device_node *port);#else static inline uint32_t drm_of_crtc_port_mask (struct drm_device *dev,struct device_node *port)
@@ -98,6 +99,12 @@ drm_of_lvds_get_dual_link_pixel_order(const struct device_node *port1, {return -EINVAL ; } + +static inline int +drm_of_lvds_get_data_mapping (const struct device_node *port); +{ +return -EINVAL ; +}#endif /*
Signature · 1 line
2.33.0
kernel test robot
build botI love your patch! Yet something to improve:
Hi Marek,
I love your patch! Yet something to improve:
[auto build test ERROR on drm-tip/drm-tip]
[cannot apply to drm-intel/for-linux-next drm-exynos/exynos-drm-next tegra-drm/drm/tegra/for-next linus/master airlied/drm-next v5.15-rc5 next-20211008] [If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Marek-Vasut/drm-of-Add-drm_of_lvds_get_data_mapping/20211011-092451 base: git://anongit.freedesktop.org/drm/drm-tip drm-tip config: i386-randconfig-m021-20211010 (attached as .config) compiler: gcc-9 (Debian 9.3.0-22) 9.3.0
reproduce (this is a W=1 build):
# https://github.com/0day-ci/linux/commit/d9a4ed21a0ee9b11df5d862e54876002751fbd45
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Marek-Vasut/drm-of-Add-drm_of_lvds_get_data_mapping/20211011-092451 git checkout d9a4ed21a0ee9b11df5d862e54876002751fbd45
# save the attached .config to linux build tree
mkdir build_dir
make W=1 O=build_dir ARCH=i386 SHELL=/bin/bash drivers/gpu/drm/
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
In file included from drivers/gpu/drm/bridge/panel.c:12:
>> include/drm/drm_of.h:105:1: error: expected identifier or '(' before '{' token
105 | {
| ^
include/drm/drm_of.h:104:1: warning: 'drm_of_lvds_get_data_mapping' declared 'static' but never defined [-Wunused-function]
104 | drm_of_lvds_get_data_mapping(const struct device_node *port);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~vim +105 include/drm/drm_of.h
102
103 static inline int
104 drm_of_lvds_get_data_mapping(const struct device_node *port);
> 105 { 106 return -EINVAL;
107 }
108 #endif
109
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
kernel test robot
build botI love your patch! Yet something to improve:
Hi Marek,
I love your patch! Yet something to improve:
[auto build test ERROR on drm-tip/drm-tip]
[cannot apply to drm-intel/for-linux-next drm-exynos/exynos-drm-next tegra-drm/drm/tegra/for-next linus/master airlied/drm-next v5.15-rc5 next-20211008] [If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Marek-Vasut/drm-of-Add-drm_of_lvds_get_data_mapping/20211011-092451 base: git://anongit.freedesktop.org/drm/drm-tip drm-tip config: hexagon-randconfig-r041-20211011 (attached as .config) compiler: clang version 14.0.0 (https://github.com/llvm/llvm-project 903b30fea21f99d8f48fde4defcc838970e30ee1)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/d9a4ed21a0ee9b11df5d862e54876002751fbd45
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Marek-Vasut/drm-of-Add-drm_of_lvds_get_data_mapping/20211011-092451 git checkout d9a4ed21a0ee9b11df5d862e54876002751fbd45
# save the attached .config to linux build tree
mkdir build_dir
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=hexagon SHELL=/bin/bash drivers/gpu/
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
In file included from drivers/gpu/drm/bridge/panel.c:12:
>> include/drm/drm_of.h:105:1: error: expected identifier or '(' {
^
1 error generated.
vim +105 include/drm/drm_of.h
102
103 static inline int
104 drm_of_lvds_get_data_mapping(const struct device_node *port);
> 105 { 106 return -EINVAL;
107 }
108 #endif
109
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
kernel test robot
build botI love your patch! Yet something to improve:
Hi Marek,
I love your patch! Yet something to improve:
[auto build test ERROR on drm-tip/drm-tip]
[cannot apply to drm-intel/for-linux-next drm-exynos/exynos-drm-next tegra-drm/drm/tegra/for-next linus/master airlied/drm-next v5.15-rc5 next-20211008] [If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Marek-Vasut/drm-of-Add-drm_of_lvds_get_data_mapping/20211011-092451 base: git://anongit.freedesktop.org/drm/drm-tip drm-tip config: xtensa-buildonly-randconfig-r003-20211011 (attached as .config) compiler: xtensa-linux-gcc (GCC) 11.2.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/d9a4ed21a0ee9b11df5d862e54876002751fbd45
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Marek-Vasut/drm-of-Add-drm_of_lvds_get_data_mapping/20211011-092451 git checkout d9a4ed21a0ee9b11df5d862e54876002751fbd45
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-11.2.0 make.cross ARCH=xtensa
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
In file included from drivers/gpu/drm/bridge/panel.c:12:
include/drm/drm_of.h:105:1: error: expected identifier or '(' before '{' token
105 | {
| ^
>> include/drm/drm_of.h:104:1: error: 'drm_of_lvds_get_data_mapping' declared 'static' but never defined [-Werror=unused-function]
104 | drm_of_lvds_get_data_mapping(const struct device_node *port);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~cc1: all warnings being treated as errors
vim +104 include/drm/drm_of.h
102
103 static inline int
> 104 drm_of_lvds_get_data_mapping(const struct device_node *port);
105 {
106 return -EINVAL;
107 }
108 #endif
109
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org