dri-devel June 2017

dri-devel@lists.freedesktop.org

228 participants
1479 discussions

[PATCH] gpu: host1x: Fix error handling
by Christophe JAILLET 15 Jun '17

15 Jun '17

If 'devm_reset_control_get' returns an error, then we erroneously return success because error code is taken from 'host->clk' instead of 'host->rst'. Fixes: b386c6b73ac6 ("gpu: host1x: Support module reset") Signed-off-by: Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> --- drivers/gpu/host1x/dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/host1x/dev.c b/drivers/gpu/host1x/dev.c index f05ebb14fa63..ac65f52850a6 100644 --- a/drivers/gpu/host1x/dev.c +++ b/drivers/gpu/host1x/dev.c @@ -172,7 +172,7 @@ static int host1x_probe(struct platform_device *pdev) host->rst = devm_reset_control_get(&pdev->dev, "host1x"); if (IS_ERR(host->rst)) { - err = PTR_ERR(host->clk); + err = PTR_ERR(host->rst); dev_err(&pdev->dev, "failed to get reset: %d\n", err); return err; } -- 2.11.0

3 2

[PATCH 4/6] v4l: vsp1: Add pipe index argument to the VSP-DU API
by Laurent Pinchart 15 Jun '17

15 Jun '17

In the H3 ES2.0 SoC the VSP2-DL instance has two connections to DU channels that need to be configured independently. Extend the VSP-DU API with a pipeline index to identify which pipeline the caller wants to operate on. Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas(a)ideasonboard.com> --- drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 9 +++++---- drivers/media/platform/vsp1/vsp1_drm.c | 28 +++++++++++++++++++--------- include/media/vsp1.h | 8 +++++--- 3 files changed, 29 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/rcar-du/rcar_du_vsp.c b/drivers/gpu/drm/rcar-du/rcar_du_vsp.c index b0ff304ce3dc..1b62b58f11ee 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_vsp.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_vsp.c @@ -70,22 +70,22 @@ void rcar_du_vsp_enable(struct rcar_du_crtc *crtc) */ crtc->group->need_restart = true; - vsp1_du_setup_lif(crtc->vsp->vsp, &cfg); + vsp1_du_setup_lif(crtc->vsp->vsp, 0, &cfg); } void rcar_du_vsp_disable(struct rcar_du_crtc *crtc) { - vsp1_du_setup_lif(crtc->vsp->vsp, NULL); + vsp1_du_setup_lif(crtc->vsp->vsp, 0, NULL); } void rcar_du_vsp_atomic_begin(struct rcar_du_crtc *crtc) { - vsp1_du_atomic_begin(crtc->vsp->vsp); + vsp1_du_atomic_begin(crtc->vsp->vsp, 0); } void rcar_du_vsp_atomic_flush(struct rcar_du_crtc *crtc) { - vsp1_du_atomic_flush(crtc->vsp->vsp); + vsp1_du_atomic_flush(crtc->vsp->vsp, 0); } /* Keep the two tables in sync. */ @@ -153,6 +153,7 @@ static void rcar_du_vsp_plane_setup(struct rcar_du_vsp_plane *plane) to_rcar_vsp_plane_state(plane->plane.state); struct drm_framebuffer *fb = plane->plane.state->fb; struct vsp1_du_atomic_config cfg = { + .pipe = 0, .pixelformat = 0, .pitch = fb->pitches[0], .alpha = state->alpha, diff --git a/drivers/media/platform/vsp1/vsp1_drm.c b/drivers/media/platform/vsp1/vsp1_drm.c index 9d235e830f5a..7699fa787b80 100644 --- a/drivers/media/platform/vsp1/vsp1_drm.c +++ b/drivers/media/platform/vsp1/vsp1_drm.c @@ -54,21 +54,26 @@ EXPORT_SYMBOL_GPL(vsp1_du_init); /** * vsp1_du_setup_lif - Setup the output part of the VSP pipeline * @dev: the VSP device + * @pipe_index: the DRM pipeline index * @cfg: the LIF configuration * * Configure the output part of VSP DRM pipeline for the given frame @cfg.width - * and @cfg.height. This sets up formats on the BRU source pad, the WPF0 sink - * and source pads, and the LIF sink pad. + * and @cfg.height. This sets up formats on the blend unit (BRU or BRS) source + * pad, the WPF sink and source pads, and the LIF sink pad. * - * As the media bus code on the BRU source pad is conditioned by the - * configuration of the BRU sink 0 pad, we also set up the formats on all BRU + * The @pipe_index argument selects which DRM pipeline to setup. The number of + * available pipelines depend on the VSP instance. + * + * As the media bus code on the blend unit source pad is conditioned by the + * configuration of its sink 0 pad, we also set up the formats on all blend unit * sinks, even if the configuration will be overwritten later by - * vsp1_du_setup_rpf(). This ensures that the BRU configuration is set to a well - * defined state. + * vsp1_du_setup_rpf(). This ensures that the blend unit configuration is set to + * a well defined state. * * Return 0 on success or a negative error code on failure. */ -int vsp1_du_setup_lif(struct device *dev, const struct vsp1_du_lif_config *cfg) +int vsp1_du_setup_lif(struct device *dev, unsigned int pipe_index, + const struct vsp1_du_lif_config *cfg) { struct vsp1_device *vsp1 = dev_get_drvdata(dev); struct vsp1_pipeline *pipe = &vsp1->drm->pipe; @@ -77,6 +82,9 @@ int vsp1_du_setup_lif(struct device *dev, const struct vsp1_du_lif_config *cfg) unsigned int i; int ret; + if (pipe_index > 0) + return -EINVAL; + if (!cfg) { /* * NULL configuration means the CRTC is being disabled, stop @@ -216,8 +224,9 @@ EXPORT_SYMBOL_GPL(vsp1_du_setup_lif); /** * vsp1_du_atomic_begin - Prepare for an atomic update * @dev: the VSP device + * @pipe_index: the DRM pipeline index */ -void vsp1_du_atomic_begin(struct device *dev) +void vsp1_du_atomic_begin(struct device *dev, unsigned int pipe_index) { struct vsp1_device *vsp1 = dev_get_drvdata(dev); struct vsp1_pipeline *pipe = &vsp1->drm->pipe; @@ -421,8 +430,9 @@ static unsigned int rpf_zpos(struct vsp1_device *vsp1, struct vsp1_rwpf *rpf) /** * vsp1_du_atomic_flush - Commit an atomic update * @dev: the VSP device + * @pipe_index: the DRM pipeline index */ -void vsp1_du_atomic_flush(struct device *dev) +void vsp1_du_atomic_flush(struct device *dev, unsigned int pipe_index) { struct vsp1_device *vsp1 = dev_get_drvdata(dev); struct vsp1_pipeline *pipe = &vsp1->drm->pipe; diff --git a/include/media/vsp1.h b/include/media/vsp1.h index 38aac554dbba..6db4ae0e7c55 100644 --- a/include/media/vsp1.h +++ b/include/media/vsp1.h @@ -30,9 +30,11 @@ struct vsp1_du_lif_config { unsigned int height; }; -int vsp1_du_setup_lif(struct device *dev, const struct vsp1_du_lif_config *cfg); +int vsp1_du_setup_lif(struct device *dev, unsigned int pipe_index, + const struct vsp1_du_lif_config *cfg); struct vsp1_du_atomic_config { + unsigned int pipe; u32 pixelformat; unsigned int pitch; dma_addr_t mem[3]; @@ -42,9 +44,9 @@ struct vsp1_du_atomic_config { unsigned int zpos; }; -void vsp1_du_atomic_begin(struct device *dev); +void vsp1_du_atomic_begin(struct device *dev, unsigned int pipe_index); int vsp1_du_atomic_update(struct device *dev, unsigned int rpf, const struct vsp1_du_atomic_config *cfg); -void vsp1_du_atomic_flush(struct device *dev); +void vsp1_du_atomic_flush(struct device *dev, unsigned int pipe_index); #endif /* __MEDIA_VSP1_H__ */ -- Regards, Laurent Pinchart

1 0

[Bug 98690] [nouveau bisected] System freeze when starting X using kernel 4.9-rc1 or later
by bugzilla-daemon＠freedesktop.org 15 Jun '17

15 Jun '17

1 0

[Bug 98690] [nouveau bisected] System freeze when starting X using kernel 4.9-rc1 or later
by bugzilla-daemon＠freedesktop.org 15 Jun '17

15 Jun '17

https://bugs.freedesktop.org/show_bug.cgi?id=98690 Jari Tahvanainen <jari.tahvanainen(a)intel.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Whiteboard|ReadyForDev | Keywords|bisected, regression | -- You are receiving this mail because: You are the assignee for the bug.

1 0

[Bug 98690] [nouveau bisected] System freeze when starting X using kernel 4.9-rc1 or later
by bugzilla-daemon＠freedesktop.org 15 Jun '17

15 Jun '17

1 0

amdgpu display corruption and hang on AMD A10-9620P
by Daniel Drake 15 Jun '17

15 Jun '17

Hi, We are working with new laptops that have the AMD Bristol Ridge chipset with this SoC: AMD A10-9620P RADEON R5, 10 COMPUTE CORES 4C+6G I think this is the Bristol Ridge chipset. During boot, the display becomes unusable at the point where the amdgpu driver loads. You can see at least two horizontal lines of garbage at this point. We have reproduced on 4.8, 4.10 and linus master (early 4.12). Photo: http://pasteboard.co/qrC9mh4p.jpg Getting logs is tricky because the system appears to freeze at that point. Is this a known issue? Anything we can do to help diagnosis? Thanks Daniel

3 3

[Bug 101401] [REGRESSION][BISECTED] GDM fails to start after 8ec4975cd83365c791a1
by bugzilla-daemon＠freedesktop.org 15 Jun '17

15 Jun '17

https://bugs.freedesktop.org/show_bug.cgi?id=101401 Bug ID: 101401 Summary: [REGRESSION][BISECTED] GDM fails to start after 8ec4975cd83365c791a1 Product: Mesa Version: git Hardware: All OS: All Status: NEW Severity: major Priority: medium Component: Drivers/Gallium/radeonsi Assignee: dri-devel(a)lists.freedesktop.org Reporter: awatry(a)gmail.com QA Contact: dri-devel(a)lists.freedesktop.org I rebuilt/installed mesa earlier this evening and not long after, my system hung. Upon reboot, the GDM login screen was corrupted and attempts to login caused gnome-shell to crash almost immediately after. Hardware: AMD Ryzen R7 1700, Radeon HD 7850 1GB Software: Ubuntu 17.04 64-bit with LLVM/Mesa from trunk/git. A bisect run shows this as the culprit: 8ec4975cd83365c791a1852a6515ed5d4ade2daf is the first bad commit commit 8ec4975cd83365c791a1852a6515ed5d4ade2daf Author: Dave Airlie <airlied(a)redhat.com> Date: Tue Jun 13 05:33:19 2017 +1000 st_glsl_to_tgsi: don't try and pass 32-bit values to get_deref_offsets Just use a temporary 16-bit index. This fixes coverity issue, pointed to me by Ilia. Reviewed-by: Samuel Pitoiset <samuel.pitoiset(a)gmail.com> Signed-off-by: Dave Airlie <airlied(a)redhat.com> :040000 040000 38cec44b25ea12b442370353240f77182c4fd5d6 ae9afe7163541fd192331025f1d8becf9e8942b0 M src -- You are receiving this mail because: You are the assignee for the bug.

1 3

[PATCH v2 00/22] Tegra DRM fixes
by Dmitry Osipenko 14 Jun '17

14 Jun '17

The major changes of the V2 are: - Dropped "drm/tegra: Check whether page belongs to BO in tegra_bo_kmap()" patch as it is not needed with the checks performed by 'submit' IOCTL. - Dropped "drm/tegra: Remove module ownership from the tegra_fb_ops", turned out it is not needed. Thanks to Thierry for the clarification. - Added new patch "gpu: host1x: At first try a non-blocking allocation for the gather copy", which is a trivial fix for the Host1x firewall performance. - Reworked "drm/tegra: dc: Drop the reset asserts to workaround a bug" patch as per Thierry's suggestion to avoid reset only on Tegra20. - Fixed "drm/tegra: Don't use IOMMU on Tegra20" patch compilation in case of modular Tegra DRM. Thanks to Mikko and Nicolas for the suggestions. - The "Forbid relocation address shifting in the firewall" patch has been reworked to not break newer Tegra's. Thanks to Erik, Mikko, Nicolas and Thierry for the reviews and suggestions. Dmitry Osipenko (21): drm/tegra: Fix lockup on a use of staging API drm/tegra: Correct idr_alloc() minimum id drm/tegra: Check for malformed offsets and sizes in the 'submit' IOCTL drm/tegra: Correct copying of waitchecks and disable them in the 'submit' IOCTL drm/tegra: Check syncpoint ID in the 'submit' IOCTL drm/tegra: dc: Avoid reset asserts on Tegra20 drm/tegra: dc: Apply clipping to the plane drm/tegra: dc: Disable plane if it is invisible drm/tegra: Don't use IOMMU on Tegra20 Revert "iommu/tegra: gart: Do not register with bus" gpu: host1x: Initialize firewall class to the jobs one gpu: host1x: Correct host1x_job_pin() error handling gpu: host1x: Do not leak BO's phys address to userspace gpu: host1x: Forbid relocation address shifting in the firewall gpu: host1x: Forbid RESTART opcode in the firewall gpu: host1x: Forbid unrelated SETCLASS opcode in the firewall gpu: host1x: Correct swapped arguments in the is_addr_reg() definition gpu: host1x: Check waits in the firewall gpu: host1x: Remove unused 'struct host1x_cmdbuf' gpu: host1x: Remove unused host1x_cdma_stop() definition gpu: host1x: At first try a non-blocking allocation for the gather copy Mikko Perttunen (1): gpu: host1x: Refactor channel allocation code drivers/gpu/drm/tegra/dc.c | 92 +++++++++++++++-------- drivers/gpu/drm/tegra/drm.c | 144 ++++++++++++++++++++++++++++++------ drivers/gpu/drm/tegra/drm.h | 1 + drivers/gpu/drm/tegra/gem.c | 5 -- drivers/gpu/drm/tegra/gem.h | 5 ++ drivers/gpu/drm/tegra/gr2d.c | 11 ++- drivers/gpu/drm/tegra/gr3d.c | 4 +- drivers/gpu/drm/tegra/vic.c | 4 +- drivers/gpu/host1x/cdma.h | 1 - drivers/gpu/host1x/channel.c | 147 +++++++++++++++++++++++-------------- drivers/gpu/host1x/channel.h | 21 ++++-- drivers/gpu/host1x/debug.c | 47 +++++------- drivers/gpu/host1x/dev.c | 14 +++- drivers/gpu/host1x/dev.h | 7 +- drivers/gpu/host1x/hw/channel_hw.c | 4 - drivers/gpu/host1x/job.c | 144 +++++++++++++++++++++++++++++------- drivers/gpu/host1x/job.h | 14 ---- drivers/iommu/tegra-gart.c | 2 +- include/linux/host1x.h | 13 +++- 19 files changed, 470 insertions(+), 210 deletions(-) -- 2.13.0

3 39

[PATCH] drm: Fix boot panic when register_chrdev fails
by Logan Gunthorpe 14 Jun '17

14 Jun '17

This is a bug found by the 0day kernel test robot. When drm is compiled into the kernel, and register_chrdev fails (due, in this, case to overfilling the chardev dynamic major numbers), a kernel panic occurs on boot: BUG: unable to handle kernel NULL pointer dereference at 00000000000000a8 IP: down_write+0x2a/0x53 Call Trace: start_creating+0x67/0x12e debugfs_create_dir+0x12/0x189 drm_debugfs_init+0x7c/0x1b7 ? ___might_sleep+0x172/0x192 ? __might_sleep+0x6b/0xef drm_minor_register+0x6b/0x141 drm_dev_register+0xcd/0x315 ? pci_enable_device_flags+0x117/0x177 drm_get_pci_dev+0x106/0x27a cirrus_pci_probe+0xfb/0x125 pci_device_probe+0x11d/0x185 ... This is because when register_chrdev fails, it removes drm_debugfs_root. However, seeing drm is not a module, nothing prevents other code from calling drm_minor_register after drm_core_init failed and thus using an invalid drm_debugfs_root. This commit fixes this issue by setting drm_debugfs_root to NULL after removal and checking that it's not NULL before using it. Signed-off-by: Logan Gunthorpe <logang(a)deltatee.com> Cc: Daniel Vetter <daniel.vetter(a)intel.com> Cc: Jani Nikula <jani.nikula(a)linux.intel.com> Cc: Sean Paul <seanpaul(a)chromium.org> Cc: David Airlie <airlied(a)linux.ie> Link: https://lkml.org/lkml/2017/6/4/107 --- drivers/gpu/drm/drm_drv.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c index 37b8ad3e30d8..904420304b75 100644 --- a/drivers/gpu/drm/drm_drv.c +++ b/drivers/gpu/drm/drm_drv.c @@ -214,6 +214,9 @@ static int drm_minor_register(struct drm_device *dev, unsigned int type) DRM_DEBUG("\n"); + if (!drm_debugfs_root) + return -ENODEV; + minor = *drm_minor_get_slot(dev, type); if (!minor) return 0; @@ -935,6 +938,7 @@ static void drm_core_exit(void) { unregister_chrdev(DRM_MAJOR, "drm"); debugfs_remove(drm_debugfs_root); + drm_debugfs_root = NULL; drm_sysfs_destroy(); idr_destroy(&drm_minors_idr); drm_connector_ida_destroy(); -- 2.11.0

1 0

[pull] radeon and amdgpu drm-fixes-4.12
by Alex Deucher 14 Jun '17

14 Jun '17

Hi Dave, A few fixes for 4.12: - fix a UVD regression on SI - fix overflow in watermark calcs on large modes The following changes since commit 6e88007e224ce51969ccf9afeec645146c638816: Merge branch 'vmwgfx-fixes-4.12' of git://people.freedesktop.org/~thomash/linux into drm-fixes (2017-06-09 13:12:02 +1000) are available in the git repository at: git://people.freedesktop.org/~agd5f/linux drm-fixes-4.12 for you to fetch changes up to 55f61a040e1b1ea0ba962e53ae341b4c51915bd1: drm/radeon: Fix overflow of watermark calcs at > 4k resolutions. (2017-06-14 09:25:58 -0400) ---------------------------------------------------------------- Christian König (1): drm/radeon: fix "force the UVD DPB into VRAM as well" Mario Kleiner (2): drm/amdgpu: Fix overflow of watermark calcs at > 4k resolutions. drm/radeon: Fix overflow of watermark calcs at > 4k resolutions. drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 7 +++++-- drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 7 +++++-- drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 7 +++++-- drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 7 +++++-- drivers/gpu/drm/radeon/cik.c | 7 +++++-- drivers/gpu/drm/radeon/evergreen.c | 7 +++++-- drivers/gpu/drm/radeon/radeon_uvd.c | 2 +- drivers/gpu/drm/radeon/si.c | 7 +++++-- 8 files changed, 36 insertions(+), 15 deletions(-)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel June 2017