aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Reding <treding@nvidia.com>2016-08-24 07:28:39 -0400
committerThierry Reding <treding@nvidia.com>2016-08-24 07:33:24 -0400
commitbbdcf516a6187d58639084f1b9f92cde50cc07ad (patch)
treeaf318a426ba0bf5651f3e8fd1c817b7159dc2fcb
parent29b4817d4018df78086157ea3a55c1d9424a7cfc (diff)
drm/dsi: Order DCS helpers by command code
Most of these helpers had been introduced in the correct order, but some were simply appended, which wasn't detected when they were applied. Signed-off-by: Thierry Reding <treding@nvidia.com>
-rw-r--r--drivers/gpu/drm/drm_mipi_dsi.c34
-rw-r--r--include/drm/drm_mipi_dsi.h2
2 files changed, 18 insertions, 18 deletions
diff --git a/drivers/gpu/drm/drm_mipi_dsi.c b/drivers/gpu/drm/drm_mipi_dsi.c
index af0d471ee246..8e56228fb1fb 100644
--- a/drivers/gpu/drm/drm_mipi_dsi.c
+++ b/drivers/gpu/drm/drm_mipi_dsi.c
@@ -999,47 +999,47 @@ int mipi_dsi_dcs_set_tear_on(struct mipi_dsi_device *dsi,
999EXPORT_SYMBOL(mipi_dsi_dcs_set_tear_on); 999EXPORT_SYMBOL(mipi_dsi_dcs_set_tear_on);
1000 1000
1001/** 1001/**
1002 * mipi_dsi_dcs_set_tear_scanline() - set the scanline to use as trigger for 1002 * mipi_dsi_dcs_set_pixel_format() - sets the pixel format for the RGB image
1003 * the Tearing Effect output signal of the display module 1003 * data used by the interface
1004 * @dsi: DSI peripheral device 1004 * @dsi: DSI peripheral device
1005 * @scanline: scanline to use as trigger 1005 * @format: pixel format
1006 * 1006 *
1007 * Return: 0 on success or a negative error code on failure 1007 * Return: 0 on success or a negative error code on failure.
1008 */ 1008 */
1009int mipi_dsi_dcs_set_tear_scanline(struct mipi_dsi_device *dsi, u16 scanline) 1009int mipi_dsi_dcs_set_pixel_format(struct mipi_dsi_device *dsi, u8 format)
1010{ 1010{
1011 u8 payload[3] = { MIPI_DCS_SET_TEAR_SCANLINE, scanline >> 8,
1012 scanline & 0xff };
1013 ssize_t err; 1011 ssize_t err;
1014 1012
1015 err = mipi_dsi_generic_write(dsi, payload, sizeof(payload)); 1013 err = mipi_dsi_dcs_write(dsi, MIPI_DCS_SET_PIXEL_FORMAT, &format,
1014 sizeof(format));
1016 if (err < 0) 1015 if (err < 0)
1017 return err; 1016 return err;
1018 1017
1019 return 0; 1018 return 0;
1020} 1019}
1021EXPORT_SYMBOL(mipi_dsi_dcs_set_tear_scanline); 1020EXPORT_SYMBOL(mipi_dsi_dcs_set_pixel_format);
1022 1021
1023/** 1022/**
1024 * mipi_dsi_dcs_set_pixel_format() - sets the pixel format for the RGB image 1023 * mipi_dsi_dcs_set_tear_scanline() - set the scanline to use as trigger for
1025 * data used by the interface 1024 * the Tearing Effect output signal of the display module
1026 * @dsi: DSI peripheral device 1025 * @dsi: DSI peripheral device
1027 * @format: pixel format 1026 * @scanline: scanline to use as trigger
1028 * 1027 *
1029 * Return: 0 on success or a negative error code on failure. 1028 * Return: 0 on success or a negative error code on failure
1030 */ 1029 */
1031int mipi_dsi_dcs_set_pixel_format(struct mipi_dsi_device *dsi, u8 format) 1030int mipi_dsi_dcs_set_tear_scanline(struct mipi_dsi_device *dsi, u16 scanline)
1032{ 1031{
1032 u8 payload[3] = { MIPI_DCS_SET_TEAR_SCANLINE, scanline >> 8,
1033 scanline & 0xff };
1033 ssize_t err; 1034 ssize_t err;
1034 1035
1035 err = mipi_dsi_dcs_write(dsi, MIPI_DCS_SET_PIXEL_FORMAT, &format, 1036 err = mipi_dsi_generic_write(dsi, payload, sizeof(payload));
1036 sizeof(format));
1037 if (err < 0) 1037 if (err < 0)
1038 return err; 1038 return err;
1039 1039
1040 return 0; 1040 return 0;
1041} 1041}
1042EXPORT_SYMBOL(mipi_dsi_dcs_set_pixel_format); 1042EXPORT_SYMBOL(mipi_dsi_dcs_set_tear_scanline);
1043 1043
1044static int mipi_dsi_drv_probe(struct device *dev) 1044static int mipi_dsi_drv_probe(struct device *dev)
1045{ 1045{
diff --git a/include/drm/drm_mipi_dsi.h b/include/drm/drm_mipi_dsi.h
index 47ac92584d76..4ba9dfc01825 100644
--- a/include/drm/drm_mipi_dsi.h
+++ b/include/drm/drm_mipi_dsi.h
@@ -265,11 +265,11 @@ int mipi_dsi_dcs_set_column_address(struct mipi_dsi_device *dsi, u16 start,
265 u16 end); 265 u16 end);
266int mipi_dsi_dcs_set_page_address(struct mipi_dsi_device *dsi, u16 start, 266int mipi_dsi_dcs_set_page_address(struct mipi_dsi_device *dsi, u16 start,
267 u16 end); 267 u16 end);
268int mipi_dsi_dcs_set_tear_scanline(struct mipi_dsi_device *dsi, u16 scanline);
269int mipi_dsi_dcs_set_tear_off(struct mipi_dsi_device *dsi); 268int mipi_dsi_dcs_set_tear_off(struct mipi_dsi_device *dsi);
270int mipi_dsi_dcs_set_tear_on(struct mipi_dsi_device *dsi, 269int mipi_dsi_dcs_set_tear_on(struct mipi_dsi_device *dsi,
271 enum mipi_dsi_dcs_tear_mode mode); 270 enum mipi_dsi_dcs_tear_mode mode);
272int mipi_dsi_dcs_set_pixel_format(struct mipi_dsi_device *dsi, u8 format); 271int mipi_dsi_dcs_set_pixel_format(struct mipi_dsi_device *dsi, u8 format);
272int mipi_dsi_dcs_set_tear_scanline(struct mipi_dsi_device *dsi, u16 scanline);
273 273
274/** 274/**
275 * struct mipi_dsi_driver - DSI driver 275 * struct mipi_dsi_driver - DSI driver