dri-devel March 2020

dri-devel@lists.freedesktop.org

328 participants
771 discussions

[PATCH 5.4 131/168] drm: kirin: Revert "Fix for hikey620 display offset problem"
by Greg Kroah-Hartman 10 Mar '20

10 Mar '20

From: John Stultz <john.stultz(a)linaro.org> commit 1b79cfd99ff5127e6a143767b51694a527b3ea38 upstream. This reverts commit ff57c6513820efe945b61863cf4a51b79f18b592. With the commit ff57c6513820 ("drm: kirin: Fix for hikey620 display offset problem") we added support for handling LDI overflows by resetting the hardware. However, its been observed that when we do hit the LDI overflow condition, the irq seems to be screaming, and we do nothing but stream: [drm:ade_irq_handler [kirin_drm]] *ERROR* LDI underflow! over and over to the screen I've tried a few appraoches to avoid this, but none has yet been successful and the cure here is worse then the original disease, so revert this for now. Cc: Xinliang Liu <xinliang.liu(a)linaro.org> Cc: Rongrong Zou <zourongrong(a)gmail.com> Cc: Xinwei Kong <kong.kongxinwei(a)hisilicon.com> Cc: Chen Feng <puck.chen(a)hisilicon.com> Cc: Sam Ravnborg <sam(a)ravnborg.org> Cc: David Airlie <airlied(a)linux.ie> Cc: Daniel Vetter <daniel(a)ffwll.ch> Cc: dri-devel <dri-devel(a)lists.freedesktop.org> Fixes: ff57c6513820 ("drm: kirin: Fix for hikey620 display offset problem") Signed-off-by: John Stultz <john.stultz(a)linaro.org> Acked-by: Xinliang Liu <xinliang.liu(a)linaro.org> Signed-off-by: Xinliang Liu <xinliang.liu(a)linaro.org> Link: https://patchwork.freedesktop.org/patch/msgid/20200303163228.52741-1-john.s… Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/gpu/drm/hisilicon/kirin/kirin_ade_reg.h | 1 - drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 20 -------------------- 2 files changed, 21 deletions(-) --- a/drivers/gpu/drm/hisilicon/kirin/kirin_ade_reg.h +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_ade_reg.h @@ -83,7 +83,6 @@ #define VSIZE_OFST 20 #define LDI_INT_EN 0x741C #define FRAME_END_INT_EN_OFST 1 -#define UNDERFLOW_INT_EN_OFST 2 #define LDI_CTRL 0x7420 #define BPP_OFST 3 #define DATA_GATE_EN BIT(2) --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c @@ -46,7 +46,6 @@ struct ade_hw_ctx { struct clk *media_noc_clk; struct clk *ade_pix_clk; struct reset_control *reset; - struct work_struct display_reset_wq; bool power_on; int irq; @@ -136,7 +135,6 @@ static void ade_init(struct ade_hw_ctx * */ ade_update_bits(base + ADE_CTRL, FRM_END_START_OFST, FRM_END_START_MASK, REG_EFFECTIVE_IN_ADEEN_FRMEND); - ade_update_bits(base + LDI_INT_EN, UNDERFLOW_INT_EN_OFST, MASK(1), 1); } static bool ade_crtc_mode_fixup(struct drm_crtc *crtc, @@ -304,17 +302,6 @@ static void ade_crtc_disable_vblank(stru MASK(1), 0); } -static void drm_underflow_wq(struct work_struct *work) -{ - struct ade_hw_ctx *ctx = container_of(work, struct ade_hw_ctx, - display_reset_wq); - struct drm_device *drm_dev = ctx->crtc->dev; - struct drm_atomic_state *state; - - state = drm_atomic_helper_suspend(drm_dev); - drm_atomic_helper_resume(drm_dev, state); -} - static irqreturn_t ade_irq_handler(int irq, void *data) { struct ade_hw_ctx *ctx = data; @@ -331,12 +318,6 @@ static irqreturn_t ade_irq_handler(int i MASK(1), 1); drm_crtc_handle_vblank(crtc); } - if (status & BIT(UNDERFLOW_INT_EN_OFST)) { - ade_update_bits(base + LDI_INT_CLR, UNDERFLOW_INT_EN_OFST, - MASK(1), 1); - DRM_ERROR("LDI underflow!"); - schedule_work(&ctx->display_reset_wq); - } return IRQ_HANDLED; } @@ -919,7 +900,6 @@ static void *ade_hw_ctx_alloc(struct pla if (ret) return ERR_PTR(-EIO); - INIT_WORK(&ctx->display_reset_wq, drm_underflow_wq); ctx->crtc = crtc; return ctx;

1 0

[drm-intel:topic/core-for-CI 18/20] arch/powerpc/platforms/embedded6xx/Kconfig:2: symbol EMBEDDED6xx depends on BROKEN_ON_SMP
by kbuild test robot 10 Mar '20

10 Mar '20

tree: git://anongit.freedesktop.org/drm-intel topic/core-for-CI head: 72212a758bdd916331477e782bdad1fa3f625322 commit: 19f102d485b9f5e03677f73133d9922e2650686f [18/20] Revert "drm/i915: Don't select BROKEN" config: powerpc-defconfig compiler: powerpc64-linux-gcc (GCC) 9.2.0 reproduce: wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross git checkout 19f102d485b9f5e03677f73133d9922e2650686f GCC_VERSION=9.2.0 make.cross ARCH=powerpc defconfig GCC_VERSION=9.2.0 make.cross ARCH=powerpc If you fix the issue, kindly add following tag Reported-by: kbuild test robot <lkp(a)intel.com> All errors (new ones prefixed by >>): arch/powerpc/platforms/embedded6xx/Kconfig:2:error: recursive dependency detected! >> arch/powerpc/platforms/embedded6xx/Kconfig:2: symbol EMBEDDED6xx depends on BROKEN_ON_SMP init/Kconfig:80: symbol BROKEN_ON_SMP depends on BROKEN init/Kconfig:77: symbol BROKEN is selected by DRM_I915_DEBUG drivers/gpu/drm/i915/Kconfig.debug:19: symbol DRM_I915_DEBUG depends on DRM_I915 drivers/gpu/drm/i915/Kconfig:2: symbol DRM_I915 depends on DRM drivers/gpu/drm/Kconfig:8: symbol DRM depends on AGP drivers/char/agp/Kconfig:2: symbol AGP depends on PCI >> drivers/pci/Kconfig:16: symbol PCI depends on HAVE_PCI drivers/pci/Kconfig:7: symbol HAVE_PCI is selected by FORCE_PCI drivers/pci/Kconfig:11: symbol FORCE_PCI is selected by MVME5100 >> arch/powerpc/platforms/embedded6xx/Kconfig:51: symbol MVME5100 depends on EMBEDDED6xx For a resolution refer to Documentation/kbuild/kconfig-language.rst subsection "Kconfig recursive dependency limitations" vim +2 arch/powerpc/platforms/embedded6xx/Kconfig a35e370cfd2ddf Arnd Bergmann 2007-08-30 @2 config EMBEDDED6xx a35e370cfd2ddf Arnd Bergmann 2007-08-30 3 bool "Embedded 6xx/7xx/7xxx-based boards" be34fff07c3755 Christophe Leroy 2018-11-17 4 depends on PPC_BOOK3S_32 && BROKEN_ON_SMP 14cf11af6cf608 Paul Mackerras 2005-09-26 5 04d76b937bdf60 Guennadi Liakhovetski 2006-12-01 6 config LINKSTATION 04d76b937bdf60 Guennadi Liakhovetski 2006-12-01 7 bool "Linkstation / Kurobox(HG) from Buffalo" a35e370cfd2ddf Arnd Bergmann 2007-08-30 8 depends on EMBEDDED6xx 04d76b937bdf60 Guennadi Liakhovetski 2006-12-01 9 select MPIC 04d76b937bdf60 Guennadi Liakhovetski 2006-12-01 10 select FSL_SOC 04d76b937bdf60 Guennadi Liakhovetski 2006-12-01 11 select PPC_UDBG_16550 if SERIAL_8250 44d7631bdb1621 Segher Boessenkool 2007-02-22 12 select DEFAULT_UIMAGE 3490cba56f7f8a Jon Loeliger 2008-01-23 13 select MPC10X_BRIDGE 04d76b937bdf60 Guennadi Liakhovetski 2006-12-01 14 help 04d76b937bdf60 Guennadi Liakhovetski 2006-12-01 15 Select LINKSTATION if configuring for one of PPC- (MPC8241) 04d76b937bdf60 Guennadi Liakhovetski 2006-12-01 16 based NAS systems from Buffalo Technology. So far only 04d76b937bdf60 Guennadi Liakhovetski 2006-12-01 17 KuroboxHG has been tested. In the future classical Kurobox, 04d76b937bdf60 Guennadi Liakhovetski 2006-12-01 18 Linkstation-I HD-HLAN and HD-HGLAN versions, and PPC-based 04d76b937bdf60 Guennadi Liakhovetski 2006-12-01 19 Terastation systems should be supported too. 04d76b937bdf60 Guennadi Liakhovetski 2006-12-01 20 3490cba56f7f8a Jon Loeliger 2008-01-23 21 config STORCENTER 3490cba56f7f8a Jon Loeliger 2008-01-23 22 bool "IOMEGA StorCenter" 3490cba56f7f8a Jon Loeliger 2008-01-23 23 depends on EMBEDDED6xx 3490cba56f7f8a Jon Loeliger 2008-01-23 24 select MPIC 3490cba56f7f8a Jon Loeliger 2008-01-23 25 select FSL_SOC 3490cba56f7f8a Jon Loeliger 2008-01-23 26 select PPC_UDBG_16550 if SERIAL_8250 3490cba56f7f8a Jon Loeliger 2008-01-23 27 select MPC10X_BRIDGE 3490cba56f7f8a Jon Loeliger 2008-01-23 28 help 3490cba56f7f8a Jon Loeliger 2008-01-23 29 Select STORCENTER if configuring for the iomega StorCenter 3490cba56f7f8a Jon Loeliger 2008-01-23 30 with an 8241 CPU in it. 3490cba56f7f8a Jon Loeliger 2008-01-23 31 c5d56332fd6c2f Zang Roy-r61911 2006-06-13 32 config MPC7448HPC2 c5d56332fd6c2f Zang Roy-r61911 2006-06-13 33 bool "Freescale MPC7448HPC2(Taiga)" a35e370cfd2ddf Arnd Bergmann 2007-08-30 34 depends on EMBEDDED6xx c5d56332fd6c2f Zang Roy-r61911 2006-06-13 35 select TSI108_BRIDGE c5d56332fd6c2f Zang Roy-r61911 2006-06-13 36 select DEFAULT_UIMAGE c5d56332fd6c2f Zang Roy-r61911 2006-06-13 37 select PPC_UDBG_16550 c5d56332fd6c2f Zang Roy-r61911 2006-06-13 38 help c5d56332fd6c2f Zang Roy-r61911 2006-06-13 39 Select MPC7448HPC2 if configuring for Freescale MPC7448HPC2 (Taiga) c5d56332fd6c2f Zang Roy-r61911 2006-06-13 40 platform cb9e4d10c448a3 Josh Boyer 2007-05-08 41 cb9e4d10c448a3 Josh Boyer 2007-05-08 42 config PPC_HOLLY cb9e4d10c448a3 Josh Boyer 2007-05-08 43 bool "PPC750GX/CL with TSI10x bridge (Hickory/Holly)" a35e370cfd2ddf Arnd Bergmann 2007-08-30 44 depends on EMBEDDED6xx cb9e4d10c448a3 Josh Boyer 2007-05-08 45 select TSI108_BRIDGE cb9e4d10c448a3 Josh Boyer 2007-05-08 46 select PPC_UDBG_16550 cb9e4d10c448a3 Josh Boyer 2007-05-08 47 help cb9e4d10c448a3 Josh Boyer 2007-05-08 48 Select PPC_HOLLY if configuring for an IBM 750GX/CL Eval cb9e4d10c448a3 Josh Boyer 2007-05-08 49 Board with TSI108/9 bridge (Hickory/Holly) fd4ba7e2b7ce9a Dale Farnsworth 2007-05-12 50 be2019816e4dcd Stephen Chivers 2014-01-09 @51 config MVME5100 be2019816e4dcd Stephen Chivers 2014-01-09 52 bool "Motorola/Emerson MVME5100" be2019816e4dcd Stephen Chivers 2014-01-09 53 depends on EMBEDDED6xx be2019816e4dcd Stephen Chivers 2014-01-09 54 select MPIC eb01d42a77785f Christoph Hellwig 2018-11-15 55 select FORCE_PCI be2019816e4dcd Stephen Chivers 2014-01-09 56 select PPC_INDIRECT_PCI be2019816e4dcd Stephen Chivers 2014-01-09 57 select PPC_I8259 be2019816e4dcd Stephen Chivers 2014-01-09 58 select PPC_NATIVE 13ae40370f62cd Stephen Chivers 2014-04-20 59 select PPC_UDBG_16550 be2019816e4dcd Stephen Chivers 2014-01-09 60 help be2019816e4dcd Stephen Chivers 2014-01-09 61 This option enables support for the Motorola (now Emerson) MVME5100 be2019816e4dcd Stephen Chivers 2014-01-09 62 board. be2019816e4dcd Stephen Chivers 2014-01-09 63 :::::: The code at line 2 was first introduced by commit :::::: a35e370cfd2ddfb5d2f0ceae376ffeda273b357c [POWERPC] Move embedded6xx into multiplatform :::::: TO: Arnd Bergmann <arnd(a)arndb.de> :::::: CC: Paul Mackerras <paulus(a)samba.org> --- 0-DAY CI Kernel Test Service, Intel Corporation https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org

1 0

Patch "drm: kirin: Revert "Fix for hikey620 display offset problem"" has been added to the 5.4-stable tree
by gregkh＠linuxfoundation.org 10 Mar '20

10 Mar '20

This is a note to let you know that I've just added the patch titled drm: kirin: Revert "Fix for hikey620 display offset problem" to the 5.4-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=sum… The filename of the patch is: drm-kirin-revert-fix-for-hikey620-display-offset-problem.patch and it can be found in the queue-5.4 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable(a)vger.kernel.org> know about it. >From 1b79cfd99ff5127e6a143767b51694a527b3ea38 Mon Sep 17 00:00:00 2001 From: John Stultz <john.stultz(a)linaro.org> Date: Tue, 3 Mar 2020 16:32:28 +0000 Subject: drm: kirin: Revert "Fix for hikey620 display offset problem" From: John Stultz <john.stultz(a)linaro.org> commit 1b79cfd99ff5127e6a143767b51694a527b3ea38 upstream. This reverts commit ff57c6513820efe945b61863cf4a51b79f18b592. With the commit ff57c6513820 ("drm: kirin: Fix for hikey620 display offset problem") we added support for handling LDI overflows by resetting the hardware. However, its been observed that when we do hit the LDI overflow condition, the irq seems to be screaming, and we do nothing but stream: [drm:ade_irq_handler [kirin_drm]] *ERROR* LDI underflow! over and over to the screen I've tried a few appraoches to avoid this, but none has yet been successful and the cure here is worse then the original disease, so revert this for now. Cc: Xinliang Liu <xinliang.liu(a)linaro.org> Cc: Rongrong Zou <zourongrong(a)gmail.com> Cc: Xinwei Kong <kong.kongxinwei(a)hisilicon.com> Cc: Chen Feng <puck.chen(a)hisilicon.com> Cc: Sam Ravnborg <sam(a)ravnborg.org> Cc: David Airlie <airlied(a)linux.ie> Cc: Daniel Vetter <daniel(a)ffwll.ch> Cc: dri-devel <dri-devel(a)lists.freedesktop.org> Fixes: ff57c6513820 ("drm: kirin: Fix for hikey620 display offset problem") Signed-off-by: John Stultz <john.stultz(a)linaro.org> Acked-by: Xinliang Liu <xinliang.liu(a)linaro.org> Signed-off-by: Xinliang Liu <xinliang.liu(a)linaro.org> Link: https://patchwork.freedesktop.org/patch/msgid/20200303163228.52741-1-john.s… Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/gpu/drm/hisilicon/kirin/kirin_ade_reg.h | 1 - drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 20 -------------------- 2 files changed, 21 deletions(-) --- a/drivers/gpu/drm/hisilicon/kirin/kirin_ade_reg.h +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_ade_reg.h @@ -83,7 +83,6 @@ #define VSIZE_OFST 20 #define LDI_INT_EN 0x741C #define FRAME_END_INT_EN_OFST 1 -#define UNDERFLOW_INT_EN_OFST 2 #define LDI_CTRL 0x7420 #define BPP_OFST 3 #define DATA_GATE_EN BIT(2) --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c @@ -46,7 +46,6 @@ struct ade_hw_ctx { struct clk *media_noc_clk; struct clk *ade_pix_clk; struct reset_control *reset; - struct work_struct display_reset_wq; bool power_on; int irq; @@ -136,7 +135,6 @@ static void ade_init(struct ade_hw_ctx * */ ade_update_bits(base + ADE_CTRL, FRM_END_START_OFST, FRM_END_START_MASK, REG_EFFECTIVE_IN_ADEEN_FRMEND); - ade_update_bits(base + LDI_INT_EN, UNDERFLOW_INT_EN_OFST, MASK(1), 1); } static bool ade_crtc_mode_fixup(struct drm_crtc *crtc, @@ -304,17 +302,6 @@ static void ade_crtc_disable_vblank(stru MASK(1), 0); } -static void drm_underflow_wq(struct work_struct *work) -{ - struct ade_hw_ctx *ctx = container_of(work, struct ade_hw_ctx, - display_reset_wq); - struct drm_device *drm_dev = ctx->crtc->dev; - struct drm_atomic_state *state; - - state = drm_atomic_helper_suspend(drm_dev); - drm_atomic_helper_resume(drm_dev, state); -} - static irqreturn_t ade_irq_handler(int irq, void *data) { struct ade_hw_ctx *ctx = data; @@ -331,12 +318,6 @@ static irqreturn_t ade_irq_handler(int i MASK(1), 1); drm_crtc_handle_vblank(crtc); } - if (status & BIT(UNDERFLOW_INT_EN_OFST)) { - ade_update_bits(base + LDI_INT_CLR, UNDERFLOW_INT_EN_OFST, - MASK(1), 1); - DRM_ERROR("LDI underflow!"); - schedule_work(&ctx->display_reset_wq); - } return IRQ_HANDLED; } @@ -919,7 +900,6 @@ static void *ade_hw_ctx_alloc(struct pla if (ret) return ERR_PTR(-EIO); - INIT_WORK(&ctx->display_reset_wq, drm_underflow_wq); ctx->crtc = crtc; return ctx; Patches currently in stable-queue which might be from john.stultz(a)linaro.org are queue-5.4/usb-dwc3-gadget-update-chain-bit-correctly-when-using-sg-list.patch queue-5.4/drm-msm-fix-return-type-of-dsi_mgr_connector_mode_va.patch queue-5.4/drm-kirin-revert-fix-for-hikey620-display-offset-problem.patch

1 0

[drm-intel:topic/core-for-CI 18/20] init/Kconfig:77: symbol BROKEN is selected by DRM_I915_DEBUG
by kbuild test robot 10 Mar '20

10 Mar '20

1 0

Patch "drm: kirin: Revert "Fix for hikey620 display offset problem"" has been added to the 5.5-stable tree
by gregkh＠linuxfoundation.org 10 Mar '20

10 Mar '20

This is a note to let you know that I've just added the patch titled drm: kirin: Revert "Fix for hikey620 display offset problem" to the 5.5-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=sum… The filename of the patch is: drm-kirin-revert-fix-for-hikey620-display-offset-problem.patch and it can be found in the queue-5.5 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable(a)vger.kernel.org> know about it. >From 1b79cfd99ff5127e6a143767b51694a527b3ea38 Mon Sep 17 00:00:00 2001 From: John Stultz <john.stultz(a)linaro.org> Date: Tue, 3 Mar 2020 16:32:28 +0000 Subject: drm: kirin: Revert "Fix for hikey620 display offset problem" From: John Stultz <john.stultz(a)linaro.org> commit 1b79cfd99ff5127e6a143767b51694a527b3ea38 upstream. This reverts commit ff57c6513820efe945b61863cf4a51b79f18b592. With the commit ff57c6513820 ("drm: kirin: Fix for hikey620 display offset problem") we added support for handling LDI overflows by resetting the hardware. However, its been observed that when we do hit the LDI overflow condition, the irq seems to be screaming, and we do nothing but stream: [drm:ade_irq_handler [kirin_drm]] *ERROR* LDI underflow! over and over to the screen I've tried a few appraoches to avoid this, but none has yet been successful and the cure here is worse then the original disease, so revert this for now. Cc: Xinliang Liu <xinliang.liu(a)linaro.org> Cc: Rongrong Zou <zourongrong(a)gmail.com> Cc: Xinwei Kong <kong.kongxinwei(a)hisilicon.com> Cc: Chen Feng <puck.chen(a)hisilicon.com> Cc: Sam Ravnborg <sam(a)ravnborg.org> Cc: David Airlie <airlied(a)linux.ie> Cc: Daniel Vetter <daniel(a)ffwll.ch> Cc: dri-devel <dri-devel(a)lists.freedesktop.org> Fixes: ff57c6513820 ("drm: kirin: Fix for hikey620 display offset problem") Signed-off-by: John Stultz <john.stultz(a)linaro.org> Acked-by: Xinliang Liu <xinliang.liu(a)linaro.org> Signed-off-by: Xinliang Liu <xinliang.liu(a)linaro.org> Link: https://patchwork.freedesktop.org/patch/msgid/20200303163228.52741-1-john.s… Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/gpu/drm/hisilicon/kirin/kirin_ade_reg.h | 1 - drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 20 -------------------- 2 files changed, 21 deletions(-) --- a/drivers/gpu/drm/hisilicon/kirin/kirin_ade_reg.h +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_ade_reg.h @@ -83,7 +83,6 @@ #define VSIZE_OFST 20 #define LDI_INT_EN 0x741C #define FRAME_END_INT_EN_OFST 1 -#define UNDERFLOW_INT_EN_OFST 2 #define LDI_CTRL 0x7420 #define BPP_OFST 3 #define DATA_GATE_EN BIT(2) --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c @@ -46,7 +46,6 @@ struct ade_hw_ctx { struct clk *media_noc_clk; struct clk *ade_pix_clk; struct reset_control *reset; - struct work_struct display_reset_wq; bool power_on; int irq; @@ -136,7 +135,6 @@ static void ade_init(struct ade_hw_ctx * */ ade_update_bits(base + ADE_CTRL, FRM_END_START_OFST, FRM_END_START_MASK, REG_EFFECTIVE_IN_ADEEN_FRMEND); - ade_update_bits(base + LDI_INT_EN, UNDERFLOW_INT_EN_OFST, MASK(1), 1); } static bool ade_crtc_mode_fixup(struct drm_crtc *crtc, @@ -304,17 +302,6 @@ static void ade_crtc_disable_vblank(stru MASK(1), 0); } -static void drm_underflow_wq(struct work_struct *work) -{ - struct ade_hw_ctx *ctx = container_of(work, struct ade_hw_ctx, - display_reset_wq); - struct drm_device *drm_dev = ctx->crtc->dev; - struct drm_atomic_state *state; - - state = drm_atomic_helper_suspend(drm_dev); - drm_atomic_helper_resume(drm_dev, state); -} - static irqreturn_t ade_irq_handler(int irq, void *data) { struct ade_hw_ctx *ctx = data; @@ -331,12 +318,6 @@ static irqreturn_t ade_irq_handler(int i MASK(1), 1); drm_crtc_handle_vblank(crtc); } - if (status & BIT(UNDERFLOW_INT_EN_OFST)) { - ade_update_bits(base + LDI_INT_CLR, UNDERFLOW_INT_EN_OFST, - MASK(1), 1); - DRM_ERROR("LDI underflow!"); - schedule_work(&ctx->display_reset_wq); - } return IRQ_HANDLED; } @@ -919,7 +900,6 @@ static void *ade_hw_ctx_alloc(struct pla if (ret) return ERR_PTR(-EIO); - INIT_WORK(&ctx->display_reset_wq, drm_underflow_wq); ctx->crtc = crtc; return ctx; Patches currently in stable-queue which might be from john.stultz(a)linaro.org are queue-5.5/usb-dwc3-gadget-update-chain-bit-correctly-when-using-sg-list.patch queue-5.5/drm-msm-fix-return-type-of-dsi_mgr_connector_mode_va.patch queue-5.5/drm-kirin-revert-fix-for-hikey620-display-offset-problem.patch

1 0

[PATCH] drm/bridge: analogix_dp: Split bind() into probe() and real bind()
by Marek Szyprowski 10 Mar '20

10 Mar '20

Analogix_dp driver acquires all its resources in ->bind() callback, what is a bit against the driver component based approach, where driver initialization is split into probe(), where all resources are gathered, and bind(), where objects are created and compound driver is initialized. Extract resource related operations to analogix_dp_probe() and analogix_dp_remove() and call them before/after registration of the device components from the main Exynos and Rockchip DP drivers. This fixes multiple tries of DRM compound driver bind() when example when DP PHY driver is not yet loaded/probed(): [drm] Exynos DRM: using 14400000.fimd device for DMA mapping operations exynos-drm exynos-drm: bound 14400000.fimd (ops fimd_component_ops [exynosdrm]) exynos-drm exynos-drm: bound 14450000.mixer (ops mixer_component_ops [exynosdrm]) exynos-dp 145b0000.dp-controller: no DP phy configured exynos-drm exynos-drm: failed to bind 145b0000.dp-controller (ops exynos_dp_ops [exynosdrm]): -517 exynos-drm exynos-drm: master bind failed: -517 ... [drm] Exynos DRM: using 14400000.fimd device for DMA mapping operations exynos-drm exynos-drm: bound 14400000.fimd (ops hdmi_enable [exynosdrm]) exynos-drm exynos-drm: bound 14450000.mixer (ops hdmi_enable [exynosdrm]) exynos-drm exynos-drm: bound 145b0000.dp-controller (ops hdmi_enable [exynosdrm]) exynos-drm exynos-drm: bound 14530000.hdmi (ops hdmi_enable [exynosdrm]) [drm] Supports vblank timestamp caching Rev 2 (21.10.2013). Console: switching to colour frame buffer device 170x48 exynos-drm exynos-drm: fb0: exynosdrmfb frame buffer device [drm] Initialized exynos 1.1.0 20180330 for exynos-drm on minor 1 ... Signed-off-by: Marek Szyprowski <m.szyprowski(a)samsung.com> --- .../drm/bridge/analogix/analogix_dp_core.c | 33 ++++++++++++------- drivers/gpu/drm/exynos/exynos_dp.c | 15 ++++++--- .../gpu/drm/rockchip/analogix_dp-rockchip.c | 15 +++++---- include/drm/bridge/analogix_dp.h | 5 +-- 4 files changed, 44 insertions(+), 24 deletions(-) diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c index dfb59a5fefea..a89a03b66bf2 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c @@ -1646,8 +1646,7 @@ static ssize_t analogix_dpaux_transfer(struct drm_dp_aux *aux, } struct analogix_dp_device * -analogix_dp_bind(struct device *dev, struct drm_device *drm_dev, - struct analogix_dp_plat_data *plat_data) +analogix_dp_probe(struct device *dev, struct analogix_dp_plat_data *plat_data) { struct platform_device *pdev = to_platform_device(dev); struct analogix_dp_device *dp; @@ -1750,22 +1749,30 @@ analogix_dp_bind(struct device *dev, struct drm_device *drm_dev, irq_flags, "analogix-dp", dp); if (ret) { dev_err(&pdev->dev, "failed to request irq\n"); - goto err_disable_pm_runtime; + return ERR_PTR(ret); } disable_irq(dp->irq); + return dp; +} +EXPORT_SYMBOL_GPL(analogix_dp_probe); + +int analogix_dp_bind(struct analogix_dp_device *dp, struct drm_device *drm_dev) +{ + int ret; + dp->drm_dev = drm_dev; dp->encoder = dp->plat_data->encoder; dp->aux.name = "DP-AUX"; dp->aux.transfer = analogix_dpaux_transfer; - dp->aux.dev = &pdev->dev; + dp->aux.dev = dp->dev; ret = drm_dp_aux_register(&dp->aux); if (ret) - return ERR_PTR(ret); + return ret; - pm_runtime_enable(dev); + pm_runtime_enable(dp->dev); ret = analogix_dp_create_bridge(drm_dev, dp); if (ret) { @@ -1773,13 +1780,12 @@ analogix_dp_bind(struct device *dev, struct drm_device *drm_dev, goto err_disable_pm_runtime; } - return dp; + return 0; err_disable_pm_runtime: + pm_runtime_disable(dp->dev); - pm_runtime_disable(dev); - - return ERR_PTR(ret); + return ret; } EXPORT_SYMBOL_GPL(analogix_dp_bind); @@ -1796,10 +1802,15 @@ void analogix_dp_unbind(struct analogix_dp_device *dp) drm_dp_aux_unregister(&dp->aux); pm_runtime_disable(dp->dev); - clk_disable_unprepare(dp->clock); } EXPORT_SYMBOL_GPL(analogix_dp_unbind); +void analogix_dp_remove(struct analogix_dp_device *dp) +{ + clk_disable_unprepare(dp->clock); +} +EXPORT_SYMBOL_GPL(analogix_dp_remove); + #ifdef CONFIG_PM int analogix_dp_suspend(struct analogix_dp_device *dp) { diff --git a/drivers/gpu/drm/exynos/exynos_dp.c b/drivers/gpu/drm/exynos/exynos_dp.c index 4785885c0f4f..558b78e8cc32 100644 --- a/drivers/gpu/drm/exynos/exynos_dp.c +++ b/drivers/gpu/drm/exynos/exynos_dp.c @@ -184,13 +184,11 @@ static int exynos_dp_bind(struct device *dev, struct device *master, void *data) dp->plat_data.encoder = encoder; - dp->adp = analogix_dp_bind(dev, dp->drm_dev, &dp->plat_data); - if (IS_ERR(dp->adp)) { + ret = analogix_dp_bind(dp->adp, dp->drm_dev); + if (ret) dp->encoder.funcs->destroy(&dp->encoder); - return PTR_ERR(dp->adp); - } - return 0; + return ret; } static void exynos_dp_unbind(struct device *dev, struct device *master, @@ -250,12 +248,19 @@ static int exynos_dp_probe(struct platform_device *pdev) dp->ptn_bridge = bridge; out: + dp->adp = analogix_dp_probe(dev, &dp->plat_data); + if (IS_ERR(dp->adp)) + return PTR_ERR(dp->adp); + return component_add(&pdev->dev, &exynos_dp_ops); } static int exynos_dp_remove(struct platform_device *pdev) { + struct exynos_dp_device *dp = platform_get_drvdata(pdev); + component_del(&pdev->dev, &exynos_dp_ops); + analogix_dp_remove(dp->adp); return 0; } diff --git a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c index f38f5e113c6b..b85cf2582864 100644 --- a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c +++ b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c @@ -349,11 +349,9 @@ static int rockchip_dp_bind(struct device *dev, struct device *master, dp->plat_data.power_off = rockchip_dp_powerdown; dp->plat_data.get_modes = rockchip_dp_get_modes; - dp->adp = analogix_dp_bind(dev, dp->drm_dev, &dp->plat_data); - if (IS_ERR(dp->adp)) { - ret = PTR_ERR(dp->adp); + ret = analogix_dp_bind(dp->adp, drm_dev); + if (ret) goto err_cleanup_encoder; - } return 0; err_cleanup_encoder: @@ -368,8 +366,6 @@ static void rockchip_dp_unbind(struct device *dev, struct device *master, analogix_dp_unbind(dp->adp); dp->encoder.funcs->destroy(&dp->encoder); - - dp->adp = ERR_PTR(-ENODEV); } static const struct component_ops rockchip_dp_component_ops = { @@ -402,12 +398,19 @@ static int rockchip_dp_probe(struct platform_device *pdev) platform_set_drvdata(pdev, dp); + dp->adp = analogix_dp_probe(dev, &dp->plat_data); + if (IS_ERR(dp->adp)) + return PTR_ERR(dp->adp); + return component_add(dev, &rockchip_dp_component_ops); } static int rockchip_dp_remove(struct platform_device *pdev) { + struct rockchip_dp_device *dp = platform_get_drvdata(pdev); + component_del(&pdev->dev, &rockchip_dp_component_ops); + analogix_dp_remove(dp->adp); return 0; } diff --git a/include/drm/bridge/analogix_dp.h b/include/drm/bridge/analogix_dp.h index 7aa2f93da49c..b0dcc07334a1 100644 --- a/include/drm/bridge/analogix_dp.h +++ b/include/drm/bridge/analogix_dp.h @@ -42,9 +42,10 @@ int analogix_dp_resume(struct analogix_dp_device *dp); int analogix_dp_suspend(struct analogix_dp_device *dp); struct analogix_dp_device * -analogix_dp_bind(struct device *dev, struct drm_device *drm_dev, - struct analogix_dp_plat_data *plat_data); +analogix_dp_probe(struct device *dev, struct analogix_dp_plat_data *plat_data); +int analogix_dp_bind(struct analogix_dp_device *dp, struct drm_device *drm_dev); void analogix_dp_unbind(struct analogix_dp_device *dp); +void analogix_dp_remove(struct analogix_dp_device *dp); int analogix_dp_start_crc(struct drm_connector *connector); int analogix_dp_stop_crc(struct drm_connector *connector); -- 2.17.1

3 5

[PATCH] drm: bridge: tfp410: Check device ID for I2C-connected TFP410
by Laurent Pinchart 10 Mar '20

10 Mar '20

The TFP410 supports configuration through I2C (in which case the corresponding DT node is a child of an I2C controller) or through pins (in which case the DT node creates a platform device). When I2C access to the device is available, read and validate the device ID at probe time to ensure that the device is present. While at it, sort headers alphabetically. Signed-off-by: Laurent Pinchart <laurent.pinchart(a)ideasonboard.com> --- drivers/gpu/drm/bridge/ti-tfp410.c | 133 +++++++++++++++++++++++++---- 1 file changed, 115 insertions(+), 18 deletions(-) diff --git a/drivers/gpu/drm/bridge/ti-tfp410.c b/drivers/gpu/drm/bridge/ti-tfp410.c index f195a4732e0b..1404d1f0b1d2 100644 --- a/drivers/gpu/drm/bridge/ti-tfp410.c +++ b/drivers/gpu/drm/bridge/ti-tfp410.c @@ -12,6 +12,7 @@ #include <linux/module.h> #include <linux/of_graph.h> #include <linux/platform_device.h> +#include <linux/regmap.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_bridge.h> @@ -32,6 +33,7 @@ struct tfp410 { int hpd_irq; struct delayed_work hpd_work; struct gpio_desc *powerdown; + struct regmap *regmap; struct drm_bridge_timings timings; @@ -201,7 +203,7 @@ static const struct drm_bridge_timings tfp410_default_timings = { .hold_time_ps = 1300, }; -static int tfp410_parse_timings(struct tfp410 *dvi, bool i2c) +static int tfp410_parse_timings(struct tfp410 *dvi) { struct drm_bridge_timings *timings = &dvi->timings; struct device_node *ep; @@ -212,7 +214,7 @@ static int tfp410_parse_timings(struct tfp410 *dvi, bool i2c) /* Start with defaults. */ *timings = tfp410_default_timings; - if (i2c) + if (dvi->regmap) /* * In I2C mode timings are configured through the I2C interface. * As the driver doesn't support I2C configuration yet, we just @@ -314,9 +316,9 @@ static int tfp410_get_connector_properties(struct tfp410 *dvi) return ret; } -static int tfp410_init(struct device *dev, bool i2c) +static int tfp410_init(struct tfp410 *dvi) { - struct tfp410 *dvi; + struct device *dev = dvi->dev; int ret; if (!dev->of_node) { @@ -324,17 +326,13 @@ static int tfp410_init(struct device *dev, bool i2c) return -ENXIO; } - dvi = devm_kzalloc(dev, sizeof(*dvi), GFP_KERNEL); - if (!dvi) - return -ENOMEM; dev_set_drvdata(dev, dvi); dvi->bridge.funcs = &tfp410_bridge_funcs; dvi->bridge.of_node = dev->of_node; dvi->bridge.timings = &dvi->timings; - dvi->dev = dev; - ret = tfp410_parse_timings(dvi, i2c); + ret = tfp410_parse_timings(dvi); if (ret) goto fail; @@ -396,7 +394,15 @@ static int tfp410_fini(struct device *dev) static int tfp410_probe(struct platform_device *pdev) { - return tfp410_init(&pdev->dev, false); + struct tfp410 *dvi; + + dvi = devm_kzalloc(&pdev->dev, sizeof(*dvi), GFP_KERNEL); + if (!dvi) + return -ENOMEM; + + dvi->dev = &pdev->dev; + + return tfp410_init(dvi); } static int tfp410_remove(struct platform_device *pdev) @@ -420,20 +426,111 @@ static struct platform_driver tfp410_platform_driver = { }; #if IS_ENABLED(CONFIG_I2C) -/* There is currently no i2c functionality. */ + +#define TFP410_VEN_ID_LO 0x00 +#define TFP410_VEN_ID_HI 0x01 +#define TFP410_DEV_ID_LO 0x02 +#define TFP410_DEV_ID_HI 0x03 +#define TFP410_REV_ID 0x04 +#define TFP410_CTL_1_MODE 0x08 +#define TFP410_CTL_2_MODE 0x09 +#define TFP410_CTL_3_MODE 0x0a +#define TFP410_CFG 0x0b +#define TFP410_DE_DLY 0x32 +#define TFP410_DE_CTL 0x33 +#define TFP410_DE_TOP 0x34 +#define TFP410_DE_CNT_LO 0x36 +#define TFP410_DE_CNT_HI 0x37 +#define TFP410_DE_LIN_LO 0x38 +#define TFP410_DE_LIN_HI 0x39 +#define TFP410_H_RES_LO 0x3a +#define TFP410_H_RES_HI 0x3b +#define TFP410_V_RES_LO 0x3c +#define TFP410_V_RES_HI 0x3d + +static const struct regmap_config tfp410_regmap_config = { + .reg_bits = 8, + .val_bits = 8, + + .max_register = 0x3d, + .wr_table = &(const struct regmap_access_table) { + .yes_ranges = (const struct regmap_range[]) { + { + .range_min = TFP410_CTL_1_MODE, + .range_max = TFP410_DE_LIN_HI, + }, + }, + .n_yes_ranges = 1, + }, +}; + +static int tfp410_check_version(struct tfp410 *dvi) +{ + unsigned int value; + u16 vendor_id; + u16 device_id; + u8 revision_id; + int ret; + + ret = regmap_read(dvi->regmap, TFP410_VEN_ID_LO, &value); + if (ret < 0) + return ret; + vendor_id = value; + + ret = regmap_read(dvi->regmap, TFP410_VEN_ID_HI, &value); + if (ret < 0) + return ret; + vendor_id |= value << 8; + + ret = regmap_read(dvi->regmap, TFP410_DEV_ID_LO, &value); + if (ret < 0) + return ret; + device_id = value; + + ret = regmap_read(dvi->regmap, TFP410_DEV_ID_HI, &value); + if (ret < 0) + return ret; + device_id |= value << 8; + + ret = regmap_read(dvi->regmap, TFP410_REV_ID, &value); + if (ret < 0) + return ret; + revision_id = value; + + if (vendor_id != 0x014c || device_id != 0x0410) { + dev_err(dvi->dev, "invalid device ID %04x:%04x\n", + vendor_id, device_id); + return -ENODEV; + } + + dev_info(dvi->dev, "Found TFP410 revision 0x%02x\n", revision_id); + + return 0; +} + static int tfp410_i2c_probe(struct i2c_client *client, const struct i2c_device_id *id) { - int reg; + struct tfp410 *dvi; + int ret; - if (!client->dev.of_node || - of_property_read_u32(client->dev.of_node, "reg", &reg)) { - dev_err(&client->dev, - "Can't get i2c reg property from device-tree\n"); - return -ENXIO; + dvi = devm_kzalloc(&client->dev, sizeof(*dvi), GFP_KERNEL); + if (!dvi) + return -ENOMEM; + + dvi->dev = &client->dev; + + dvi->regmap = devm_regmap_init_i2c(client, &tfp410_regmap_config); + if (IS_ERR(dvi->regmap)) + return PTR_ERR(dvi->regmap); + + ret = tfp410_check_version(dvi); + if (ret < 0) { + dev_err(dvi->dev, "failed to read device ID (%d)\n", ret); + return ret; } - return tfp410_init(&client->dev, true); + return tfp410_init(dvi); } static int tfp410_i2c_remove(struct i2c_client *client) -- Regards, Laurent Pinchart

2 2

[PATCH v5 00/11] drm/bridge: dw-hdmi: implement bus-format negotiation and YUV420 support
by Neil Armstrong 10 Mar '20

10 Mar '20

Hi Philippe, Heiko, Maxime, Laurent, A bad negociation was detected on platforms not implementing a bridge on the encoder side, which has been fixed in this version. Could you check it doesn't break your platforms using dw-hdmi ? Especially patches 1-5. Thanks, Neil This patchset is based on Boris's merged "drm: Add support for bus-format negotiation" patchset to implement full bus-format negotiation for DW-HDMI, including YUV420 support and 10/12/16bit YUV444, YUV422 and RGB. The Color Space Converter support is already implemented. And the counterpart implementation in the Amlogic Meson VPU dw-hdmi glue : - basic bus-format negotiation to select YUV444 bus-format as DW-HDMI input - YUV420 support when HDMI2.0 YUV420 modeset This is a follow-up from the previous attempts : - "drm/meson: Add support for HDMI2.0 YUV420 4k60" at [2] - "drm/meson: Add support for HDMI2.0 4k60" at [3] Changes since v4 at [7]: - Cleaned up patch 1 - Added comment on patch 2 - Added commit message on patch 3 - Fixed invalid negociation when encoder is not yet a bridge (seen on allwinner & rockchip platforms) on patch 4 - Fixed invalid defines, handled MEDIA_BUS_FMT_FIXED and cleaned negociation debug on patch 4 - Added tags on patch 5, 6 - Removed meson_venc_hdmi_encoder_get_out_bus_fmts on patch 7 - Add off-list r-b from Jernej Changes since v3 at [6]: - Added "Plug atomic state hooks to the default implementation" on drm/bridge: dw-hdmi - Also added these atomic state hooks in meson-dw-hdmi in patch 7 - Rebased on latest drm-misc-next including patches 1-7 of [1] Changes since RFC v2 at [5]: - Added fixes from Jonas, who tested and integrated it for Rockchip SoCs - Added support for 10/12/16bit tmds clock calculation - Added support for max_bcp connector property - Adapted to Boris's v4 patchset - Fixed typos reported by boris Changes since RFC v1 at [4]: - Rewrote negociation using the v2 patchset, including full DW-HDMI fmt negociation [2] https://patchwork.freedesktop.org/patch/msgid/20190520133753.23871-1-narmst… [3] https://patchwork.freedesktop.org/patch/msgid/1549022873-40549-1-git-send-e… [4] https://patchwork.freedesktop.org/patch/msgid/20190820084109.24616-1-narmst… [5] https://patchwork.freedesktop.org/patch/msgid/20190827081425.15011-1-narmst… [6] https://patchwork.freedesktop.org/patch/msgid/20191218154637.17509-1-narmst… [7] https://patchwork.freedesktop.org/patch/msgid/20200206191834.6125-1-narmstr… Jonas Karlman (2): drm/bridge: dw-hdmi: set mtmdsclock for deep color drm/bridge: dw-hdmi: add max bpc connector property Neil Armstrong (9): drm/bridge: dw-hdmi: Plug atomic state hooks to the default implementation drm/bridge: synopsys: dw-hdmi: add bus format negociation drm/bridge: synopsys: dw-hdmi: allow ycbcr420 modes for >= 0x200a drm/meson: venc: make drm_display_mode const drm/meson: meson_dw_hdmi: add bridge and switch to drm_bridge_funcs drm/meson: dw-hdmi: stop enforcing input_bus_format drm/meson: venc: add support for YUV420 setup drm/meson: vclk: add support for YUV420 setup drm/meson: Add YUV420 output support drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 319 +++++++++++++++++++++- drivers/gpu/drm/meson/meson_dw_hdmi.c | 180 +++++++++--- drivers/gpu/drm/meson/meson_vclk.c | 93 +++++-- drivers/gpu/drm/meson/meson_vclk.h | 7 +- drivers/gpu/drm/meson/meson_venc.c | 10 +- drivers/gpu/drm/meson/meson_venc.h | 4 +- drivers/gpu/drm/meson/meson_venc_cvbs.c | 6 +- include/drm/bridge/dw_hdmi.h | 1 + 8 files changed, 544 insertions(+), 76 deletions(-) -- 2.22.0

1 12

[PATCH v11 0/5] arm/arm64: mediatek: Fix mt8173 mmsys device probing
by Enric Balletbo i Serra 10 Mar '20

10 Mar '20

Dear all, Those patches are intended to solve an old standing issue on some Mediatek devices (mt8173, mt2701 and mt2712 are affected by this issue). Up to now both drivers, clock and drm are probed with the same device tree compatible. But only the first driver gets probed, which in effect breaks graphics on those devices. The MMSYS (Multimedia subsystem) in Mediatek SoCs has some registers to control clock gates (which is used in the clk driver) and some registers to set the routing and enable the differnet blocks of the display and MDP (Media Data Path) subsystem. On this series the clk driver is not a pure clock controller but a system controller that can provide access to the shared registers between the different drivers that need it (mediatek-drm and mediatek-mdp). Hence the MMSYS clk driver was moved to drivers/soc/mediatek and is the entry point (parent) which will trigger the probe of the corresponding mediatek-drm driver. **IMPORTANT** This series only fixes the issue on mt8173 to make it simple and as is the only platform I can test. Similar changes should be applied for mt2701 and mt2712 to have display working. For reference, here are the links to the old discussions: * v10: https://patchwork.kernel.org/project/linux-mediatek/list/?series=248505 * v9: https://patchwork.kernel.org/project/linux-clk/list/?series=247591 * v8: https://patchwork.kernel.org/project/linux-mediatek/list/?series=244891 * v7: https://patchwork.kernel.org/project/linux-mediatek/list/?series=241217 * v6: https://patchwork.kernel.org/project/linux-mediatek/list/?series=213219 * v5: https://patchwork.kernel.org/project/linux-mediatek/list/?series=44063 * v4: * https://patchwork.kernel.org/patch/10530871/ * https://patchwork.kernel.org/patch/10530883/ * https://patchwork.kernel.org/patch/10530885/ * https://patchwork.kernel.org/patch/10530911/ * https://patchwork.kernel.org/patch/10530913/ * v3: * https://patchwork.kernel.org/patch/10367857/ * https://patchwork.kernel.org/patch/10367861/ * https://patchwork.kernel.org/patch/10367877/ * https://patchwork.kernel.org/patch/10367875/ * https://patchwork.kernel.org/patch/10367885/ * https://patchwork.kernel.org/patch/10367883/ * https://patchwork.kernel.org/patch/10367889/ * https://patchwork.kernel.org/patch/10367907/ * https://patchwork.kernel.org/patch/10367909/ * https://patchwork.kernel.org/patch/10367905/ * v2: No relevant discussion, see v3 * v1: * https://patchwork.kernel.org/patch/10016497/ * https://patchwork.kernel.org/patch/10016499/ * https://patchwork.kernel.org/patch/10016505/ * https://patchwork.kernel.org/patch/10016507/ Best regards, Enric Changes in v11: - Select CONFIG_MTK_MMSYS (CK) - Pass device pointer of mmsys device instead of config regs (CK) Changes in v10: - Update the binding documentation for the mmsys system controller. - Renamed to be generic mtk-mmsys - Add driver data support to be able to support diferent SoCs - Introduced a new patch to move routing control into mmsys driver. - Removed the patch to use regmap as is not needed anymore. - Match driver data to get display routing. Changes in v9: - Move mmsys to drivers/soc/mediatek (CK) - Do not move the display routing from the drm driver (CK) Changes in v8: - Be a builtin_platform_driver like other mediatek mmsys drivers. - New patch introduced in this series. Changes in v7: - Free clk_data->clks as well - Get rid of private data structure Enric Balletbo i Serra (3): dt-bindings: mediatek: Update mmsys binding to reflect it is a system controller soc / drm: mediatek: Move routing control to mmsys device soc / drm: mediatek: Fix mediatek-drm device probing Matthias Brugger (2): drm/mediatek: Omit warning on probe defers soc: mediatek: Move mt8173 MMSYS to platform driver .../bindings/arm/mediatek/mediatek,mmsys.txt | 7 +- drivers/clk/mediatek/clk-mt8173.c | 104 ----- drivers/gpu/drm/mediatek/Kconfig | 1 + drivers/gpu/drm/mediatek/mtk_disp_color.c | 5 +- drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 5 +- drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 5 +- drivers/gpu/drm/mediatek/mtk_dpi.c | 12 +- drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 19 +- drivers/gpu/drm/mediatek/mtk_drm_ddp.c | 259 +---------- drivers/gpu/drm/mediatek/mtk_drm_ddp.h | 7 - drivers/gpu/drm/mediatek/mtk_drm_drv.c | 45 +- drivers/gpu/drm/mediatek/mtk_drm_drv.h | 2 +- drivers/gpu/drm/mediatek/mtk_dsi.c | 8 +- drivers/gpu/drm/mediatek/mtk_hdmi.c | 4 +- drivers/soc/mediatek/Kconfig | 7 + drivers/soc/mediatek/Makefile | 1 + drivers/soc/mediatek/mtk-mmsys.c | 437 ++++++++++++++++++ include/linux/soc/mediatek/mtk-mmsys.h | 20 + 18 files changed, 537 insertions(+), 411 deletions(-) create mode 100644 drivers/soc/mediatek/mtk-mmsys.c create mode 100644 include/linux/soc/mediatek/mtk-mmsys.h -- 2.25.1

6 16

[PATCH] drm/ttm: fix false positive assert
by Christian König 10 Mar '20

10 Mar '20

The assert sometimes incorrectly triggers when pinned BOs are destroyed. Signed-off-by: Christian König <christian.koenig(a)amd.com> --- drivers/gpu/drm/ttm/ttm_bo.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index 2445e2bd6267..ca5a8d01ff1f 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -151,8 +151,6 @@ static void ttm_bo_add_mem_to_lru(struct ttm_buffer_object *bo, struct ttm_bo_device *bdev = bo->bdev; struct ttm_mem_type_manager *man; - dma_resv_assert_held(bo->base.resv); - if (!list_empty(&bo->lru)) return; @@ -611,7 +609,8 @@ static void ttm_bo_release(struct kref *kref) */ if (bo->mem.placement & TTM_PL_FLAG_NO_EVICT) { bo->mem.placement &= ~TTM_PL_FLAG_NO_EVICT; - ttm_bo_move_to_lru_tail(bo, NULL); + ttm_bo_del_from_lru(bo); + ttm_bo_add_mem_to_lru(bo, &bo->mem); } kref_init(&bo->kref); -- 2.17.1

3 3

← Newer
1
...
56
57
58
59
60
61
62
...
78
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel March 2020