dri-devel September 2014

dri-devel@lists.freedesktop.org

173 participants
1045 discussions

[pull] radeon drm-fixes-3.17
by Alex Deucher 19 Sep '14

19 Sep '14

Hi Dave, One more fix for radeon. Fixes a regression on rs4xx/rs690/rs740 asics. The following changes since commit 235e6def762557fb209a7853864444653809451b: Merge tag 'drm-intel-fixes-2014-09-18' of git://anongit.freedesktop.org/drm-intel into drm-fixes (2014-09-19 10:34:34 +1000) are available in the git repository at: git://people.freedesktop.org/~agd5f/linux drm-fixes-3.17 for you to fetch changes up to 226b6d88d0c38bd0817660c79e3bea870dfeee4b: drm/radeon: Fix typo 'addr' -> 'entry' in rs400_gart_set_page (2014-09-18 21:52:29 -0400) ---------------------------------------------------------------- Michel Dänzer (1): drm/radeon: Fix typo 'addr' -> 'entry' in rs400_gart_set_page drivers/gpu/drm/radeon/rs400.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[PATCH 0/9] Add drm driver for Rockchip Socs
by mark yao 19 Sep '14

19 Sep '14

From: mark yao <yzq(a)rock-chips.com> This a series of patches is a DRM Driver for Rockchip Socs, driver provides an abstraction for the graphics hardware, as lcd controller and connector interface. add rk3288 lcd controller. add rk3288 lvds and rk3288 edp connector. Tested on rk3288 sdk board, use lvds or edp connector, boot and display OK mark yao (9): drm: Add drm driver for Rockchip Socs Add devicetree bindings for panels used by the Rockchip DRM drm: add driver for panels used by the Rockchip DRM Add devicetree bindings for Rockchip lcd controller drm: add Rockchip rk3288 lcd controller driver Add devicetree bindings for Rockchip Soc LVDS drm: add Rockchip Soc rk3288 lvds connector Add devicetree bindings for Rockchip Soc EDP drm: add Rockchip Soc rk3288 edp connector -- 1.7.9.5

6 21

[pull] radeon drm-fixes-3.17
by Alex Deucher 18 Sep '14

18 Sep '14

Hi Dave, Radeon fixes for 3.17: - fix a resume hang on mullins - fix an oops on module unload with vgaswitcheroo (radeon and nouveau) - fix possible hangs DMA engine hangs due to hw bugs The following changes since commit 83502a5d34386f7c6973bc70e1c423f55f5a2e3a: drm/ast: AST2000 cannot be detected correctly (2014-09-12 13:41:39 +1000) are available in the git repository at: git://people.freedesktop.org/~agd5f/linux drm-fixes-3.17 for you to fetch changes up to 53beaa01e0fe8e4202f43485a03b32fcf5dfea74: drm/nouveau/runpm: fix module unload (2014-09-18 19:22:37 -0400) ---------------------------------------------------------------- Alex Deucher (7): drm/radeon/dpm: fix resume on mullins drm/radeon: don't reset dma on NI/SI init drm/radeon: don't reset sdma on CIK init drm/radeon: don't reset dma on r6xx-evergreen init vgaswitcheroo: add vga_switcheroo_fini_domain_pm_ops drm/radeon/px: fix module unload drm/nouveau/runpm: fix module unload Kyle McMartin (1): drm/radeon: delete unused PTE_* defines Michel Dänzer (1): drm/radeon: Disable HDP flush before every CS again for < r600 drivers/gpu/drm/nouveau/nouveau_vga.c | 9 +++++++++ drivers/gpu/drm/radeon/cik_sdma.c | 7 ------- drivers/gpu/drm/radeon/kv_dpm.c | 28 +++++++++++++++++++++------- drivers/gpu/drm/radeon/ni_dma.c | 6 ------ drivers/gpu/drm/radeon/r100.c | 28 ++++++++++++++-------------- drivers/gpu/drm/radeon/r600_dma.c | 9 --------- drivers/gpu/drm/radeon/r600d.h | 7 ------- drivers/gpu/drm/radeon/radeon_asic.c | 2 -- drivers/gpu/drm/radeon/radeon_asic.h | 3 +-- drivers/gpu/drm/radeon/radeon_device.c | 11 +++++++++-- drivers/gpu/drm/radeon/radeon_drv.c | 2 +- drivers/gpu/vga/vga_switcheroo.c | 6 ++++++ include/linux/vga_switcheroo.h | 2 ++ 13 files changed, 63 insertions(+), 57 deletions(-)

1 0

[pull] radeon drm-next-3.18
by Alex Deucher 18 Sep '14

18 Sep '14

Hi Dave, Just a fix for 3.18 for AGP. The following changes since commit 8337486a8fda53e5f46b3cb2b4eb3272608348cb: Merge branch 'drm/next/du' of git://linuxtv.org/pinchartl/fbdev into drm-next (2014-09-18 21:53:47 +1000) are available in the git repository at: git://people.freedesktop.org/~agd5f/linux drm-next-3.18 for you to fetch changes up to 3840a656f61fdc504f1b0c6617f6af800d551efe: drm/radeon: fix AGP userptr handling (2014-09-18 18:44:52 -0400) ---------------------------------------------------------------- Christian König (1): drm/radeon: fix AGP userptr handling drivers/gpu/drm/radeon/radeon_ttm.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-)

1 0

[PATCH 1/5] drm/radeon: fix register name to match internal name
by Alex Deucher 18 Sep '14

18 Sep '14

no functional change. Signed-off-by: Alex Deucher <alexander.deucher(a)amd.com> --- drivers/gpu/drm/radeon/dce6_afmt.c | 2 +- drivers/gpu/drm/radeon/sid.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/radeon/dce6_afmt.c b/drivers/gpu/drm/radeon/dce6_afmt.c index ab29f95..088d19c 100644 --- a/drivers/gpu/drm/radeon/dce6_afmt.c +++ b/drivers/gpu/drm/radeon/dce6_afmt.c @@ -289,7 +289,7 @@ void dce6_audio_enable(struct radeon_device *rdev, if (!pin) return; - WREG32_ENDPOINT(pin->offset, AZ_F0_CODEC_PIN_CONTROL_HOTPLUG_CONTROL, + WREG32_ENDPOINT(pin->offset, AZ_F0_CODEC_PIN_CONTROL_HOT_PLUG_CONTROL, enable ? AUDIO_ENABLED : 0); } diff --git a/drivers/gpu/drm/radeon/sid.h b/drivers/gpu/drm/radeon/sid.h index fd414d3..6635da9 100644 --- a/drivers/gpu/drm/radeon/sid.h +++ b/drivers/gpu/drm/radeon/sid.h @@ -736,7 +736,7 @@ # define DESCRIPTION16(x) (((x) & 0xff) << 0) # define DESCRIPTION17(x) (((x) & 0xff) << 8) -#define AZ_F0_CODEC_PIN_CONTROL_HOTPLUG_CONTROL 0x54 +#define AZ_F0_CODEC_PIN_CONTROL_HOT_PLUG_CONTROL 0x54 # define AUDIO_ENABLED (1 << 31) #define AZ_F0_CODEC_PIN_CONTROL_RESPONSE_CONFIGURATION_DEFAULT 0x56 -- 1.8.3.1

1 4

[PATCH 1/3] drm/radeon: don't reset dma on NI/SI init
by Alex Deucher 18 Sep '14

18 Sep '14

Otherwise we may lose the DMA golden settings which can lead to hangs, etc. bug: https://www.libreoffice.org/bugzilla/show_bug.cgi?id=83500 Signed-off-by: Alex Deucher <alexander.deucher(a)amd.com> Cc: stable(a)vger.kernel.org --- drivers/gpu/drm/radeon/ni_dma.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/gpu/drm/radeon/ni_dma.c b/drivers/gpu/drm/radeon/ni_dma.c index 8a3e622..f26f0a9 100644 --- a/drivers/gpu/drm/radeon/ni_dma.c +++ b/drivers/gpu/drm/radeon/ni_dma.c @@ -191,12 +191,6 @@ int cayman_dma_resume(struct radeon_device *rdev) u32 reg_offset, wb_offset; int i, r; - /* Reset dma */ - WREG32(SRBM_SOFT_RESET, SOFT_RESET_DMA | SOFT_RESET_DMA1); - RREG32(SRBM_SOFT_RESET); - udelay(50); - WREG32(SRBM_SOFT_RESET, 0); - for (i = 0; i < 2; i++) { if (i == 0) { ring = &rdev->ring[R600_RING_TYPE_DMA_INDEX]; -- 1.8.3.1

2 5

[PATCH 1/3] vgaswitcheroo: add vga_switcheroo_fini_domain_pm_ops
by Alex Deucher 18 Sep '14

18 Sep '14

Drivers should call this on unload to unregister pmops. Bug: https://bugzilla.kernel.org/show_bug.cgi?id=84431 Signed-off-by: Alex Deucher <alexander.deucher(a)amd.com> Cc: stable(a)vger.kernel.org Signed-off-by: Pali Rohár <pali.rohar(a)gmail.com> Cc: Ben Skeggs <bskeggs(a)redhat.com> --- drivers/gpu/vga/vga_switcheroo.c | 6 ++++++ include/linux/vga_switcheroo.h | 2 ++ 2 files changed, 8 insertions(+) diff --git a/drivers/gpu/vga/vga_switcheroo.c b/drivers/gpu/vga/vga_switcheroo.c index 6866448..37ac7b5 100644 --- a/drivers/gpu/vga/vga_switcheroo.c +++ b/drivers/gpu/vga/vga_switcheroo.c @@ -660,6 +660,12 @@ int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain * } EXPORT_SYMBOL(vga_switcheroo_init_domain_pm_ops); +void vga_switcheroo_fini_domain_pm_ops(struct device *dev) +{ + dev->pm_domain = NULL; +} +EXPORT_SYMBOL(vga_switcheroo_fini_domain_pm_ops); + static int vga_switcheroo_runtime_resume_hdmi_audio(struct device *dev) { struct pci_dev *pdev = to_pci_dev(dev); diff --git a/include/linux/vga_switcheroo.h b/include/linux/vga_switcheroo.h index 502073a..b483abd 100644 --- a/include/linux/vga_switcheroo.h +++ b/include/linux/vga_switcheroo.h @@ -64,6 +64,7 @@ int vga_switcheroo_get_client_state(struct pci_dev *dev); void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic); int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain); +void vga_switcheroo_fini_domain_pm_ops(struct device *dev); int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain); #else @@ -82,6 +83,7 @@ static inline int vga_switcheroo_get_client_state(struct pci_dev *dev) { return static inline void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic) {} static inline int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; } +static inline void vga_switcheroo_fini_domain_pm_ops(struct device *dev) {} static inline int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; } #endif -- 1.8.3.1

1 3

[Bug 71051] Cannot suspend with radeon drivers.
by bugzilla-daemon＠bugzilla.kernel.org 18 Sep '14

18 Sep '14

https://bugzilla.kernel.org/show_bug.cgi?id=71051 --- Comment #8 from Alex Deucher <alexdeucher(a)gmail.com> --- Created attachment 150801 --> https://bugzilla.kernel.org/attachment.cgi?id=150801&action=edit possible fix for mullins This patch may fix Hin-Tak's issue, but won't affect the original reporter. -- You are receiving this mail because: You are watching the assignee of the bug.

1 0

[Bug 71051] Cannot suspend with radeon drivers.
by bugzilla-daemon＠bugzilla.kernel.org 18 Sep '14

18 Sep '14

https://bugzilla.kernel.org/show_bug.cgi?id=71051 Alex Deucher <alexdeucher(a)gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |alexdeucher(a)gmail.com --- Comment #7 from Alex Deucher <alexdeucher(a)gmail.com> --- (In reply to Hin-Tak Leung from comment #6) > From mine (toshiba, but I believe the hp has similar graphic hardware): > > dmesg: > > [drm] Found VCE firmware/feedback version 40.2.2 / 15! > > # lspci | grep VGA > 00:01.0 VGA compatible controller: Advanced Micro Devices, Inc. [AMD/ATI] > Mullins [Radeon R3 Graphics] > > > I looked up that 'VCE firmware/feedback' line where it comes from in the > kernel code. It seems that Mullins support in new to kernel 3.15.x (?) and > still being actively worked on. Is that correct? This is a different chip than Álvaro, so it's probably a different issue. -- You are receiving this mail because: You are watching the assignee of the bug.

1 0

[PATCH] drm/exynos: fix plane-framebuffer linkage
by Daniel Drake 18 Sep '14

18 Sep '14

Pageflipping currently causes some inconsistencies that lead to crashes. Just run an app that causes a CRTC pageflip in a raw X session and check that it exits cleanly and can be restarted - you'll see crashes like: Unable to handle kernel NULL pointer dereference at virtual address 00000334 PC is at exynos_drm_crtc_plane_commit+0x20/0x40 LR is at exynos_drm_crtc_plane_commit+0x20/0x40 [<c03749b4>] (exynos_drm_crtc_plane_commit) from [<c03741bc>] (exynos_drm_crtc_commit+0x44/0x70) [<c03741bc>] (exynos_drm_crtc_commit) from [<c03743a0>] (exynos_drm_crtc_mode_set_commit.isra.2+0xb4/0xc4) [<c03743a0>] (exynos_drm_crtc_mode_set_commit.isra.2) from [<c03744f4>] (exynos_drm_crtc_page_flip+0x140/0x1a8) [<c03744f4>] (exynos_drm_crtc_page_flip) from [<c036b20c>] (drm_mode_page_flip_ioctl+0x224/0x2dc) [<c036b20c>] (drm_mode_page_flip_ioctl) from [<c035c324>] (drm_ioctl+0x338/0x4fc) These crashes happen because drm_plane_force_disable has previously set plane->crtc to NULL. When drm_mode_page_flip_ioctl() is used to flip another framebuffer onto the primary plane, crtc->primary->fb is correctly updated (this is a virtual plane created by plane_helper), but plane->fb is not (this plane is the real one, created by exynos_drm_crtc_create). We then come to handle rmfb of the backbuffer, which the "real" primary plane is incorrectly pointing at. So drm_framebuffer_remove() decides that the buffer is actually active on a plane and force-disables the plane. Ensuring that plane->fb is kept up-to-date solves that issue, but exposes a reference counting problem. Now we see crashes when rmfb is called on the front-buffer, because the rmfb code expects to drop 3 references here, and there are only 2. That can be fixed by adopting the reference management found in omapdrm: Framebuffer references are not taken directly in crtc mode_set context, but rather in the context of updating the plane, which also covers flips. Like omapdrm we also unreference the old framebuffer here. Signed-off-by: Daniel Drake <drake(a)endlessm.com> --- drivers/gpu/drm/exynos/exynos_drm_crtc.c | 12 ++---------- drivers/gpu/drm/exynos/exynos_drm_plane.c | 8 ++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_crtc.c b/drivers/gpu/drm/exynos/exynos_drm_crtc.c index b68e58f..7aa9dee 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_crtc.c +++ b/drivers/gpu/drm/exynos/exynos_drm_crtc.c @@ -140,16 +140,8 @@ exynos_drm_crtc_mode_set(struct drm_crtc *crtc, struct drm_display_mode *mode, if (manager->ops->mode_set) manager->ops->mode_set(manager, &crtc->mode); - ret = exynos_plane_mode_set(plane, crtc, crtc->primary->fb, 0, 0, crtc_w, crtc_h, - x, y, crtc_w, crtc_h); - if (ret) - return ret; - - plane->crtc = crtc; - plane->fb = crtc->primary->fb; - drm_framebuffer_reference(plane->fb); - - return 0; + return exynos_plane_mode_set(plane, crtc, crtc->primary->fb, 0, 0, + crtc_w, crtc_h, x, y, crtc_w, crtc_h); } static int exynos_drm_crtc_mode_set_commit(struct drm_crtc *crtc, int x, int y, diff --git a/drivers/gpu/drm/exynos/exynos_drm_plane.c b/drivers/gpu/drm/exynos/exynos_drm_plane.c index 8371cbd..df27e35 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_plane.c +++ b/drivers/gpu/drm/exynos/exynos_drm_plane.c @@ -139,6 +139,14 @@ int exynos_plane_mode_set(struct drm_plane *plane, struct drm_crtc *crtc, overlay->crtc_x, overlay->crtc_y, overlay->crtc_width, overlay->crtc_height); + if (plane->fb) + drm_framebuffer_unreference(plane->fb); + + drm_framebuffer_reference(fb); + + plane->fb = fb; + plane->crtc = crtc; + exynos_drm_crtc_plane_mode_set(crtc, overlay); return 0; -- 1.9.1

5 11

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel September 2014