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

Commit 892fdcb0 authored Nov 10, 2015 by Tomi Valkeinen

drm/omap: display: don't use dsi_get_pixel_size()



display.c uses dsi_get_pixel_size() which is implemented in the DSI
driver, and we won't have that in the omapdss-base module, to which we
want to move display.c

This patch changes display.c not to use dsi_get_pixel_size(). The call
can be replaced with a simple check for OMAP_DSS_DSI_FMT_RGB565.

We can also make dsi_get_pixel_size() static as it's no longer used
outside dsi.c.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

parent 39637e10

drivers/gpu/drm/omapdrm/dss/display.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -55,10 +55,10 @@ int omapdss_default_get_recommended_bpp(struct omap_dss_device *dssdev)
		else
		return 16;
		case OMAP_DISPLAY_TYPE_DSI:
		if (dsi_get_pixel_size(dssdev->panel.dsi_pix_fmt) > 16)
		return 24;
		else
		if (dssdev->panel.dsi_pix_fmt == OMAP_DSS_DSI_FMT_RGB565)
		return 16;
		else
		return 24;
		case OMAP_DISPLAY_TYPE_VENC:
		case OMAP_DISPLAY_TYPE_SDI:
		case OMAP_DISPLAY_TYPE_HDMI:

drivers/gpu/drm/omapdrm/dss/dsi.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -527,7 +527,7 @@ static inline int wait_for_bit_change(struct platform_device *dsidev,
		return !value;
		}

		u8 dsi_get_pixel_size(enum omap_dss_dsi_pixel_format fmt)
		static u8 dsi_get_pixel_size(enum omap_dss_dsi_pixel_format fmt)
		{
		switch (fmt) {
		case OMAP_DSS_DSI_FMT_RGB888:

drivers/gpu/drm/omapdrm/dss/dss.h

+0 −8

Original line number	Diff line number	Diff line
		@@ -315,15 +315,7 @@ void dsi_uninit_platform_driver(void);
		void dsi_dump_clocks(struct seq_file *s);

		void dsi_irq_handler(void);
		u8 dsi_get_pixel_size(enum omap_dss_dsi_pixel_format fmt);

		#else
		static inline u8 dsi_get_pixel_size(enum omap_dss_dsi_pixel_format fmt)
		{
		WARN(1, "%s: DSI not compiled in, returning pixel_size as 0\n",
		__func__);
		return 0;
		}
		#endif

		/* DPI */