diff for duplicates of <1390486503-1504-6-git-send-email-dh.herrmann@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 5af6231..6c3faf6 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -73,15 +73,15 @@ index a760d47..9338427 100644 for (i = 0; i < ARRAY_SIZE(formats); ++i) { f = &formats[i]; -- if (si->lfb_depth = f->bits_per_pixel && -- si->red_size = f->red.length && -- si->red_pos = f->red.offset && -- si->green_size = f->green.length && -- si->green_pos = f->green.offset && -- si->blue_size = f->blue.length && -- si->blue_pos = f->blue.offset && -- si->rsvd_size = f->transp.length && -- si->rsvd_pos = f->transp.offset) { +- if (si->lfb_depth == f->bits_per_pixel && +- si->red_size == f->red.length && +- si->red_pos == f->red.offset && +- si->green_size == f->green.length && +- si->green_pos == f->green.offset && +- si->blue_size == f->blue.length && +- si->blue_pos == f->blue.offset && +- si->rsvd_size == f->transp.length && +- si->rsvd_pos == f->transp.offset) { - mode->format = f->name; - mode->width = si->lfb_width; - mode->height = si->lfb_height; @@ -100,7 +100,7 @@ index a760d47..9338427 100644 + + /* lfb_size is in bytes except for VLFB it's in 64kb blocks */ + size = si->lfb_size; -+ if (type = VIDEO_TYPE_VLFB) ++ if (type == VIDEO_TYPE_VLFB) + size <<= 16; + + /* don't use lfb_size as it may contain the whole VMEM instead diff --git a/a/content_digest b/N1/content_digest index a54e8e7..3939d8e 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\01390486503-1504-1-git-send-email-dh.herrmann@gmail.com\0" "From\0David Herrmann <dh.herrmann@gmail.com>\0" "Subject\0[PATCH 05/11] x86: sysfb: store apertures in simplefb platform-data\0" - "Date\0Thu, 23 Jan 2014 14:14:57 +0000\0" + "Date\0Thu, 23 Jan 2014 15:14:57 +0100\0" "To\0dri-devel@lists.freedesktop.org\0" "Cc\0linux-fbdev@vger.kernel.org" Daniel Vetter <daniel.vetter@ffwll.ch> @@ -85,15 +85,15 @@ " \n" " \tfor (i = 0; i < ARRAY_SIZE(formats); ++i) {\n" " \t\tf = &formats[i];\n" - "-\t\tif (si->lfb_depth = f->bits_per_pixel &&\n" - "-\t\t si->red_size = f->red.length &&\n" - "-\t\t si->red_pos = f->red.offset &&\n" - "-\t\t si->green_size = f->green.length &&\n" - "-\t\t si->green_pos = f->green.offset &&\n" - "-\t\t si->blue_size = f->blue.length &&\n" - "-\t\t si->blue_pos = f->blue.offset &&\n" - "-\t\t si->rsvd_size = f->transp.length &&\n" - "-\t\t si->rsvd_pos = f->transp.offset) {\n" + "-\t\tif (si->lfb_depth == f->bits_per_pixel &&\n" + "-\t\t si->red_size == f->red.length &&\n" + "-\t\t si->red_pos == f->red.offset &&\n" + "-\t\t si->green_size == f->green.length &&\n" + "-\t\t si->green_pos == f->green.offset &&\n" + "-\t\t si->blue_size == f->blue.length &&\n" + "-\t\t si->blue_pos == f->blue.offset &&\n" + "-\t\t si->rsvd_size == f->transp.length &&\n" + "-\t\t si->rsvd_pos == f->transp.offset) {\n" "-\t\t\tmode->format = f->name;\n" "-\t\t\tmode->width = si->lfb_width;\n" "-\t\t\tmode->height = si->lfb_height;\n" @@ -112,7 +112,7 @@ "+\n" "+\t\t/* lfb_size is in bytes except for VLFB it's in 64kb blocks */\n" "+\t\tsize = si->lfb_size;\n" - "+\t\tif (type = VIDEO_TYPE_VLFB)\n" + "+\t\tif (type == VIDEO_TYPE_VLFB)\n" "+\t\t\tsize <<= 16;\n" "+\n" "+\t\t/* don't use lfb_size as it may contain the whole VMEM instead\n" @@ -181,4 +181,4 @@ "-- \n" 1.8.5.3 -8488618602fc0f24be31bffcbf5bf3a26b3fbe4bd6720261a2f1050267ba8974 +8c641fc83d82f70edeaecd180fdb6eb9573a3411fba325b3ebdbf4194171f5d1
diff --git a/a/1.txt b/N2/1.txt index 5af6231..6c3faf6 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -73,15 +73,15 @@ index a760d47..9338427 100644 for (i = 0; i < ARRAY_SIZE(formats); ++i) { f = &formats[i]; -- if (si->lfb_depth = f->bits_per_pixel && -- si->red_size = f->red.length && -- si->red_pos = f->red.offset && -- si->green_size = f->green.length && -- si->green_pos = f->green.offset && -- si->blue_size = f->blue.length && -- si->blue_pos = f->blue.offset && -- si->rsvd_size = f->transp.length && -- si->rsvd_pos = f->transp.offset) { +- if (si->lfb_depth == f->bits_per_pixel && +- si->red_size == f->red.length && +- si->red_pos == f->red.offset && +- si->green_size == f->green.length && +- si->green_pos == f->green.offset && +- si->blue_size == f->blue.length && +- si->blue_pos == f->blue.offset && +- si->rsvd_size == f->transp.length && +- si->rsvd_pos == f->transp.offset) { - mode->format = f->name; - mode->width = si->lfb_width; - mode->height = si->lfb_height; @@ -100,7 +100,7 @@ index a760d47..9338427 100644 + + /* lfb_size is in bytes except for VLFB it's in 64kb blocks */ + size = si->lfb_size; -+ if (type = VIDEO_TYPE_VLFB) ++ if (type == VIDEO_TYPE_VLFB) + size <<= 16; + + /* don't use lfb_size as it may contain the whole VMEM instead diff --git a/a/content_digest b/N2/content_digest index a54e8e7..2d8e792 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,13 +1,16 @@ "ref\01390486503-1504-1-git-send-email-dh.herrmann@gmail.com\0" "From\0David Herrmann <dh.herrmann@gmail.com>\0" "Subject\0[PATCH 05/11] x86: sysfb: store apertures in simplefb platform-data\0" - "Date\0Thu, 23 Jan 2014 14:14:57 +0000\0" + "Date\0Thu, 23 Jan 2014 15:14:57 +0100\0" "To\0dri-devel@lists.freedesktop.org\0" - "Cc\0linux-fbdev@vger.kernel.org" + "Cc\0Ingo Molnar <mingo@kernel.org>" + linux-fbdev@vger.kernel.org + Dave Airlie <airlied@gmail.com> Daniel Vetter <daniel.vetter@ffwll.ch> - linux-kernel@vger.kernel.org Tomi Valkeinen <tomi.valkeinen@ti.com> - " Ingo Molnar <mingo@kernel.org>\0" + linux-kernel@vger.kernel.org + Tom Gundersen <teg@jklm.no> + " David Herrmann <dh.herrmann@gmail.com>\0" "\00:1\0" "b\0" "To get a generic remove_conflicting_framebuffers() for\n" @@ -85,15 +88,15 @@ " \n" " \tfor (i = 0; i < ARRAY_SIZE(formats); ++i) {\n" " \t\tf = &formats[i];\n" - "-\t\tif (si->lfb_depth = f->bits_per_pixel &&\n" - "-\t\t si->red_size = f->red.length &&\n" - "-\t\t si->red_pos = f->red.offset &&\n" - "-\t\t si->green_size = f->green.length &&\n" - "-\t\t si->green_pos = f->green.offset &&\n" - "-\t\t si->blue_size = f->blue.length &&\n" - "-\t\t si->blue_pos = f->blue.offset &&\n" - "-\t\t si->rsvd_size = f->transp.length &&\n" - "-\t\t si->rsvd_pos = f->transp.offset) {\n" + "-\t\tif (si->lfb_depth == f->bits_per_pixel &&\n" + "-\t\t si->red_size == f->red.length &&\n" + "-\t\t si->red_pos == f->red.offset &&\n" + "-\t\t si->green_size == f->green.length &&\n" + "-\t\t si->green_pos == f->green.offset &&\n" + "-\t\t si->blue_size == f->blue.length &&\n" + "-\t\t si->blue_pos == f->blue.offset &&\n" + "-\t\t si->rsvd_size == f->transp.length &&\n" + "-\t\t si->rsvd_pos == f->transp.offset) {\n" "-\t\t\tmode->format = f->name;\n" "-\t\t\tmode->width = si->lfb_width;\n" "-\t\t\tmode->height = si->lfb_height;\n" @@ -112,7 +115,7 @@ "+\n" "+\t\t/* lfb_size is in bytes except for VLFB it's in 64kb blocks */\n" "+\t\tsize = si->lfb_size;\n" - "+\t\tif (type = VIDEO_TYPE_VLFB)\n" + "+\t\tif (type == VIDEO_TYPE_VLFB)\n" "+\t\t\tsize <<= 16;\n" "+\n" "+\t\t/* don't use lfb_size as it may contain the whole VMEM instead\n" @@ -181,4 +184,4 @@ "-- \n" 1.8.5.3 -8488618602fc0f24be31bffcbf5bf3a26b3fbe4bd6720261a2f1050267ba8974 +c7f3b1bad17c6808cb00f8112c7247499fc044da1ceca606fc19a1a9e420d548
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.