浏览代码

gpu: ipu-v3: ipu-dc: don't bug out on invalid bus_format

If imx-drm is combined with a bridge or panel that requests an
unsupported format, warn and use a default mapping instead of
hanging the machine. The worst that can happen here are wrong
colors.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Philipp Zabel 9 年之前
父节点
当前提交
b575b31387
共有 1 个文件被更改,包括 3 次插入3 次删除
  1. 3 3
      drivers/gpu/ipu-v3/ipu-dc.c

+ 3 - 3
drivers/gpu/ipu-v3/ipu-dc.c

@@ -150,6 +150,9 @@ static void dc_write_tmpl(struct ipu_dc *dc, int word, u32 opcode, u32 operand,
 static int ipu_bus_format_to_map(u32 fmt)
 static int ipu_bus_format_to_map(u32 fmt)
 {
 {
 	switch (fmt) {
 	switch (fmt) {
+	default:
+		WARN_ON(1);
+		/* fall-through */
 	case MEDIA_BUS_FMT_RGB888_1X24:
 	case MEDIA_BUS_FMT_RGB888_1X24:
 		return IPU_DC_MAP_RGB24;
 		return IPU_DC_MAP_RGB24;
 	case MEDIA_BUS_FMT_RGB565_1X16:
 	case MEDIA_BUS_FMT_RGB565_1X16:
@@ -162,8 +165,6 @@ static int ipu_bus_format_to_map(u32 fmt)
 		return IPU_DC_MAP_LVDS666;
 		return IPU_DC_MAP_LVDS666;
 	case MEDIA_BUS_FMT_BGR888_1X24:
 	case MEDIA_BUS_FMT_BGR888_1X24:
 		return IPU_DC_MAP_BGR24;
 		return IPU_DC_MAP_BGR24;
-	default:
-		return -EINVAL;
 	}
 	}
 }
 }
 
 
@@ -178,7 +179,6 @@ int ipu_dc_init_sync(struct ipu_dc *dc, struct ipu_di *di, bool interlaced,
 	dc->di = ipu_di_get_num(di);
 	dc->di = ipu_di_get_num(di);
 
 
 	map = ipu_bus_format_to_map(bus_format);
 	map = ipu_bus_format_to_map(bus_format);
-	BUG_ON(map < 0);
 
 
 	/*
 	/*
 	 * In interlaced mode we need more counters to create the asymmetric
 	 * In interlaced mode we need more counters to create the asymmetric