dri-devel March 2021

dri-devel@lists.freedesktop.org

326 participants
867 discussions

Re: [PATCH 02/18] iommu/fsl_pamu: remove fsl_pamu_get_domain_attr
by Will Deacon 30 Mar '21

30 Mar '21

On Tue, Mar 16, 2021 at 04:38:08PM +0100, Christoph Hellwig wrote: > None of the values returned by this function are ever queried. Also > remove the DOMAIN_ATTR_FSL_PAMUV1 enum value that is not otherwise used. > > Signed-off-by: Christoph Hellwig <hch(a)lst.de> > Acked-by: Li Yang <leoyang.li(a)nxp.com> > --- > drivers/iommu/fsl_pamu_domain.c | 30 ------------------------------ > include/linux/iommu.h | 4 ---- > 2 files changed, 34 deletions(-) Acked-by: Will Deacon <will(a)kernel.org> Will

1 0

Re: [PATCH 01/18] iommu: remove the unused domain_window_disable method
by Will Deacon 30 Mar '21

30 Mar '21

On Tue, Mar 16, 2021 at 04:38:07PM +0100, Christoph Hellwig wrote: > domain_window_disable is wired up by fsl_pamu, but never actually called. > > Signed-off-by: Christoph Hellwig <hch(a)lst.de> > Acked-by: Li Yang <leoyang.li(a)nxp.com> > --- > drivers/iommu/fsl_pamu_domain.c | 48 --------------------------------- > include/linux/iommu.h | 2 -- > 2 files changed, 50 deletions(-) Acked-by: Will Deacon <will(a)kernel.org> Will

1 0

[PATCH v2 0/3] drm/mediatek: Don't support hdmi connector creation
by Dafna Hirschfeld 30 Mar '21

30 Mar '21

commit f01195148967 ("drm/mediatek: mtk_dpi: Create connector for bridges") broke the display support for elm device since mtk_dpi calls drm_bridge_attach with the flag DRM_BRIDGE_ATTACH_NO_CONNECTOR while mtk_hdmi does not yet support this flag. These three patches fix that by adding support for DRM_BRIDGE_ATTACH_NO_CONNECTOR in mtk_hdmi bridge attachment. changes since v1: 1. split the first patch - now the first patch only moves the bridge ops to the atomic API while the replacement of the field 'conn' with the field '*curr_conn' is done in a new third patch. 2. in the function 'get_eld' use the current conn only if 'enabled = true'. Dafna Hirschfeld (3): drm/mediatek: Switch the hdmi bridge ops to the atomic versions drm/mediatek: Don't support hdmi connector creation drm/mediatek: in struct mtk_hdmi, replace conn field with curr_conn ptr drivers/gpu/drm/mediatek/mtk_hdmi.c | 171 ++++++++++++---------------- 1 file changed, 73 insertions(+), 98 deletions(-) -- 2.17.1

2 7

Re: [PATCH] dt-bindings: bcm2711-hdmi: Fix broken schema
by Rob Herring 30 Mar '21

30 Mar '21

On Tue, Feb 23, 2021 at 2:26 PM Rob Herring <robh(a)kernel.org> wrote: > > On Thu, 18 Feb 2021 16:28:37 +0100, Maxime Ripard wrote: > > For some reason, unevaluatedProperties doesn't work and > > additionalProperties is required. Fix it by switching to > > additionalProperties. > > > > Signed-off-by: Maxime Ripard <maxime(a)cerno.tech> > > --- > > .../devicetree/bindings/display/brcm,bcm2711-hdmi.yaml | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > Applied, thanks! Something weird is going on with this fix. linux-next doesn't end up with the change even though 5.12-rc2 has it. I suspect it's because the original commit is in 2 branches (drm-misc-next and drm-misc-fixes), but the fix was applied by me. I'm not sure how linux-next didn't have a manual merge for this. Rob

3 2

[GIT PULL] exynos-drm-next
by Inki Dae 30 Mar '21

30 Mar '21

Hi Dave, Just one patch to clean up the use of request_irq funtion. This patch has a dependency of one patch[1] so merged it on top of tag 'irq-no-autoen-2021-03-25' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip after top of drm next branch. Please kindly let me know if there is any problem. Thanks, Inki Dae [1] https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next-history.git… The following changes since commit 99e5730dd2b11fedc890bbc9c803f69aad24e3ca: Merge tag 'irq-no-autoen-2021-03-25' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into exynos-drm-next (2021-03-29 20:35:13 +0900) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos tags/exynos-drm-next-for-v5.13 for you to fetch changes up to a4e5eed2c6a689ef2b6ad8d7ae86665c69039379: drm/exynos: move to use request_irq by IRQF_NO_AUTOEN flag (2021-03-29 20:37:17 +0900) ---------------------------------------------------------------- One cleanup - Based on the patch[1], clean up the use of request_irq function series. [1] https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next-history.git… ---------------------------------------------------------------- Tian Tao (1): drm/exynos: move to use request_irq by IRQF_NO_AUTOEN flag drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 4 ++-- drivers/gpu/drm/exynos/exynos_drm_dsi.c | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-)

1 0

[PATCH v3 0/1] drm/tiny: add support for Waveshare 2inch LCD module
by Carlis 30 Mar '21

30 Mar '21

From: Xuezhi Zhang <zhangxuezhi1(a)yulong.com> This adds a new module for the ST7789V controller with parameters for the Waveshare 2inch LCD module. Signed-off-by: Xuezhi Zhang <zhangxuezhi1(a)yulong.com> --- v2:change compatible value. v3:change author name. --- MAINTAINERS | 8 + drivers/gpu/drm/tiny/Kconfig | 14 ++ drivers/gpu/drm/tiny/Makefile | 1 + drivers/gpu/drm/tiny/st7789v.c | 269 +++++++++++++++++++++++++++++++++ 4 files changed, 292 insertions(+) create mode 100644 drivers/gpu/drm/tiny/st7789v.c diff --git a/MAINTAINERS b/MAINTAINERS index d92f85ca831d..df25e8e0deb1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5769,6 +5769,14 @@ T: git git://anongit.freedesktop.org/drm/drm-misc F: Documentation/devicetree/bindings/display/sitronix,st7735r.yaml F: drivers/gpu/drm/tiny/st7735r.c +DRM DRIVER FOR SITRONIX ST7789V PANELS +M: David Lechner <david(a)lechnology.com> +M: Xuezhi Zhang <zhangxuezhi1(a)yulong.com> +S: Maintained +T: git git://anongit.freedesktop.org/drm/drm-misc +F: Documentation/devicetree/bindings/display/sitronix,st7789v-dbi.yaml +F: drivers/gpu/drm/tiny/st7789v.c + DRM DRIVER FOR SONY ACX424AKP PANELS M: Linus Walleij <linus.walleij(a)linaro.org> S: Maintained diff --git a/drivers/gpu/drm/tiny/Kconfig b/drivers/gpu/drm/tiny/Kconfig index 2b6414f0fa75..ac2c7fb702f0 100644 --- a/drivers/gpu/drm/tiny/Kconfig +++ b/drivers/gpu/drm/tiny/Kconfig @@ -131,3 +131,17 @@ config TINYDRM_ST7735R * Okaya RH128128T 1.44" 128x128 TFT If M is selected the module will be called st7735r. + +config TINYDRM_ST7789V + tristate "DRM support for Sitronix ST7789V display panels" + depends on DRM && SPI + select DRM_KMS_HELPER + select DRM_KMS_CMA_HELPER + select DRM_MIPI_DBI + select BACKLIGHT_CLASS_DEVICE + help + DRM driver for Sitronix ST7789V with one of the following + LCDs: + * Waveshare 2inch lcd module 240x320 TFT + + If M is selected the module will be called st7789v. diff --git a/drivers/gpu/drm/tiny/Makefile b/drivers/gpu/drm/tiny/Makefile index 6ae4e9e5a35f..aa0caa2b6c16 100644 --- a/drivers/gpu/drm/tiny/Makefile +++ b/drivers/gpu/drm/tiny/Makefile @@ -10,3 +10,4 @@ obj-$(CONFIG_TINYDRM_MI0283QT) += mi0283qt.o obj-$(CONFIG_TINYDRM_REPAPER) += repaper.o obj-$(CONFIG_TINYDRM_ST7586) += st7586.o obj-$(CONFIG_TINYDRM_ST7735R) += st7735r.o +obj-$(CONFIG_TINYDRM_ST7789V) += st7789v.o diff --git a/drivers/gpu/drm/tiny/st7789v.c b/drivers/gpu/drm/tiny/st7789v.c new file mode 100644 index 000000000000..9b4bb9edba40 --- /dev/null +++ b/drivers/gpu/drm/tiny/st7789v.c @@ -0,0 +1,269 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * DRM driver for display panels connected to a Sitronix ST7789V + * display controller in SPI mode. + * + * Copyright 2017 David Lechner <david(a)lechnology.com> + * Copyright (C) 2019 Glider bvba + */ + +#include <linux/backlight.h> +#include <linux/delay.h> +#include <linux/dma-buf.h> +#include <linux/gpio/consumer.h> +#include <linux/module.h> +#include <linux/property.h> +#include <linux/spi/spi.h> +#include <video/mipi_display.h> + +#include <drm/drm_atomic_helper.h> +#include <drm/drm_drv.h> +#include <drm/drm_fb_helper.h> +#include <drm/drm_gem_cma_helper.h> +#include <drm/drm_gem_framebuffer_helper.h> +#include <drm/drm_managed.h> +#include <drm/drm_mipi_dbi.h> + +#define ST7789V_PORCTRL 0xb2 +#define ST7789V_GCTRL 0xb7 +#define ST7789V_VCOMS 0xbb +#define ST7789V_LCMCTRL 0xc0 +#define ST7789V_VDVVRHEN 0xc2 +#define ST7789V_VRHS 0xc3 +#define ST7789V_VDVS 0xc4 +#define ST7789V_FRCTRL2 0xc6 +#define ST7789V_PWCTRL1 0xd0 +#define ST7789V_PVGAMCTRL 0xe0 +#define ST7789V_NVGAMCTRL 0xe1 + +#define ST7789V_MY BIT(7) +#define ST7789V_MX BIT(6) +#define ST7789V_MV BIT(5) +#define ST7789V_RGB BIT(3) + +struct st7789v_cfg { + const struct drm_display_mode mode; + unsigned int left_offset; + unsigned int top_offset; + unsigned int write_only:1; + unsigned int rgb:1; /* RGB (vs. BGR) */ +}; + +struct st7789v_priv { + struct mipi_dbi_dev dbidev; /* Must be first for .release() */ + const struct st7789v_cfg *cfg; +}; + +static void st7789v_pipe_enable(struct drm_simple_display_pipe *pipe, + struct drm_crtc_state *crtc_state, + struct drm_plane_state *plane_state) +{ + struct mipi_dbi_dev *dbidev = drm_to_mipi_dbi_dev(pipe->crtc.dev); + struct st7789v_priv *priv = container_of(dbidev, struct st7789v_priv, + dbidev); + struct mipi_dbi *dbi = &dbidev->dbi; + int ret, idx; + u8 addr_mode; + + if (!drm_dev_enter(pipe->crtc.dev, &idx)) + return; + + DRM_DEBUG_KMS("\n"); + + ret = mipi_dbi_poweron_reset(dbidev); + if (ret) + goto out_exit; + + msleep(150); + + mipi_dbi_command(dbi, MIPI_DCS_EXIT_SLEEP_MODE); + msleep(100); + + + switch (dbidev->rotation) { + default: + addr_mode = 0; + break; + case 90: + addr_mode = ST7789V_MY | ST7789V_MV; + break; + case 180: + addr_mode = ST7789V_MX | ST7789V_MY; + break; + case 270: + addr_mode = ST7789V_MX | ST7789V_MV; + break; + } + + if (priv->cfg->rgb) + addr_mode |= ST7789V_RGB; + + mipi_dbi_command(dbi, MIPI_DCS_SET_ADDRESS_MODE, addr_mode); + mipi_dbi_command(dbi, MIPI_DCS_SET_PIXEL_FORMAT, + MIPI_DCS_PIXEL_FMT_16BIT); + mipi_dbi_command(dbi, MIPI_DCS_ENTER_INVERT_MODE); + mipi_dbi_command(dbi, ST7789V_PORCTRL, 0x0c, 0x0c, 0x00, 0x33, 0x33); + mipi_dbi_command(dbi, ST7789V_GCTRL, 0x35); + mipi_dbi_command(dbi, ST7789V_VCOMS, 0x1f); + mipi_dbi_command(dbi, ST7789V_LCMCTRL, 0x2c); + mipi_dbi_command(dbi, ST7789V_VDVVRHEN, 0x01); + mipi_dbi_command(dbi, ST7789V_VRHS, 0x12); + mipi_dbi_command(dbi, ST7789V_VDVS, 0x20); + mipi_dbi_command(dbi, ST7789V_FRCTRL2, 0x0f); + mipi_dbi_command(dbi, ST7789V_PWCTRL1, 0xa4, 0xa1); + mipi_dbi_command(dbi, ST7789V_PVGAMCTRL, 0xd0, 0x08, 0x11, 0x08, 0x0c, + 0x15, 0x39, 0x33, 0x50, 0x36, 0x13, 0x14, 0x29, 0x2d); + mipi_dbi_command(dbi, ST7789V_NVGAMCTRL, 0xd0, 0x08, 0x10, 0x08, 0x06, + 0x06, 0x39, 0x44, 0x51, 0x0b, 0x16, 0x14, 0x2f, 0x31); + mipi_dbi_command(dbi, MIPI_DCS_SET_DISPLAY_ON); + msleep(100); + mipi_dbi_enable_flush(dbidev, crtc_state, plane_state); + +out_exit: + drm_dev_exit(idx); +} + +static const struct drm_simple_display_pipe_funcs st7789v_pipe_funcs = { + .enable = st7789v_pipe_enable, + .disable = mipi_dbi_pipe_disable, + .update = mipi_dbi_pipe_update, + .prepare_fb = drm_gem_fb_simple_display_pipe_prepare_fb, +}; + +static const struct st7789v_cfg ws_2inch_lcd_cfg = { + .mode = { DRM_SIMPLE_MODE(240, 320, 34, 43) }, + /* Cannot read from Waveshare 2inch lcd module" display via SPI */ + .write_only = true, + .rgb = false, +}; + + +DEFINE_DRM_GEM_CMA_FOPS(st7789v_fops); + +static const struct drm_driver st7789v_driver = { + .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, + .fops = &st7789v_fops, + DRM_GEM_CMA_DRIVER_OPS_VMAP, + .debugfs_init = mipi_dbi_debugfs_init, + .name = "st7789v", + .desc = "Sitronix ST7789R", + .date = "20210310", + .major = 1, + .minor = 0, +}; + +static const struct of_device_id st7789v_of_match[] = { + { .compatible = "waveshare,ws2inch", .data = &ws_2inch_lcd_cfg }, + { }, +}; +MODULE_DEVICE_TABLE(of, st7789v_of_match); + +static const struct spi_device_id st7789v_id[] = { + { "ws2inch", (uintptr_t)&ws_2inch_lcd_cfg }, + { }, +}; +MODULE_DEVICE_TABLE(spi, st7789v_id); + +static int st7789v_probe(struct spi_device *spi) +{ + struct device *dev = &spi->dev; + const struct st7789v_cfg *cfg; + struct mipi_dbi_dev *dbidev; + struct st7789v_priv *priv; + struct drm_device *drm; + struct mipi_dbi *dbi; + struct gpio_desc *dc; + u32 rotation = 0; + int ret; + + cfg = device_get_match_data(&spi->dev); + if (!cfg) + cfg = (void *)spi_get_device_id(spi)->driver_data; + + priv = devm_drm_dev_alloc(dev, &st7789v_driver, + struct st7789v_priv, dbidev.drm); + if (IS_ERR(priv)) + return PTR_ERR(priv); + + dbidev = &priv->dbidev; + priv->cfg = cfg; + + dbi = &dbidev->dbi; + drm = &dbidev->drm; + + dbi->reset = devm_gpiod_get(dev, "reset", GPIOD_OUT_HIGH); + if (IS_ERR(dbi->reset)) { + DRM_DEV_ERROR(dev, "Failed to get gpio 'reset'\n"); + return PTR_ERR(dbi->reset); + } + + dc = devm_gpiod_get(dev, "dc", GPIOD_OUT_LOW); + if (IS_ERR(dc)) { + DRM_DEV_ERROR(dev, "Failed to get gpio 'dc'\n"); + return PTR_ERR(dc); + } + + dbidev->backlight = devm_of_find_backlight(dev); + if (IS_ERR(dbidev->backlight)) + return PTR_ERR(dbidev->backlight); + + device_property_read_u32(dev, "rotation", &rotation); + + ret = mipi_dbi_spi_init(spi, dbi, dc); + if (ret) + return ret; + + if (cfg->write_only) + dbi->read_commands = NULL; + + dbidev->left_offset = cfg->left_offset; + dbidev->top_offset = cfg->top_offset; + + ret = mipi_dbi_dev_init(dbidev, &st7789v_pipe_funcs, &cfg->mode, + rotation); + if (ret) + return ret; + + drm_mode_config_reset(drm); + + ret = drm_dev_register(drm, 0); + if (ret) + return ret; + + spi_set_drvdata(spi, drm); + + drm_fbdev_generic_setup(drm, 0); + + return 0; +} + +static int st7789v_remove(struct spi_device *spi) +{ + struct drm_device *drm = spi_get_drvdata(spi); + + drm_dev_unplug(drm); + drm_atomic_helper_shutdown(drm); + + return 0; +} + +static void st7789v_shutdown(struct spi_device *spi) +{ + drm_atomic_helper_shutdown(spi_get_drvdata(spi)); +} + +static struct spi_driver st7789v_spi_driver = { + .driver = { + .name = "st7789v-dbi", + .of_match_table = st7789v_of_match, + }, + .id_table = st7789v_id, + .probe = st7789v_probe, + .remove = st7789v_remove, + .shutdown = st7789v_shutdown, +}; +module_spi_driver(st7789v_spi_driver); + +MODULE_DESCRIPTION("Sitronix ST7789V DRM driver"); +MODULE_AUTHOR("Carlis <zhangxuezhi1(a)yulong.com>"); +MODULE_LICENSE("GPL"); -- 2.25.1

3 2

[PATCH v4 0/4] arm64: dts: qcom: sm8250: fix display nodes
by Dmitry Baryshkov 30 Mar '21

30 Mar '21

This is a series of patches developed by Jonathan Marek, and picked up to split them, so that dts fixes can be picked up into stable branch Add sm8150/sm8250 compatibles to drm/msm and fix the sm8250 display nodes. v2: do not remove mmcx-supply from dispcc node v3: remove references to dp_phy (missed this in v2, sorry for the spam) v4: split patches to let fixes be picked up into stable branch ---------------------------------------------------------------- Jonathan Marek (4): arm64: dts: qcom: sm8250: fix display nodes dt-bindings: msm/disp: add compatibles for sm8150/sm8250 display drm/msm: add compatibles for sm8150/sm8250 display arm64: dts: qcom: sm8250: fix display nodes Documentation/devicetree/bindings/display/msm/dpu.txt | 4 ++-- arch/arm64/boot/dts/qcom/sm8250.dtsi | 31 ++++++++----------------------- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 2 ++ drivers/gpu/drm/msm/msm_drv.c | 6 +++--- 4 files changed, 15 insertions(+), 28 deletions(-)

3 10

[PATCH] staging: fbtft: change '16 bit' to '16-bit'
by Carlis 30 Mar '21

30 Mar '21

From: "carlis.zhang_cp" <zhangxuezhi1(a)yulong.com> Change '16 bit' to '16-bit' for a same style. Signed-off-by: carlis.zhang_cp <zhangxuezhi1(a)yulong.com> --- drivers/staging/fbtft/fbtft-bus.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/fbtft/fbtft-bus.c b/drivers/staging/fbtft/fbtft-bus.c index 63c65dd..7040131 100644 --- a/drivers/staging/fbtft/fbtft-bus.c +++ b/drivers/staging/fbtft/fbtft-bus.c @@ -117,7 +117,7 @@ void fbtft_write_reg8_bus9(struct fbtft_par *par, int len, ...) * *****************************************************************************/ -/* 16 bit pixel over 8-bit databus */ +/* 16-bit pixel over 8-bit databus */ int fbtft_write_vmem16_bus8(struct fbtft_par *par, size_t offset, size_t len) { u16 *vmem16; @@ -172,7 +172,7 @@ int fbtft_write_vmem16_bus8(struct fbtft_par *par, size_t offset, size_t len) } EXPORT_SYMBOL(fbtft_write_vmem16_bus8); -/* 16 bit pixel over 9-bit SPI bus: dc + high byte, dc + low byte */ +/* 16-bit pixel over 9-bit SPI bus: dc + high byte, dc + low byte */ int fbtft_write_vmem16_bus9(struct fbtft_par *par, size_t offset, size_t len) { u8 *vmem8; @@ -228,7 +228,7 @@ int fbtft_write_vmem8_bus8(struct fbtft_par *par, size_t offset, size_t len) } EXPORT_SYMBOL(fbtft_write_vmem8_bus8); -/* 16 bit pixel over 16-bit databus */ +/* 16-bit pixel over 16-bit databus */ int fbtft_write_vmem16_bus16(struct fbtft_par *par, size_t offset, size_t len) { u16 *vmem16; -- 1.9.1

3 2

[PATCH v2] staging: fbtft: fix a typo
by Carlis 30 Mar '21

30 Mar '21

From: Xuezhi Zhang <zhangxuezhi1(a)yulong.com> Change 'tft' to 'TFT' Signed-off-by: Xuezhi Zhang <zhangxuezhi1(a)yulong.com> --- v2: use full name. drivers/staging/fbtft/fbtft-core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/fbtft/fbtft-core.c b/drivers/staging/fbtft/fbtft-core.c index 4f362da..44e7acb 100644 --- a/drivers/staging/fbtft/fbtft-core.c +++ b/drivers/staging/fbtft/fbtft-core.c @@ -775,7 +775,7 @@ void fbtft_framebuffer_release(struct fb_info *info) EXPORT_SYMBOL(fbtft_framebuffer_release); /** - * fbtft_register_framebuffer - registers a tft frame buffer device + * fbtft_register_framebuffer - registers a TFT frame buffer device * @fb_info: frame buffer info structure * * Sets SPI driverdata if needed @@ -873,7 +873,7 @@ int fbtft_register_framebuffer(struct fb_info *fb_info) EXPORT_SYMBOL(fbtft_register_framebuffer); /** - * fbtft_unregister_framebuffer - releases a tft frame buffer device + * fbtft_unregister_framebuffer - releases a TFT frame buffer device * @fb_info: frame buffer info structure * * Frees SPI driverdata if needed -- 1.9.1

3 2

[PATCH v3] drm/scheduler re-insert Bailing job to avoid memleak
by Jack Zhang 30 Mar '21

30 Mar '21

re-insert Bailing jobs to avoid memory leak. V2: move re-insert step to drm/scheduler logic V3: add panfrost's return value for bailing jobs in case it hits the memleak issue. Signed-off-by: Jack Zhang <Jack.Zhang1(a)amd.com> --- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 +++- drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 8 ++++++-- drivers/gpu/drm/panfrost/panfrost_job.c | 4 ++-- drivers/gpu/drm/scheduler/sched_main.c | 8 +++++++- include/drm/gpu_scheduler.h | 1 + 5 files changed, 19 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index 79b9cc73763f..86463b0f936e 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -4815,8 +4815,10 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev, job ? job->base.id : -1); /* even we skipped this reset, still need to set the job to guilty */ - if (job) + if (job) { drm_sched_increase_karma(&job->base); + r = DRM_GPU_SCHED_STAT_BAILING; + } goto skip_recovery; } diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c index 759b34799221..41390bdacd9e 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c @@ -34,6 +34,7 @@ static enum drm_gpu_sched_stat amdgpu_job_timedout(struct drm_sched_job *s_job) struct amdgpu_job *job = to_amdgpu_job(s_job); struct amdgpu_task_info ti; struct amdgpu_device *adev = ring->adev; + int ret; memset(&ti, 0, sizeof(struct amdgpu_task_info)); @@ -52,8 +53,11 @@ static enum drm_gpu_sched_stat amdgpu_job_timedout(struct drm_sched_job *s_job) ti.process_name, ti.tgid, ti.task_name, ti.pid); if (amdgpu_device_should_recover_gpu(ring->adev)) { - amdgpu_device_gpu_recover(ring->adev, job); - return DRM_GPU_SCHED_STAT_NOMINAL; + ret = amdgpu_device_gpu_recover(ring->adev, job); + if (ret == DRM_GPU_SCHED_STAT_BAILING) + return DRM_GPU_SCHED_STAT_BAILING; + else + return DRM_GPU_SCHED_STAT_NOMINAL; } else { drm_sched_suspend_timeout(&ring->sched); if (amdgpu_sriov_vf(adev)) diff --git a/drivers/gpu/drm/panfrost/panfrost_job.c b/drivers/gpu/drm/panfrost/panfrost_job.c index 6003cfeb1322..e2cb4f32dae1 100644 --- a/drivers/gpu/drm/panfrost/panfrost_job.c +++ b/drivers/gpu/drm/panfrost/panfrost_job.c @@ -444,7 +444,7 @@ static enum drm_gpu_sched_stat panfrost_job_timedout(struct drm_sched_job * spurious. Bail out. */ if (dma_fence_is_signaled(job->done_fence)) - return DRM_GPU_SCHED_STAT_NOMINAL; + return DRM_GPU_SCHED_STAT_BAILING; dev_err(pfdev->dev, "gpu sched timeout, js=%d, config=0x%x, status=0x%x, head=0x%x, tail=0x%x, sched_job=%p", js, @@ -456,7 +456,7 @@ static enum drm_gpu_sched_stat panfrost_job_timedout(struct drm_sched_job /* Scheduler is already stopped, nothing to do. */ if (!panfrost_scheduler_stop(&pfdev->js->queue[js], sched_job)) - return DRM_GPU_SCHED_STAT_NOMINAL; + return DRM_GPU_SCHED_STAT_BAILING; /* Schedule a reset if there's no reset in progress. */ if (!atomic_xchg(&pfdev->reset.pending, 1)) diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/scheduler/sched_main.c index 92d8de24d0a1..a44f621fb5c4 100644 --- a/drivers/gpu/drm/scheduler/sched_main.c +++ b/drivers/gpu/drm/scheduler/sched_main.c @@ -314,6 +314,7 @@ static void drm_sched_job_timedout(struct work_struct *work) { struct drm_gpu_scheduler *sched; struct drm_sched_job *job; + int ret; sched = container_of(work, struct drm_gpu_scheduler, work_tdr.work); @@ -331,8 +332,13 @@ static void drm_sched_job_timedout(struct work_struct *work) list_del_init(&job->list); spin_unlock(&sched->job_list_lock); - job->sched->ops->timedout_job(job); + ret = job->sched->ops->timedout_job(job); + if (ret == DRM_GPU_SCHED_STAT_BAILING) { + spin_lock(&sched->job_list_lock); + list_add(&job->node, &sched->ring_mirror_list); + spin_unlock(&sched->job_list_lock); + } /* * Guilty job did complete and hence needs to be manually removed * See drm_sched_stop doc. diff --git a/include/drm/gpu_scheduler.h b/include/drm/gpu_scheduler.h index 4ea8606d91fe..8093ac2427ef 100644 --- a/include/drm/gpu_scheduler.h +++ b/include/drm/gpu_scheduler.h @@ -210,6 +210,7 @@ enum drm_gpu_sched_stat { DRM_GPU_SCHED_STAT_NONE, /* Reserve 0 */ DRM_GPU_SCHED_STAT_NOMINAL, DRM_GPU_SCHED_STAT_ENODEV, + DRM_GPU_SCHED_STAT_BAILING, }; /** -- 2.25.1

7 19

← Newer
1
...
22
23
24
25
26
27
28
...
87
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel March 2021