Eric Lee / smarc-fsl-linux-kernel

08 Mar, 2020

1 commit

  • 335d2828a   Merge tag 'v5.4.24' into imx_5.4.y ... Browse Code »

    Merge Linux stable release v5.4.24 into imx_5.4.y

    * tag 'v5.4.24': (3306 commits)
    Linux 5.4.24
    blktrace: Protect q->blk_trace with RCU
    kvm: nVMX: VMWRITE checks unsupported field before read-only field
    ...

    Signed-off-by: Jason Liu

    Conflicts:
    arch/arm/boot/dts/imx6sll-evk.dts
    arch/arm/boot/dts/imx7ulp.dtsi
    arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
    drivers/clk/imx/clk-composite-8m.c
    drivers/gpio/gpio-mxc.c
    drivers/irqchip/Kconfig
    drivers/mmc/host/sdhci-of-esdhc.c
    drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
    drivers/net/can/flexcan.c
    drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
    drivers/net/ethernet/mscc/ocelot.c
    drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
    drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
    drivers/net/phy/realtek.c
    drivers/pci/controller/mobiveil/pcie-mobiveil-host.c
    drivers/perf/fsl_imx8_ddr_perf.c
    drivers/tee/optee/shm_pool.c
    drivers/usb/cdns3/gadget.c
    kernel/sched/cpufreq.c
    net/core/xdp.c
    sound/soc/fsl/fsl_esai.c
    sound/soc/fsl/fsl_sai.c
    sound/soc/sof/core.c
    sound/soc/sof/imx/Kconfig
    sound/soc/sof/loader.c

    Jason Liu
     

24 Feb, 2020

1 commit

  • 9c76a7b28   pxa168fb: Fix the function used to release some memory in an error handling path ... Browse Code »

    [ Upstream commit 3c911fe799d1c338d94b78e7182ad452c37af897 ]

    In the probe function, some resources are allocated using 'dma_alloc_wc()',
    they should be released with 'dma_free_wc()', not 'dma_free_coherent()'.

    We already use 'dma_free_wc()' in the remove function, but not in the
    error handling path of the probe function.

    Also, remove a useless 'PAGE_ALIGN()'. 'info->fix.smem_len' is already
    PAGE_ALIGNed.

    Fixes: 638772c7553f ("fb: add support of LCD display controller on pxa168/910 (base layer)")
    Signed-off-by: Christophe JAILLET
    Reviewed-by: Lubomir Rintel
    CC: YueHaibing
    Signed-off-by: Bartlomiej Zolnierkiewicz
    Link: https://patchwork.freedesktop.org/patch/msgid/20190831100024.3248-1-christophe.jaillet@wanadoo.fr
    Signed-off-by: Sasha Levin

    Christophe JAILLET
     

26 Dec, 2019

1 commit

18 Dec, 2019

3 commits

  • 5d677f4ef   LF-509: video: fbdev: sii902x: Fix imx7d hdmi display not work ... Browse Code »

    sii902x hdmi cable detect thread is trigged by
    event FB_EVENT_FB_REGISTERED in register_framebuffer function
    when device bootup.

    when CONFIG_FB_MXC_OVERLAY is enabled, pixel clock has
    chance to be disabled by overlay fb.
    In this case cable detect thread will fail to get cable state
    and sii902x hdmi will not initialized.

    Fix it with immediate execute the cable detect thread and
    add 20ms delay to wait cable detect thread get the cable state.

    Signed-off-by: Sandor Yu
    Reviewed-by: Robby Cai

    Sandor Yu
     
  • e8ef76a05   LF-481: video: fbdev: mxc: Fix build warning ... Browse Code »

    Fix the followed build warning.

    drivers/video/fbdev/mxc/mxc_hdmi.c: In function ‘mxc_hdmi_cable_connected’:
    drivers/video/fbdev/mxc/mxc_hdmi.c:1964:3: warning: this statement may fall through [-Wimplicit-fallthrough=]
       mxc_hdmi_default_edid_cfg(hdmi);
       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    drivers/video/fbdev/mxc/mxc_hdmi.c:1966:2: note: here
      case HDMI_EDID_NO_MODES:
      ^~~~

    Signed-off-by: Sandor Yu

    Sandor Yu
     
  • 8d3e44702   video/hdmi: Fix AVI bar unpack ... Browse Code »

    commit 6039f37dd6b76641198e290f26b31c475248f567 upstream.

    The bar values are little endian, not big endian. The pack
    function did it right but the unpack got it wrong. Fix it.

    Cc: stable@vger.kernel.org
    Cc: linux-media@vger.kernel.org
    Cc: Martin Bugge
    Cc: Hans Verkuil
    Cc: Thierry Reding
    Cc: Mauro Carvalho Chehab
    Fixes: 2c676f378edb ("[media] hdmi: added unpack and logging functions for InfoFrames")
    Signed-off-by: Ville Syrjälä
    Link: https://patchwork.freedesktop.org/patch/msgid/20190919132853.30954-1-ville.syrjala@linux.intel.com
    Reviewed-by: Thierry Reding
    Signed-off-by: Greg Kroah-Hartman

    Ville Syrjälä
     

03 Dec, 2019

3 commits

  • 62b188044   LF-105-2 fbdev: mxc: hdmi: fix build warning of fall through ... Browse Code »

    fix following build warning:
    ../drivers/video/fbdev/mxc/mxc_hdmi.c: In function 'mxc_hdmi_cable_connected':
    ../drivers/video/fbdev/mxc/mxc_hdmi.c:1964:3: warning: this statement may fall through [-Wimplicit-fallthrough=]
    mxc_hdmi_default_edid_cfg(hdmi);
    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    ../drivers/video/fbdev/mxc/mxc_hdmi.c:1966:2: note: here
    case HDMI_EDID_NO_MODES:
    ^~~~

    Signed-off-by: Robby Cai
    Reviewed-by: Sandor Yu
    (cherry picked from commit ca5ffb6e67b6c4ce7351285a184179bd3c20afc5)

    Robby Cai
     
  • dd7f8f01c   video: fbdev: mxsfb: fix build error for dma_alloc_writecombine ... Browse Code »

    Since the commit

    commit 212836a9929f0c91214a8a1879e6e41be0e26a6f
    Author: Christoph Hellwig
    Date: Fri Jul 26 08:58:36 2019 +0200

    dma-mapping: remove dma_{alloc,free,mmap}_writecombine

    has removed dma_alloc_writecombine interface, below build
    error occured:

    drivers/video/fbdev/mxsfb.c: In function ‘mxsfb_overlay_map_video_memory’:
    drivers/video/fbdev/mxsfb.c:2059:19: error: implicit declaration of function ‘dma_alloc_writecombine’; did you mean ‘pgprot_writecombine’? [-Werror=implicit-function-declaration]
    2059 | ofb->video_mem = dma_alloc_writecombine(ofb->dev,
    | ^~~~~~~~~~~~~~~~~~~~~~
    | pgprot_writecombine
    drivers/video/fbdev/mxsfb.c:2059:17: warning: assignment to ‘void *’ from ‘int’ makes pointer from integer without a cast [-Wint-conversion]
    2059 | ofb->video_mem = dma_alloc_writecombine(ofb->dev,
    | ^
    drivers/video/fbdev/mxsfb.c: In function ‘mxsfb_overlay_exit’:
    drivers/video/fbdev/mxsfb.c:2134:4: error: implicit declaration of function ‘dma_free_writecombine’; did you mean ‘pgprot_writecombine’? [-Werror=implicit-function-declaration]
    2134 | dma_free_writecombine(ofb->dev, ofb->video_mem_size,
    | ^~~~~~~~~~~~~~~~~~~~~
    | pgprot_writecombine

    Signed-off-by: Fancy Fang

    Fancy Fang
     
  • ece587014   vide: fbdev: mxsfb: don't check return value for lock_fb_info() ... Browse Code »

    Since the commit

    commit cf4a3ae4ef3399179166a464af1d6b172225bef4
    Author: Daniel Vetter
    Date: Tue May 28 11:02:47 2019 +0200

    fbdev: lock_fb_info cannot fail

    has changed the lock_fb_info() to void type, so cannot check its
    return value anymore.

    Signed-off-by: Fancy Fang

    Fancy Fang
     

02 Dec, 2019

2 commits

  • 240dd9ec8   Merge branch 'display/next' into next ... Browse Code »

    * display/next: (340 commits)
    LF-94: drm: hdmi: imx: Add hdmi phy video mode valid function
    drm: hdmi: imx8: fix wrong hdmi type with non-SCDC HDMI sinks
    Revert "drm/imx/hdp: fix issue with non-SCDC HDMI sinks"
    drm/bridge: nwl-dsi Correct the DSI init sequence
    gpu: imx: framegen: Use crtc_clock instead of mode clock
    ...

    Dong Aisheng
     
  • cef61e1b5   Merge remote-tracking branch 'origin/display/fbdev' into display/next ... Browse Code »

    * origin/display/fbdev: (26 commits)
    MLK-22768 video: fbdev: mxc_ipuv3_fb: Handle enabled fg properly when set-par happens on bg
    video: fbdev: mxsfb: Fix writecombine/wc build error
    MLK-22084: fbdev: hdmi: Fix HDCP function failed work with Sony TV
    fbdev: dcic: Enable imx6 dcic driver
    video: fbdev: mxc: hdmi: add hdmi framebuffer driver
    ...

    Dong Aisheng
     

25 Nov, 2019

22 commits

08 Nov, 2019

1 commit

04 Nov, 2019

1 commit

  • b330f3972   fbdev: c2p: Fix link failure on non-inlining ... Browse Code »

    When the compiler decides not to inline the Chunky-to-Planar core
    functions, the build fails with:

    c2p_planar.c:(.text+0xd6): undefined reference to `c2p_unsupported'
    c2p_planar.c:(.text+0x1dc): undefined reference to `c2p_unsupported'
    c2p_iplan2.c:(.text+0xc4): undefined reference to `c2p_unsupported'
    c2p_iplan2.c:(.text+0x150): undefined reference to `c2p_unsupported'

    Fix this by marking the functions __always_inline.

    While this could be triggered before by manually enabling both
    CONFIG_OPTIMIZE_INLINING and CONFIG_CC_OPTIMIZE_FOR_SIZE, it was exposed
    in the m68k defconfig by commit ac7c3e4ff401b304 ("compiler: enable
    CONFIG_OPTIMIZE_INLINING forcibly").

    Fixes: 9012d011660ea5cf ("compiler: allow all arches to enable CONFIG_OPTIMIZE_INLINING")
    Reported-by: noreply@ellerman.id.au
    Signed-off-by: Geert Uytterhoeven
    Reviewed-by: Masahiro Yamada
    Signed-off-by: Daniel Vetter
    Link: https://patchwork.freedesktop.org/patch/msgid/20190927094708.11563-1-geert@linux-m68k.org

    Geert Uytterhoeven
     

05 Oct, 2019

2 commits

24 Sep, 2019

1 commit

  • d0b3cfee3   Merge tag 'backlight-next-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight ... Browse Code »

    Pull backlight updates from Lee Jones:
    "Core Frameworks
    - Obtain scale type through sysfs

    New Functionality:
    - Provide Device Tree functionality in rave-sp-backlight
    - Calculate if scale type is (non-)linear in pwm_bl

    Fix-ups:
    - Simplify code in lm3630a_bl
    - Trivial rename/whitespace/typo fixes in lms283gf05
    - Remove superfluous NULL check in tosa_lcd
    - Fix power state initialisation in gpio_backlight
    - List supported file in MAINTAINERS

    Bug Fixes:
    - Kconfig - default to not building unless requested in
    {LED,BACKLIGHT}_CLASS_DEVICE"

    * tag 'backlight-next-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight:
    backlight: pwm_bl: Set scale type for brightness curves specified in the DT
    backlight: pwm_bl: Set scale type for CIE 1931 curves
    backlight: Expose brightness curve type through sysfs
    MAINTAINERS: Add entry for stable backlight sysfs ABI documentation
    backlight: gpio-backlight: Correct initial power state handling
    video: backlight: tosa_lcd: drop check because i2c_unregister_device() is NULL safe
    video: backlight: Drop default m for {LCD,BACKLIGHT_CLASS_DEVICE}
    backlight: lms283gf05: Fix a typo in the description passed to 'devm_gpio_request_one()'
    backlight: lm3630a: Switch to use fwnode_property_count_uXX()
    backlight: rave-sp: Leave initial state and register with correct device

    Linus Torvalds
     

23 Sep, 2019

1 commit

  • 5c6bd5de3   Merge tag 'mips_5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux ... Browse Code »

    Pull MIPS updates from Paul Burton:
    "Main MIPS changes:

    - boot_mem_map is removed, providing a nice cleanup made possible by
    the recent removal of bootmem.

    - Some fixes to atomics, in general providing compiler barriers for
    smp_mb__{before,after}_atomic plus fixes specific to Loongson CPUs
    or MIPS32 systems using cmpxchg64().

    - Conversion to the new generic VDSO infrastructure courtesy of
    Vincenzo Frascino.

    - Removal of undefined behavior in set_io_port_base(), fixing the
    behavior of some MIPS kernel configurations when built with recent
    clang versions.

    - Initial MIPS32 huge page support, functional on at least Ingenic
    SoCs.

    - pte_special() is now supported for some configurations, allowing
    among other things generic fast GUP to be used.

    - Miscellaneous fixes & cleanups.

    And platform specific changes:

    - Major improvements to Ingenic SoC support from Paul Cercueil,
    mostly enabled by the inclusion of the new TCU (timer-counter unit)
    drivers he's spent a very patient year or so working on. Plus some
    fixes for X1000 SoCs from Zhou Yanjie.

    - Netgear R6200 v1 systems are now supported by the bcm47xx platform.

    - DT updates for BMIPS, Lantiq & Microsemi Ocelot systems"

    * tag 'mips_5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux: (89 commits)
    MIPS: Detect bad _PFN_SHIFT values
    MIPS: Disable pte_special() for MIPS32 with RiXi
    MIPS: ralink: deactivate PCI support for SOC_MT7621
    mips: compat: vdso: Use legacy syscalls as fallback
    MIPS: Drop Loongson _CACHE_* definitions
    MIPS: tlbex: Remove cpu_has_local_ebase
    MIPS: tlbex: Simplify r3k check
    MIPS: Select R3k-style TLB in Kconfig
    MIPS: PCI: refactor ioc3 special handling
    mips: remove ioremap_cachable
    mips/atomic: Fix smp_mb__{before,after}_atomic()
    mips/atomic: Fix loongson_llsc_mb() wreckage
    mips/atomic: Fix cmpxchg64 barriers
    MIPS: Octeon: remove duplicated include from dma-octeon.c
    firmware: bcm47xx_nvram: Allow COMPILE_TEST
    firmware: bcm47xx_nvram: Correct size_t printf format
    MIPS: Treat Loongson Extensions as ASEs
    MIPS: Remove dev_err() usage after platform_get_irq()
    MIPS: dts: mscc: describe the PTP ready interrupt
    MIPS: dts: mscc: describe the PTP register range
    ...

    Linus Torvalds
     

20 Sep, 2019

1 commit

  • 574cc4539   Merge tag 'drm-next-2019-09-18' of git://anongit.freedesktop.org/drm/drm ... Browse Code »

    Pull drm updates from Dave Airlie:
    "This is the main pull request for 5.4-rc1 merge window. I don't think
    there is anything outstanding so next week should just be fixes, but
    we'll see if I missed anything. I landed some fixes earlier in the
    week but got delayed writing summary and sending it out, due to a mix
    of sick kid and jetlag!

    There are some fixes pending, but I'd rather get the main merge out of
    the way instead of delaying it longer.

    It's also pretty large in commit count and new amd header file size.
    The largest thing is four new amdgpu products (navi12/14, arcturus and
    renoir APU support).

    Otherwise it's pretty much lots of work across the board, i915 has
    started landing tigerlake support, lots of icelake fixes and lots of
    locking reworking for future gpu support, lots of header file rework
    (drmP.h is nearly gone), some old legacy hacks (DRM_WAIT_ON) have been
    put into the places they are needed.

    uapi:
    - content protection type property for HDCP

    core:
    - rework include dependencies
    - lots of drmP.h removals
    - link rate calculation robustness fix
    - make fb helper map only when required
    - add connector->DDC adapter link
    - DRM_WAIT_ON removed
    - drop DRM_AUTH usage from drivers

    dma-buf:
    - reservation object fence helper

    dma-fence:
    - shrink dma_fence struct
    - merge signal functions
    - store timestamps in dma_fence
    - selftests

    ttm:
    - embed drm_get_object struct into ttm_buffer_object
    - release_notify callback

    bridges:
    - sii902x - audio graph card support
    - tc358767 - aux data handling rework
    - ti-snd64dsi86 - debugfs support, DSI mode flags support

    panels:
    - Support for GiantPlus GPM940B0, Sharp LQ070Y3DG3B, Ortustech
    COM37H3M, Novatek NT39016, Sharp LS020B1DD01D, Raydium RM67191, Boe
    Himax8279d, Sharp LD-D5116Z01B
    - TI nspire, NEC NL8048HL11, LG Philips LB035Q02, Sharp LS037V7DW01,
    Sony ACX565AKM, Toppoly TD028TTEC1 Toppoly TD043MTEA1

    i915:
    - Initial tigerlake platform support
    - Locking simplification work, general all over refactoring.
    - Selftests
    - HDCP debug info improvements
    - DSI properties
    - Icelake display PLL fixes, colorspace fixes, bandwidth fixes, DSI
    suspend/resume
    - GuC fixes
    - Perf fixes
    - ElkhartLake enablement
    - DP MST fixes
    - GVT - command parser enhancements

    amdgpu:
    - add wipe memory on release flag for buffer creation
    - Navi12/14 support (may be marked experimental)
    - Arcturus support
    - Renoir APU support
    - mclk DPM for Navi
    - DC display fixes
    - Raven scatter/gather support
    - RAS support for GFX
    - Navi12 + Arcturus power features
    - GPU reset for Picasso
    - smu11 i2c controller support

    amdkfd:
    - navi12/14 support
    - Arcturus support

    radeon:
    - kexec fix

    nouveau:
    - improved display color management
    - detect lack of GPU power cables

    vmwgfx:
    - evicition priority support
    - remove unused security feature

    msm:
    - msm8998 display support
    - better async commit support for cursor updates

    etnaviv:
    - per-process address space support
    - performance counter fixes
    - softpin support

    mcde:
    - DCS transfers fix

    exynos:
    - drmP.h cleanup

    lima:
    - reduce logging

    kirin:
    - misc clenaups

    komeda:
    - dual-link support
    - DT memory regions

    hisilicon:
    - misc fixes

    imx:
    - IPUv3 image converter fixes
    - 32-bit RGB V4L2 pixel format support

    ingenic:
    - more support for panel related cases

    mgag200:
    - cursor support fix

    panfrost:
    - export GPU features register to userspace
    - gpu heap allocations
    - per-fd address space support

    pl111:
    - CLD pads wiring support removed from DT

    rockchip:
    - rework to use DRM PSR helpers
    - fix bug in VOP_WIN_GET macro
    - DSI DT binding rework

    sun4i:
    - improve support for color encoding and range
    - DDC enabled GPIO

    tinydrm:
    - rework SPI support
    - improve MIPI-DBI support
    - moved to drm/tiny

    vkms:
    - rework CRC tracking

    dw-hdmi:
    - get_eld and i2s improvements

    gm12u320:
    - misc fixes

    meson:
    - global code cleanup
    - vpu feature detect

    omap:
    - alpha/pixel blend mode properties

    rcar-du:
    - misc fixes"

    * tag 'drm-next-2019-09-18' of git://anongit.freedesktop.org/drm/drm: (2112 commits)
    drm/nouveau/bar/gm20b: Avoid BAR1 teardown during init
    drm/nouveau: Fix ordering between TTM and GEM release
    drm/nouveau/prime: Extend DMA reservation object lock
    drm/nouveau: Fix fallout from reservation object rework
    drm/nouveau/kms/nv50-: Don't create MSTMs for eDP connectors
    drm/i915: Use NOEVICT for first pass on attemping to pin a GGTT mmap
    drm/i915: to make vgpu ppgtt notificaiton as atomic operation
    drm/i915: Flush the existing fence before GGTT read/write
    drm/i915: Hold irq-off for the entire fake lock period
    drm/i915/gvt: update RING_START reg of vGPU when the context is submitted to i915
    drm/i915/gvt: update vgpu workload head pointer correctly
    drm/mcde: Fix DSI transfers
    drm/msm: Use the correct dma_sync calls harder
    drm/msm: remove unlikely() from WARN_ON() conditions
    drm/msm/dsi: Fix return value check for clk_get_parent
    drm/msm: add atomic traces
    drm/msm/dpu: async commit support
    drm/msm: async commit support
    drm/msm: split power control from prepare/complete_commit
    drm/msm: add kms->flush_commit()
    ...

    Linus Torvalds