1. 15 Dec, 2020 25 commits
  2. 14 Dec, 2020 4 commits
    • Daniel Vetter's avatar
      drm/amdkfd: fix ttm size refactor fallout · 8c392cd5
      Daniel Vetter authored
      I guess Christian didn't compile test amdkfd.
      Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
      Reviewed-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
      Fixes: e11bfb99 ("drm/ttm: cleanup BO size handling v3")
      Cc: Christian König <christian.koenig@amd.com>
      Cc: Huang Rui <ray.huang@amd.com> (v1)
      Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
      Cc: Felix Kuehling <Felix.Kuehling@amd.com>
      Cc: amd-gfx@lists.freedesktop.org
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
      Link: https://patchwork.freedesktop.org/patch/msgid/20201214191725.3899147-1-daniel.vetter@ffwll.ch
      8c392cd5
    • Linus Torvalds's avatar
      Merge tag 'drm-next-2020-12-11' of git://anongit.freedesktop.org/drm/drm · 1d36dffa
      Linus Torvalds authored
      Pull drm updates from Dave Airlie:
       "Not a huge amount of big things here, AMD has support for a few new HW
        variants (vangogh, green sardine, dimgrey cavefish), Intel has some
        more DG1 enablement. We have a few big reworks of the TTM layers and
        interfaces, GEM and atomic internal API reworks cross tree. fbdev is
        marked orphaned in here as well to reflect the current reality.
      
        core:
         - documentation updates
         - deprecate DRM_FORMAT_MOD_NONE
         - atomic crtc enable/disable rework
         - GEM convert drivers to gem object functions
         - remove SCATTER_LIST_MAX_SEGMENT
      
        sched:
         - avoid infinite waits
      
        ttm:
         - remove AGP support
         - don't modify caching for swapout
         - ttm pinning rework
         - major TTM reworks
         - new backend allocator
         - multihop support
      
        vram-helper:
         - top down BO placement fix
         - TTM changes
         - GEM object support
      
        displayport:
         - DP 2.0 DPCD prep work
         - DP MST extended DPCD caps
      
        fbdev:
         - mark as orphaned
      
        amdgpu:
         - Initial Vangogh support
         - Green Sardine support
         - Dimgrey Cavefish support
         - SG display support for renoir
         - SMU7 improvements
         - gfx9+ modiifier support
         - CI BACO fixes
      
        radeon:
         - expose voltage via hwmon on SUMO
      
        amdkfd:
         - fix unique id handling
      
        i915:
         - more DG1 enablement
         - bigjoiner support
         - integer scaling filter support
         - async flip support
         - ICL+ DSI command mode
         - Improve display shutdown
         - Display refactoring
         - eLLC machine fbdev loading fix
         - dma scatterlist fixes
         - TGL hang fixes
         - eLLC display buffer caching on SKL+
         - MOCS PTE seeting for gen9+
      
        msm:
         - Shutdown hook
         - GPU cooling device support
         - DSI 7nm and 10nm phy/pll updates
         - sm8150/sm2850 DPU support
         - GEM locking re-work
         - LLCC system cache support
      
        aspeed:
         - sysfs output config support
      
        ast:
         - LUT fix
         - new display mode
      
        gma500:
         - remove 2d framebuffer accel
      
        panfrost:
         - move gpu reset to a worker
      
        exynos:
         - new HDMI mode support
      
        mediatek:
         - MT8167 support
         - yaml bindings
         - MIPI DSI phy code moved
      
        etnaviv:
         - new perf counter
         - more lockdep annotation
      
        hibmc:
         - i2c DDC support
      
        ingenic:
         - pixel clock reset fix
         - reserved memory support
         - allow both DMA channels at once
         - different pixel format support
         - 30/24/8-bit palette modes
      
        tilcdc:
         - don't keep vblank irq enabled
      
        vc4:
         - new maintainer added
         - DSI registration fix
      
        virtio:
         - blob resource support
         - host visible and cross-device support
         - uuid api support"
      
      * tag 'drm-next-2020-12-11' of git://anongit.freedesktop.org/drm/drm: (1754 commits)
        drm/amdgpu: Initialise drm_gem_object_funcs for imported BOs
        drm/amdgpu: fix size calculation with stolen vga memory
        drm/amdgpu: remove amdgpu_ttm_late_init  and amdgpu_bo_late_init
        drm/amdgpu: free the pre-OS console framebuffer after the first modeset
        drm/amdgpu: enable runtime pm using BACO on CI dGPUs
        drm/amdgpu/cik: enable BACO reset on Bonaire
        drm/amd/pm: update smu10.h WORKLOAD_PPLIB setting for raven
        drm/amd/pm: remove one unsupported smu function for vangogh
        drm/amd/display: setup system context for APUs
        drm/amd/display: add S/G support for Vangogh
        drm/amdkfd: Fix leak in dmabuf import
        drm/amdgpu: use AMDGPU_NUM_VMID when possible
        drm/amdgpu: fix sdma instance fw version and feature version init
        drm/amd/pm: update driver if version for dimgrey_cavefish
        drm/amd/display: 3.2.115
        drm/amd/display: [FW Promotion] Release 0.0.45
        drm/amd/display: Revert DCN2.1 dram_clock_change_latency update
        drm/amd/display: Enable gpu_vm_support for dcn3.01
        drm/amd/display: Fixed the audio noise during mode switching with HDCP mode on
        drm/amd/display: Add wm table for Renoir
        ...
      1d36dffa
    • Christian König's avatar
      drm/ttm: cleanup BO size handling v3 · e11bfb99
      Christian König authored
      Based on an idea from Dave, but cleaned up a bit.
      
      We had multiple fields for essentially the same thing.
      
      Now bo->base.size is the original size of the BO in
      arbitrary units, usually bytes.
      
      bo->mem.num_pages is the size in number of pages in the
      resource domain of bo->mem.mem_type.
      
      v2: use the GEM object size instead of the BO size
      v3: fix printks in some places
      Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
      Reviewed-by: Huang Rui <ray.huang@amd.com> (v1)
      Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      Link: https://patchwork.freedesktop.org/patch/406831/
      e11bfb99
    • Tian Tao's avatar
      drm/drv: Remove invalid assignments · dc379303
      Tian Tao authored
      it's not necessary to assign a value of 0 to ret here, because if
      the previous functions were executed correctly, ret would be 0.
      Signed-off-by: default avatarTian Tao <tiantao6@hisilicon.com>
      Reviewed-by: default avatarSimon Ser <contact@emersion.fr>
      Link: https://patchwork.freedesktop.org/patch/msgid/1607653037-37785-1-git-send-email-tiantao6@hisilicon.com
      dc379303
  3. 13 Dec, 2020 3 commits
    • Linus Torvalds's avatar
      Linux 5.10 · 2c85ebc5
      Linus Torvalds authored
      2c85ebc5
    • Linus Torvalds's avatar
      Merge tag 'x86-urgent-2020-12-13' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · ec6f5e0e
      Linus Torvalds authored
      Pull x86 fixes from Thomas Gleixner:
       "A set of x86 and membarrier fixes:
      
         - Correct a few problems in the x86 and the generic membarrier
           implementation. Small corrections for assumptions about visibility
           which have turned out not to be true.
      
         - Make the PAT bits for memory encryption correct vs 4K and 2M/1G
           page table entries as they are at a different location.
      
         - Fix a concurrency issue in the the local bandwidth readout of
           resource control leading to incorrect values
      
         - Fix the ordering of allocating a vector for an interrupt. The order
           missed to respect the provided cpumask when the first attempt of
           allocating node local in the mask fails. It then tries the node
           instead of trying the full provided mask first. This leads to
           erroneous error messages and breaking the (user) supplied affinity
           request. Reorder it.
      
         - Make the INT3 padding detection in optprobe work correctly"
      
      * tag 'x86-urgent-2020-12-13' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/kprobes: Fix optprobe to detect INT3 padding correctly
        x86/apic/vector: Fix ordering in vector assignment
        x86/resctrl: Fix incorrect local bandwidth when mba_sc is enabled
        x86/mm/mem_encrypt: Fix definition of PMD_FLAGS_DEC_WP
        membarrier: Execute SYNC_CORE on the calling thread
        membarrier: Explicitly sync remote cores when SYNC_CORE is requested
        membarrier: Add an actual barrier before rseq_preempt()
        x86/membarrier: Get rid of a dubious optimization
      ec6f5e0e
    • Linus Torvalds's avatar
      Merge tag 'block-5.10-2020-12-12' of git://git.kernel.dk/linux-block · d2360a39
      Linus Torvalds authored
      Pull block fixes from Jens Axboe:
       "This should be it for 5.10.
      
        Mike and Song looked into the warning case, and thankfully it appears
        the fix was pretty trivial - we can just change the md device chunk
        type to unsigned int to get rid of it. They cannot currently be < 0,
        and nobody is checking for that either.
      
        We're reverting the discard changes as the corruption reports came in
        very late, and there's just no time to attempt to deal with it at this
        point. Reverting the changes in question is the right call for 5.10"
      
      * tag 'block-5.10-2020-12-12' of git://git.kernel.dk/linux-block:
        md: change mddev 'chunk_sectors' from int to unsigned
        Revert "md: add md_submit_discard_bio() for submitting discard bio"
        Revert "md/raid10: extend r10bio devs to raid disks"
        Revert "md/raid10: pull codes that wait for blocked dev into one function"
        Revert "md/raid10: improve raid10 discard request"
        Revert "md/raid10: improve discard request for far layout"
        Revert "dm raid: remove unnecessary discard limits for raid10"
      d2360a39
  4. 12 Dec, 2020 8 commits
    • Linus Torvalds's avatar
      Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · 6bff9bb8
      Linus Torvalds authored
      Pull SCSI fixes from James Bottomley:
       "Five small fixes.  Four in drivers:
      
         - hisi_sas: fix internal queue timeout
      
         - be2iscsi: revert a prior fix causing problems
      
         - bnx2i: add missing dependency
      
         - storvsc: late arriving revert of a problem fix
      
        and one in the core.
      
        The core one is a minor change to stop paying attention to the busy
        count when returning out of resources because there's a race window
        where the queue might not restart due to missing returning I/O"
      
      * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
        Revert "scsi: storvsc: Validate length of incoming packet in storvsc_on_channel_callback()"
        scsi: hisi_sas: Select a suitable queue for internal I/Os
        scsi: core: Fix race between handling STS_RESOURCE and completion
        scsi: be2iscsi: Revert "Fix a theoretical leak in beiscsi_create_eqs()"
        scsi: bnx2i: Requires MMU
      6bff9bb8
    • Linus Torvalds's avatar
      Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux · 5ee595d9
      Linus Torvalds authored
      Pull i2c fix from Wolfram Sang:
       "Bugfix for the AT24 EEPROM driver"
      
      * 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
        misc: eeprom: at24: fix NVMEM name with custom AT24 device name
      5ee595d9
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm · 7b1b868e
      Linus Torvalds authored
      Pull kvm fixes from Paolo Bonzini:
       "Bugfixes for ARM, x86 and tools"
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
        tools/kvm_stat: Exempt time-based counters
        KVM: mmu: Fix SPTE encoding of MMIO generation upper half
        kvm: x86/mmu: Use cpuid to determine max gfn
        kvm: svm: de-allocate svm_cpu_data for all cpus in svm_cpu_uninit()
        selftests: kvm/set_memory_region_test: Fix race in move region test
        KVM: arm64: Add usage of stage 2 fault lookup level in user_mem_abort()
        KVM: arm64: Fix handling of merging tables into a block entry
        KVM: arm64: Fix memory leak on stage2 update of a valid PTE
      7b1b868e
    • Linus Torvalds's avatar
      Merge tag 'for-linus-5.10c-rc8-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip · b53966ff
      Linus Torvalds authored
      Pull xen fixes from Juergen Gross:
       "A short series fixing a regression introduced in 5.9 for running as
        Xen dom0 on a system with NVMe backed storage"
      
      * tag 'for-linus-5.10c-rc8-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
        xen: don't use page->lru for ZONE_DEVICE memory
        xen: add helpers for caching grant mapping pages
      b53966ff
    • Linus Torvalds's avatar
      Merge tag 'riscv-for-linus-5.10-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux · b01deddb
      Linus Torvalds authored
      Pull RISC-V fix from Palmer Dabbelt:
       "Just one fix. It's nothing critical, just a randconfig that wasn't
        building. That said, it does seem pretty safe and is technically a
        regression so I'm sending it along for 5.10:
      
         - define get_cycles64() all the time, as it's used by most
           configurations"
      
      * tag 'riscv-for-linus-5.10-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
        RISC-V: Define get_cycles64() regardless of M-mode
      b01deddb
    • Linus Torvalds's avatar
      Merge tag 'io_uring-5.10-2020-12-11' of git://git.kernel.dk/linux-block · 31d00f6e
      Linus Torvalds authored
      Pull io_uring fixes from Jens Axboe:
       "Two fixes in here, fixing issues introduced in this merge window"
      
      * tag 'io_uring-5.10-2020-12-11' of git://git.kernel.dk/linux-block:
        io_uring: fix file leak on error path of io ctx creation
        io_uring: fix mis-seting personality's creds
      31d00f6e
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 643e69af
      Linus Torvalds authored
      Pull input fixes from Dmitry Torokhov:
      
       - a fix for cm109 stomping on its own control URB if it tries to toggle
         buzzer immediately after userspace opens input device (found by
         syzcaller)
      
       - another fix for Raydium touchscreens that do not like splitting
         command transfers
      
       - quirks for i8042, soc_button_array, and goodix drivers to make them
         work better with certain hardware.
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
        Input: goodix - add upside-down quirk for Teclast X98 Pro tablet
        Input: cm109 - do not stomp on control URB
        Input: i8042 - add Acer laptops to the i8042 reset list
        Input: cros_ec_keyb - send 'scancodes' in addition to key events
        Input: soc_button_array - add Lenovo Yoga Tablet2 1051L to the dmi_use_low_level_irq list
        Input: raydium_ts_i2c - do not split tx transactions
      643e69af
    • Mike Snitzer's avatar
      md: change mddev 'chunk_sectors' from int to unsigned · 6ffeb1c3
      Mike Snitzer authored
      Commit e2782f56 ("Revert "dm raid: remove unnecessary discard
      limits for raid10"") exposed compiler warnings introduced by commit
      e0910c8e ("dm raid: fix discard limits for raid1 and raid10"):
      
      In file included from ./include/linux/kernel.h:14,
                       from ./include/asm-generic/bug.h:20,
                       from ./arch/x86/include/asm/bug.h:93,
                       from ./include/linux/bug.h:5,
                       from ./include/linux/mmdebug.h:5,
                       from ./include/linux/gfp.h:5,
                       from ./include/linux/slab.h:15,
                       from drivers/md/dm-raid.c:8:
      drivers/md/dm-raid.c: In function ‘raid_io_hints’:
      ./include/linux/minmax.h:18:28: warning: comparison of distinct pointer types lacks a cast
        (!!(sizeof((typeof(x) *)1 == (typeof(y) *)1)))
                                  ^~
      ./include/linux/minmax.h:32:4: note: in expansion of macro ‘__typecheck’
         (__typecheck(x, y) && __no_side_effects(x, y))
          ^~~~~~~~~~~
      ./include/linux/minmax.h:42:24: note: in expansion of macro ‘__safe_cmp’
        __builtin_choose_expr(__safe_cmp(x, y), \
                              ^~~~~~~~~~
      ./include/linux/minmax.h:51:19: note: in expansion of macro ‘__careful_cmp’
       #define min(x, y) __careful_cmp(x, y, <)
                         ^~~~~~~~~~~~~
      ./include/linux/minmax.h:84:39: note: in expansion of macro ‘min’
        __x == 0 ? __y : ((__y == 0) ? __x : min(__x, __y)); })
                                             ^~~
      drivers/md/dm-raid.c:3739:33: note: in expansion of macro ‘min_not_zero’
         limits->max_discard_sectors = min_not_zero(rs->md.chunk_sectors,
                                       ^~~~~~~~~~~~
      
      Fix this by changing the chunk_sectors member of 'struct mddev' from
      int to 'unsigned int' to match the type used for the 'chunk_sectors'
      member of 'struct queue_limits'.  Various MD code still uses 'int' but
      none of it appears to ever make use of signed int; and storing
      positive signed int in unsigned is perfectly safe.
      Reported-by: default avatarSong Liu <songliubraving@fb.com>
      Fixes: e2782f56 ("Revert "dm raid: remove unnecessary discard limits for raid10"")
      Fixes: e0910c8e ("dm raid: fix discard limits for raid1 and raid10")
      Cc: stable@vger,kernel.org # e0910c8e was marked for stable@
      Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
      Reviewed-by: default avatarSong Liu <song@kernel.org>
      Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
      6ffeb1c3