Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 42c151e6 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/dsi: lose the loose 666 format name in favor of packed 



The enum mipi_dsi_pixel_format defines MIPI_DSI_FMT_RGB666 for the
"loose" 24 bpp format and MIPI_DSI_FMT_RGB666_PACKED for the 18 bpp
format. We have this the other way round, defining a loose version for
24 bpp.

Follow suit with what's in enum mipi_dsi_pixel_format to avoid future
confusion. Rename

VID_MODE_FORMAT_RGB666 -> VID_MODE_FORMAT_RGB666_PACKED
VID_MODE_FORMAT_RGB666_LOOSE -> VID_MODE_FORMAT_RGB666

Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1458123700-16003-1-git-send-email-jani.nikula@intel.com
parent 1bb4308e

drivers/gpu/drm/i915/i915_reg.h

+2 −2
Original line number Diff line number Diff line
@@ -7887,8 +7887,8 @@ enum skl_disp_power_wells { 
#define  VID_MODE_FORMAT_MASK				(0xf << 7)

#define  VID_MODE_NOT_SUPPORTED				(0 << 7)

#define  VID_MODE_FORMAT_RGB565				(1 << 7)

#define  VID_MODE_FORMAT_RGB666				(2 << 7)

#define  VID_MODE_FORMAT_RGB666_LOOSE			(3 << 7)

#define  VID_MODE_FORMAT_RGB666_PACKED			(2 << 7)

#define  VID_MODE_FORMAT_RGB666				(3 << 7)

#define  VID_MODE_FORMAT_RGB888				(4 << 7)

#define  CMD_MODE_CHANNEL_NUMBER_SHIFT			5

#define  CMD_MODE_CHANNEL_NUMBER_MASK			(3 << 5)

drivers/gpu/drm/i915/intel_dsi_pll.c

+2 −2
Original line number Diff line number Diff line
@@ -37,10 +37,10 @@ int dsi_pixel_format_bpp(int pixel_format) 
	switch (pixel_format) {

	default:

	case VID_MODE_FORMAT_RGB888:

	case VID_MODE_FORMAT_RGB666_LOOSE:

	case VID_MODE_FORMAT_RGB666:

		bpp = 24;

		break;

	case VID_MODE_FORMAT_RGB666:

	case VID_MODE_FORMAT_RGB666_PACKED:

		bpp = 18;

		break;

	case VID_MODE_FORMAT_RGB565: