diff mbox

[v2,4/4] drm/tinydrm: new driver for ILI9341 display panels

Message ID 20180525193623.15533-5-david@lechnology.com (mailing list archive)
State New, archived
Headers show

Commit Message

David Lechner May 25, 2018, 7:36 p.m. UTC 
This adds a new driver for display panels that use the Ilitek ILI9341
controller. It currently supports a single display panel, namely
the YX240QV29-T (e.g. Adafruit 2.4" TFT).

The init sequence is from the Adafruit Python library for the ILI9341
controller. https://github.com/adafruit/Adafruit_Python_ILI9341

Signed-off-by: David Lechner <david@lechnology.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Reviewed-by: Noralf Trønnes <noralf@tronnes.org>
---
 MAINTAINERS                       |   6 +
 drivers/gpu/drm/tinydrm/Kconfig   |  10 ++
 drivers/gpu/drm/tinydrm/Makefile  |   1 +
 drivers/gpu/drm/tinydrm/ili9341.c | 233 ++++++++++++++++++++++++++++++
 4 files changed, 250 insertions(+)
 create mode 100644 drivers/gpu/drm/tinydrm/ili9341.c

Comments

kernel test robot May 27, 2018, 2:04 p.m. UTC | #1 
Hi David,

I love your patch! Yet something to improve:

[auto build test ERROR on linus/master]
[also build test ERROR on v4.17-rc6]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]

url:    https://github.com/0day-ci/linux/commits/David-Lechner/drm-tinydrm-new-dirver-for-ILI9341-displays/20180527-182036
config: i386-allmodconfig (attached as .config)
compiler: gcc-7 (Debian 7.3.0-16) 7.3.0
reproduce:
        # save the attached .config to linux build tree
        make ARCH=i386 

All errors (new ones prefixed by >>):

   drivers/gpu/drm/tinydrm/ili9341.c: In function 'yx240qv29_enable':
>> drivers/gpu/drm/tinydrm/ili9341.c:128:2: error: too many arguments to function 'mipi_dbi_enable_flush'
     mipi_dbi_enable_flush(mipi, crtc_state, plane_state);
     ^~~~~~~~~~~~~~~~~~~~~
   In file included from drivers/gpu/drm/tinydrm/ili9341.c:21:0:
   include/drm/tinydrm/mipi-dbi.h:70:6: note: declared here
    void mipi_dbi_enable_flush(struct mipi_dbi *mipi);
         ^~~~~~~~~~~~~~~~~~~~~
   drivers/gpu/drm/tinydrm/ili9341.c: At top level:
>> drivers/gpu/drm/tinydrm/ili9341.c:132:12: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
     .enable = yx240qv29_enable,
               ^~~~~~~~~~~~~~~~
   drivers/gpu/drm/tinydrm/ili9341.c:132:12: note: (near initialization for 'ili9341_pipe_funcs.enable')
>> drivers/gpu/drm/tinydrm/ili9341.c:135:16: error: 'drm_gem_fb_simple_display_pipe_prepare_fb' undeclared here (not in a function); did you mean 'tinydrm_display_pipe_prepare_fb'?
     .prepare_fb = drm_gem_fb_simple_display_pipe_prepare_fb,
                   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
                   tinydrm_display_pipe_prepare_fb
   cc1: some warnings being treated as errors

vim +/mipi_dbi_enable_flush +128 drivers/gpu/drm/tinydrm/ili9341.c

    17	
    18	#include <drm/drm_fb_helper.h>
    19	#include <drm/drm_gem_framebuffer_helper.h>
    20	#include <drm/drm_modeset_helper.h>
  > 21	#include <drm/tinydrm/mipi-dbi.h>
    22	#include <drm/tinydrm/tinydrm-helpers.h>
    23	#include <video/mipi_display.h>
    24	
    25	#define ILI9341_FRMCTR1		0xb1
    26	#define ILI9341_DISCTRL		0xb6
    27	#define ILI9341_ETMOD		0xb7
    28	
    29	#define ILI9341_PWCTRL1		0xc0
    30	#define ILI9341_PWCTRL2		0xc1
    31	#define ILI9341_VMCTRL1		0xc5
    32	#define ILI9341_VMCTRL2		0xc7
    33	#define ILI9341_PWCTRLA		0xcb
    34	#define ILI9341_PWCTRLB		0xcf
    35	
    36	#define ILI9341_PGAMCTRL	0xe0
    37	#define ILI9341_NGAMCTRL	0xe1
    38	#define ILI9341_DTCTRLA		0xe8
    39	#define ILI9341_DTCTRLB		0xea
    40	#define ILI9341_PWRSEQ		0xed
    41	
    42	#define ILI9341_EN3GAM		0xf2
    43	#define ILI9341_PUMPCTRL	0xf7
    44	
    45	#define ILI9341_MADCTL_BGR	BIT(3)
    46	#define ILI9341_MADCTL_MV	BIT(5)
    47	#define ILI9341_MADCTL_MX	BIT(6)
    48	#define ILI9341_MADCTL_MY	BIT(7)
    49	
    50	static void yx240qv29_enable(struct drm_simple_display_pipe *pipe,
    51				     struct drm_crtc_state *crtc_state,
    52				     struct drm_plane_state *plane_state)
    53	{
    54		struct tinydrm_device *tdev = pipe_to_tinydrm(pipe);
    55		struct mipi_dbi *mipi = mipi_dbi_from_tinydrm(tdev);
    56		u8 addr_mode;
    57		int ret;
    58	
    59		DRM_DEBUG_KMS("\n");
    60	
    61		ret = mipi_dbi_poweron_conditional_reset(mipi);
    62		if (ret < 0)
    63			return;
    64		if (ret == 1)
    65			goto out_enable;
    66	
    67		mipi_dbi_command(mipi, MIPI_DCS_SET_DISPLAY_OFF);
    68	
    69		mipi_dbi_command(mipi, ILI9341_PWCTRLB, 0x00, 0xc1, 0x30);
    70		mipi_dbi_command(mipi, ILI9341_PWRSEQ, 0x64, 0x03, 0x12, 0x81);
    71		mipi_dbi_command(mipi, ILI9341_DTCTRLA, 0x85, 0x00, 0x78);
    72		mipi_dbi_command(mipi, ILI9341_PWCTRLA, 0x39, 0x2c, 0x00, 0x34, 0x02);
    73		mipi_dbi_command(mipi, ILI9341_PUMPCTRL, 0x20);
    74		mipi_dbi_command(mipi, ILI9341_DTCTRLB, 0x00, 0x00);
    75	
    76		/* Power Control */
    77		mipi_dbi_command(mipi, ILI9341_PWCTRL1, 0x23);
    78		mipi_dbi_command(mipi, ILI9341_PWCTRL2, 0x10);
    79		/* VCOM */
    80		mipi_dbi_command(mipi, ILI9341_VMCTRL1, 0x3e, 0x28);
    81		mipi_dbi_command(mipi, ILI9341_VMCTRL2, 0x86);
    82	
    83		/* Memory Access Control */
    84		mipi_dbi_command(mipi, MIPI_DCS_SET_PIXEL_FORMAT, MIPI_DCS_PIXEL_FMT_16BIT);
    85	
    86		/* Frame Rate */
    87		mipi_dbi_command(mipi, ILI9341_FRMCTR1, 0x00, 0x1b);
    88	
    89		/* Gamma */
    90		mipi_dbi_command(mipi, ILI9341_EN3GAM, 0x00);
    91		mipi_dbi_command(mipi, MIPI_DCS_SET_GAMMA_CURVE, 0x01);
    92		mipi_dbi_command(mipi, ILI9341_PGAMCTRL,
    93				 0x0f, 0x31, 0x2b, 0x0c, 0x0e, 0x08, 0x4e, 0xf1,
    94				 0x37, 0x07, 0x10, 0x03, 0x0e, 0x09, 0x00);
    95		mipi_dbi_command(mipi, ILI9341_NGAMCTRL,
    96				 0x00, 0x0e, 0x14, 0x03, 0x11, 0x07, 0x31, 0xc1,
    97				 0x48, 0x08, 0x0f, 0x0c, 0x31, 0x36, 0x0f);
    98	
    99		/* DDRAM */
   100		mipi_dbi_command(mipi, ILI9341_ETMOD, 0x07);
   101	
   102		/* Display */
   103		mipi_dbi_command(mipi, ILI9341_DISCTRL, 0x08, 0x82, 0x27, 0x00);
   104		mipi_dbi_command(mipi, MIPI_DCS_EXIT_SLEEP_MODE);
   105		msleep(100);
   106	
   107		mipi_dbi_command(mipi, MIPI_DCS_SET_DISPLAY_ON);
   108		msleep(100);
   109	
   110	out_enable:
   111		switch (mipi->rotation) {
   112		default:
   113			addr_mode = ILI9341_MADCTL_MX;
   114			break;
   115		case 90:
   116			addr_mode = ILI9341_MADCTL_MV;
   117			break;
   118		case 180:
   119			addr_mode = ILI9341_MADCTL_MY;
   120			break;
   121		case 270:
   122			addr_mode = ILI9341_MADCTL_MV | ILI9341_MADCTL_MY |
   123				    ILI9341_MADCTL_MX;
   124			break;
   125		}
   126		addr_mode |= ILI9341_MADCTL_BGR;
   127		mipi_dbi_command(mipi, MIPI_DCS_SET_ADDRESS_MODE, addr_mode);
 > 128		mipi_dbi_enable_flush(mipi, crtc_state, plane_state);
   129	}
   130	
   131	static const struct drm_simple_display_pipe_funcs ili9341_pipe_funcs = {
 > 132		.enable = yx240qv29_enable,
   133		.disable = mipi_dbi_pipe_disable,
   134		.update = tinydrm_display_pipe_update,
 > 135		.prepare_fb = drm_gem_fb_simple_display_pipe_prepare_fb,
   136	};
   137	

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation
kernel test robot May 27, 2018, 2:04 p.m. UTC | #2 
Hi David,

I love your patch! Yet something to improve:

[auto build test ERROR on linus/master]
[also build test ERROR on v4.17-rc6]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]

url:    https://github.com/0day-ci/linux/commits/David-Lechner/drm-tinydrm-new-dirver-for-ILI9341-displays/20180527-182036
config: ia64-allmodconfig (attached as .config)
compiler: ia64-linux-gcc (GCC) 8.1.0
reproduce:
        wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # save the attached .config to linux build tree
        make.cross ARCH=ia64 

All errors (new ones prefixed by >>):

   drivers/gpu//drm/tinydrm/ili9341.c: In function 'yx240qv29_enable':
   drivers/gpu//drm/tinydrm/ili9341.c:128:2: error: too many arguments to function 'mipi_dbi_enable_flush'
     mipi_dbi_enable_flush(mipi, crtc_state, plane_state);
     ^~~~~~~~~~~~~~~~~~~~~
   In file included from drivers/gpu//drm/tinydrm/ili9341.c:21:
   include/drm/tinydrm/mipi-dbi.h:70:6: note: declared here
    void mipi_dbi_enable_flush(struct mipi_dbi *mipi);
         ^~~~~~~~~~~~~~~~~~~~~
   drivers/gpu//drm/tinydrm/ili9341.c: At top level:
>> drivers/gpu//drm/tinydrm/ili9341.c:132:12: error: initialization of 'void (*)(struct drm_simple_display_pipe *, struct drm_crtc_state *)' from incompatible pointer type 'void (*)(struct drm_simple_display_pipe *, struct drm_crtc_state *, struct drm_plane_state *)' [-Werror=incompatible-pointer-types]
     .enable = yx240qv29_enable,
               ^~~~~~~~~~~~~~~~
   drivers/gpu//drm/tinydrm/ili9341.c:132:12: note: (near initialization for 'ili9341_pipe_funcs.enable')
   drivers/gpu//drm/tinydrm/ili9341.c:135:16: error: 'drm_gem_fb_simple_display_pipe_prepare_fb' undeclared here (not in a function); did you mean 'tinydrm_display_pipe_prepare_fb'?
     .prepare_fb = drm_gem_fb_simple_display_pipe_prepare_fb,
                   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
                   tinydrm_display_pipe_prepare_fb
   cc1: some warnings being treated as errors

vim +132 drivers/gpu//drm/tinydrm/ili9341.c

    49	
    50	static void yx240qv29_enable(struct drm_simple_display_pipe *pipe,
    51				     struct drm_crtc_state *crtc_state,
    52				     struct drm_plane_state *plane_state)
    53	{
    54		struct tinydrm_device *tdev = pipe_to_tinydrm(pipe);
    55		struct mipi_dbi *mipi = mipi_dbi_from_tinydrm(tdev);
    56		u8 addr_mode;
    57		int ret;
    58	
    59		DRM_DEBUG_KMS("\n");
    60	
    61		ret = mipi_dbi_poweron_conditional_reset(mipi);
    62		if (ret < 0)
    63			return;
    64		if (ret == 1)
    65			goto out_enable;
    66	
    67		mipi_dbi_command(mipi, MIPI_DCS_SET_DISPLAY_OFF);
    68	
    69		mipi_dbi_command(mipi, ILI9341_PWCTRLB, 0x00, 0xc1, 0x30);
    70		mipi_dbi_command(mipi, ILI9341_PWRSEQ, 0x64, 0x03, 0x12, 0x81);
    71		mipi_dbi_command(mipi, ILI9341_DTCTRLA, 0x85, 0x00, 0x78);
    72		mipi_dbi_command(mipi, ILI9341_PWCTRLA, 0x39, 0x2c, 0x00, 0x34, 0x02);
    73		mipi_dbi_command(mipi, ILI9341_PUMPCTRL, 0x20);
    74		mipi_dbi_command(mipi, ILI9341_DTCTRLB, 0x00, 0x00);
    75	
    76		/* Power Control */
    77		mipi_dbi_command(mipi, ILI9341_PWCTRL1, 0x23);
    78		mipi_dbi_command(mipi, ILI9341_PWCTRL2, 0x10);
    79		/* VCOM */
    80		mipi_dbi_command(mipi, ILI9341_VMCTRL1, 0x3e, 0x28);
    81		mipi_dbi_command(mipi, ILI9341_VMCTRL2, 0x86);
    82	
    83		/* Memory Access Control */
    84		mipi_dbi_command(mipi, MIPI_DCS_SET_PIXEL_FORMAT, MIPI_DCS_PIXEL_FMT_16BIT);
    85	
    86		/* Frame Rate */
    87		mipi_dbi_command(mipi, ILI9341_FRMCTR1, 0x00, 0x1b);
    88	
    89		/* Gamma */
    90		mipi_dbi_command(mipi, ILI9341_EN3GAM, 0x00);
    91		mipi_dbi_command(mipi, MIPI_DCS_SET_GAMMA_CURVE, 0x01);
    92		mipi_dbi_command(mipi, ILI9341_PGAMCTRL,
    93				 0x0f, 0x31, 0x2b, 0x0c, 0x0e, 0x08, 0x4e, 0xf1,
    94				 0x37, 0x07, 0x10, 0x03, 0x0e, 0x09, 0x00);
    95		mipi_dbi_command(mipi, ILI9341_NGAMCTRL,
    96				 0x00, 0x0e, 0x14, 0x03, 0x11, 0x07, 0x31, 0xc1,
    97				 0x48, 0x08, 0x0f, 0x0c, 0x31, 0x36, 0x0f);
    98	
    99		/* DDRAM */
   100		mipi_dbi_command(mipi, ILI9341_ETMOD, 0x07);
   101	
   102		/* Display */
   103		mipi_dbi_command(mipi, ILI9341_DISCTRL, 0x08, 0x82, 0x27, 0x00);
   104		mipi_dbi_command(mipi, MIPI_DCS_EXIT_SLEEP_MODE);
   105		msleep(100);
   106	
   107		mipi_dbi_command(mipi, MIPI_DCS_SET_DISPLAY_ON);
   108		msleep(100);
   109	
   110	out_enable:
   111		switch (mipi->rotation) {
   112		default:
   113			addr_mode = ILI9341_MADCTL_MX;
   114			break;
   115		case 90:
   116			addr_mode = ILI9341_MADCTL_MV;
   117			break;
   118		case 180:
   119			addr_mode = ILI9341_MADCTL_MY;
   120			break;
   121		case 270:
   122			addr_mode = ILI9341_MADCTL_MV | ILI9341_MADCTL_MY |
   123				    ILI9341_MADCTL_MX;
   124			break;
   125		}
   126		addr_mode |= ILI9341_MADCTL_BGR;
   127		mipi_dbi_command(mipi, MIPI_DCS_SET_ADDRESS_MODE, addr_mode);
 > 128		mipi_dbi_enable_flush(mipi, crtc_state, plane_state);
   129	}
   130	
   131	static const struct drm_simple_display_pipe_funcs ili9341_pipe_funcs = {
 > 132		.enable = yx240qv29_enable,
   133		.disable = mipi_dbi_pipe_disable,
   134		.update = tinydrm_display_pipe_update,
   135		.prepare_fb = drm_gem_fb_simple_display_pipe_prepare_fb,
   136	};
   137	

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation
kernel test robot May 27, 2018, 2:50 p.m. UTC | #3 
Hi David,

I love your patch! Perhaps something to improve:

[auto build test WARNING on linus/master]
[also build test WARNING on v4.17-rc6]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]

url:    https://github.com/0day-ci/linux/commits/David-Lechner/drm-tinydrm-new-dirver-for-ILI9341-displays/20180527-182036
reproduce:
        # apt-get install sparse
        make ARCH=x86_64 allmodconfig
        make C=1 CF=-D__CHECK_ENDIAN__


sparse warnings: (new ones prefixed by >>)

   drivers/gpu/drm/tinydrm/ili9341.c:128:30: sparse: too many arguments for function mipi_dbi_enable_flush
>> drivers/gpu/drm/tinydrm/ili9341.c:132:19: sparse: incorrect type in initializer (different argument counts) @@    expected void ( *enable )( ... ) @@    got void ( *enable )( ... ) @@
   drivers/gpu/drm/tinydrm/ili9341.c:132:19:    expected void ( *enable )( ... )
   drivers/gpu/drm/tinydrm/ili9341.c:132:19:    got void ( *<noident> )( ... )
   drivers/gpu/drm/tinydrm/ili9341.c:135:23: sparse: undefined identifier 'drm_gem_fb_simple_display_pipe_prepare_fb'
   drivers/gpu/drm/tinydrm/ili9341.c: In function 'yx240qv29_enable':
   drivers/gpu/drm/tinydrm/ili9341.c:128:2: error: too many arguments to function 'mipi_dbi_enable_flush'
     mipi_dbi_enable_flush(mipi, crtc_state, plane_state);
     ^~~~~~~~~~~~~~~~~~~~~
   In file included from drivers/gpu/drm/tinydrm/ili9341.c:21:0:
   include/drm/tinydrm/mipi-dbi.h:70:6: note: declared here
    void mipi_dbi_enable_flush(struct mipi_dbi *mipi);
         ^~~~~~~~~~~~~~~~~~~~~
   drivers/gpu/drm/tinydrm/ili9341.c: At top level:
   drivers/gpu/drm/tinydrm/ili9341.c:132:12: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
     .enable = yx240qv29_enable,
               ^~~~~~~~~~~~~~~~
   drivers/gpu/drm/tinydrm/ili9341.c:132:12: note: (near initialization for 'ili9341_pipe_funcs.enable')
   drivers/gpu/drm/tinydrm/ili9341.c:135:16: error: 'drm_gem_fb_simple_display_pipe_prepare_fb' undeclared here (not in a function); did you mean 'tinydrm_display_pipe_prepare_fb'?
     .prepare_fb = drm_gem_fb_simple_display_pipe_prepare_fb,
                   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
                   tinydrm_display_pipe_prepare_fb
   cc1: some warnings being treated as errors

vim +132 drivers/gpu/drm/tinydrm/ili9341.c

    49	
    50	static void yx240qv29_enable(struct drm_simple_display_pipe *pipe,
    51				     struct drm_crtc_state *crtc_state,
    52				     struct drm_plane_state *plane_state)
    53	{
    54		struct tinydrm_device *tdev = pipe_to_tinydrm(pipe);
    55		struct mipi_dbi *mipi = mipi_dbi_from_tinydrm(tdev);
    56		u8 addr_mode;
    57		int ret;
    58	
    59		DRM_DEBUG_KMS("\n");
    60	
    61		ret = mipi_dbi_poweron_conditional_reset(mipi);
    62		if (ret < 0)
    63			return;
    64		if (ret == 1)
    65			goto out_enable;
    66	
    67		mipi_dbi_command(mipi, MIPI_DCS_SET_DISPLAY_OFF);
    68	
    69		mipi_dbi_command(mipi, ILI9341_PWCTRLB, 0x00, 0xc1, 0x30);
    70		mipi_dbi_command(mipi, ILI9341_PWRSEQ, 0x64, 0x03, 0x12, 0x81);
    71		mipi_dbi_command(mipi, ILI9341_DTCTRLA, 0x85, 0x00, 0x78);
    72		mipi_dbi_command(mipi, ILI9341_PWCTRLA, 0x39, 0x2c, 0x00, 0x34, 0x02);
    73		mipi_dbi_command(mipi, ILI9341_PUMPCTRL, 0x20);
    74		mipi_dbi_command(mipi, ILI9341_DTCTRLB, 0x00, 0x00);
    75	
    76		/* Power Control */
    77		mipi_dbi_command(mipi, ILI9341_PWCTRL1, 0x23);
    78		mipi_dbi_command(mipi, ILI9341_PWCTRL2, 0x10);
    79		/* VCOM */
    80		mipi_dbi_command(mipi, ILI9341_VMCTRL1, 0x3e, 0x28);
    81		mipi_dbi_command(mipi, ILI9341_VMCTRL2, 0x86);
    82	
    83		/* Memory Access Control */
    84		mipi_dbi_command(mipi, MIPI_DCS_SET_PIXEL_FORMAT, MIPI_DCS_PIXEL_FMT_16BIT);
    85	
    86		/* Frame Rate */
    87		mipi_dbi_command(mipi, ILI9341_FRMCTR1, 0x00, 0x1b);
    88	
    89		/* Gamma */
    90		mipi_dbi_command(mipi, ILI9341_EN3GAM, 0x00);
    91		mipi_dbi_command(mipi, MIPI_DCS_SET_GAMMA_CURVE, 0x01);
    92		mipi_dbi_command(mipi, ILI9341_PGAMCTRL,
    93				 0x0f, 0x31, 0x2b, 0x0c, 0x0e, 0x08, 0x4e, 0xf1,
    94				 0x37, 0x07, 0x10, 0x03, 0x0e, 0x09, 0x00);
    95		mipi_dbi_command(mipi, ILI9341_NGAMCTRL,
    96				 0x00, 0x0e, 0x14, 0x03, 0x11, 0x07, 0x31, 0xc1,
    97				 0x48, 0x08, 0x0f, 0x0c, 0x31, 0x36, 0x0f);
    98	
    99		/* DDRAM */
   100		mipi_dbi_command(mipi, ILI9341_ETMOD, 0x07);
   101	
   102		/* Display */
   103		mipi_dbi_command(mipi, ILI9341_DISCTRL, 0x08, 0x82, 0x27, 0x00);
   104		mipi_dbi_command(mipi, MIPI_DCS_EXIT_SLEEP_MODE);
   105		msleep(100);
   106	
   107		mipi_dbi_command(mipi, MIPI_DCS_SET_DISPLAY_ON);
   108		msleep(100);
   109	
   110	out_enable:
   111		switch (mipi->rotation) {
   112		default:
   113			addr_mode = ILI9341_MADCTL_MX;
   114			break;
   115		case 90:
   116			addr_mode = ILI9341_MADCTL_MV;
   117			break;
   118		case 180:
   119			addr_mode = ILI9341_MADCTL_MY;
   120			break;
   121		case 270:
   122			addr_mode = ILI9341_MADCTL_MV | ILI9341_MADCTL_MY |
   123				    ILI9341_MADCTL_MX;
   124			break;
   125		}
   126		addr_mode |= ILI9341_MADCTL_BGR;
   127		mipi_dbi_command(mipi, MIPI_DCS_SET_ADDRESS_MODE, addr_mode);
 > 128		mipi_dbi_enable_flush(mipi, crtc_state, plane_state);
   129	}
   130	
   131	static const struct drm_simple_display_pipe_funcs ili9341_pipe_funcs = {
 > 132		.enable = yx240qv29_enable,
   133		.disable = mipi_dbi_pipe_disable,
   134		.update = tinydrm_display_pipe_update,
   135		.prepare_fb = drm_gem_fb_simple_display_pipe_prepare_fb,
   136	};
   137	

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation
diff mbox

Patch

diff --git a/MAINTAINERS b/MAINTAINERS
index bc219de9cbee..ffa099abbd79 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4480,6 +4480,12 @@  S:	Maintained
 F:	drivers/gpu/drm/tinydrm/ili9225.c
 F:	Documentation/devicetree/bindings/display/ilitek,ili9225.txt
 
+DRM DRIVER FOR ILITEK ILI9341 PANELS
+M:	David Lechner <david@lechnology.com>
+S:	Maintained
+F:	drivers/gpu/drm/tinydrm/ili9341.c
+F:	Documentation/devicetree/bindings/display/ilitek,ili9341.txt
+
 DRM DRIVER FOR INTEL I810 VIDEO CARDS
 S:	Orphan / Obsolete
 F:	drivers/gpu/drm/i810/
diff --git a/drivers/gpu/drm/tinydrm/Kconfig b/drivers/gpu/drm/tinydrm/Kconfig
index 4592a5e3f20b..7a8008b0783f 100644
--- a/drivers/gpu/drm/tinydrm/Kconfig
+++ b/drivers/gpu/drm/tinydrm/Kconfig
@@ -20,6 +20,16 @@  config TINYDRM_ILI9225
 
 	  If M is selected the module will be called ili9225.
 
+config TINYDRM_ILI9341
+	tristate "DRM support for ILI9341 display panels"
+	depends on DRM_TINYDRM && SPI
+	select TINYDRM_MIPI_DBI
+	help
+	  DRM driver for the following Ilitek ILI9341 panels:
+	  * YX240QV29-T 2.4" 240x320 TFT (Adafruit 2.4")
+
+	  If M is selected the module will be called ili9341.
+
 config TINYDRM_MI0283QT
 	tristate "DRM support for MI0283QT"
 	depends on DRM_TINYDRM && SPI
diff --git a/drivers/gpu/drm/tinydrm/Makefile b/drivers/gpu/drm/tinydrm/Makefile
index 49a111929724..14d99080665a 100644
--- a/drivers/gpu/drm/tinydrm/Makefile
+++ b/drivers/gpu/drm/tinydrm/Makefile
@@ -5,6 +5,7 @@  obj-$(CONFIG_TINYDRM_MIPI_DBI)		+= mipi-dbi.o
 
 # Displays
 obj-$(CONFIG_TINYDRM_ILI9225)		+= ili9225.o
+obj-$(CONFIG_TINYDRM_ILI9341)		+= ili9341.o
 obj-$(CONFIG_TINYDRM_MI0283QT)		+= mi0283qt.o
 obj-$(CONFIG_TINYDRM_REPAPER)		+= repaper.o
 obj-$(CONFIG_TINYDRM_ST7586)		+= st7586.o
diff --git a/drivers/gpu/drm/tinydrm/ili9341.c b/drivers/gpu/drm/tinydrm/ili9341.c
new file mode 100644
index 000000000000..8864dcde6edc
--- /dev/null
+++ b/drivers/gpu/drm/tinydrm/ili9341.c
@@ -0,0 +1,233 @@ 
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * DRM driver for Ilitek ILI9341 panels
+ *
+ * Copyright 2018 David Lechner <david@lechnology.com>
+ *
+ * Based on mi0283qt.c:
+ * Copyright 2016 Noralf Trønnes
+ */
+
+#include <linux/backlight.h>
+#include <linux/delay.h>
+#include <linux/gpio/consumer.h>
+#include <linux/module.h>
+#include <linux/property.h>
+#include <linux/spi/spi.h>
+
+#include <drm/drm_fb_helper.h>
+#include <drm/drm_gem_framebuffer_helper.h>
+#include <drm/drm_modeset_helper.h>
+#include <drm/tinydrm/mipi-dbi.h>
+#include <drm/tinydrm/tinydrm-helpers.h>
+#include <video/mipi_display.h>
+
+#define ILI9341_FRMCTR1		0xb1
+#define ILI9341_DISCTRL		0xb6
+#define ILI9341_ETMOD		0xb7
+
+#define ILI9341_PWCTRL1		0xc0
+#define ILI9341_PWCTRL2		0xc1
+#define ILI9341_VMCTRL1		0xc5
+#define ILI9341_VMCTRL2		0xc7
+#define ILI9341_PWCTRLA		0xcb
+#define ILI9341_PWCTRLB		0xcf
+
+#define ILI9341_PGAMCTRL	0xe0
+#define ILI9341_NGAMCTRL	0xe1
+#define ILI9341_DTCTRLA		0xe8
+#define ILI9341_DTCTRLB		0xea
+#define ILI9341_PWRSEQ		0xed
+
+#define ILI9341_EN3GAM		0xf2
+#define ILI9341_PUMPCTRL	0xf7
+
+#define ILI9341_MADCTL_BGR	BIT(3)
+#define ILI9341_MADCTL_MV	BIT(5)
+#define ILI9341_MADCTL_MX	BIT(6)
+#define ILI9341_MADCTL_MY	BIT(7)
+
+static void yx240qv29_enable(struct drm_simple_display_pipe *pipe,
+			     struct drm_crtc_state *crtc_state,
+			     struct drm_plane_state *plane_state)
+{
+	struct tinydrm_device *tdev = pipe_to_tinydrm(pipe);
+	struct mipi_dbi *mipi = mipi_dbi_from_tinydrm(tdev);
+	u8 addr_mode;
+	int ret;
+
+	DRM_DEBUG_KMS("\n");
+
+	ret = mipi_dbi_poweron_conditional_reset(mipi);
+	if (ret < 0)
+		return;
+	if (ret == 1)
+		goto out_enable;
+
+	mipi_dbi_command(mipi, MIPI_DCS_SET_DISPLAY_OFF);
+
+	mipi_dbi_command(mipi, ILI9341_PWCTRLB, 0x00, 0xc1, 0x30);
+	mipi_dbi_command(mipi, ILI9341_PWRSEQ, 0x64, 0x03, 0x12, 0x81);
+	mipi_dbi_command(mipi, ILI9341_DTCTRLA, 0x85, 0x00, 0x78);
+	mipi_dbi_command(mipi, ILI9341_PWCTRLA, 0x39, 0x2c, 0x00, 0x34, 0x02);
+	mipi_dbi_command(mipi, ILI9341_PUMPCTRL, 0x20);
+	mipi_dbi_command(mipi, ILI9341_DTCTRLB, 0x00, 0x00);
+
+	/* Power Control */
+	mipi_dbi_command(mipi, ILI9341_PWCTRL1, 0x23);
+	mipi_dbi_command(mipi, ILI9341_PWCTRL2, 0x10);
+	/* VCOM */
+	mipi_dbi_command(mipi, ILI9341_VMCTRL1, 0x3e, 0x28);
+	mipi_dbi_command(mipi, ILI9341_VMCTRL2, 0x86);
+
+	/* Memory Access Control */
+	mipi_dbi_command(mipi, MIPI_DCS_SET_PIXEL_FORMAT, MIPI_DCS_PIXEL_FMT_16BIT);
+
+	/* Frame Rate */
+	mipi_dbi_command(mipi, ILI9341_FRMCTR1, 0x00, 0x1b);
+
+	/* Gamma */
+	mipi_dbi_command(mipi, ILI9341_EN3GAM, 0x00);
+	mipi_dbi_command(mipi, MIPI_DCS_SET_GAMMA_CURVE, 0x01);
+	mipi_dbi_command(mipi, ILI9341_PGAMCTRL,
+			 0x0f, 0x31, 0x2b, 0x0c, 0x0e, 0x08, 0x4e, 0xf1,
+			 0x37, 0x07, 0x10, 0x03, 0x0e, 0x09, 0x00);
+	mipi_dbi_command(mipi, ILI9341_NGAMCTRL,
+			 0x00, 0x0e, 0x14, 0x03, 0x11, 0x07, 0x31, 0xc1,
+			 0x48, 0x08, 0x0f, 0x0c, 0x31, 0x36, 0x0f);
+
+	/* DDRAM */
+	mipi_dbi_command(mipi, ILI9341_ETMOD, 0x07);
+
+	/* Display */
+	mipi_dbi_command(mipi, ILI9341_DISCTRL, 0x08, 0x82, 0x27, 0x00);
+	mipi_dbi_command(mipi, MIPI_DCS_EXIT_SLEEP_MODE);
+	msleep(100);
+
+	mipi_dbi_command(mipi, MIPI_DCS_SET_DISPLAY_ON);
+	msleep(100);
+
+out_enable:
+	switch (mipi->rotation) {
+	default:
+		addr_mode = ILI9341_MADCTL_MX;
+		break;
+	case 90:
+		addr_mode = ILI9341_MADCTL_MV;
+		break;
+	case 180:
+		addr_mode = ILI9341_MADCTL_MY;
+		break;
+	case 270:
+		addr_mode = ILI9341_MADCTL_MV | ILI9341_MADCTL_MY |
+			    ILI9341_MADCTL_MX;
+		break;
+	}
+	addr_mode |= ILI9341_MADCTL_BGR;
+	mipi_dbi_command(mipi, MIPI_DCS_SET_ADDRESS_MODE, addr_mode);
+	mipi_dbi_enable_flush(mipi, crtc_state, plane_state);
+}
+
+static const struct drm_simple_display_pipe_funcs ili9341_pipe_funcs = {
+	.enable = yx240qv29_enable,
+	.disable = mipi_dbi_pipe_disable,
+	.update = tinydrm_display_pipe_update,
+	.prepare_fb = drm_gem_fb_simple_display_pipe_prepare_fb,
+};
+
+static const struct drm_display_mode yx240qv29_mode = {
+	TINYDRM_MODE(240, 320, 37, 49),
+};
+
+DEFINE_DRM_GEM_CMA_FOPS(ili9341_fops);
+
+static struct drm_driver ili9341_driver = {
+	.driver_features	= DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | DRIVER_ATOMIC,
+	.fops			= &ili9341_fops,
+	TINYDRM_GEM_DRIVER_OPS,
+	.lastclose		= drm_fb_helper_lastclose,
+	.debugfs_init		= mipi_dbi_debugfs_init,
+	.name			= "ili9341",
+	.desc			= "Ilitek ILI9341",
+	.date			= "20180514",
+	.major			= 1,
+	.minor			= 0,
+};
+
+static const struct of_device_id ili9341_of_match[] = {
+	{ .compatible = "adafruit,yx240qv29" },
+	{ }
+};
+MODULE_DEVICE_TABLE(of, ili9341_of_match);
+
+static const struct spi_device_id ili9341_id[] = {
+	{ "yx240qv29", 0 },
+	{ }
+};
+MODULE_DEVICE_TABLE(spi, ili9341_id);
+
+static int ili9341_probe(struct spi_device *spi)
+{
+	struct device *dev = &spi->dev;
+	struct mipi_dbi *mipi;
+	struct gpio_desc *dc;
+	u32 rotation = 0;
+	int ret;
+
+	mipi = devm_kzalloc(dev, sizeof(*mipi), GFP_KERNEL);
+	if (!mipi)
+		return -ENOMEM;
+
+	mipi->reset = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_HIGH);
+	if (IS_ERR(mipi->reset)) {
+		DRM_DEV_ERROR(dev, "Failed to get gpio 'reset'\n");
+		return PTR_ERR(mipi->reset);
+	}
+
+	dc = devm_gpiod_get_optional(dev, "dc", GPIOD_OUT_LOW);
+	if (IS_ERR(dc)) {
+		DRM_DEV_ERROR(dev, "Failed to get gpio 'dc'\n");
+		return PTR_ERR(dc);
+	}
+
+	mipi->backlight = devm_of_find_backlight(dev);
+	if (IS_ERR(mipi->backlight))
+		return PTR_ERR(mipi->backlight);
+
+	device_property_read_u32(dev, "rotation", &rotation);
+
+	ret = mipi_dbi_spi_init(spi, mipi, dc);
+	if (ret)
+		return ret;
+
+	ret = mipi_dbi_init(&spi->dev, mipi, &ili9341_pipe_funcs,
+			    &ili9341_driver, &yx240qv29_mode, rotation);
+	if (ret)
+		return ret;
+
+	spi_set_drvdata(spi, mipi);
+
+	return devm_tinydrm_register(&mipi->tinydrm);
+}
+
+static void ili9341_shutdown(struct spi_device *spi)
+{
+	struct mipi_dbi *mipi = spi_get_drvdata(spi);
+
+	tinydrm_shutdown(&mipi->tinydrm);
+}
+
+static struct spi_driver ili9341_spi_driver = {
+	.driver = {
+		.name = "ili9341",
+		.of_match_table = ili9341_of_match,
+	},
+	.id_table = ili9341_id,
+	.probe = ili9341_probe,
+	.shutdown = ili9341_shutdown,
+};
+module_spi_driver(ili9341_spi_driver);
+
+MODULE_DESCRIPTION("Ilitek ILI9341 DRM driver");
+MODULE_AUTHOR("David Lechner <david@lechnology.com>");
+MODULE_LICENSE("GPL");