Commit 41dec757 authored by Jani Nikula's avatar Jani Nikula
Browse files

Merge tag 'topic/drm-mipi-dsi-dsc-updates-2019-11-11' of... 

Merge tag 'topic/drm-mipi-dsi-dsc-updates-2019-11-11' of git://anongit.freedesktop.org/drm/drm-intel

 into drm-intel-next-queued

Core Changes:
- Update DSI data type and command definitions
- Add helpers for sending compression mode and PPS packets

Driver Changes:
- Update tiny/st7586 to reflect a definition change

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
From: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/87tv7a4eq3.fsf@intel.com
parents c53d1313 f4dea1aa

drivers/gpu/drm/drm_mipi_dsi.c

+55 −2
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include <linux/pm_runtime.h>

#include <linux/slab.h>



#include <drm/drm_dsc.h>

#include <video/mipi_display.h>



/**
@@ -373,6 +374,7 @@ bool mipi_dsi_packet_format_is_short(u8 type) 
	case MIPI_DSI_V_SYNC_END:

	case MIPI_DSI_H_SYNC_START:

	case MIPI_DSI_H_SYNC_END:

	case MIPI_DSI_COMPRESSION_MODE:

	case MIPI_DSI_END_OF_TRANSMISSION:

	case MIPI_DSI_COLOR_MODE_OFF:

	case MIPI_DSI_COLOR_MODE_ON:
@@ -387,7 +389,7 @@ bool mipi_dsi_packet_format_is_short(u8 type) 
	case MIPI_DSI_DCS_SHORT_WRITE:

	case MIPI_DSI_DCS_SHORT_WRITE_PARAM:

	case MIPI_DSI_DCS_READ:

	case MIPI_DSI_DCS_COMPRESSION_MODE:

	case MIPI_DSI_EXECUTE_QUEUE:

	case MIPI_DSI_SET_MAXIMUM_RETURN_PACKET_SIZE:

		return true;

	}
@@ -406,11 +408,12 @@ EXPORT_SYMBOL(mipi_dsi_packet_format_is_short); 
bool mipi_dsi_packet_format_is_long(u8 type)

{

	switch (type) {

	case MIPI_DSI_PPS_LONG_WRITE:

	case MIPI_DSI_NULL_PACKET:

	case MIPI_DSI_BLANKING_PACKET:

	case MIPI_DSI_GENERIC_LONG_WRITE:

	case MIPI_DSI_DCS_LONG_WRITE:

	case MIPI_DSI_PICTURE_PARAMETER_SET:

	case MIPI_DSI_COMPRESSED_PIXEL_STREAM:

	case MIPI_DSI_LOOSELY_PACKED_PIXEL_STREAM_YCBCR20:

	case MIPI_DSI_PACKED_PIXEL_STREAM_YCBCR24:

	case MIPI_DSI_PACKED_PIXEL_STREAM_YCBCR16:
@@ -546,6 +549,56 @@ int mipi_dsi_set_maximum_return_packet_size(struct mipi_dsi_device *dsi, 
}

EXPORT_SYMBOL(mipi_dsi_set_maximum_return_packet_size);



/**

 * mipi_dsi_compression_mode() - enable/disable DSC on the peripheral

 * @dsi: DSI peripheral device

 * @enable: Whether to enable or disable the DSC

 *

 * Enable or disable Display Stream Compression on the peripheral using the

 * default Picture Parameter Set and VESA DSC 1.1 algorithm.

 *

 * Return: 0 on success or a negative error code on failure.

 */

ssize_t mipi_dsi_compression_mode(struct mipi_dsi_device *dsi, bool enable)

{

	/* Note: Needs updating for non-default PPS or algorithm */

	u8 tx[2] = { enable << 0, 0 };

	struct mipi_dsi_msg msg = {

		.channel = dsi->channel,

		.type = MIPI_DSI_COMPRESSION_MODE,

		.tx_len = sizeof(tx),

		.tx_buf = tx,

	};

	int ret = mipi_dsi_device_transfer(dsi, &msg);



	return (ret < 0) ? ret : 0;

}

EXPORT_SYMBOL(mipi_dsi_compression_mode);



/**

 * mipi_dsi_picture_parameter_set() - transmit the DSC PPS to the peripheral

 * @dsi: DSI peripheral device

 * @pps: VESA DSC 1.1 Picture Parameter Set

 *

 * Transmit the VESA DSC 1.1 Picture Parameter Set to the peripheral.

 *

 * Return: 0 on success or a negative error code on failure.

 */

ssize_t mipi_dsi_picture_parameter_set(struct mipi_dsi_device *dsi,

				       const struct drm_dsc_picture_parameter_set *pps)

{

	struct mipi_dsi_msg msg = {

		.channel = dsi->channel,

		.type = MIPI_DSI_PICTURE_PARAMETER_SET,

		.tx_len = sizeof(*pps),

		.tx_buf = pps,

	};

	int ret = mipi_dsi_device_transfer(dsi, &msg);



	return (ret < 0) ? ret : 0;

}

EXPORT_SYMBOL(mipi_dsi_picture_parameter_set);



/**

 * mipi_dsi_generic_write() - transmit data using a generic write packet

 * @dsi: DSI peripheral device

drivers/gpu/drm/tiny/st7586.c

+1 −1
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ static void st7586_pipe_enable(struct drm_simple_display_pipe *pipe, 


	mipi_dbi_command(dbi, ST7586_SET_DISP_DUTY, 0x7f);

	mipi_dbi_command(dbi, ST7586_SET_PART_DISP, 0xa0);

	mipi_dbi_command(dbi, MIPI_DCS_SET_PARTIAL_AREA, 0x00, 0x00, 0x00, 0x77);

	mipi_dbi_command(dbi, MIPI_DCS_SET_PARTIAL_ROWS, 0x00, 0x00, 0x00, 0x77);

	mipi_dbi_command(dbi, MIPI_DCS_EXIT_INVERT_MODE);



	msleep(100);

include/drm/drm_mipi_dsi.h

+4 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 


struct mipi_dsi_host;

struct mipi_dsi_device;

struct drm_dsc_picture_parameter_set;



/* request ACK from peripheral */

#define MIPI_DSI_MSG_REQ_ACK	BIT(0)
@@ -228,6 +229,9 @@ int mipi_dsi_shutdown_peripheral(struct mipi_dsi_device *dsi); 
int mipi_dsi_turn_on_peripheral(struct mipi_dsi_device *dsi);

int mipi_dsi_set_maximum_return_packet_size(struct mipi_dsi_device *dsi,

					    u16 value);

ssize_t mipi_dsi_compression_mode(struct mipi_dsi_device *dsi, bool enable);

ssize_t mipi_dsi_picture_parameter_set(struct mipi_dsi_device *dsi,

				       const struct drm_dsc_picture_parameter_set *pps);



ssize_t mipi_dsi_generic_write(struct mipi_dsi_device *dsi, const void *payload,

			       size_t size);

include/video/mipi_display.h

+18 −6
Original line number Diff line number Diff line
@@ -17,6 +17,9 @@ enum { 
	MIPI_DSI_H_SYNC_START				= 0x21,

	MIPI_DSI_H_SYNC_END				= 0x31,



	MIPI_DSI_COMPRESSION_MODE			= 0x07,

	MIPI_DSI_END_OF_TRANSMISSION			= 0x08,



	MIPI_DSI_COLOR_MODE_OFF				= 0x02,

	MIPI_DSI_COLOR_MODE_ON				= 0x12,

	MIPI_DSI_SHUTDOWN_PERIPHERAL			= 0x22,
@@ -34,19 +37,18 @@ enum { 
	MIPI_DSI_DCS_SHORT_WRITE_PARAM			= 0x15,



	MIPI_DSI_DCS_READ				= 0x06,



	MIPI_DSI_DCS_COMPRESSION_MODE                   = 0x07,

	MIPI_DSI_PPS_LONG_WRITE                         = 0x0A,

	MIPI_DSI_EXECUTE_QUEUE				= 0x16,



	MIPI_DSI_SET_MAXIMUM_RETURN_PACKET_SIZE		= 0x37,



	MIPI_DSI_END_OF_TRANSMISSION			= 0x08,



	MIPI_DSI_NULL_PACKET				= 0x09,

	MIPI_DSI_BLANKING_PACKET			= 0x19,

	MIPI_DSI_GENERIC_LONG_WRITE			= 0x29,

	MIPI_DSI_DCS_LONG_WRITE				= 0x39,



	MIPI_DSI_PICTURE_PARAMETER_SET			= 0x0a,

	MIPI_DSI_COMPRESSED_PIXEL_STREAM		= 0x0b,



	MIPI_DSI_LOOSELY_PACKED_PIXEL_STREAM_YCBCR20	= 0x0c,

	MIPI_DSI_PACKED_PIXEL_STREAM_YCBCR24		= 0x1c,

	MIPI_DSI_PACKED_PIXEL_STREAM_YCBCR16		= 0x2c,
@@ -77,7 +79,9 @@ enum { 
enum {

	MIPI_DCS_NOP			= 0x00,

	MIPI_DCS_SOFT_RESET		= 0x01,

	MIPI_DCS_GET_COMPRESSION_MODE	= 0x03,

	MIPI_DCS_GET_DISPLAY_ID		= 0x04,

	MIPI_DCS_GET_ERROR_COUNT_ON_DSI	= 0x05,

	MIPI_DCS_GET_RED_CHANNEL	= 0x06,

	MIPI_DCS_GET_GREEN_CHANNEL	= 0x07,

	MIPI_DCS_GET_BLUE_CHANNEL	= 0x08,
@@ -92,6 +96,8 @@ enum { 
	MIPI_DCS_EXIT_SLEEP_MODE	= 0x11,

	MIPI_DCS_ENTER_PARTIAL_MODE	= 0x12,

	MIPI_DCS_ENTER_NORMAL_MODE	= 0x13,

	MIPI_DCS_GET_IMAGE_CHECKSUM_RGB	= 0x14,

	MIPI_DCS_GET_IMAGE_CHECKSUM_CT	= 0x15,

	MIPI_DCS_EXIT_INVERT_MODE	= 0x20,

	MIPI_DCS_ENTER_INVERT_MODE	= 0x21,

	MIPI_DCS_SET_GAMMA_CURVE	= 0x26,
@@ -102,7 +108,8 @@ enum { 
	MIPI_DCS_WRITE_MEMORY_START	= 0x2C,

	MIPI_DCS_WRITE_LUT		= 0x2D,

	MIPI_DCS_READ_MEMORY_START	= 0x2E,

	MIPI_DCS_SET_PARTIAL_AREA	= 0x30,

	MIPI_DCS_SET_PARTIAL_ROWS	= 0x30,		/* MIPI DCS 1.02 - MIPI_DCS_SET_PARTIAL_AREA before that */

	MIPI_DCS_SET_PARTIAL_COLUMNS	= 0x31,

	MIPI_DCS_SET_SCROLL_AREA	= 0x33,

	MIPI_DCS_SET_TEAR_OFF		= 0x34,

	MIPI_DCS_SET_TEAR_ON		= 0x35,
@@ -112,7 +119,10 @@ enum { 
	MIPI_DCS_ENTER_IDLE_MODE	= 0x39,

	MIPI_DCS_SET_PIXEL_FORMAT	= 0x3A,

	MIPI_DCS_WRITE_MEMORY_CONTINUE	= 0x3C,

	MIPI_DCS_SET_3D_CONTROL		= 0x3D,

	MIPI_DCS_READ_MEMORY_CONTINUE	= 0x3E,

	MIPI_DCS_GET_3D_CONTROL		= 0x3F,

	MIPI_DCS_SET_VSYNC_TIMING	= 0x40,

	MIPI_DCS_SET_TEAR_SCANLINE	= 0x44,

	MIPI_DCS_GET_SCANLINE		= 0x45,

	MIPI_DCS_SET_DISPLAY_BRIGHTNESS = 0x51,		/* MIPI DCS 1.3 */
@@ -124,7 +134,9 @@ enum { 
	MIPI_DCS_SET_CABC_MIN_BRIGHTNESS = 0x5E,	/* MIPI DCS 1.3 */

	MIPI_DCS_GET_CABC_MIN_BRIGHTNESS = 0x5F,	/* MIPI DCS 1.3 */

	MIPI_DCS_READ_DDB_START		= 0xA1,

	MIPI_DCS_READ_PPS_START		= 0xA2,

	MIPI_DCS_READ_DDB_CONTINUE	= 0xA8,

	MIPI_DCS_READ_PPS_CONTINUE	= 0xA9,

};



/* MIPI DCS pixel formats */

CRA Git | Maintained and supported by SUSTech CRA and CCSE