Skip to content
  1. Aug 11, 2014
  2. Aug 10, 2014
    • Linus Torvalds's avatar
      Merge branch 'linux-3.17' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 · 91384758
      Linus Torvalds authored
      
      
      Pull nouveau drm updates from Ben Skeggs:
       "Apologies for not getting this done in time for Dave's drm-next merge
        window.  As he mentioned, a pre-existing bug reared its head a lot
        more obviously after this lot of changes.  It took quite a bit of time
        to track it down.  In any case, Dave suggested I try my luck by
        sending directly to you this time.
      
        Overview:
      
         - more code for Tegra GK20A from NVIDIA - probing, reclockig
         - better fix for Kepler GPUs that have the graphics engine powered
           off on startup, method courtesy of info provided by NVIDIA
         - unhardcoding of a bunch of graphics engine setup on
           Fermi/Kepler/Maxwell, will hopefully solve some issues people have
           noticed on higher-end models
         - support for "Zero Bandwidth Clear" on Fermi/Kepler/Maxwell, needs
           userspace support in general, but some lucky apps will benefit
           automagically
         - reviewed/exposed the full object APIs to userspace (finally), gives
           it access to perfctrs, ZBC controls, various events.  More to come
           in the future.
         - various other fixes"
      
      Acked-by: default avatarDave Airlie <airlied@redhat.com>
      
      * 'linux-3.17' of git://anongit.freedesktop.org/git/nouveau/linux-2.6: (87 commits)
        drm/nouveau: expose the full object/event interfaces to userspace
        drm/nouveau: fix headless mode
        drm/nouveau: hide sysfs pstate file behind an option again
        drm/nv50/disp: shhh compiler
        drm/gf100-/gr: implement the proper SetShaderExceptions method
        drm/gf100-/gr: remove some broken ltc bashing, for now
        drm/gf100-/gr: unhardcode attribute cb config
        drm/gf100-/gr: fetch tpcs-per-ppc info on startup
        drm/gf100-/gr: unhardcode pagepool config
        drm/gf100-/gr: unhardcode bundle cb config
        drm/gf100-/gr: improve initial context patch list helpers
        drm/gf100-/gr: add support for zero bandwidth clear
        drm/nouveau/ltc: add zbc drivers
        drm/nouveau/ltc: s/ltcg/ltc/ + cleanup
        drm/nouveau: use ram info from nvif_device
        drm/nouveau/disp: implement nvif event sources for vblank/connector notifiers
        drm/nouveau/disp: allow user direct access to channel control registers
        drm/nouveau/disp: audit and version display classes
        drm/nouveau/disp: audit and version SCANOUTPOS method
        drm/nv50-/disp: audit and version PIOR_PWR method
        ...
      91384758
    • Linus Torvalds's avatar
      Merge tag 'trace-ipi-tracepoints' of... · c23190c0
      Linus Torvalds authored
      Merge tag 'trace-ipi-tracepoints' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
      
      Pull IPI tracepoints for ARM from Steven Rostedt:
       "Nicolas Pitre added generic tracepoints for tracing IPIs and updated
        the arm and arm64 architectures.  It required some minor updates to
        the generic tracepoint system, so it had to wait for me to implement
        them"
      
      * tag 'trace-ipi-tracepoints' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        ARM64: add IPI tracepoints
        ARM: add IPI tracepoints
        tracepoint: add generic tracepoint definitions for IPI tracing
        tracing: Do not do anything special with tracepoint_string when tracing is disabled
      c23190c0
    • Linus Torvalds's avatar
      Merge tag 'trace-fixes-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · fc335c1b
      Linus Torvalds authored
      Pull trace file read iterator fixes from Steven Rostedt:
       "This contains a fix for two long standing bugs.  Both of which are
        rarely ever hit, and requires the user to do something that users
        rarely do.  It took a few special test cases to even trigger this bug,
        and one of them was just one test in the process of finishing up as
        another one started.
      
        Both bugs have to do with the ring buffer iterator rb_iter_peek(), but
        one is more indirect than the other.
      
        The fist bug fix is simply an increase in the safety net loop counter.
        The counter makes sure that the rb_iter_peek() only iterates the
        number of times we expect it can, and no more.  Well, there was one
        way it could iterate one more than we expected, and that caused the
        ring buffer to shutdown with a nasty warning.  The fix was simply to
        up that counter by one.
      
        The other bug has to be with rb_iter_reset() (called by
        rb_iter_peek()).  This happens when a user reads both the trace_pipe
        and trace files.  The trace_pipe is a consuming read and does not use
        the ring buffer iterator, but the trace file is not a consuming read
        and does use the ring buffer iterator.  When the trace file is being
        read, if it detects that a consuming read occurred, it resets the
        iterator and starts over.  But the reset code that does this
        (rb_iter_reset()), checks if the reader_page is linked to the ring
        buffer or not, and will look into the ring buffer itself if it is not.
        This is wrong, as it should always try to read the reader page first.
        Not to mention, the code that looked into the ring buffer did it
        wrong, and used the header_page "read" offset to start reading on that
        page.  That offset is bogus for pages in the writable ring buffer, and
        was corrupting the iterator, and it would start returning bogus
        events"
      
      * tag 'trace-fixes-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        ring-buffer: Always reset iterator to reader page
        ring-buffer: Up rb_iter_peek() loop count to 3
      fc335c1b
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace · 77e40aae
      Linus Torvalds authored
      Pull namespace updates from Eric Biederman:
       "This is a bunch of small changes built against 3.16-rc6.  The most
        significant change for users is the first patch which makes setns
        drmatically faster by removing unneded rcu handling.
      
        The next chunk of changes are so that "mount -o remount,.." will not
        allow the user namespace root to drop flags on a mount set by the
        system wide root.  Aks this forces read-only mounts to stay read-only,
        no-dev mounts to stay no-dev, no-suid mounts to stay no-suid, no-exec
        mounts to stay no exec and it prevents unprivileged users from messing
        with a mounts atime settings.  I have included my test case as the
        last patch in this series so people performing backports can verify
        this change works correctly.
      
        The next change fixes a bug in NFS that was discovered while auditing
        nsproxy users for the first optimization.  Today you can oops the
        kernel by readi...
      77e40aae
    • Linus Torvalds's avatar
      Merge branch 'stable-3.17' of git://git.infradead.org/users/pcmoore/selinux · 96784de5
      Linus Torvalds authored
      Pull SElinux fixes from Paul Moore:
       "Two small patches to fix a couple of build warnings in SELinux and
        NetLabel.  The patches are obvious enough that I don't think any
        additional explanation is necessary, but it basically boils down to
        the usual: I was stupid, and these patches fix some of the stupid.
      
        Both patches were posted earlier this week to the SELinux list, and
        that is where they sat as I didn't think there were noteworthy enough
        to go upstream at this point in time, but DaveM would rather see them
        upstream now so who am I to argue.  As the patches are both very
        small"
      
      * 'stable-3.17' of git://git.infradead.org/users/pcmoore/selinux:
        selinux: remove unused variabled in the netport, netnode, and netif caches
        netlabel: fix the netlbl_catmap_setlong() dummy function
      96784de5
    • Linus Torvalds's avatar
      Merge branch 'for-3.17' of git://linux-nfs.org/~bfields/linux · 0d10c2c1
      Linus Torvalds authored
      Pull nfsd updates from Bruce Fields:
       "This includes a major rewrite of the NFSv4 state code, which has
        always depended on a single mutex.  As an example, open creates are no
        longer serialized, fixing a performance regression on NFSv3->NFSv4
        upgrades.  Thanks to Jeff, Trond, and Benny, and to Christoph for
        review.
      
        Also some RDMA fixes from Chuck Lever and Steve Wise, and
        miscellaneous fixes from Kinglong Mee and others"
      
      * 'for-3.17' of git://linux-nfs.org/~bfields/linux: (167 commits)
        svcrdma: remove rdma_create_qp() failure recovery logic
        nfsd: add some comments to the nfsd4 object definitions
        nfsd: remove the client_mutex and the nfs4_lock/unlock_state wrappers
        nfsd: remove nfs4_lock_state: nfs4_state_shutdown_net
        nfsd: remove nfs4_lock_state: nfs4_laundromat
        nfsd: Remove nfs4_lock_state(): reclaim_complete()
        nfsd: Remove nfs4_lock_state(): setclientid, setclientid_confirm, renew
        nfsd: Remove nfs4_lock_state(): exchange_id, create/destroy_session()
        nfsd: Remove nfs4_lock_state(): nfsd4_open and nfsd4_open_confirm
        nfsd: Remove nfs4_lock_state(): nfsd4_delegreturn()
        nfsd: Remove nfs4_lock_state(): nfsd4_open_downgrade + nfsd4_close
        nfsd: Remove nfs4_lock_state(): nfsd4_lock/locku/lockt()
        nfsd: Remove nfs4_lock_state(): nfsd4_release_lockowner
        nfsd: Remove nfs4_lock_state(): nfsd4_test_stateid/nfsd4_free_stateid
        nfsd: Remove nfs4_lock_state(): nfs4_preprocess_stateid_op()
        nfsd: remove old fault injection infrastructure
        nfsd: add more granular locking to *_delegations fault injectors
        nfsd: add more granular locking to forget_openowners fault injector
        nfsd: add more granular locking to forget_locks fault injector
        nfsd: add a list_head arg to nfsd_foreach_client_lock
        ...
      0d10c2c1
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6 · 023f78b0
      Linus Torvalds authored
      Pull CIFS updates from Steve French:
       "The most visible change in this set is the additional of multi-credit
        support for SMB2/SMB3 which dramatically improves the large file i/o
        performance for these dialects and significantly increases the maximum
        i/o size used on the wire for SMB2/SMB3.
      
        Also reconnection behavior after network failure is improved"
      
      * 'for-next' of git://git.samba.org/sfrench/cifs-2.6: (35 commits)
        Add worker function to set allocation size
        [CIFS] Fix incorrect hex vs. decimal in some debug print statements
        update CIFS TODO list
        Add Pavel to contributor list in cifs AUTHORS file
        Update cifs version
        CIFS: Fix STATUS_CANNOT_DELETE error mapping for SMB2
        CIFS: Optimize readpages in a short read case on reconnects
        CIFS: Optimize cifs_user_read() in a short read case on reconnects
        CIFS: Improve indentation in cifs_user_read()
        CIFS: Fix possible buffer corruption in cifs_user_read()
        CIFS: Count got bytes in read_into_pages()
        CIFS: Use separate var for the number of bytes got in async read
        CIFS: Indicate reconnect with ECONNABORTED error code
        CIFS: Use multicredits for SMB 2.1/3 reads
        CIFS: Fix rsize usage for sync read
        CIFS: Fix rsize usage in user read
        CIFS: Separate page reading from user read
        CIFS: Fix rsize usage in readpages
        CIFS: Separate page search from readpages
        CIFS: Use multicredits for SMB 2.1/3 writes
        ...
      023f78b0
    • Ben Skeggs's avatar
    • Ben Skeggs's avatar
      drm/nouveau: fix headless mode · 771fa0e4
      Ben Skeggs authored
      
      
      Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
      771fa0e4
    • Ben Skeggs's avatar
      drm/nouveau: hide sysfs pstate file behind an option again · 0d48b58a
      Ben Skeggs authored
      
      
      No-one has yet had time to move this to debugfs as discussed during
      the last merge window.  Until this happens, hide the option to make
      it clear it's not going to be here forever.
      
      Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
      0d48b58a
    • Ben Skeggs's avatar
      drm/nv50/disp: shhh compiler · c354080d
      Ben Skeggs authored
      
      
      Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
      c354080d
    • Ben Skeggs's avatar
      drm/gf100-/gr: implement the proper SetShaderExceptions method · d6bd3803
      Ben Skeggs authored
      
      
      We have another version of it implemented in SW, however, that version
      isn't serialised with normal PGRAPH operation and can possibly clobber
      the enables for another context.
      
      This is the same method that's implemented by the NVIDIA binary driver.
      
      Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
      d6bd3803
    • Ben Skeggs's avatar
      drm/gf100-/gr: remove some broken ltc bashing, for now · e8873773
      Ben Skeggs authored
      
      
      ... and hope that the defaults are good enough.  This was always
      supposed to be a read/modify/write thing anyway, so we're writing
      very wrong stuff for some boards already.
      
      Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
      e8873773
    • Ben Skeggs's avatar
      drm/gf100-/gr: unhardcode attribute cb config · 67cfbfdf
      Ben Skeggs authored
      
      
      Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
      67cfbfdf
    • Ben Skeggs's avatar
      b81146b0
    • Ben Skeggs's avatar
      drm/gf100-/gr: unhardcode pagepool config · f331a15f
      Ben Skeggs authored
      
      
      Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
      f331a15f
    • Ben Skeggs's avatar
      drm/gf100-/gr: unhardcode bundle cb config · aa2d58c3
      Ben Skeggs authored
      
      
      Should be the same values as before, except:
      
      GF117 has smaller buffer allocated, as per register setup.
      GK20A now uses values from Tegra driver, not GK104's.
      
      Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
      aa2d58c3
    • Ben Skeggs's avatar
      drm/gf100-/gr: improve initial context patch list helpers · 694c6caf
      Ben Skeggs authored
      
      
      Removes need for fixed buffer indices, and allows the functions
      utilising them to also be run outside of context generation.
      
      Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
      694c6caf
    • Ben Skeggs's avatar
      drm/gf100-/gr: add support for zero bandwidth clear · ac9738bb
      Ben Skeggs authored
      
      
      Default ZBC table is compatible with binary driver defaults.
      
      Userspace will need to be updated to take full advantage of this
      feature, however, some applications will see a performance boost
      without updated drivers.
      
      Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
      ac9738bb
    • Ben Skeggs's avatar
      drm/nouveau/ltc: add zbc drivers · f38fdb6a
      Ben Skeggs authored
      
      
      Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
      f38fdb6a
    • Ben Skeggs's avatar
      drm/nouveau/ltc: s/ltcg/ltc/ + cleanup · 95484b57
      Ben Skeggs authored
      
      
      Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
      95484b57
    • Ben Skeggs's avatar
      drm/nouveau: use ram info from nvif_device · f392ec4b
      Ben Skeggs authored
      
      
      Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
      f392ec4b
    • Ben Skeggs's avatar
    • Ben Skeggs's avatar
    • Ben Skeggs's avatar
      drm/nouveau/disp: audit and version display classes · 648d4dfd
      Ben Skeggs authored
      
      
      The full object interfaces are about to be exposed to userspace, so we
      need to check for any security-related issues and version the structs
      to make it easier to handle any changes we may need in the future.
      
      Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
      648d4dfd
    • Ben Skeggs's avatar
      drm/nouveau/disp: audit and version SCANOUTPOS method · 4952b4d3
      Ben Skeggs authored
      
      
      The full object interfaces are about to be exposed to userspace, so we
      need to check for any security-related issues and version the structs
      to make it easier to handle any changes we may need in the future.
      
      Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
      4952b4d3
    • Ben Skeggs's avatar
      drm/nv50-/disp: audit and version PIOR_PWR method · 67cb49c4
      Ben Skeggs authored
      
      
      The full object interfaces are about to be exposed to userspace, so we
      need to check for any security-related issues and version the structs
      to make it easier to handle any changes we may need in the future.
      
      Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
      67cb49c4
    • Ben Skeggs's avatar
      drm/nv50-/disp: audit and version SOR_DP_PWR method · c02ed2bf
      Ben Skeggs authored
      
      
      The full object interfaces are about to be exposed to userspace, so we
      need to check for any security-related issues and version the structs
      to make it easier to handle any changes we may need in the future.
      
      Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
      c02ed2bf
    • Ben Skeggs's avatar
      drm/nv50-/disp: audit and version LVDS_SCRIPT method · a3761fa2
      Ben Skeggs authored
      
      
      The full object interfaces are about to be exposed to userspace, so we
      need to check for any security-related issues and version the structs
      to make it easier to handle any changes we may need in the future.
      
      Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
      a3761fa2
    • Ben Skeggs's avatar
      drm/nv50-/disp: audit and version SOR_HDMI_PWR method · e00f2235
      Ben Skeggs authored
      
      
      The full object interfaces are about to be exposed to userspace, so we
      need to check for any security-related issues and version the structs
      to make it easier to handle any changes we may need in the future.
      
      Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
      e00f2235
    • Ben Skeggs's avatar
      drm/nv50-/disp: audit and version SOR_HDA_ELD method · 120b0c39
      Ben Skeggs authored
      
      
      The full object interfaces are about to be exposed to userspace, so we
      need to check for any security-related issues and version the structs
      to make it easier to handle any changes we may need in the future.
      
      Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
      120b0c39
    • Ben Skeggs's avatar
      drm/nv50-/disp: audit and version SOR_PWR method · d55b4af9
      Ben Skeggs authored
      
      
      The full object interfaces are about to be exposed to userspace, so we
      need to check for any security-related issues and version the structs
      to make it easier to handle any changes we may need in the future.
      
      Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
      d55b4af9
    • Ben Skeggs's avatar
      drm/nv50-/disp: audit and version DAC_LOAD method · c4abd317
      Ben Skeggs authored
      
      
      The full object interfaces are about to be exposed to userspace, so we
      need to check for any security-related issues and version the structs
      to make it easier to handle any changes we may need in the future.
      
      Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
      c4abd317
    • Ben Skeggs's avatar
      drm/nv50-/disp: audit and version DAC_PWR method · bf0eb898
      Ben Skeggs authored
      
      
      The full object interfaces are about to be exposed to userspace, so we
      need to check for any security-related issues and version the structs
      to make it easier to handle any changes we may need in the future.
      
      Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
      bf0eb898