* [PATCH v2 0/3] Improve MIPS Magnum support @ 2020-02-06 23:01 Finn Thain 2020-02-06 23:01 ` [PATCH v2 1/3] fbdev/g364fb: Fix build failure Finn Thain 2020-02-19 19:03 ` [PATCH v2 0/3] Improve MIPS Magnum support Paul Burton 0 siblings, 2 replies; 5+ messages in thread From: Finn Thain @ 2020-02-06 23:01 UTC (permalink / raw) To: Ralf Baechle, Paul Burton, James Hogan Cc: linux-fbdev, Thomas Bogendoerfer, Bartlomiej Zolnierkiewicz, linux-kernel, dri-devel, Philippe Mathieu-Daudé, linux-mips A few minor patches are needed to more easily boot a MIPS Magnum build under QEMU. This series fixes a build failure in the g364fb driver and modifies jazz_defconfig for use with 'qemu-system-mips64el -M magnum'. Note that QEMU's dp8393x implementation has bugs, one of which prevents the Linux jazzsonic driver from probing the chip. I have fixed the bugs that I know of in a series of patches at, https://github.com/fthain/qemu/commits/sonic Changed since v1: - Added reviewed-by and tested-by tags from Philippe Mathieu-Daudé. - Rebased. Finn Thain (3): fbdev/g364fb: Fix build failure mips/jazz: Remove redundant settings and shrink jazz_defconfig mips/jazz: Update jazz_defconfig for MIPS Magnum arch/mips/configs/jazz_defconfig | 267 ++----------------------------- drivers/video/fbdev/g364fb.c | 29 +--- 2 files changed, 15 insertions(+), 281 deletions(-) -- 2.24.1 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2 1/3] fbdev/g364fb: Fix build failure 2020-02-06 23:01 [PATCH v2 0/3] Improve MIPS Magnum support Finn Thain @ 2020-02-06 23:01 ` Finn Thain 2020-02-07 14:41 ` Bartlomiej Zolnierkiewicz 2020-02-08 17:16 ` Philippe Mathieu-Daudé 2020-02-19 19:03 ` [PATCH v2 0/3] Improve MIPS Magnum support Paul Burton 1 sibling, 2 replies; 5+ messages in thread From: Finn Thain @ 2020-02-06 23:01 UTC (permalink / raw) To: Ralf Baechle, Paul Burton, James Hogan Cc: linux-fbdev, Thomas Bogendoerfer, Bartlomiej Zolnierkiewicz, linux-kernel, dri-devel, Philippe Mathieu-Daudé, linux-mips This patch resolves these compiler errors and warnings -- CC drivers/video/fbdev/g364fb.o drivers/video/fbdev/g364fb.c: In function 'g364fb_cursor': drivers/video/fbdev/g364fb.c:137:9: error: 'x' undeclared (first use in this function) drivers/video/fbdev/g364fb.c:137:9: note: each undeclared identifier is reported only once for each function it appears in drivers/video/fbdev/g364fb.c:137:7: error: implicit declaration of function 'fontwidth' [-Werror=implicit-function-declaration] drivers/video/fbdev/g364fb.c:137:23: error: 'p' undeclared (first use in this function) drivers/video/fbdev/g364fb.c:137:38: error: 'y' undeclared (first use in this function) drivers/video/fbdev/g364fb.c:137:7: error: implicit declaration of function 'fontheight' [-Werror=implicit-function-declaration] drivers/video/fbdev/g364fb.c: In function 'g364fb_init': drivers/video/fbdev/g364fb.c:233:24: error: 'fbvar' undeclared (first use in this function) drivers/video/fbdev/g364fb.c:234:24: error: 'xres' undeclared (first use in this function) drivers/video/fbdev/g364fb.c:201:14: warning: unused variable 'j' [-Wunused-variable] drivers/video/fbdev/g364fb.c:197:25: warning: unused variable 'pal_ptr' [-Wunused-variable] The MIPS Magnum framebuffer console now works when tested in QEMU. Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Signed-off-by: Finn Thain <fthain@telegraphics.com.au> --- drivers/video/fbdev/g364fb.c | 29 +++-------------------------- 1 file changed, 3 insertions(+), 26 deletions(-) diff --git a/drivers/video/fbdev/g364fb.c b/drivers/video/fbdev/g364fb.c index 845b79da2a7c..05837a3b985c 100644 --- a/drivers/video/fbdev/g364fb.c +++ b/drivers/video/fbdev/g364fb.c @@ -108,7 +108,6 @@ static int g364fb_pan_display(struct fb_var_screeninfo *var, static int g364fb_setcolreg(u_int regno, u_int red, u_int green, u_int blue, u_int transp, struct fb_info *info); -static int g364fb_cursor(struct fb_info *info, struct fb_cursor *cursor); static int g364fb_blank(int blank, struct fb_info *info); static const struct fb_ops g364fb_ops = { @@ -119,28 +118,8 @@ static const struct fb_ops g364fb_ops = { .fb_fillrect = cfb_fillrect, .fb_copyarea = cfb_copyarea, .fb_imageblit = cfb_imageblit, - .fb_cursor = g364fb_cursor, }; -int g364fb_cursor(struct fb_info *info, struct fb_cursor *cursor) -{ - - switch (cursor->enable) { - case CM_ERASE: - *(unsigned int *) CTLA_REG |= CURS_TOGGLE; - break; - - case CM_MOVE: - case CM_DRAW: - *(unsigned int *) CTLA_REG &= ~CURS_TOGGLE; - *(unsigned int *) CURS_POS_REG = - ((x * fontwidth(p)) << 12) | ((y * fontheight(p)) - - info->var.yoffset); - break; - } - return 0; -} - /* * Pan or Wrap the Display * @@ -194,11 +173,9 @@ static int g364fb_setcolreg(u_int regno, u_int red, u_int green, */ int __init g364fb_init(void) { - volatile unsigned int *pal_ptr = - (volatile unsigned int *) CLR_PAL_REG; volatile unsigned int *curs_pal_ptr = (volatile unsigned int *) CURS_PAL_REG; - int mem, i, j; + int mem, i; if (fb_get_options("g364fb", NULL)) return -ENODEV; @@ -230,8 +207,8 @@ int __init g364fb_init(void) */ *(unsigned short *) (CURS_PAT_REG + 14 * 64) = 0xffff; *(unsigned short *) (CURS_PAT_REG + 15 * 64) = 0xffff; - fb_var.xres_virtual = fbvar.xres; - fb_fix.line_length = (xres / 8) * fb_var.bits_per_pixel; + fb_var.xres_virtual = fb_var.xres; + fb_fix.line_length = fb_var.xres_virtual * fb_var.bits_per_pixel / 8; fb_fix.smem_start = 0x40000000; /* physical address */ /* get size of video memory; this is special for the JAZZ hardware */ mem = (r4030_read_reg32(JAZZ_R4030_CONFIG) >> 8) & 3; -- 2.24.1 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v2 1/3] fbdev/g364fb: Fix build failure 2020-02-06 23:01 ` [PATCH v2 1/3] fbdev/g364fb: Fix build failure Finn Thain @ 2020-02-07 14:41 ` Bartlomiej Zolnierkiewicz 2020-02-08 17:16 ` Philippe Mathieu-Daudé 1 sibling, 0 replies; 5+ messages in thread From: Bartlomiej Zolnierkiewicz @ 2020-02-07 14:41 UTC (permalink / raw) To: Finn Thain Cc: linux-fbdev, Thomas Bogendoerfer, Paul Burton, James Hogan, linux-mips, Ralf Baechle, Philippe Mathieu-Daudé, dri-devel, linux-kernel On 2/7/20 12:01 AM, Finn Thain wrote: > This patch resolves these compiler errors and warnings -- > > CC drivers/video/fbdev/g364fb.o > drivers/video/fbdev/g364fb.c: In function 'g364fb_cursor': > drivers/video/fbdev/g364fb.c:137:9: error: 'x' undeclared (first use in this function) > drivers/video/fbdev/g364fb.c:137:9: note: each undeclared identifier is reported only once for each function it appears in > drivers/video/fbdev/g364fb.c:137:7: error: implicit declaration of function 'fontwidth' [-Werror=implicit-function-declaration] > drivers/video/fbdev/g364fb.c:137:23: error: 'p' undeclared (first use in this function) > drivers/video/fbdev/g364fb.c:137:38: error: 'y' undeclared (first use in this function) > drivers/video/fbdev/g364fb.c:137:7: error: implicit declaration of function 'fontheight' [-Werror=implicit-function-declaration] > drivers/video/fbdev/g364fb.c: In function 'g364fb_init': > drivers/video/fbdev/g364fb.c:233:24: error: 'fbvar' undeclared (first use in this function) > drivers/video/fbdev/g364fb.c:234:24: error: 'xres' undeclared (first use in this function) > drivers/video/fbdev/g364fb.c:201:14: warning: unused variable 'j' [-Wunused-variable] > drivers/video/fbdev/g364fb.c:197:25: warning: unused variable 'pal_ptr' [-Wunused-variable] > > The MIPS Magnum framebuffer console now works when tested in QEMU. > > Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> > Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") > Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > Signed-off-by: Finn Thain <fthain@telegraphics.com.au> Acked-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Best regards, -- Bartlomiej Zolnierkiewicz Samsung R&D Institute Poland Samsung Electronics > --- > drivers/video/fbdev/g364fb.c | 29 +++-------------------------- > 1 file changed, 3 insertions(+), 26 deletions(-) > > diff --git a/drivers/video/fbdev/g364fb.c b/drivers/video/fbdev/g364fb.c > index 845b79da2a7c..05837a3b985c 100644 > --- a/drivers/video/fbdev/g364fb.c > +++ b/drivers/video/fbdev/g364fb.c > @@ -108,7 +108,6 @@ static int g364fb_pan_display(struct fb_var_screeninfo *var, > static int g364fb_setcolreg(u_int regno, u_int red, u_int green, > u_int blue, u_int transp, > struct fb_info *info); > -static int g364fb_cursor(struct fb_info *info, struct fb_cursor *cursor); > static int g364fb_blank(int blank, struct fb_info *info); > > static const struct fb_ops g364fb_ops = { > @@ -119,28 +118,8 @@ static const struct fb_ops g364fb_ops = { > .fb_fillrect = cfb_fillrect, > .fb_copyarea = cfb_copyarea, > .fb_imageblit = cfb_imageblit, > - .fb_cursor = g364fb_cursor, > }; > > -int g364fb_cursor(struct fb_info *info, struct fb_cursor *cursor) > -{ > - > - switch (cursor->enable) { > - case CM_ERASE: > - *(unsigned int *) CTLA_REG |= CURS_TOGGLE; > - break; > - > - case CM_MOVE: > - case CM_DRAW: > - *(unsigned int *) CTLA_REG &= ~CURS_TOGGLE; > - *(unsigned int *) CURS_POS_REG = > - ((x * fontwidth(p)) << 12) | ((y * fontheight(p)) - > - info->var.yoffset); > - break; > - } > - return 0; > -} > - > /* > * Pan or Wrap the Display > * > @@ -194,11 +173,9 @@ static int g364fb_setcolreg(u_int regno, u_int red, u_int green, > */ > int __init g364fb_init(void) > { > - volatile unsigned int *pal_ptr = > - (volatile unsigned int *) CLR_PAL_REG; > volatile unsigned int *curs_pal_ptr = > (volatile unsigned int *) CURS_PAL_REG; > - int mem, i, j; > + int mem, i; > > if (fb_get_options("g364fb", NULL)) > return -ENODEV; > @@ -230,8 +207,8 @@ int __init g364fb_init(void) > */ > *(unsigned short *) (CURS_PAT_REG + 14 * 64) = 0xffff; > *(unsigned short *) (CURS_PAT_REG + 15 * 64) = 0xffff; > - fb_var.xres_virtual = fbvar.xres; > - fb_fix.line_length = (xres / 8) * fb_var.bits_per_pixel; > + fb_var.xres_virtual = fb_var.xres; > + fb_fix.line_length = fb_var.xres_virtual * fb_var.bits_per_pixel / 8; > fb_fix.smem_start = 0x40000000; /* physical address */ > /* get size of video memory; this is special for the JAZZ hardware */ > mem = (r4030_read_reg32(JAZZ_R4030_CONFIG) >> 8) & 3; _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2 1/3] fbdev/g364fb: Fix build failure 2020-02-06 23:01 ` [PATCH v2 1/3] fbdev/g364fb: Fix build failure Finn Thain 2020-02-07 14:41 ` Bartlomiej Zolnierkiewicz @ 2020-02-08 17:16 ` Philippe Mathieu-Daudé 1 sibling, 0 replies; 5+ messages in thread From: Philippe Mathieu-Daudé @ 2020-02-08 17:16 UTC (permalink / raw) To: Finn Thain, Ralf Baechle, Paul Burton, James Hogan Cc: linux-fbdev, Thomas Bogendoerfer, Bartlomiej Zolnierkiewicz, linux-mips, dri-devel, linux-kernel On 2/7/20 12:01 AM, Finn Thain wrote: > This patch resolves these compiler errors and warnings -- > > CC drivers/video/fbdev/g364fb.o > drivers/video/fbdev/g364fb.c: In function 'g364fb_cursor': > drivers/video/fbdev/g364fb.c:137:9: error: 'x' undeclared (first use in this function) > drivers/video/fbdev/g364fb.c:137:9: note: each undeclared identifier is reported only once for each function it appears in > drivers/video/fbdev/g364fb.c:137:7: error: implicit declaration of function 'fontwidth' [-Werror=implicit-function-declaration] > drivers/video/fbdev/g364fb.c:137:23: error: 'p' undeclared (first use in this function) > drivers/video/fbdev/g364fb.c:137:38: error: 'y' undeclared (first use in this function) > drivers/video/fbdev/g364fb.c:137:7: error: implicit declaration of function 'fontheight' [-Werror=implicit-function-declaration] > drivers/video/fbdev/g364fb.c: In function 'g364fb_init': > drivers/video/fbdev/g364fb.c:233:24: error: 'fbvar' undeclared (first use in this function) > drivers/video/fbdev/g364fb.c:234:24: error: 'xres' undeclared (first use in this function) > drivers/video/fbdev/g364fb.c:201:14: warning: unused variable 'j' [-Wunused-variable] > drivers/video/fbdev/g364fb.c:197:25: warning: unused variable 'pal_ptr' [-Wunused-variable] > > The MIPS Magnum framebuffer console now works when tested in QEMU. > > Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> > Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") > Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > Signed-off-by: Finn Thain <fthain@telegraphics.com.au> > --- > drivers/video/fbdev/g364fb.c | 29 +++-------------------------- > 1 file changed, 3 insertions(+), 26 deletions(-) > > diff --git a/drivers/video/fbdev/g364fb.c b/drivers/video/fbdev/g364fb.c > index 845b79da2a7c..05837a3b985c 100644 > --- a/drivers/video/fbdev/g364fb.c > +++ b/drivers/video/fbdev/g364fb.c > @@ -108,7 +108,6 @@ static int g364fb_pan_display(struct fb_var_screeninfo *var, > static int g364fb_setcolreg(u_int regno, u_int red, u_int green, > u_int blue, u_int transp, > struct fb_info *info); > -static int g364fb_cursor(struct fb_info *info, struct fb_cursor *cursor); > static int g364fb_blank(int blank, struct fb_info *info); > > static const struct fb_ops g364fb_ops = { > @@ -119,28 +118,8 @@ static const struct fb_ops g364fb_ops = { > .fb_fillrect = cfb_fillrect, > .fb_copyarea = cfb_copyarea, > .fb_imageblit = cfb_imageblit, > - .fb_cursor = g364fb_cursor, > }; > > -int g364fb_cursor(struct fb_info *info, struct fb_cursor *cursor) > -{ > - > - switch (cursor->enable) { > - case CM_ERASE: > - *(unsigned int *) CTLA_REG |= CURS_TOGGLE; > - break; > - > - case CM_MOVE: > - case CM_DRAW: > - *(unsigned int *) CTLA_REG &= ~CURS_TOGGLE; > - *(unsigned int *) CURS_POS_REG = > - ((x * fontwidth(p)) << 12) | ((y * fontheight(p)) - > - info->var.yoffset); > - break; > - } > - return 0; > -} > - > /* > * Pan or Wrap the Display > * > @@ -194,11 +173,9 @@ static int g364fb_setcolreg(u_int regno, u_int red, u_int green, > */ > int __init g364fb_init(void) > { > - volatile unsigned int *pal_ptr = > - (volatile unsigned int *) CLR_PAL_REG; > volatile unsigned int *curs_pal_ptr = > (volatile unsigned int *) CURS_PAL_REG; > - int mem, i, j; > + int mem, i; > > if (fb_get_options("g364fb", NULL)) > return -ENODEV; > @@ -230,8 +207,8 @@ int __init g364fb_init(void) > */ > *(unsigned short *) (CURS_PAT_REG + 14 * 64) = 0xffff; > *(unsigned short *) (CURS_PAT_REG + 15 * 64) = 0xffff; > - fb_var.xres_virtual = fbvar.xres; > - fb_fix.line_length = (xres / 8) * fb_var.bits_per_pixel; > + fb_var.xres_virtual = fb_var.xres; > + fb_fix.line_length = fb_var.xres_virtual * fb_var.bits_per_pixel / 8; > fb_fix.smem_start = 0x40000000; /* physical address */ > /* get size of video memory; this is special for the JAZZ hardware */ > mem = (r4030_read_reg32(JAZZ_R4030_CONFIG) >> 8) & 3; > Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org> _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2 0/3] Improve MIPS Magnum support 2020-02-06 23:01 [PATCH v2 0/3] Improve MIPS Magnum support Finn Thain 2020-02-06 23:01 ` [PATCH v2 1/3] fbdev/g364fb: Fix build failure Finn Thain @ 2020-02-19 19:03 ` Paul Burton 1 sibling, 0 replies; 5+ messages in thread From: Paul Burton @ 2020-02-19 19:03 UTC (permalink / raw) To: Finn Thain Cc: linux-fbdev, Thomas Bogendoerfer, Paul Burton, Bartlomiej Zolnierkiewicz, James Hogan, linux-mips, Ralf Baechle, Philippe Mathieu-Daudé, dri-devel, linux-kernel [-- Attachment #1: Type: text/plain, Size: 2083 bytes --] Hello, Finn Thain wrote: > A few minor patches are needed to more easily boot a MIPS Magnum build > under QEMU. This series fixes a build failure in the g364fb driver and > modifies jazz_defconfig for use with 'qemu-system-mips64el -M magnum'. > > Note that QEMU's dp8393x implementation has bugs, one of which prevents > the Linux jazzsonic driver from probing the chip. I have fixed the bugs > that I know of in a series of patches at, > https://github.com/fthain/qemu/commits/sonic > > Changed since v1: > - Added reviewed-by and tested-by tags from Philippe Mathieu-Daudé. > - Rebased. > > > Finn Thain (3): > fbdev/g364fb: Fix build failure > mips/jazz: Remove redundant settings and shrink jazz_defconfig > mips/jazz: Update jazz_defconfig for MIPS Magnum Series applied to mips-next. > fbdev/g364fb: Fix build failure > commit c584f9532115 > https://git.kernel.org/mips/c/c584f9532115 > > Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") > Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > Signed-off-by: Finn Thain <fthain@telegraphics.com.au> > Acked-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> > Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > Signed-off-by: Paul Burton <paulburton@kernel.org> > > mips/jazz: Remove redundant settings and shrink jazz_defconfig > commit a7047b8dd098 > https://git.kernel.org/mips/c/a7047b8dd098 > > Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > Signed-off-by: Finn Thain <fthain@telegraphics.com.au> > Signed-off-by: Paul Burton <paulburton@kernel.org> > > mips/jazz: Update jazz_defconfig for MIPS Magnum > commit 91f40e896444 > https://git.kernel.org/mips/c/91f40e896444 > > Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > Signed-off-by: Finn Thain <fthain@telegraphics.com.au> > Signed-off-by: Paul Burton <paulburton@kernel.org> Thanks, Paul [ This message was auto-generated; if you believe anything is incorrect then please email paulburton@kernel.org to report it. ] [-- Attachment #2: Type: text/plain, Size: 160 bytes --] _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-02-19 19:04 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2020-02-06 23:01 [PATCH v2 0/3] Improve MIPS Magnum support Finn Thain 2020-02-06 23:01 ` [PATCH v2 1/3] fbdev/g364fb: Fix build failure Finn Thain 2020-02-07 14:41 ` Bartlomiej Zolnierkiewicz 2020-02-08 17:16 ` Philippe Mathieu-Daudé 2020-02-19 19:03 ` [PATCH v2 0/3] Improve MIPS Magnum support Paul Burton
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox