Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backporting 5.3/5.4 changes into 4.19 #32

Merged

Commits on Jan 17, 2020

  1. Revert "USB: Modify lpm check for sdcard-reader"

    This reverts commit 218ad8f.
    
    (corresponds to commit 810a019)
    kitakar5525 committed Jan 17, 2020
    Configuration menu
    Copy the full SHA
    5ab0b86 View commit details
    Browse the repository at this point in the history
  2. Revert "staging: Add WIP camera drivers for Surfae devices"

    This reverts commit 36f3225.
    
    (corresponds to commit a13b184)
    kitakar5525 committed Jan 17, 2020
    Configuration menu
    Copy the full SHA
    f346b5b View commit details
    Browse the repository at this point in the history
  3. Revert "power/suspend: Add delay for device quirks"

    This reverts commit 4bb6b4b.
    
    (corresponds to commit 71867ba)
    kitakar5525 committed Jan 17, 2020
    Configuration menu
    Copy the full SHA
    e1adbee View commit details
    Browse the repository at this point in the history
  4. Revert "wireless: Add mwlwifi driver"

    This reverts commit b026a27.
    
    (corresponds to commit 09372ba)
    kitakar5525 committed Jan 17, 2020
    Configuration menu
    Copy the full SHA
    1e27f5e View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2020

  1. BACKPORT: Revert downstream_hpd_needs_d0 changes in i915

    (cherry-picked from commit 434376f)
    [changed commit title from "Revert downstream_hpd_needs_d0 changes
    in i915_legacy" because 5.3 kernel used i915_legacy but 4.19 kernel
    uses i915.]
    qzed authored and kitakar5525 committed Jan 19, 2020
    Configuration menu
    Copy the full SHA
    cb11130 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    2f2ae1a View commit details
    Browse the repository at this point in the history
  3. BACKPORT: Remove IPTS sensor mode APIs

    The previous commit reverted the changes to hid-multitouch that were done by
    the IPTS patch. The original implementation modified hid-multitouch to make the
    single-touch mode work. However, window managers such as GNOME's mutter cannot
    differentiate between two touchscreens on the same panel. This results in broken
    touch input rotation (the single-touch panel gets rotated, even if it is not
    active).
    
    jakeday/linux-surface#549 had some discussion on this
    and multiple fixes. But I think the less changes to unrelated kernel code, the
    better. I don't think that anyone actually uses single-touch mode.
    
    Since single-touch mode was disabled by the previous commit, remove all user-
    space APIs to enable it, since that just sends all touch input to /dev/null
    
    Because IPTS does switch it's mode during initialization, it is not possible to
    remove all references to the sensor mode, at least not without a more in-depth
    review.
    
    Signed-off-by: Dorian Stoll <dorian.stoll@tmsp.io>
    
    (cherry-picked from commit 86f95d2)
    StollD authored and kitakar5525 committed Jan 19, 2020
    Configuration menu
    Copy the full SHA
    7e520ac View commit details
    Browse the repository at this point in the history
  4. BACKPORT: ipts: Implement new companion interface

    This makes it easier to extend the companion driver, since everything is
    stored in a single struct.
    
    The ipts_companion_t struct is stored in two places, the IPTS main driver,
    and the driver registering it. It is still passed through to the functions
    that the companion driver implements to allow for device specific behaviour.
    
    Signed-off-by: Dorian Stoll <dorian.stoll@tmsp.io>
    
    (cherry-picked from commit a1531a7)
    StollD authored and kitakar5525 committed Jan 19, 2020
    Configuration menu
    Copy the full SHA
    c48c2ee View commit details
    Browse the repository at this point in the history
  5. BACKPORT: ipts: Move ipts_fw_config.bin into the companion

    Since ipts_fw_config.bin is mapped directly onto C structs by the IPTS
    driver, we can declare those values ourselves, instead of putting them
    into an obscure binary file that was provided by Intel ages ago.
    
    This could also open up the door to modifying the firmware config in
    case anyone ever understands IPTS that much.
    
    Signed-off-by: Dorian Stoll <dorian.stoll@tmsp.io>
    
    (cherry-picked from commit e1cfd84)
    StollD authored and kitakar5525 committed Jan 19, 2020
    Configuration menu
    Copy the full SHA
    8700a7f View commit details
    Browse the repository at this point in the history
  6. BACKPORT: ipts: Address comments by qzed and grayhatter

    * Removed some of the gotos in the simpler companion function
    * Made the companion driver the first parameter in the firmware handler
    * Changed ipts-surface to warn when adding the companion driver failed
    * Made ipts_alloc_fw_list static
    * Streamlined ipts_request_firmware_config
    * Added explicit values for ipts_bin_data_file_flags_t elements
    
    Signed-off-by: Dorian Stoll <dorian.stoll@tmsp.io>
    
    (cherry-picked from commit 636e23d)
    StollD authored and kitakar5525 committed Jan 19, 2020
    Configuration menu
    Copy the full SHA
    e54ba9e View commit details
    Browse the repository at this point in the history
  7. BACKPORT: ipts: Clean up ipts-mei-msg.h to pass checkpatch

    Signed-off-by: Dorian Stoll <dorian.stoll@tmsp.io>
    
    (cherry-picked from commit a16bb16)
    StollD authored and kitakar5525 committed Jan 19, 2020
    Configuration menu
    Copy the full SHA
    7dfd1b6 View commit details
    Browse the repository at this point in the history
  8. BACKPORT: ipts: Clean up ipts.h to pass checkpatch

    Signed-off-by: Dorian Stoll <dorian.stoll@tmsp.io>
    
    (cherry-picked from commit bda1092)
    StollD authored and kitakar5525 committed Jan 19, 2020
    Configuration menu
    Copy the full SHA
    b5cd975 View commit details
    Browse the repository at this point in the history
  9. BACKPORT: ipts: Cleanup ipts-sensor-regs.h to pass checkpatch

    Signed-off-by: Dorian Stoll <dorian.stoll@tmsp.io>
    
    (cherry-picked from commit 30a9d30)
    StollD authored and kitakar5525 committed Jan 19, 2020
    Configuration menu
    Copy the full SHA
    97256f6 View commit details
    Browse the repository at this point in the history
  10. BACKPORT: ipts: Cleanup ipts-dbgfs.c to pass checkpatch

    Signed-off-by: Dorian Stoll <dorian.stoll@tmsp.io>
    
    (cherry-picked from commit 52e26dd)
    StollD authored and kitakar5525 committed Jan 19, 2020
    Configuration menu
    Copy the full SHA
    525aeb7 View commit details
    Browse the repository at this point in the history
  11. BACKPORT: ipts: Cleanup ipts-params to pass checkpatch

    Signed-off-by: Dorian Stoll <dorian.stoll@tmsp.io>
    
    (cherry-picked commit from 9c9dfad)
    StollD authored and kitakar5525 committed Jan 19, 2020
    Configuration menu
    Copy the full SHA
    83619a6 View commit details
    Browse the repository at this point in the history
  12. BACKPORT: ipts: Cleanup ipts-resource to pass checkpatch

    Signed-off-by: Dorian Stoll <dorian.stoll@tmsp.io>
    
    (cherry-picked from commit 05f51be)
    StollD authored and kitakar5525 committed Jan 19, 2020
    Configuration menu
    Copy the full SHA
    7672bb0 View commit details
    Browse the repository at this point in the history
  13. BACKPORT: ipts: Cleanup ipts-state.h to pass checkpatch

    Signed-off-by: Dorian Stoll <dorian.stoll@tmsp.io>
    
    (cherry-picked from commit 4aaed39)
    StollD authored and kitakar5525 committed Jan 19, 2020
    Configuration menu
    Copy the full SHA
    76642e3 View commit details
    Browse the repository at this point in the history
  14. BACKPORT: ipts: Cleanup ipts-gfx to pass checkpatch

    Signed-off-by: Dorian Stoll <dorian.stoll@tmsp.io>
    
    (cherry-picked from commit 24f97ef)
    StollD authored and kitakar5525 committed Jan 19, 2020
    Configuration menu
    Copy the full SHA
    36bb00d View commit details
    Browse the repository at this point in the history
  15. BACKPORT: ipts: Cleanup ipts-companion to pass checkpatch

    Signed-off-by: Dorian Stoll <dorian.stoll@tmsp.io>
    
    (cherry-picked from commit f63f758)
    StollD authored and kitakar5525 committed Jan 19, 2020
    Configuration menu
    Copy the full SHA
    6c2bceb View commit details
    Browse the repository at this point in the history
  16. BACKPORT: ipts: Cleanup ipts-msg-handler to pass checkpatch

    Signed-off-by: Dorian Stoll <dorian.stoll@tmsp.io>
    
    (cherry-picked from commit 0774af9)
    StollD authored and kitakar5525 committed Jan 19, 2020
    Configuration menu
    Copy the full SHA
    085f2d3 View commit details
    Browse the repository at this point in the history
  17. BACKPORT: ipts: Cleanup ipts-surface to pass checkpatch

    Signed-off-by: Dorian Stoll <dorian.stoll@tmsp.io>
    
    (cherry-picked from commit c0556e1)
    StollD authored and kitakar5525 committed Jan 19, 2020
    Configuration menu
    Copy the full SHA
    79d32d1 View commit details
    Browse the repository at this point in the history
  18. BACKPORT: ipts: Cleanup public headers to pass checkpatch

    Signed-off-by: Dorian Stoll <dorian.stoll@tmsp.io>
    
    (cherry-picked from commit 1fb6e17)
    StollD authored and kitakar5525 committed Jan 19, 2020
    Configuration menu
    Copy the full SHA
    47b71b6 View commit details
    Browse the repository at this point in the history
  19. BACKPORT: ipts: Cleanup ipts-hid to pass checkpatch

    Signed-off-by: Dorian Stoll <dorian.stoll@tmsp.io>
    
    (cherry-picked from commit 1050bfc)
    StollD authored and kitakar5525 committed Jan 19, 2020
    Configuration menu
    Copy the full SHA
    5874171 View commit details
    Browse the repository at this point in the history
  20. BACKPORT: ipts: Cleanup ipts-kernel to pass checkpatch

    Signed-off-by: Dorian Stoll <dorian.stoll@tmsp.io>
    
    (cherry-picked from commit 863de54)
    StollD authored and kitakar5525 committed Jan 19, 2020
    Configuration menu
    Copy the full SHA
    14ca509 View commit details
    Browse the repository at this point in the history
  21. BACKPORT: ipts: Update Makefile / Kconfig to pass checkpatch

    Signed-off-by: Dorian Stoll <dorian.stoll@tmsp.io>
    
    (cherry-picked from commit 9f369e2)
    StollD authored and kitakar5525 committed Jan 19, 2020
    Configuration menu
    Copy the full SHA
    21832a5 View commit details
    Browse the repository at this point in the history
  22. BACKPORT: ipts: Cleanup ipts-mei to pass checkpatch

    Signed-off-by: Dorian Stoll <dorian.stoll@tmsp.io>
    
    (cherry-picked from commit 1623943)
    StollD authored and kitakar5525 committed Jan 19, 2020
    Configuration menu
    Copy the full SHA
    8ab16f2 View commit details
    Browse the repository at this point in the history
  23. BACKPORT: ipts: Cleanup ipts-i915 to pass checkpatch

    Signed-off-by: Dorian Stoll <dorian.stoll@tmsp.io>
    
    (cherry-picked from commit b7c60a6)
    [resolved conflicts caused by changes between 4.19 and 5.3]
    StollD authored and kitakar5525 committed Jan 19, 2020
    Configuration menu
    Copy the full SHA
    7d81703 View commit details
    Browse the repository at this point in the history
  24. Fixup: BACKPORT: ipts: Cleanup ipts-i915 to pass checkpatch

    When cherry-picking the commit b7c60a6
    (ipts: Cleanup ipts-i915 to pass checkpatch), the following line added
    accidentally.
    
            drivers/gpu/drm/i915/i915_irq.c:40:10: fatal error: intel_psr.h: No such file or directory
               40 | #include "intel_psr.h"
                  |          ^~~~~~~~~~~~~
    
    This commit fixes up the accidentally added line by removing it.
    kitakar5525 committed Jan 19, 2020
    Configuration menu
    Copy the full SHA
    5928135 View commit details
    Browse the repository at this point in the history
  25. Fixup: BACKPORT: ipts: add static_assert definition to header files

    Fixup the following commits:
        BACKPORT: ipts: Cleanup ipts-sensor-regs.h to pass checkpatch
        BACKPORT: ipts: Clean up ipts-mei-msg.h to pass checkpatch
    
    The static_assert macro is not available on 4.19. So, there are two ways
    to fixup those commits:
        1. Backport upstream commit[1] that adds the static_assert
        2. Add the definition to ipts header files
    
    I chose the latter way because backporting the upstream commit causes
    conflicts and I have to a) backport other commit(s) or b) resolve the
    conflict manually.
    
    Also, the original IPTS patch[2] is doing the same way; they defined
    C_ASSERT in those files [3][4].
    
    References:
    [1] torvalds/linux@6bab69c
    [2] https://github.com/ipts-linux-org/ipts-linux-new
    [3] https://github.com/ipts-linux-org/ipts-linux-new/blob/master/drivers/misc/ipts/ipts-sensor-regs.h
    [4] https://github.com/ipts-linux-org/ipts-linux-new/blob/master/drivers/misc/ipts/ipts-mei-msgs.h
    kitakar5525 committed Jan 19, 2020
    Configuration menu
    Copy the full SHA
    437b497 View commit details
    Browse the repository at this point in the history
  26. BACKPORT: ipts: Move debugging settings into modparams

    Signed-off-by: Dorian Stoll <dorian.stoll@tmsp.io>
    
    (cherry-picked from commit ec34a39)
    StollD authored and kitakar5525 committed Jan 19, 2020
    Configuration menu
    Copy the full SHA
    75345e3 View commit details
    Browse the repository at this point in the history
  27. BACKPORT: ipts: Remove ipts prefix from driver source files

    Signed-off-by: Dorian Stoll <dorian.stoll@tmsp.io>
    
    (cherry-picked from commit 15585f5)
    StollD authored and kitakar5525 committed Jan 19, 2020
    Configuration menu
    Copy the full SHA
    16d6324 View commit details
    Browse the repository at this point in the history
  28. BACKPORT: ipts: Document output of IPTS debug thread

    Signed-off-by: Dorian Stoll <dorian.stoll@tmsp.io>
    
    (cherry-picked from commit 6fad9aa)
    StollD authored and kitakar5525 committed Jan 19, 2020
    Configuration menu
    Copy the full SHA
    38c7513 View commit details
    Browse the repository at this point in the history
  29. BACKPORT: ipts: Let the companion decide about no_feedback

    Having a DMI match for some surface devices doesn't really match with
    the concept of having a device-specific companion driver, so this commit
    moves the matching code to the companion.
    
    ipts-surface is now setup in a way that allows us to add device-specific
    data pretty easily. All you need is the interface to IPTS, which can
    just be copied from no_feedback.
    
    Signed-off-by: Dorian Stoll <dorian.stoll@tmsp.io>
    
    (cherry-picked from commit 40f343b)
    StollD authored and kitakar5525 committed Jan 19, 2020
    Configuration menu
    Copy the full SHA
    83eb67d View commit details
    Browse the repository at this point in the history
  30. BACKPORT: ipts: Add a generic interface for quirks

    Signed-off-by: Dorian Stoll <dorian.stoll@tmsp.io>
    
    (cherry-picked from commit 55e49e1)
    StollD authored and kitakar5525 committed Jan 19, 2020
    Configuration menu
    Copy the full SHA
    78ec176 View commit details
    Browse the repository at this point in the history
  31. Revert "wireless/mwifiex: Add quirks for Surface devices"

    This reverts commit 7f59405.
    
    (corresponds to commit d95adde)
    kitakar5525 committed Jan 19, 2020
    Configuration menu
    Copy the full SHA
    0202aad View commit details
    Browse the repository at this point in the history
  32. BACKPORT: wireless/mwifiex: Fix S0ix / suspend

    (cherry-picked from commit 8dbbfa6)
    sebanc authored and kitakar5525 committed Jan 19, 2020
    Configuration menu
    Copy the full SHA
    81a669a View commit details
    Browse the repository at this point in the history
  33. BACKPORT: ipts: Dont automatically switch sensor modes

    We don't want IPTS to set itself to singletouch mode in case it thinks
    that might fix anything, because it doesn't. Even a malfunctioning
    multitouch IPTS has a higher chance of working than singletouch.
    
    Signed-off-by: Dorian Stoll <dorian.stoll@tmsp.io>
    
    (cherry-picked from commit 894fbba)
    StollD authored and kitakar5525 committed Jan 19, 2020
    Configuration menu
    Copy the full SHA
    69ea9ac View commit details
    Browse the repository at this point in the history