diff for duplicates of <1434214625.2507.9.camel@perches.com> diff --git a/a/1.txt b/N1/1.txt index 0505993..1420125 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -49,7 +49,7 @@ index 5db26f1..5be2560 100644 * 16/32 bit true-colour, use pseudo-palette for 16 base color */ - if (regno < 16) { -- if (sfb->fb->var.bits_per_pixel = 16) { +- if (sfb->fb->var.bits_per_pixel == 16) { - u32 *pal = sfb->fb->pseudo_palette; - - val = chan_to_field(red, &sfb->fb->var.red); @@ -58,14 +58,15 @@ index 5db26f1..5be2560 100644 - val |= chan_to_field(blue, &sfb->fb->var.blue); + if (regno >= 16) + break; -+ if (sfb->fb->var.bits_per_pixel = 16) { ++ if (sfb->fb->var.bits_per_pixel == 16) { + u32 *pal = sfb->fb->pseudo_palette; + + val = chan_to_field(red, &sfb->fb->var.red); + val |= chan_to_field(green, &sfb->fb->var.green); + val |= chan_to_field(blue, &sfb->fb->var.blue); #ifdef __BIG_ENDIAN -- pal[regno] - ((red & 0xf800) >> 8) | +- pal[regno] = +- ((red & 0xf800) >> 8) | - ((green & 0xe000) >> 13) | - ((green & 0x1c00) << 3) | - ((blue & 0xf800) >> 3); @@ -90,7 +91,8 @@ index 5db26f1..5be2560 100644 + val |= chan_to_field(green, &sfb->fb->var.green); + val |= chan_to_field(blue, &sfb->fb->var.blue); #ifdef __BIG_ENDIAN -- val - (val & 0xff00ff00 >> 8) | +- val = +- (val & 0xff00ff00 >> 8) | - (val & 0x00ff00ff << 8); + val = (val & 0xff00ff00 >> 8) | (val & 0x00ff00ff << 8); #endif @@ -115,7 +117,8 @@ index 5db26f1..5be2560 100644 dst = buffer; for (i = c >> 2; i--;) { *dst = fb_readl(src++); -- *dst - (*dst & 0xff00ff00 >> 8) | +- *dst = +- (*dst & 0xff00ff00 >> 8) | - (*dst & 0x00ff00ff << 8); + *dst = (*dst & 0xff00ff00 >> 8) | + (*dst & 0x00ff00ff << 8); @@ -138,10 +141,10 @@ index 5db26f1..5be2560 100644 sfb->width, sfb->height, sfb->fb->var.bits_per_pixel, sfb->hz); for (j = 0; j < numvgamodes; j++) { -- if (vgamode[j].mmsizex = sfb->width && -- vgamode[j].mmsizey = sfb->height && -- vgamode[j].bpp = sfb->fb->var.bits_per_pixel && -- vgamode[j].hz = sfb->hz) { +- if (vgamode[j].mmsizex == sfb->width && +- vgamode[j].mmsizey == sfb->height && +- vgamode[j].bpp == sfb->fb->var.bits_per_pixel && +- vgamode[j].hz == sfb->hz) { - dev_dbg(&sfb->pdev->dev, - "vgamode[j].mmsizex=%d vgamode[j].mmSizeY=%d vgamode[j].bpp=%d vgamode[j].hz=%d\n", - vgamode[j].mmsizex, vgamode[j].mmsizey, @@ -273,7 +276,8 @@ index 5db26f1..5be2560 100644 writel(0x0, sfb->vp_regs + 0x40); /* set data width */ -- m_nscreenstride - (sfb->width * sfb->fb->var.bits_per_pixel) / 64; +- m_nscreenstride = +- (sfb->width * sfb->fb->var.bits_per_pixel) / 64; + m_nscreenstride = (sfb->width * sfb->fb->var.bits_per_pixel) / 64; switch (sfb->fb->var.bits_per_pixel) { case 8: @@ -289,7 +293,7 @@ index 5db26f1..5be2560 100644 if (err) @@ -815,12 +804,12 @@ static int smtcfb_pci_probe(struct pci_dev *pdev, #ifdef __BIG_ENDIAN - if (sfb->fb->var.bits_per_pixel = 32) { + if (sfb->fb->var.bits_per_pixel == 32) { sfb->lfb += 0x800000; - dev_info(&pdev->dev, "sfb->lfb=%p", sfb->lfb); + dev_info(&pdev->dev, "sfb->lfb=%p\n", sfb->lfb); diff --git a/a/content_digest b/N1/content_digest index acd739c..1598c03 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,8 +3,8 @@ "ref\020150613084618.GA6492@sudip-PC\0" "ref\020150613162839.GA14842@kroah.com\0" "From\0Joe Perches <joe@perches.com>\0" - "Subject\0Re: doubt about sm7xxfb (was: Re: [PATCH v4 0/7] staging: fsl-mc: New functionality to the MC bus dr\0" - "Date\0Sat, 13 Jun 2015 16:57:05 +0000\0" + "Subject\0Re: doubt about sm7xxfb (was: Re: [PATCH v4 0/7] staging: fsl-mc: New functionality to the MC bus driver)\0" + "Date\0Sat, 13 Jun 2015 09:57:05 -0700\0" "To\0Sudip Mukherjee <sudipm.mukherjee@gmail.com>\0" "Cc\0Greg KH <gregkh@linuxfoundation.org>" devel@driverdev.osuosl.org @@ -65,7 +65,7 @@ " \t\t * 16/32 bit true-colour, use pseudo-palette for 16 base color\n" " \t\t */\n" "-\t\tif (regno < 16) {\n" - "-\t\t\tif (sfb->fb->var.bits_per_pixel = 16) {\n" + "-\t\t\tif (sfb->fb->var.bits_per_pixel == 16) {\n" "-\t\t\t\tu32 *pal = sfb->fb->pseudo_palette;\n" "-\n" "-\t\t\t\tval = chan_to_field(red, &sfb->fb->var.red);\n" @@ -74,14 +74,15 @@ "-\t\t\t\tval |= chan_to_field(blue, &sfb->fb->var.blue);\n" "+\t\tif (regno >= 16)\n" "+\t\t\tbreak;\n" - "+\t\tif (sfb->fb->var.bits_per_pixel = 16) {\n" + "+\t\tif (sfb->fb->var.bits_per_pixel == 16) {\n" "+\t\t\tu32 *pal = sfb->fb->pseudo_palette;\n" "+\n" "+\t\t\tval = chan_to_field(red, &sfb->fb->var.red);\n" "+\t\t\tval |= chan_to_field(green, &sfb->fb->var.green);\n" "+\t\t\tval |= chan_to_field(blue, &sfb->fb->var.blue);\n" " #ifdef __BIG_ENDIAN\n" - "-\t\t\t\tpal[regno] -\t\t\t\t ((red & 0xf800) >> 8) |\n" + "-\t\t\t\tpal[regno] =\n" + "-\t\t\t\t ((red & 0xf800) >> 8) |\n" "-\t\t\t\t ((green & 0xe000) >> 13) |\n" "-\t\t\t\t ((green & 0x1c00) << 3) |\n" "-\t\t\t\t ((blue & 0xf800) >> 3);\n" @@ -106,7 +107,8 @@ "+\t\t\tval |= chan_to_field(green, &sfb->fb->var.green);\n" "+\t\t\tval |= chan_to_field(blue, &sfb->fb->var.blue);\n" " #ifdef __BIG_ENDIAN\n" - "-\t\t\t\tval -\t\t\t\t (val & 0xff00ff00 >> 8) |\n" + "-\t\t\t\tval =\n" + "-\t\t\t\t (val & 0xff00ff00 >> 8) |\n" "-\t\t\t\t (val & 0x00ff00ff << 8);\n" "+\t\t\tval = (val & 0xff00ff00 >> 8) | (val & 0x00ff00ff << 8);\n" " #endif\n" @@ -131,7 +133,8 @@ " \t\tdst = buffer;\n" " \t\tfor (i = c >> 2; i--;) {\n" " \t\t\t*dst = fb_readl(src++);\n" - "-\t\t\t*dst -\t\t\t (*dst & 0xff00ff00 >> 8) |\n" + "-\t\t\t*dst =\n" + "-\t\t\t (*dst & 0xff00ff00 >> 8) |\n" "-\t\t\t (*dst & 0x00ff00ff << 8);\n" "+\t\t\t*dst = (*dst & 0xff00ff00 >> 8) |\n" "+\t\t\t (*dst & 0x00ff00ff << 8);\n" @@ -154,10 +157,10 @@ " \t\tsfb->width, sfb->height, sfb->fb->var.bits_per_pixel, sfb->hz);\n" " \n" " \tfor (j = 0; j < numvgamodes; j++) {\n" - "-\t\tif (vgamode[j].mmsizex = sfb->width &&\n" - "-\t\t vgamode[j].mmsizey = sfb->height &&\n" - "-\t\t vgamode[j].bpp = sfb->fb->var.bits_per_pixel &&\n" - "-\t\t vgamode[j].hz = sfb->hz) {\n" + "-\t\tif (vgamode[j].mmsizex == sfb->width &&\n" + "-\t\t vgamode[j].mmsizey == sfb->height &&\n" + "-\t\t vgamode[j].bpp == sfb->fb->var.bits_per_pixel &&\n" + "-\t\t vgamode[j].hz == sfb->hz) {\n" "-\t\t\tdev_dbg(&sfb->pdev->dev,\n" "-\t\t\t\t\"vgamode[j].mmsizex=%d vgamode[j].mmSizeY=%d vgamode[j].bpp=%d vgamode[j].hz=%d\\n\",\n" "-\t\t\t\tvgamode[j].mmsizex, vgamode[j].mmsizey,\n" @@ -289,7 +292,8 @@ " \twritel(0x0, sfb->vp_regs + 0x40);\n" " \n" " \t/* set data width */\n" - "-\tm_nscreenstride -\t\t(sfb->width * sfb->fb->var.bits_per_pixel) / 64;\n" + "-\tm_nscreenstride =\n" + "-\t\t(sfb->width * sfb->fb->var.bits_per_pixel) / 64;\n" "+\tm_nscreenstride = (sfb->width * sfb->fb->var.bits_per_pixel) / 64;\n" " \tswitch (sfb->fb->var.bits_per_pixel) {\n" " \tcase 8:\n" @@ -305,7 +309,7 @@ " \tif (err)\n" "@@ -815,12 +804,12 @@ static int smtcfb_pci_probe(struct pci_dev *pdev,\n" " #ifdef __BIG_ENDIAN\n" - " \t\tif (sfb->fb->var.bits_per_pixel = 32) {\n" + " \t\tif (sfb->fb->var.bits_per_pixel == 32) {\n" " \t\t\tsfb->lfb += 0x800000;\n" "-\t\t\tdev_info(&pdev->dev, \"sfb->lfb=%p\", sfb->lfb);\n" "+\t\t\tdev_info(&pdev->dev, \"sfb->lfb=%p\\n\", sfb->lfb);\n" @@ -345,4 +349,4 @@ " \tsmtc_unmap_smem(sfb);\n" " \tsmtc_unmap_mmio(sfb);" -88d96f567a76efc5154386af81e1e7f721260b7647f99e34628424006b30e87e +75dad5290a8b1488b7be535fd87507db21f411cec8c03da436ead56eb2bf74ce
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.