All of lore.kernel.org
 help / color / mirror / Atom feed

diff for duplicates of <2238944.jilJcacc6d@amdc3058>

diff --git a/a/1.txt b/N1/1.txt
index a8b15cd..4b02d25 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -20,7 +20,8 @@ Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
  delete mode 100644 drivers/video/fbdev/omap2/omapfb/dss/rfbi.c
 
 Index: b/drivers/video/fbdev/omap2/omapfb/dss/Kconfig
-=================================--- a/drivers/video/fbdev/omap2/omapfb/dss/Kconfig	2018-04-27 16:24:48.171632007 +0200
+===================================================================
+--- a/drivers/video/fbdev/omap2/omapfb/dss/Kconfig	2018-04-27 16:24:48.171632007 +0200
 +++ b/drivers/video/fbdev/omap2/omapfb/dss/Kconfig	2018-04-27 16:25:31.067633088 +0200
 @@ -42,19 +42,6 @@ config FB_OMAP2_DSS_DPI
  	help
@@ -43,7 +44,8 @@ Index: b/drivers/video/fbdev/omap2/omapfb/dss/Kconfig
  	bool "VENC support"
          default y
 Index: b/drivers/video/fbdev/omap2/omapfb/dss/Makefile
-=================================--- a/drivers/video/fbdev/omap2/omapfb/dss/Makefile	2018-04-27 16:24:48.171632007 +0200
+===================================================================
+--- a/drivers/video/fbdev/omap2/omapfb/dss/Makefile	2018-04-27 16:24:48.171632007 +0200
 +++ b/drivers/video/fbdev/omap2/omapfb/dss/Makefile	2018-04-27 16:26:20.511634333 +0200
 @@ -8,7 +8,6 @@ omapdss-y := core.o dss.o dss_features.o
  omapdss-y += manager.o manager-sysfs.o overlay.o overlay-sysfs.o apply.o \
@@ -54,7 +56,8 @@ Index: b/drivers/video/fbdev/omap2/omapfb/dss/Makefile
  omapdss-$(CONFIG_FB_OMAP2_DSS_SDI) += sdi.o
  omapdss-$(CONFIG_FB_OMAP2_DSS_DSI) += dsi.o
 Index: b/drivers/video/fbdev/omap2/omapfb/dss/core.c
-=================================--- a/drivers/video/fbdev/omap2/omapfb/dss/core.c	2018-04-27 16:24:48.171632007 +0200
+===================================================================
+--- a/drivers/video/fbdev/omap2/omapfb/dss/core.c	2018-04-27 16:24:48.171632007 +0200
 +++ b/drivers/video/fbdev/omap2/omapfb/dss/core.c	2018-04-27 16:26:00.675633833 +0200
 @@ -251,9 +251,6 @@ static int (*dss_output_drv_reg_funcs[])
  #ifdef CONFIG_FB_OMAP2_DSS_SDI
@@ -77,7 +80,8 @@ Index: b/drivers/video/fbdev/omap2/omapfb/dss/core.c
  	sdi_uninit_platform_driver,
  #endif
 Index: b/drivers/video/fbdev/omap2/omapfb/dss/dss.h
-=================================--- a/drivers/video/fbdev/omap2/omapfb/dss/dss.h	2018-04-27 16:24:48.171632007 +0200
+===================================================================
+--- a/drivers/video/fbdev/omap2/omapfb/dss/dss.h	2018-04-27 16:24:48.171632007 +0200
 +++ b/drivers/video/fbdev/omap2/omapfb/dss/dss.h	2018-04-27 16:24:48.171632007 +0200
 @@ -472,10 +472,6 @@ void hdmi4_uninit_platform_driver(void);
  int hdmi5_init_platform_driver(void) __init;
@@ -91,7 +95,8 @@ Index: b/drivers/video/fbdev/omap2/omapfb/dss/dss.h
  #ifdef CONFIG_FB_OMAP2_DSS_COLLECT_IRQ_STATS
  static inline void dss_collect_irq_stats(u32 irqstatus, unsigned *irq_arr)
 Index: b/drivers/video/fbdev/omap2/omapfb/dss/rfbi.c
-=================================--- a/drivers/video/fbdev/omap2/omapfb/dss/rfbi.c	2018-04-27 16:24:42.223631857 +0200
+===================================================================
+--- a/drivers/video/fbdev/omap2/omapfb/dss/rfbi.c	2018-04-27 16:24:42.223631857 +0200
 +++ /dev/null	1970-01-01 00:00:00.000000000 +0000
 @@ -1,1078 +0,0 @@
 -/*
@@ -352,8 +357,8 @@ Index: b/drivers/video/fbdev/omap2/omapfb/dss/rfbi.c
 -	int horiz_offset = scr_width - w;
 -	int i;
 -
--	if (rfbi.datatype = OMAP_DSS_RFBI_DATATYPE_16 &&
--	   rfbi.parallelmode = OMAP_DSS_RFBI_PARALLELMODE_8) {
+-	if (rfbi.datatype == OMAP_DSS_RFBI_DATATYPE_16 &&
+-	   rfbi.parallelmode == OMAP_DSS_RFBI_PARALLELMODE_8) {
 -		const u16 __iomem *pd = buf;
 -		pd += start_offset;
 -
@@ -366,8 +371,8 @@ Index: b/drivers/video/fbdev/omap2/omapfb/dss/rfbi.c
 -			}
 -			pd += horiz_offset;
 -		}
--	} else if (rfbi.datatype = OMAP_DSS_RFBI_DATATYPE_24 &&
--	   rfbi.parallelmode = OMAP_DSS_RFBI_PARALLELMODE_8) {
+-	} else if (rfbi.datatype == OMAP_DSS_RFBI_DATATYPE_24 &&
+-	   rfbi.parallelmode == OMAP_DSS_RFBI_PARALLELMODE_8) {
 -		const u32 __iomem *pd = buf;
 -		pd += start_offset;
 -
@@ -381,8 +386,8 @@ Index: b/drivers/video/fbdev/omap2/omapfb/dss/rfbi.c
 -			}
 -			pd += horiz_offset;
 -		}
--	} else if (rfbi.datatype = OMAP_DSS_RFBI_DATATYPE_16 &&
--	   rfbi.parallelmode = OMAP_DSS_RFBI_PARALLELMODE_16) {
+-	} else if (rfbi.datatype == OMAP_DSS_RFBI_DATATYPE_16 &&
+-	   rfbi.parallelmode == OMAP_DSS_RFBI_PARALLELMODE_16) {
 -		const u16 __iomem *pd = buf;
 -		pd += start_offset;
 -
@@ -407,7 +412,7 @@ Index: b/drivers/video/fbdev/omap2/omapfb/dss/rfbi.c
 -	u16 width = rfbi.timings.x_res;
 -	u16 height = rfbi.timings.y_res;
 -
--	/*BUG_ON(callback = 0);*/
+-	/*BUG_ON(callback == 0);*/
 -	BUG_ON(rfbi.framedone_callback != NULL);
 -
 -	DSSDBG("rfbi_transfer_area %dx%d\n", width, height);
@@ -523,7 +528,7 @@ Index: b/drivers/video/fbdev/omap2/omapfb/dss/rfbi.c
 -
 -	rfbi_get_clk_info(&extif_clk_period, &max_clk_div);
 -	for (div = 1; div <= max_clk_div; div++) {
--		if (calc_reg_timing(t, div) = 0)
+-		if (calc_reg_timing(t, div) == 0)
 -			break;
 -	}
 -
@@ -677,13 +682,13 @@ Index: b/drivers/video/fbdev/omap2/omapfb/dss/rfbi.c
 -	vs = ps_to_rfbi_ticks(vs_pulse_time, 1);
 -	if (hs < 2)
 -		return -EDOM;
--	if (mode = OMAP_DSS_RFBI_TE_MODE_2)
+-	if (mode == OMAP_DSS_RFBI_TE_MODE_2)
 -		min = 2;
 -	else /* OMAP_DSS_RFBI_TE_MODE_1 */
 -		min = 4;
 -	if (vs < min)
 -		return -EDOM;
--	if (vs = hs)
+-	if (vs == hs)
 -		return -EINVAL;
 -	rfbi.te_mode = mode;
 -	DSSDBG("setup_te: mode %d hs %d vs %d hs_inv %d vs_inv %d\n",
@@ -773,7 +778,7 @@ Index: b/drivers/video/fbdev/omap2/omapfb/dss/rfbi.c
 -	}
 -	rfbi.parallelmode = parallelmode;
 -
--	if ((bpp % lines) = 0) {
+-	if ((bpp % lines) == 0) {
 -		switch (bpp / lines) {
 -		case 1:
 -			cycleformat = OMAP_DSS_RFBI_CYCLEFORMAT_1_1;
@@ -788,8 +793,8 @@ Index: b/drivers/video/fbdev/omap2/omapfb/dss/rfbi.c
 -			BUG();
 -			return 1;
 -		}
--	} else if ((2 * bpp % lines) = 0) {
--		if ((2 * bpp / lines) = 3)
+-	} else if ((2 * bpp % lines) == 0) {
+-		if ((2 * bpp / lines) == 3)
 -			cycleformat = OMAP_DSS_RFBI_CYCLEFORMAT_3_2;
 -		else {
 -			BUG();
@@ -976,7 +981,7 @@ Index: b/drivers/video/fbdev/omap2/omapfb/dss/rfbi.c
 -	struct omap_dss_device *out = &rfbi.output;
 -	int r;
 -
--	if (out->manager = NULL) {
+-	if (out->manager == NULL) {
 -		DSSERR("failed to enable display: no output/manager\n");
 -		return -ENODEV;
 -	}
@@ -1173,7 +1178,8 @@ Index: b/drivers/video/fbdev/omap2/omapfb/dss/rfbi.c
 -	platform_driver_unregister(&omap_rfbihw_driver);
 -}
 Index: b/include/video/omapfb_dss.h
-=================================--- a/include/video/omapfb_dss.h	2018-04-27 16:24:48.171632007 +0200
+===================================================================
+--- a/include/video/omapfb_dss.h	2018-04-27 16:24:48.171632007 +0200
 +++ b/include/video/omapfb_dss.h	2018-04-27 16:26:58.563635291 +0200
 @@ -118,11 +118,6 @@ enum omap_dss_trans_key_type {
  	OMAP_DSS_COLOR_KEY_VID_SRC = 1,
@@ -1235,3 +1241,8 @@ Index: b/include/video/omapfb_dss.h
  	} ctrl;
  
  	const char *name;
+
+_______________________________________________
+dri-devel mailing list
+dri-devel@lists.freedesktop.org
+https://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/a/content_digest b/N1/content_digest
index 7026f3d..4fb796f 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,7 +1,7 @@
  "ref\0CGME20180427150914eucas1p14dd8df4a215014ddac990b0ccdb1805c@eucas1p1.samsung.com\0"
  "From\0Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>\0"
  "Subject\0[PATCH] video: fbdev: omap2: remove rfbi\0"
- "Date\0Fri, 27 Apr 2018 15:09:14 +0000\0"
+ "Date\0Fri, 27 Apr 2018 17:09:14 +0200\0"
  "To\0Tomi Valkeinen <tomi.valkeinen@ti.com>\0"
  "Cc\0linux-fbdev@vger.kernel.org"
   linux-omap@vger.kernel.org
@@ -32,7 +32,8 @@
  " delete mode 100644 drivers/video/fbdev/omap2/omapfb/dss/rfbi.c\n"
  "\n"
  "Index: b/drivers/video/fbdev/omap2/omapfb/dss/Kconfig\n"
- "=================================--- a/drivers/video/fbdev/omap2/omapfb/dss/Kconfig\t2018-04-27 16:24:48.171632007 +0200\n"
+ "===================================================================\n"
+ "--- a/drivers/video/fbdev/omap2/omapfb/dss/Kconfig\t2018-04-27 16:24:48.171632007 +0200\n"
  "+++ b/drivers/video/fbdev/omap2/omapfb/dss/Kconfig\t2018-04-27 16:25:31.067633088 +0200\n"
  "@@ -42,19 +42,6 @@ config FB_OMAP2_DSS_DPI\n"
  " \thelp\n"
@@ -55,7 +56,8 @@
  " \tbool \"VENC support\"\n"
  "         default y\n"
  "Index: b/drivers/video/fbdev/omap2/omapfb/dss/Makefile\n"
- "=================================--- a/drivers/video/fbdev/omap2/omapfb/dss/Makefile\t2018-04-27 16:24:48.171632007 +0200\n"
+ "===================================================================\n"
+ "--- a/drivers/video/fbdev/omap2/omapfb/dss/Makefile\t2018-04-27 16:24:48.171632007 +0200\n"
  "+++ b/drivers/video/fbdev/omap2/omapfb/dss/Makefile\t2018-04-27 16:26:20.511634333 +0200\n"
  "@@ -8,7 +8,6 @@ omapdss-y := core.o dss.o dss_features.o\n"
  " omapdss-y += manager.o manager-sysfs.o overlay.o overlay-sysfs.o apply.o \\\n"
@@ -66,7 +68,8 @@
  " omapdss-$(CONFIG_FB_OMAP2_DSS_SDI) += sdi.o\n"
  " omapdss-$(CONFIG_FB_OMAP2_DSS_DSI) += dsi.o\n"
  "Index: b/drivers/video/fbdev/omap2/omapfb/dss/core.c\n"
- "=================================--- a/drivers/video/fbdev/omap2/omapfb/dss/core.c\t2018-04-27 16:24:48.171632007 +0200\n"
+ "===================================================================\n"
+ "--- a/drivers/video/fbdev/omap2/omapfb/dss/core.c\t2018-04-27 16:24:48.171632007 +0200\n"
  "+++ b/drivers/video/fbdev/omap2/omapfb/dss/core.c\t2018-04-27 16:26:00.675633833 +0200\n"
  "@@ -251,9 +251,6 @@ static int (*dss_output_drv_reg_funcs[])\n"
  " #ifdef CONFIG_FB_OMAP2_DSS_SDI\n"
@@ -89,7 +92,8 @@
  " \tsdi_uninit_platform_driver,\n"
  " #endif\n"
  "Index: b/drivers/video/fbdev/omap2/omapfb/dss/dss.h\n"
- "=================================--- a/drivers/video/fbdev/omap2/omapfb/dss/dss.h\t2018-04-27 16:24:48.171632007 +0200\n"
+ "===================================================================\n"
+ "--- a/drivers/video/fbdev/omap2/omapfb/dss/dss.h\t2018-04-27 16:24:48.171632007 +0200\n"
  "+++ b/drivers/video/fbdev/omap2/omapfb/dss/dss.h\t2018-04-27 16:24:48.171632007 +0200\n"
  "@@ -472,10 +472,6 @@ void hdmi4_uninit_platform_driver(void);\n"
  " int hdmi5_init_platform_driver(void) __init;\n"
@@ -103,7 +107,8 @@
  " #ifdef CONFIG_FB_OMAP2_DSS_COLLECT_IRQ_STATS\n"
  " static inline void dss_collect_irq_stats(u32 irqstatus, unsigned *irq_arr)\n"
  "Index: b/drivers/video/fbdev/omap2/omapfb/dss/rfbi.c\n"
- "=================================--- a/drivers/video/fbdev/omap2/omapfb/dss/rfbi.c\t2018-04-27 16:24:42.223631857 +0200\n"
+ "===================================================================\n"
+ "--- a/drivers/video/fbdev/omap2/omapfb/dss/rfbi.c\t2018-04-27 16:24:42.223631857 +0200\n"
  "+++ /dev/null\t1970-01-01 00:00:00.000000000 +0000\n"
  "@@ -1,1078 +0,0 @@\n"
  "-/*\n"
@@ -364,8 +369,8 @@
  "-\tint horiz_offset = scr_width - w;\n"
  "-\tint i;\n"
  "-\n"
- "-\tif (rfbi.datatype = OMAP_DSS_RFBI_DATATYPE_16 &&\n"
- "-\t   rfbi.parallelmode = OMAP_DSS_RFBI_PARALLELMODE_8) {\n"
+ "-\tif (rfbi.datatype == OMAP_DSS_RFBI_DATATYPE_16 &&\n"
+ "-\t   rfbi.parallelmode == OMAP_DSS_RFBI_PARALLELMODE_8) {\n"
  "-\t\tconst u16 __iomem *pd = buf;\n"
  "-\t\tpd += start_offset;\n"
  "-\n"
@@ -378,8 +383,8 @@
  "-\t\t\t}\n"
  "-\t\t\tpd += horiz_offset;\n"
  "-\t\t}\n"
- "-\t} else if (rfbi.datatype = OMAP_DSS_RFBI_DATATYPE_24 &&\n"
- "-\t   rfbi.parallelmode = OMAP_DSS_RFBI_PARALLELMODE_8) {\n"
+ "-\t} else if (rfbi.datatype == OMAP_DSS_RFBI_DATATYPE_24 &&\n"
+ "-\t   rfbi.parallelmode == OMAP_DSS_RFBI_PARALLELMODE_8) {\n"
  "-\t\tconst u32 __iomem *pd = buf;\n"
  "-\t\tpd += start_offset;\n"
  "-\n"
@@ -393,8 +398,8 @@
  "-\t\t\t}\n"
  "-\t\t\tpd += horiz_offset;\n"
  "-\t\t}\n"
- "-\t} else if (rfbi.datatype = OMAP_DSS_RFBI_DATATYPE_16 &&\n"
- "-\t   rfbi.parallelmode = OMAP_DSS_RFBI_PARALLELMODE_16) {\n"
+ "-\t} else if (rfbi.datatype == OMAP_DSS_RFBI_DATATYPE_16 &&\n"
+ "-\t   rfbi.parallelmode == OMAP_DSS_RFBI_PARALLELMODE_16) {\n"
  "-\t\tconst u16 __iomem *pd = buf;\n"
  "-\t\tpd += start_offset;\n"
  "-\n"
@@ -419,7 +424,7 @@
  "-\tu16 width = rfbi.timings.x_res;\n"
  "-\tu16 height = rfbi.timings.y_res;\n"
  "-\n"
- "-\t/*BUG_ON(callback = 0);*/\n"
+ "-\t/*BUG_ON(callback == 0);*/\n"
  "-\tBUG_ON(rfbi.framedone_callback != NULL);\n"
  "-\n"
  "-\tDSSDBG(\"rfbi_transfer_area %dx%d\\n\", width, height);\n"
@@ -535,7 +540,7 @@
  "-\n"
  "-\trfbi_get_clk_info(&extif_clk_period, &max_clk_div);\n"
  "-\tfor (div = 1; div <= max_clk_div; div++) {\n"
- "-\t\tif (calc_reg_timing(t, div) = 0)\n"
+ "-\t\tif (calc_reg_timing(t, div) == 0)\n"
  "-\t\t\tbreak;\n"
  "-\t}\n"
  "-\n"
@@ -689,13 +694,13 @@
  "-\tvs = ps_to_rfbi_ticks(vs_pulse_time, 1);\n"
  "-\tif (hs < 2)\n"
  "-\t\treturn -EDOM;\n"
- "-\tif (mode = OMAP_DSS_RFBI_TE_MODE_2)\n"
+ "-\tif (mode == OMAP_DSS_RFBI_TE_MODE_2)\n"
  "-\t\tmin = 2;\n"
  "-\telse /* OMAP_DSS_RFBI_TE_MODE_1 */\n"
  "-\t\tmin = 4;\n"
  "-\tif (vs < min)\n"
  "-\t\treturn -EDOM;\n"
- "-\tif (vs = hs)\n"
+ "-\tif (vs == hs)\n"
  "-\t\treturn -EINVAL;\n"
  "-\trfbi.te_mode = mode;\n"
  "-\tDSSDBG(\"setup_te: mode %d hs %d vs %d hs_inv %d vs_inv %d\\n\",\n"
@@ -785,7 +790,7 @@
  "-\t}\n"
  "-\trfbi.parallelmode = parallelmode;\n"
  "-\n"
- "-\tif ((bpp % lines) = 0) {\n"
+ "-\tif ((bpp % lines) == 0) {\n"
  "-\t\tswitch (bpp / lines) {\n"
  "-\t\tcase 1:\n"
  "-\t\t\tcycleformat = OMAP_DSS_RFBI_CYCLEFORMAT_1_1;\n"
@@ -800,8 +805,8 @@
  "-\t\t\tBUG();\n"
  "-\t\t\treturn 1;\n"
  "-\t\t}\n"
- "-\t} else if ((2 * bpp % lines) = 0) {\n"
- "-\t\tif ((2 * bpp / lines) = 3)\n"
+ "-\t} else if ((2 * bpp % lines) == 0) {\n"
+ "-\t\tif ((2 * bpp / lines) == 3)\n"
  "-\t\t\tcycleformat = OMAP_DSS_RFBI_CYCLEFORMAT_3_2;\n"
  "-\t\telse {\n"
  "-\t\t\tBUG();\n"
@@ -988,7 +993,7 @@
  "-\tstruct omap_dss_device *out = &rfbi.output;\n"
  "-\tint r;\n"
  "-\n"
- "-\tif (out->manager = NULL) {\n"
+ "-\tif (out->manager == NULL) {\n"
  "-\t\tDSSERR(\"failed to enable display: no output/manager\\n\");\n"
  "-\t\treturn -ENODEV;\n"
  "-\t}\n"
@@ -1185,7 +1190,8 @@
  "-\tplatform_driver_unregister(&omap_rfbihw_driver);\n"
  "-}\n"
  "Index: b/include/video/omapfb_dss.h\n"
- "=================================--- a/include/video/omapfb_dss.h\t2018-04-27 16:24:48.171632007 +0200\n"
+ "===================================================================\n"
+ "--- a/include/video/omapfb_dss.h\t2018-04-27 16:24:48.171632007 +0200\n"
  "+++ b/include/video/omapfb_dss.h\t2018-04-27 16:26:58.563635291 +0200\n"
  "@@ -118,11 +118,6 @@ enum omap_dss_trans_key_type {\n"
  " \tOMAP_DSS_COLOR_KEY_VID_SRC = 1,\n"
@@ -1246,6 +1252,11 @@
  "-\t\tstruct rfbi_timings rfbi_timings;\n"
  " \t} ctrl;\n"
  " \n"
- " \tconst char *name;"
+ " \tconst char *name;\n"
+ "\n"
+ "_______________________________________________\n"
+ "dri-devel mailing list\n"
+ "dri-devel@lists.freedesktop.org\n"
+ https://lists.freedesktop.org/mailman/listinfo/dri-devel
 
-a5fb42432fd720670c039f2363823ec587b9c295326f5257f1a83d67edafde05
+712ffe190f7f756612eeb57f97449744a7864eea8c930a951752d7477b596df0

diff --git a/a/1.txt b/N2/1.txt
index a8b15cd..be5769b 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -20,7 +20,8 @@ Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
  delete mode 100644 drivers/video/fbdev/omap2/omapfb/dss/rfbi.c
 
 Index: b/drivers/video/fbdev/omap2/omapfb/dss/Kconfig
-=================================--- a/drivers/video/fbdev/omap2/omapfb/dss/Kconfig	2018-04-27 16:24:48.171632007 +0200
+===================================================================
+--- a/drivers/video/fbdev/omap2/omapfb/dss/Kconfig	2018-04-27 16:24:48.171632007 +0200
 +++ b/drivers/video/fbdev/omap2/omapfb/dss/Kconfig	2018-04-27 16:25:31.067633088 +0200
 @@ -42,19 +42,6 @@ config FB_OMAP2_DSS_DPI
  	help
@@ -43,7 +44,8 @@ Index: b/drivers/video/fbdev/omap2/omapfb/dss/Kconfig
  	bool "VENC support"
          default y
 Index: b/drivers/video/fbdev/omap2/omapfb/dss/Makefile
-=================================--- a/drivers/video/fbdev/omap2/omapfb/dss/Makefile	2018-04-27 16:24:48.171632007 +0200
+===================================================================
+--- a/drivers/video/fbdev/omap2/omapfb/dss/Makefile	2018-04-27 16:24:48.171632007 +0200
 +++ b/drivers/video/fbdev/omap2/omapfb/dss/Makefile	2018-04-27 16:26:20.511634333 +0200
 @@ -8,7 +8,6 @@ omapdss-y := core.o dss.o dss_features.o
  omapdss-y += manager.o manager-sysfs.o overlay.o overlay-sysfs.o apply.o \
@@ -54,7 +56,8 @@ Index: b/drivers/video/fbdev/omap2/omapfb/dss/Makefile
  omapdss-$(CONFIG_FB_OMAP2_DSS_SDI) += sdi.o
  omapdss-$(CONFIG_FB_OMAP2_DSS_DSI) += dsi.o
 Index: b/drivers/video/fbdev/omap2/omapfb/dss/core.c
-=================================--- a/drivers/video/fbdev/omap2/omapfb/dss/core.c	2018-04-27 16:24:48.171632007 +0200
+===================================================================
+--- a/drivers/video/fbdev/omap2/omapfb/dss/core.c	2018-04-27 16:24:48.171632007 +0200
 +++ b/drivers/video/fbdev/omap2/omapfb/dss/core.c	2018-04-27 16:26:00.675633833 +0200
 @@ -251,9 +251,6 @@ static int (*dss_output_drv_reg_funcs[])
  #ifdef CONFIG_FB_OMAP2_DSS_SDI
@@ -77,7 +80,8 @@ Index: b/drivers/video/fbdev/omap2/omapfb/dss/core.c
  	sdi_uninit_platform_driver,
  #endif
 Index: b/drivers/video/fbdev/omap2/omapfb/dss/dss.h
-=================================--- a/drivers/video/fbdev/omap2/omapfb/dss/dss.h	2018-04-27 16:24:48.171632007 +0200
+===================================================================
+--- a/drivers/video/fbdev/omap2/omapfb/dss/dss.h	2018-04-27 16:24:48.171632007 +0200
 +++ b/drivers/video/fbdev/omap2/omapfb/dss/dss.h	2018-04-27 16:24:48.171632007 +0200
 @@ -472,10 +472,6 @@ void hdmi4_uninit_platform_driver(void);
  int hdmi5_init_platform_driver(void) __init;
@@ -91,7 +95,8 @@ Index: b/drivers/video/fbdev/omap2/omapfb/dss/dss.h
  #ifdef CONFIG_FB_OMAP2_DSS_COLLECT_IRQ_STATS
  static inline void dss_collect_irq_stats(u32 irqstatus, unsigned *irq_arr)
 Index: b/drivers/video/fbdev/omap2/omapfb/dss/rfbi.c
-=================================--- a/drivers/video/fbdev/omap2/omapfb/dss/rfbi.c	2018-04-27 16:24:42.223631857 +0200
+===================================================================
+--- a/drivers/video/fbdev/omap2/omapfb/dss/rfbi.c	2018-04-27 16:24:42.223631857 +0200
 +++ /dev/null	1970-01-01 00:00:00.000000000 +0000
 @@ -1,1078 +0,0 @@
 -/*
@@ -352,8 +357,8 @@ Index: b/drivers/video/fbdev/omap2/omapfb/dss/rfbi.c
 -	int horiz_offset = scr_width - w;
 -	int i;
 -
--	if (rfbi.datatype = OMAP_DSS_RFBI_DATATYPE_16 &&
--	   rfbi.parallelmode = OMAP_DSS_RFBI_PARALLELMODE_8) {
+-	if (rfbi.datatype == OMAP_DSS_RFBI_DATATYPE_16 &&
+-	   rfbi.parallelmode == OMAP_DSS_RFBI_PARALLELMODE_8) {
 -		const u16 __iomem *pd = buf;
 -		pd += start_offset;
 -
@@ -366,8 +371,8 @@ Index: b/drivers/video/fbdev/omap2/omapfb/dss/rfbi.c
 -			}
 -			pd += horiz_offset;
 -		}
--	} else if (rfbi.datatype = OMAP_DSS_RFBI_DATATYPE_24 &&
--	   rfbi.parallelmode = OMAP_DSS_RFBI_PARALLELMODE_8) {
+-	} else if (rfbi.datatype == OMAP_DSS_RFBI_DATATYPE_24 &&
+-	   rfbi.parallelmode == OMAP_DSS_RFBI_PARALLELMODE_8) {
 -		const u32 __iomem *pd = buf;
 -		pd += start_offset;
 -
@@ -381,8 +386,8 @@ Index: b/drivers/video/fbdev/omap2/omapfb/dss/rfbi.c
 -			}
 -			pd += horiz_offset;
 -		}
--	} else if (rfbi.datatype = OMAP_DSS_RFBI_DATATYPE_16 &&
--	   rfbi.parallelmode = OMAP_DSS_RFBI_PARALLELMODE_16) {
+-	} else if (rfbi.datatype == OMAP_DSS_RFBI_DATATYPE_16 &&
+-	   rfbi.parallelmode == OMAP_DSS_RFBI_PARALLELMODE_16) {
 -		const u16 __iomem *pd = buf;
 -		pd += start_offset;
 -
@@ -407,7 +412,7 @@ Index: b/drivers/video/fbdev/omap2/omapfb/dss/rfbi.c
 -	u16 width = rfbi.timings.x_res;
 -	u16 height = rfbi.timings.y_res;
 -
--	/*BUG_ON(callback = 0);*/
+-	/*BUG_ON(callback == 0);*/
 -	BUG_ON(rfbi.framedone_callback != NULL);
 -
 -	DSSDBG("rfbi_transfer_area %dx%d\n", width, height);
@@ -523,7 +528,7 @@ Index: b/drivers/video/fbdev/omap2/omapfb/dss/rfbi.c
 -
 -	rfbi_get_clk_info(&extif_clk_period, &max_clk_div);
 -	for (div = 1; div <= max_clk_div; div++) {
--		if (calc_reg_timing(t, div) = 0)
+-		if (calc_reg_timing(t, div) == 0)
 -			break;
 -	}
 -
@@ -677,13 +682,13 @@ Index: b/drivers/video/fbdev/omap2/omapfb/dss/rfbi.c
 -	vs = ps_to_rfbi_ticks(vs_pulse_time, 1);
 -	if (hs < 2)
 -		return -EDOM;
--	if (mode = OMAP_DSS_RFBI_TE_MODE_2)
+-	if (mode == OMAP_DSS_RFBI_TE_MODE_2)
 -		min = 2;
 -	else /* OMAP_DSS_RFBI_TE_MODE_1 */
 -		min = 4;
 -	if (vs < min)
 -		return -EDOM;
--	if (vs = hs)
+-	if (vs == hs)
 -		return -EINVAL;
 -	rfbi.te_mode = mode;
 -	DSSDBG("setup_te: mode %d hs %d vs %d hs_inv %d vs_inv %d\n",
@@ -773,7 +778,7 @@ Index: b/drivers/video/fbdev/omap2/omapfb/dss/rfbi.c
 -	}
 -	rfbi.parallelmode = parallelmode;
 -
--	if ((bpp % lines) = 0) {
+-	if ((bpp % lines) == 0) {
 -		switch (bpp / lines) {
 -		case 1:
 -			cycleformat = OMAP_DSS_RFBI_CYCLEFORMAT_1_1;
@@ -788,8 +793,8 @@ Index: b/drivers/video/fbdev/omap2/omapfb/dss/rfbi.c
 -			BUG();
 -			return 1;
 -		}
--	} else if ((2 * bpp % lines) = 0) {
--		if ((2 * bpp / lines) = 3)
+-	} else if ((2 * bpp % lines) == 0) {
+-		if ((2 * bpp / lines) == 3)
 -			cycleformat = OMAP_DSS_RFBI_CYCLEFORMAT_3_2;
 -		else {
 -			BUG();
@@ -976,7 +981,7 @@ Index: b/drivers/video/fbdev/omap2/omapfb/dss/rfbi.c
 -	struct omap_dss_device *out = &rfbi.output;
 -	int r;
 -
--	if (out->manager = NULL) {
+-	if (out->manager == NULL) {
 -		DSSERR("failed to enable display: no output/manager\n");
 -		return -ENODEV;
 -	}
@@ -1173,7 +1178,8 @@ Index: b/drivers/video/fbdev/omap2/omapfb/dss/rfbi.c
 -	platform_driver_unregister(&omap_rfbihw_driver);
 -}
 Index: b/include/video/omapfb_dss.h
-=================================--- a/include/video/omapfb_dss.h	2018-04-27 16:24:48.171632007 +0200
+===================================================================
+--- a/include/video/omapfb_dss.h	2018-04-27 16:24:48.171632007 +0200
 +++ b/include/video/omapfb_dss.h	2018-04-27 16:26:58.563635291 +0200
 @@ -118,11 +118,6 @@ enum omap_dss_trans_key_type {
  	OMAP_DSS_COLOR_KEY_VID_SRC = 1,
diff --git a/a/content_digest b/N2/content_digest
index 7026f3d..670edd2 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -1,12 +1,12 @@
  "ref\0CGME20180427150914eucas1p14dd8df4a215014ddac990b0ccdb1805c@eucas1p1.samsung.com\0"
  "From\0Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>\0"
  "Subject\0[PATCH] video: fbdev: omap2: remove rfbi\0"
- "Date\0Fri, 27 Apr 2018 15:09:14 +0000\0"
+ "Date\0Fri, 27 Apr 2018 17:09:14 +0200\0"
  "To\0Tomi Valkeinen <tomi.valkeinen@ti.com>\0"
- "Cc\0linux-fbdev@vger.kernel.org"
-  linux-omap@vger.kernel.org
-  Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+ "Cc\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>"
+  linux-fbdev@vger.kernel.org
   dri-devel@lists.freedesktop.org
+  linux-omap@vger.kernel.org
  " linux-kernel@vger.kernel.org\0"
  "\00:1\0"
  "b\0"
@@ -32,7 +32,8 @@
  " delete mode 100644 drivers/video/fbdev/omap2/omapfb/dss/rfbi.c\n"
  "\n"
  "Index: b/drivers/video/fbdev/omap2/omapfb/dss/Kconfig\n"
- "=================================--- a/drivers/video/fbdev/omap2/omapfb/dss/Kconfig\t2018-04-27 16:24:48.171632007 +0200\n"
+ "===================================================================\n"
+ "--- a/drivers/video/fbdev/omap2/omapfb/dss/Kconfig\t2018-04-27 16:24:48.171632007 +0200\n"
  "+++ b/drivers/video/fbdev/omap2/omapfb/dss/Kconfig\t2018-04-27 16:25:31.067633088 +0200\n"
  "@@ -42,19 +42,6 @@ config FB_OMAP2_DSS_DPI\n"
  " \thelp\n"
@@ -55,7 +56,8 @@
  " \tbool \"VENC support\"\n"
  "         default y\n"
  "Index: b/drivers/video/fbdev/omap2/omapfb/dss/Makefile\n"
- "=================================--- a/drivers/video/fbdev/omap2/omapfb/dss/Makefile\t2018-04-27 16:24:48.171632007 +0200\n"
+ "===================================================================\n"
+ "--- a/drivers/video/fbdev/omap2/omapfb/dss/Makefile\t2018-04-27 16:24:48.171632007 +0200\n"
  "+++ b/drivers/video/fbdev/omap2/omapfb/dss/Makefile\t2018-04-27 16:26:20.511634333 +0200\n"
  "@@ -8,7 +8,6 @@ omapdss-y := core.o dss.o dss_features.o\n"
  " omapdss-y += manager.o manager-sysfs.o overlay.o overlay-sysfs.o apply.o \\\n"
@@ -66,7 +68,8 @@
  " omapdss-$(CONFIG_FB_OMAP2_DSS_SDI) += sdi.o\n"
  " omapdss-$(CONFIG_FB_OMAP2_DSS_DSI) += dsi.o\n"
  "Index: b/drivers/video/fbdev/omap2/omapfb/dss/core.c\n"
- "=================================--- a/drivers/video/fbdev/omap2/omapfb/dss/core.c\t2018-04-27 16:24:48.171632007 +0200\n"
+ "===================================================================\n"
+ "--- a/drivers/video/fbdev/omap2/omapfb/dss/core.c\t2018-04-27 16:24:48.171632007 +0200\n"
  "+++ b/drivers/video/fbdev/omap2/omapfb/dss/core.c\t2018-04-27 16:26:00.675633833 +0200\n"
  "@@ -251,9 +251,6 @@ static int (*dss_output_drv_reg_funcs[])\n"
  " #ifdef CONFIG_FB_OMAP2_DSS_SDI\n"
@@ -89,7 +92,8 @@
  " \tsdi_uninit_platform_driver,\n"
  " #endif\n"
  "Index: b/drivers/video/fbdev/omap2/omapfb/dss/dss.h\n"
- "=================================--- a/drivers/video/fbdev/omap2/omapfb/dss/dss.h\t2018-04-27 16:24:48.171632007 +0200\n"
+ "===================================================================\n"
+ "--- a/drivers/video/fbdev/omap2/omapfb/dss/dss.h\t2018-04-27 16:24:48.171632007 +0200\n"
  "+++ b/drivers/video/fbdev/omap2/omapfb/dss/dss.h\t2018-04-27 16:24:48.171632007 +0200\n"
  "@@ -472,10 +472,6 @@ void hdmi4_uninit_platform_driver(void);\n"
  " int hdmi5_init_platform_driver(void) __init;\n"
@@ -103,7 +107,8 @@
  " #ifdef CONFIG_FB_OMAP2_DSS_COLLECT_IRQ_STATS\n"
  " static inline void dss_collect_irq_stats(u32 irqstatus, unsigned *irq_arr)\n"
  "Index: b/drivers/video/fbdev/omap2/omapfb/dss/rfbi.c\n"
- "=================================--- a/drivers/video/fbdev/omap2/omapfb/dss/rfbi.c\t2018-04-27 16:24:42.223631857 +0200\n"
+ "===================================================================\n"
+ "--- a/drivers/video/fbdev/omap2/omapfb/dss/rfbi.c\t2018-04-27 16:24:42.223631857 +0200\n"
  "+++ /dev/null\t1970-01-01 00:00:00.000000000 +0000\n"
  "@@ -1,1078 +0,0 @@\n"
  "-/*\n"
@@ -364,8 +369,8 @@
  "-\tint horiz_offset = scr_width - w;\n"
  "-\tint i;\n"
  "-\n"
- "-\tif (rfbi.datatype = OMAP_DSS_RFBI_DATATYPE_16 &&\n"
- "-\t   rfbi.parallelmode = OMAP_DSS_RFBI_PARALLELMODE_8) {\n"
+ "-\tif (rfbi.datatype == OMAP_DSS_RFBI_DATATYPE_16 &&\n"
+ "-\t   rfbi.parallelmode == OMAP_DSS_RFBI_PARALLELMODE_8) {\n"
  "-\t\tconst u16 __iomem *pd = buf;\n"
  "-\t\tpd += start_offset;\n"
  "-\n"
@@ -378,8 +383,8 @@
  "-\t\t\t}\n"
  "-\t\t\tpd += horiz_offset;\n"
  "-\t\t}\n"
- "-\t} else if (rfbi.datatype = OMAP_DSS_RFBI_DATATYPE_24 &&\n"
- "-\t   rfbi.parallelmode = OMAP_DSS_RFBI_PARALLELMODE_8) {\n"
+ "-\t} else if (rfbi.datatype == OMAP_DSS_RFBI_DATATYPE_24 &&\n"
+ "-\t   rfbi.parallelmode == OMAP_DSS_RFBI_PARALLELMODE_8) {\n"
  "-\t\tconst u32 __iomem *pd = buf;\n"
  "-\t\tpd += start_offset;\n"
  "-\n"
@@ -393,8 +398,8 @@
  "-\t\t\t}\n"
  "-\t\t\tpd += horiz_offset;\n"
  "-\t\t}\n"
- "-\t} else if (rfbi.datatype = OMAP_DSS_RFBI_DATATYPE_16 &&\n"
- "-\t   rfbi.parallelmode = OMAP_DSS_RFBI_PARALLELMODE_16) {\n"
+ "-\t} else if (rfbi.datatype == OMAP_DSS_RFBI_DATATYPE_16 &&\n"
+ "-\t   rfbi.parallelmode == OMAP_DSS_RFBI_PARALLELMODE_16) {\n"
  "-\t\tconst u16 __iomem *pd = buf;\n"
  "-\t\tpd += start_offset;\n"
  "-\n"
@@ -419,7 +424,7 @@
  "-\tu16 width = rfbi.timings.x_res;\n"
  "-\tu16 height = rfbi.timings.y_res;\n"
  "-\n"
- "-\t/*BUG_ON(callback = 0);*/\n"
+ "-\t/*BUG_ON(callback == 0);*/\n"
  "-\tBUG_ON(rfbi.framedone_callback != NULL);\n"
  "-\n"
  "-\tDSSDBG(\"rfbi_transfer_area %dx%d\\n\", width, height);\n"
@@ -535,7 +540,7 @@
  "-\n"
  "-\trfbi_get_clk_info(&extif_clk_period, &max_clk_div);\n"
  "-\tfor (div = 1; div <= max_clk_div; div++) {\n"
- "-\t\tif (calc_reg_timing(t, div) = 0)\n"
+ "-\t\tif (calc_reg_timing(t, div) == 0)\n"
  "-\t\t\tbreak;\n"
  "-\t}\n"
  "-\n"
@@ -689,13 +694,13 @@
  "-\tvs = ps_to_rfbi_ticks(vs_pulse_time, 1);\n"
  "-\tif (hs < 2)\n"
  "-\t\treturn -EDOM;\n"
- "-\tif (mode = OMAP_DSS_RFBI_TE_MODE_2)\n"
+ "-\tif (mode == OMAP_DSS_RFBI_TE_MODE_2)\n"
  "-\t\tmin = 2;\n"
  "-\telse /* OMAP_DSS_RFBI_TE_MODE_1 */\n"
  "-\t\tmin = 4;\n"
  "-\tif (vs < min)\n"
  "-\t\treturn -EDOM;\n"
- "-\tif (vs = hs)\n"
+ "-\tif (vs == hs)\n"
  "-\t\treturn -EINVAL;\n"
  "-\trfbi.te_mode = mode;\n"
  "-\tDSSDBG(\"setup_te: mode %d hs %d vs %d hs_inv %d vs_inv %d\\n\",\n"
@@ -785,7 +790,7 @@
  "-\t}\n"
  "-\trfbi.parallelmode = parallelmode;\n"
  "-\n"
- "-\tif ((bpp % lines) = 0) {\n"
+ "-\tif ((bpp % lines) == 0) {\n"
  "-\t\tswitch (bpp / lines) {\n"
  "-\t\tcase 1:\n"
  "-\t\t\tcycleformat = OMAP_DSS_RFBI_CYCLEFORMAT_1_1;\n"
@@ -800,8 +805,8 @@
  "-\t\t\tBUG();\n"
  "-\t\t\treturn 1;\n"
  "-\t\t}\n"
- "-\t} else if ((2 * bpp % lines) = 0) {\n"
- "-\t\tif ((2 * bpp / lines) = 3)\n"
+ "-\t} else if ((2 * bpp % lines) == 0) {\n"
+ "-\t\tif ((2 * bpp / lines) == 3)\n"
  "-\t\t\tcycleformat = OMAP_DSS_RFBI_CYCLEFORMAT_3_2;\n"
  "-\t\telse {\n"
  "-\t\t\tBUG();\n"
@@ -988,7 +993,7 @@
  "-\tstruct omap_dss_device *out = &rfbi.output;\n"
  "-\tint r;\n"
  "-\n"
- "-\tif (out->manager = NULL) {\n"
+ "-\tif (out->manager == NULL) {\n"
  "-\t\tDSSERR(\"failed to enable display: no output/manager\\n\");\n"
  "-\t\treturn -ENODEV;\n"
  "-\t}\n"
@@ -1185,7 +1190,8 @@
  "-\tplatform_driver_unregister(&omap_rfbihw_driver);\n"
  "-}\n"
  "Index: b/include/video/omapfb_dss.h\n"
- "=================================--- a/include/video/omapfb_dss.h\t2018-04-27 16:24:48.171632007 +0200\n"
+ "===================================================================\n"
+ "--- a/include/video/omapfb_dss.h\t2018-04-27 16:24:48.171632007 +0200\n"
  "+++ b/include/video/omapfb_dss.h\t2018-04-27 16:26:58.563635291 +0200\n"
  "@@ -118,11 +118,6 @@ enum omap_dss_trans_key_type {\n"
  " \tOMAP_DSS_COLOR_KEY_VID_SRC = 1,\n"
@@ -1248,4 +1254,4 @@
  " \n"
  " \tconst char *name;"
 
-a5fb42432fd720670c039f2363823ec587b9c295326f5257f1a83d67edafde05
+fa264fa9995effef7fa87ef5d4f7d6de62abb2ef3d733c9d6f459f9a8d9be830

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.