1. 11 Jul, 2004 21 commits
  2. 10 Jul, 2004 2 commits
  3. 08 Jul, 2004 2 commits
    • Russell King's avatar
      Back out smc91x late collision "performance" hack. · 372b616b
      Russell King authored
      Apparantly, the reason for this change is that it gives "much less
      NFS stalls with a SMC91C96 on a 10/100MB switch."
      
      Alan Cox's comments on this is:
      "spec says 16 collision retries max _ever_.  I bet his 'broken
      switch' is a case of half v full duplex" and a recommendation to
      remove it.
      
      Also, since the change does not limit the number of times we may
      retry to send the packet, I think this code opens a potential DoS
      attack against network which has a machine connected running this
      code.
      372b616b
    • John Lenz's avatar
      [ARM PATCH] 1937/1: LoCoMo common device · 9fd1d0c7
      John Lenz authored
      Patch from John Lenz
      
      Cleanup and forward port of patch 1849.
      This patch provides support for the SHARP LoCoMo device, 
      a companion chip similar to the sa1111 device.  It is present
      in many of the SHARP Zaurus line of PDAs.
      9fd1d0c7
  4. 06 Jul, 2004 15 commits
    • Linus Torvalds's avatar
      Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk · afb7238d
      Linus Torvalds authored
      into ppc970.osdl.org:/home/torvalds/v2.6/linux
      afb7238d
    • Ian Campbell's avatar
      [ARM PATCH] 1954/2: Make pxa platform device names more sensible · 1dac5247
      Ian Campbell authored
      Patch from Ian Campbell
      
      Update 1954/1 to use pxa2xx- as the platform device prefix 
      instead of pxa2xx_. This changes pxamci to pxa2xx-mci, pxa2xx_udc 
      to pxa2xx-udc and pxafb to pxa2xx-fb. pxa2xx-uart doesn't need changing.
      1dac5247
    • Russell King's avatar
      [ARM] Usual mach-types update. · 496bf4b8
      Russell King authored
      496bf4b8
    • Linus Torvalds's avatar
      Merge bk://kernel.bkbits.net/davem/sparc-2.6 · b24b10d7
      Linus Torvalds authored
      into ppc970.osdl.org:/home/torvalds/v2.6/linux
      b24b10d7
    • Linus Torvalds's avatar
      Merge bk://kernel.bkbits.net/davem/net-2.6 · 0ac3fc9f
      Linus Torvalds authored
      into ppc970.osdl.org:/home/torvalds/v2.6/linux
      0ac3fc9f
    • Linus Torvalds's avatar
    • Wen-chien Jesse Sung's avatar
      [PATCH] snd_ctl_read() fix fix · da0504fc
      Wen-chien Jesse Sung authored
      hm, I had a brainfart here.  The recent "fix" to snd_ctl_read() actually
      unfixed it.  Revert that, and fix the real bug.
      
      Cc: Jaroslav Kysela <perex@suse.cz>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      da0504fc
    • Jerzy Szczepkowski's avatar
      [PATCH] Fix memory leak in epoll · c105abb3
      Jerzy Szczepkowski authored
      There was a memory leak in epoll.
      
      The reference count (d_count) of the struct dentry of a new epoll-fd was
      set to TWO.  (new_inode() assigned ONE, than ep_getfd() incremented it by
      dget()).  There was only ONE reference to this dentry, so struct dentry and
      struct inode were never freed.
      Signed-off-by: default avatarDavide Libenzi <davidel@xmailserver.org>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      c105abb3
    • Rusty Russell's avatar
      [PATCH] Remove include/{asm-i386,linux}/upd4990a.h · 6173a113
      Rusty Russell authored
      From: Alexey Dobriyan <adobriyan@mail.ru>
      
      drivers/char/upd4990a.c was removed from 2.6.
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      6173a113
    • Gerd Knorr's avatar
      [PATCH] saa5246a Videotext driver update · a97d11d9
      Gerd Knorr authored
      From: Michael Geng <linux@MichaelGeng.de>
      
      The patch updates docs, comments + strings to also mention the SAA5281 chip
      (which is compatible to the SAA5246A) as supported.
      Signed-off-by: default avatarMichael Geng <linux@MichaelGeng.de>
      Signed-off-by: default avatarGerd Knorr <kraxel@bytesex.org>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      a97d11d9
    • Mika Kukkonen's avatar
      [PATCH] sparse: fix remaining three non-ANSI warnings · 9d2e400d
      Mika Kukkonen authored
        CHECK   fs/smbfs/smbiod.c
      fs/smbfs/smbiod.c:68:25: warning: non-ANSI parameter list
        CHECK   drivers/isdn/tpam/tpam_crcpc.c
      drivers/isdn/tpam/tpam_crcpc.c:57:15: warning: non-ANSI parameter list
        CHECK   drivers/scsi/aic7xxx/aic79xx_reg_print.c
      drivers/scsi/aic7xxx/aic79xx_osm.h:791:19: warning: non-ANSI parameter list
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      9d2e400d
    • Andi Kleen's avatar
      [PATCH] NUMA API: fix use-after-free bug · fb921d69
      Andi Kleen authored
      Move the memory policy freeing to later in exit to make sure the last
      memory allocations don't use an uninitialized policy.
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      fb921d69
    • Antonino Daplas's avatar
      [PATCH] fbdev: set capabilities flag for vesafb and vga16fb · 701cbbb7
      Antonino Daplas authored
      This patch sets the correct capabilities flag for vesafb and vga16fb to
      provide fbcon with the correct hints as to the best scrolling mode.
      Signed-off-by: default avatarAntonino Daplas <adaplas@pol.net>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      701cbbb7
    • Antonino Daplas's avatar
      [PATCH] fbcon: new scrolling mode: YPAN + REDRAW · 8b984eb4
      Antonino Daplas authored
      Added a new scrolling mode (SCROLL_PAN_REDRAW) to fbcon that should greatly
      benefit unaccelerated drivers such as VESA fbdev.  An increase of 3-10 times
      in scrolling speed can be expected.
      
      Currently, fbcon has 4 different scrolling methods (1-4).  Potentially, we can
      have 6.  This patch implements SCROLL_PAN_REDRAW (5).  SCROLL_WRAP_REDRAW (6)
      is still unimplemented.
      
      Scroll Mode		Operation	YPan	YWrap
      +++++++++++++++++++++++++++++++++++++++++++++++++++++
      1. SCROLL_ACCEL		copyarea	No	No
      2. SCROLL_REDRAW	imageblit	No	No
      3. SCROLL_PAN		copyarea	Yes	No
      4. SCROLL_WRAP		copyarea	No	Yes
      5. SCROLL_PAN_REDRAW 	imageblit	Yes	No	
      6. SCROLL_WRAP_REDRAW	imageblit	No	Yes
      +++++++++++++++++++++++++++++++++++++++++++++++++++++
      Note 1:  I've changed the nomenclature to increase clarity:
      
      SCROLL_ACCEL = SCROLL_MOVE
      SCROLL_REDRAW = SCROLL_REDRAW
      SCROLL_PAN = SCROLL_PAN_MOVE
      SCROLL_WRAP = SCROLL_WRAP_MOVE
      
      To demonstrate the effect of each of the scrolling methods on
      an unaccelerated PCI/AGP-based driver (vesafb), I used a simple
      benchmark (time cat linux/MAINTAINERS - a 50K text file). The
      framebuffer is set at:
      
      1024x768-8bpp, 8x16 font, yres_virtual = 2*yres
      
      1. SCROLL_MOVE:
      real    5m50.277s
      user    0m0.001s
      sys     5m50.227s
      
      Almost 6 minutes for a 50K text file.  Using soft copyarea on a
      PCI-based card is just too slow (because copyarea has to 
      read from the framebuffer memory).
      
      2. SCROLL_PAN_MOVE
      scrollmode: SCROLL_PAN
      real    0m8.592s
      user    0m0.000s
      sys     0m8.586s
      
      Using ypan with copyarea dramatically improves the scrolling.  However, the
      scrolling action is jerky (fast during the panning stages, slows down during
      the copyarea stages).
      
      3. SCROLL_REDRAW (this is the default scrolling mode)
      real    0m3.189s
      user    0m0.000s
      sys     0m3.170s
      
      Simply eliminating the copyarea, even without ypanning, makes it faster than
      SCROLL_PAN_MOvE.  Plus, the scrolling action is smoother.
      
      So, if we combine YPanning with imageblit (PAN_REDRAW), we get this:
      
      4. SCROLL_PAN_REDRAW
      real    0m0.520s
      user    0m0.000s
      sys     0m0.518s
      
      That's almost 6x faster than SCROLL_REDRAW.  Increasing the amount of video
      RAM still increases the speed, but not very dramatically.  Higher than 16 MB,
      the increase is negligible.
      
      Using an accelerated driver, we see almost the same effect but not as
      dramatically:
      
      1. SCROLL_MOVE - accel
      real    0m3.112s
      user    0m0.000s
      sys     0m3.112s
      
      2. SCROLL_REDRAW - accel
      real    0m2.604s
      user    0m0.000s
      sys     0m2.603s
      
      Redraw is still faster than move, but not much.
      
      3. SCROLL_PAN_MOVE - accel
      real    0m0.203s
      user    0m0.000s
      sys     0m0.202s
      
      4. SCROLL_PAN_REDRAW - accel
      real    0m0.326s
      user    0m0.002s
      sys     0m0.323s
      
      This is one exception.  If panning is enabled, move is actually faster than
      redraw.  As to why, I don't know.
      
      So based on the above, fbcon will choose the scrolling method based on the
      following preference:
      
      Ypan/Ywrap > accel imageblit > accel copyarea >
      soft imageblit > (soft copyarea)
      
      Note 2: Exception: accel copyarea > accel imageblit if Pan/Wrap is enabled.
      
      Note 3: soft copyarea will be avoided by fbcon as much as possible unless
      there is a specific override, ie., FBINFO_READS_FAST flag is set.  If this
      flag is set, fbcon will prefer copyarea over imageblit, accel or soft.
      
      As a final note, in order for fbcon to use the best scrolling method, the
      low-level drivers must provide the correct hinting by setting the
      FBINFO_HWACCEL_* flags.
      
      To vesafb users: boot vesafb like this for fastest scrolling action:
      
      video=vesafb:ypan,vram:16
      Signed-off-by: default avatarAntonino Daplas <adaplas@pol.net>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      8b984eb4
    • Antonino Daplas's avatar
      [PATCH] fbcon: refinements for fbcon · f032365d
      Antonino Daplas authored
      1.  From Petr Vandrovec <vandrove@vc.cvut.cz>.
      
      Begin quote
      
              yesterday I finally found why 2.6.x has problems with taking
              over vgacon.  Problem is that take_over_console does:
      
        	if (IS_VISIBLE)
          	save_screen(i);
        	...
        	visual_init(i, 0);
        	...
      
              so code nicely saves screen contents, and calls visual_init,
              which calls fbcon's init, which in turn can issue vc_resize.  And this
              vc_resize will trigger read from vc->vc_origin.  But vc_origin still
              points to videomemory, not to the buffer where save_screen() copied
              its data.
      
      End quote
      
      So updating vc->vc_origin to point to screenbuf after the previous console
      deinitializes allows fbcon to correctly update the screen from the screen
      buffer.  This change makes the clearing of vram (using fillrect) unnecessary.
      
      2.  If FBINFO_MISC_MODESWITCH flag is set in info, do the set_par() in
      fbcon_switch() instead of piggy-backing the set_par() on fbcon_resize().  This
      preserves the current var, skipping the unnecessary fb_find_mode() step.
      Signed-off-by: default avatarAntonino Daplas <adaplas@pol.net>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      f032365d