dri-devel September 2015

dri-devel@lists.freedesktop.org

168 participants
1129 discussions

[PATCH] drm/mst: update the link_address_sent before sending the link address
by Dave Airlie 05 Sep '15

05 Sep '15

There is a race where the reply could get processed by another work queue before we've updated the state. Update the state before sending the msg to close it. Pointed out by Adam J Richter on Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91481 Signed-off-by: Dave Airlie <airlied(a)redhat.com> --- drivers/gpu/drm/drm_dp_mst_topology.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/… [View More]

1 0

[PATCH] drm/exynos: add cursor plane support
by Gustavo Padovan 04 Sep '15

04 Sep '15

From: Gustavo Padovan <gustavo.padovan(a)collabora.co.uk> Set one of the planes for each crtc driver as a cursor plane enabled window managers to fully work on exynos. Signed-off-by: Gustavo Padovan <gustavo.padovan(a)collabora.co.uk> --- drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 9 ++------- drivers/gpu/drm/exynos/exynos7_drm_decon.c | 8 ++------ drivers/gpu/drm/exynos/exynos_drm_drv.h | 3 +++ drivers/gpu/drm/exynos/exynos_drm_fimd.c | 8 ++------ … [View More]drivers/gpu/drm/exynos/exynos_drm_plane.c | 18 +++++++++++++++--- drivers/gpu/drm/exynos/exynos_drm_plane.h | 5 ++--- drivers/gpu/drm/exynos/exynos_drm_vidi.c | 9 ++------- drivers/gpu/drm/exynos/exynos_mixer.c | 10 +++------- 8 files changed, 31 insertions(+), 39 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c index b3c7307..79b2b22 100644 --- a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c +++ b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c @@ -33,7 +33,6 @@ struct decon_context { struct exynos_drm_plane planes[WINDOWS_NR]; void __iomem *addr; struct clk *clks[6]; - unsigned int default_win; unsigned long irq_flags; int pipe; bool suspended; @@ -493,7 +492,6 @@ static int decon_bind(struct device *dev, struct device *master, void *data) struct drm_device *drm_dev = data; struct exynos_drm_private *priv = drm_dev->dev_private; struct exynos_drm_plane *exynos_plane; - enum drm_plane_type type; unsigned int zpos; int ret; @@ -501,16 +499,14 @@ static int decon_bind(struct device *dev, struct device *master, void *data) ctx->pipe = priv->pipe++; for (zpos = 0; zpos < WINDOWS_NR; zpos++) { - type = (zpos == ctx->default_win) ? DRM_PLANE_TYPE_PRIMARY : - DRM_PLANE_TYPE_OVERLAY; ret = exynos_plane_init(drm_dev, &ctx->planes[zpos], - 1 << ctx->pipe, type, decon_formats, + 1 << ctx->pipe, decon_formats, ARRAY_SIZE(decon_formats), zpos); if (ret) return ret; } - exynos_plane = &ctx->planes[ctx->default_win]; + exynos_plane = &ctx->planes[DEFAULT_WIN]; ctx->crtc = exynos_drm_crtc_create(drm_dev, &exynos_plane->base, ctx->pipe, EXYNOS_DISPLAY_TYPE_LCD, &decon_crtc_ops, ctx); @@ -607,7 +603,6 @@ static int exynos5433_decon_probe(struct platform_device *pdev) if (!ctx) return -ENOMEM; - ctx->default_win = 0; ctx->suspended = true; ctx->dev = dev; if (of_get_child_by_name(dev->of_node, "i80-if-timings")) diff --git a/drivers/gpu/drm/exynos/exynos7_drm_decon.c b/drivers/gpu/drm/exynos/exynos7_drm_decon.c index cbdb78e..f3826dc 100644 --- a/drivers/gpu/drm/exynos/exynos7_drm_decon.c +++ b/drivers/gpu/drm/exynos/exynos7_drm_decon.c @@ -52,7 +52,6 @@ struct decon_context { struct clk *eclk; struct clk *vclk; void __iomem *regs; - unsigned int default_win; unsigned long irq_flags; bool i80_if; bool suspended; @@ -691,7 +690,6 @@ static int decon_bind(struct device *dev, struct device *master, void *data) struct decon_context *ctx = dev_get_drvdata(dev); struct drm_device *drm_dev = data; struct exynos_drm_plane *exynos_plane; - enum drm_plane_type type; unsigned int zpos; int ret; @@ -702,16 +700,14 @@ static int decon_bind(struct device *dev, struct device *master, void *data) } for (zpos = 0; zpos < WINDOWS_NR; zpos++) { - type = (zpos == ctx->default_win) ? DRM_PLANE_TYPE_PRIMARY : - DRM_PLANE_TYPE_OVERLAY; ret = exynos_plane_init(drm_dev, &ctx->planes[zpos], - 1 << ctx->pipe, type, decon_formats, + 1 << ctx->pipe, decon_formats, ARRAY_SIZE(decon_formats), zpos); if (ret) return ret; } - exynos_plane = &ctx->planes[ctx->default_win]; + exynos_plane = &ctx->planes[DEFAULT_WIN]; ctx->crtc = exynos_drm_crtc_create(drm_dev, &exynos_plane->base, ctx->pipe, EXYNOS_DISPLAY_TYPE_LCD, &decon_crtc_ops, ctx); diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.h b/drivers/gpu/drm/exynos/exynos_drm_drv.h index b7ba21d..cc56c3d 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_drv.h +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.h @@ -22,6 +22,9 @@ #define MAX_PLANE 5 #define MAX_FB_BUFFER 4 +#define DEFAULT_WIN 0 +#define CURSOR_WIN 1 + #define to_exynos_crtc(x) container_of(x, struct exynos_drm_crtc, base) #define to_exynos_plane(x) container_of(x, struct exynos_drm_plane, base) diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c index 750a9e6..2697ebc 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c +++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c @@ -154,7 +154,6 @@ struct fimd_context { struct clk *lcd_clk; void __iomem *regs; struct regmap *sysreg; - unsigned int default_win; unsigned long irq_flags; u32 vidcon0; u32 vidcon1; @@ -953,7 +952,6 @@ static int fimd_bind(struct device *dev, struct device *master, void *data) struct drm_device *drm_dev = data; struct exynos_drm_private *priv = drm_dev->dev_private; struct exynos_drm_plane *exynos_plane; - enum drm_plane_type type; unsigned int zpos; int ret; @@ -961,16 +959,14 @@ static int fimd_bind(struct device *dev, struct device *master, void *data) ctx->pipe = priv->pipe++; for (zpos = 0; zpos < WINDOWS_NR; zpos++) { - type = (zpos == ctx->default_win) ? DRM_PLANE_TYPE_PRIMARY : - DRM_PLANE_TYPE_OVERLAY; ret = exynos_plane_init(drm_dev, &ctx->planes[zpos], - 1 << ctx->pipe, type, fimd_formats, + 1 << ctx->pipe, fimd_formats, ARRAY_SIZE(fimd_formats), zpos); if (ret) return ret; } - exynos_plane = &ctx->planes[ctx->default_win]; + exynos_plane = &ctx->planes[DEFAULT_WIN]; ctx->crtc = exynos_drm_crtc_create(drm_dev, &exynos_plane->base, ctx->pipe, EXYNOS_DISPLAY_TYPE_LCD, &fimd_crtc_ops, ctx); diff --git a/drivers/gpu/drm/exynos/exynos_drm_plane.c b/drivers/gpu/drm/exynos/exynos_drm_plane.c index 7148224..d2aab4d 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_plane.c +++ b/drivers/gpu/drm/exynos/exynos_drm_plane.c @@ -210,12 +210,24 @@ static void exynos_plane_attach_zpos_property(struct drm_plane *plane, int exynos_plane_init(struct drm_device *dev, struct exynos_drm_plane *exynos_plane, - unsigned long possible_crtcs, enum drm_plane_type type, - const uint32_t *formats, unsigned int fcount, - unsigned int zpos) + unsigned long possible_crtcs, const uint32_t *formats, + unsigned int fcount, unsigned int zpos) { + enum drm_plane_type type; int err; + switch (zpos) { + case DEFAULT_WIN: + type = DRM_PLANE_TYPE_PRIMARY; + break; + case CURSOR_WIN: + type = DRM_PLANE_TYPE_CURSOR; + break; + default: + type = DRM_PLANE_TYPE_OVERLAY; + break; + }; + err = drm_universal_plane_init(dev, &exynos_plane->base, possible_crtcs, &exynos_plane_funcs, formats, fcount, type); diff --git a/drivers/gpu/drm/exynos/exynos_drm_plane.h b/drivers/gpu/drm/exynos/exynos_drm_plane.h index 476c934..0ab5acf 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_plane.h +++ b/drivers/gpu/drm/exynos/exynos_drm_plane.h @@ -11,6 +11,5 @@ int exynos_plane_init(struct drm_device *dev, struct exynos_drm_plane *exynos_plane, - unsigned long possible_crtcs, enum drm_plane_type type, - const uint32_t *formats, unsigned int fcount, - unsigned int zpos); + unsigned long possible_crtcs, const uint32_t *formats, + unsigned int fcount, unsigned int zpos); diff --git a/drivers/gpu/drm/exynos/exynos_drm_vidi.c b/drivers/gpu/drm/exynos/exynos_drm_vidi.c index 75718e1..4499117 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_vidi.c +++ b/drivers/gpu/drm/exynos/exynos_drm_vidi.c @@ -42,7 +42,6 @@ struct vidi_context { struct exynos_drm_plane planes[WINDOWS_NR]; struct edid *raw_edid; unsigned int clkdiv; - unsigned int default_win; unsigned long irq_flags; unsigned int connected; bool vblank_on; @@ -439,23 +438,20 @@ static int vidi_bind(struct device *dev, struct device *master, void *data) struct drm_device *drm_dev = data; struct drm_encoder *encoder = &ctx->encoder; struct exynos_drm_plane *exynos_plane; - enum drm_plane_type type; unsigned int zpos; int pipe, ret; vidi_ctx_initialize(ctx, drm_dev); for (zpos = 0; zpos < WINDOWS_NR; zpos++) { - type = (zpos == ctx->default_win) ? DRM_PLANE_TYPE_PRIMARY : - DRM_PLANE_TYPE_OVERLAY; ret = exynos_plane_init(drm_dev, &ctx->planes[zpos], - 1 << ctx->pipe, type, formats, + 1 << ctx->pipe, formats, ARRAY_SIZE(formats), zpos); if (ret) return ret; } - exynos_plane = &ctx->planes[ctx->default_win]; + exynos_plane = &ctx->planes[DEFAULT_WIN]; ctx->crtc = exynos_drm_crtc_create(drm_dev, &exynos_plane->base, ctx->pipe, EXYNOS_DISPLAY_TYPE_VIDI, &vidi_crtc_ops, ctx); @@ -507,7 +503,6 @@ static int vidi_probe(struct platform_device *pdev) if (!ctx) return -ENOMEM; - ctx->default_win = 0; ctx->pdev = pdev; INIT_WORK(&ctx->work, vidi_fake_vblank_handler); diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c index 7f81cce..2484277 100644 --- a/drivers/gpu/drm/exynos/exynos_mixer.c +++ b/drivers/gpu/drm/exynos/exynos_mixer.c @@ -600,7 +600,7 @@ static void mixer_graph_buffer(struct mixer_context *ctx, /* setup display size */ if (ctx->mxr_ver == MXR_VER_128_0_0_184 && - win == MIXER_DEFAULT_WIN) { + win == DEFAULT_WIN) { val = MXR_MXR_RES_HEIGHT(mode->vdisplay); val |= MXR_MXR_RES_WIDTH(mode->hdisplay); mixer_reg_write(res, MXR_RESOLUTION, val); @@ -1193,12 +1193,9 @@ static int mixer_bind(struct device *dev, struct device *manager, void *data) return ret; for (zpos = 0; zpos < MIXER_WIN_NR; zpos++) { - enum drm_plane_type type; const uint32_t *formats; unsigned int fcount; - type = (zpos == MIXER_DEFAULT_WIN) ? DRM_PLANE_TYPE_PRIMARY : - DRM_PLANE_TYPE_OVERLAY; if (zpos < VP_DEFAULT_WIN) { formats = mixer_formats; fcount = ARRAY_SIZE(mixer_formats); @@ -1208,13 +1205,12 @@ static int mixer_bind(struct device *dev, struct device *manager, void *data) } ret = exynos_plane_init(drm_dev, &ctx->planes[zpos], - 1 << ctx->pipe, type, formats, fcount, - zpos); + 1 << ctx->pipe, formats, fcount, zpos); if (ret) return ret; } - exynos_plane = &ctx->planes[MIXER_DEFAULT_WIN]; + exynos_plane = &ctx->planes[DEFAULT_WIN]; ctx->crtc = exynos_drm_crtc_create(drm_dev, &exynos_plane->base, ctx->pipe, EXYNOS_DISPLAY_TYPE_HDMI, &mixer_crtc_ops, ctx); -- 2.1.0 [View Less]

3 4

[pull] amdgpu drm-next-4.3
by Alex Deucher 04 Sep '15

04 Sep '15

Hi Dave, A few more fixes for amdgpu from the last few days: - Fix several copy paste typos - Resume from suspend fixes for VCE - Fix the GPU scheduler warning in kfifo_out - Re-enable GPUVM fault interrupts which were inadvertently disabled - GPUVM page table hang fix when paging The following changes since commit bddf8026386927985ef6d0d11c3ba78f70b76bad: drm/amdgpu: set MEC doorbell range for Fiji (2015-09-02 12:35:52 -0400) are available in the git repository at: git://people.… [View More]freedesktop.org/~agd5f/linux drm-next-4.3 for you to fetch changes up to 35c7a9526af75040fac744babd0fafe18b8fe0a1: drm/amdgpu: rename gmc_v8_0_init_compute_vmid (2015-09-04 16:36:28 -0400) ---------------------------------------------------------------- Alex Deucher (8): drm/amdgpu: be explicit about cpu vram access for driver BOs (v2) drm/amdgpu: use top down allocation for non-CPU accessible vram drm/amdgpu: fix typo in dce10 watermark setup drm/amdgpu: fix typo in dce11 watermark setup drm/amdgpu/cz: fix cz_dpm_update_low_memory_pstate logic drm/amdgpu: fix warning in scheduler drm/amdgpu: fix vce3 instance handling drm/amdgpu: rename gmc_v8_0_init_compute_vmid Christian König (2): drm/amdgpu: fix buffer placement under memory pressure drm/amdgpu: properly enable VM fault interrupts Leo Liu (1): drm/amdgpu: remove ib test for the second VCE Ring drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 4 +-- drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 12 +++++-- drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 8 ++++- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 7 ++-- drivers/gpu/drm/amd/amdgpu/cz_dpm.c | 4 +-- drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/fiji_smc.c | 8 +++-- drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 12 +++++-- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 6 ++-- drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 16 +++++---- drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 17 +++++----- drivers/gpu/drm/amd/amdgpu/iceland_smc.c | 4 ++- drivers/gpu/drm/amd/amdgpu/tonga_smc.c | 8 +++-- drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 48 +++++++++++++++++++++++---- drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | 5 +-- 22 files changed, 127 insertions(+), 52 deletions(-) [View Less]

1 0

[PATCH libdrm 01/17] vbltest: fix variable shadowing warning
by Emil Velikov 04 Sep '15

04 Sep '15

Just remove the second (shadowing) declaration of ret. Signed-off-by: Emil Velikov <emil.l.velikov(a)gmail.com> --- tests/vbltest/vbltest.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/vbltest/vbltest.c b/tests/vbltest/vbltest.c index 4200adb..e27f45c 100644 --- a/tests/vbltest/vbltest.c +++ b/tests/vbltest/vbltest.c @@ -177,7 +177,6 @@ int main(int argc, char **argv) while (1) { struct timeval timeout = { .tv_sec = 3, .tv_usec = 0 }; fd_set fds; - int ret; … [View More]

3 32

[RFC] Per file OOM badness
by Christian König 04 Sep '15

04 Sep '15

Hello everyone, I'm currently working on the issue that when device drivers allocate memory on behalf of an application the OOM killer usually doesn't knew about that unless the application also get this memory mapped into their address space. This is especially annoying for graphics drivers where a lot of the VRAM usually isn't CPU accessible and so doesn't make sense to map into the address space of the process using it. The problem now is that when an application starts to use a lot of … [View More]

1 4

[PATCH] drm/bridge: fix platform_no_drv_owner.cocci warnings
by kbuild test robot 04 Sep '15

04 Sep '15

drivers/gpu/drm/bridge/nxp-ptn3460.c:403:3-8: No need to set .owner here. The core will do it. Remove .owner field if calls are used which set it automatically Generated by: scripts/coccinelle/api/platform_no_drv_owner.cocci Signed-off-by: Fengguang Wu <fengguang.wu(a)intel.com> --- nxp-ptn3460.c | 1 - 1 file changed, 1 deletion(-) --- a/drivers/gpu/drm/bridge/nxp-ptn3460.c +++ b/drivers/gpu/drm/bridge/nxp-ptn3460.c @@ -400,7 +400,6 @@ static struct i2c_driver ptn3460_driver .… [View More]

2 1

[PATCH] drm/bridge: fix platform_no_drv_owner.cocci warnings
by kbuild test robot 04 Sep '15

04 Sep '15

drivers/gpu/drm/bridge/parade-ps8622.c:671:3-8: No need to set .owner here. The core will do it. Remove .owner field if calls are used which set it automatically Generated by: scripts/coccinelle/api/platform_no_drv_owner.cocci Signed-off-by: Fengguang Wu <fengguang.wu(a)intel.com> --- parade-ps8622.c | 1 - 1 file changed, 1 deletion(-) --- a/drivers/gpu/drm/bridge/parade-ps8622.c +++ b/drivers/gpu/drm/bridge/parade-ps8622.c @@ -668,7 +668,6 @@ static struct i2c_driver … [View More]

2 1

[RFC 01/13] drm/dp: Read fast training capability from link
by Thierry Reding 04 Sep '15

04 Sep '15

From: Thierry Reding <treding(a)nvidia.com> While probing the DisplayPort link, query the fast training capability. If supported, drivers can use the fast link training sequence instead of the more involved full link training sequence. Signed-off-by: Thierry Reding <treding(a)nvidia.com> --- drivers/gpu/drm/drm_dp_helper.c | 5 ++++- include/drm/drm_dp_helper.h | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_dp_helper.c b/drivers/gpu/… [View More]

4 21

[Bug 91871] link retraining for DP not possible with current design of Atomic modeset framework
by bugzilla-daemon＠freedesktop.org 04 Sep '15

04 Sep '15

https://bugs.freedesktop.org/show_bug.cgi?id=91871 Bug ID: 91871 Summary: link retraining for DP not possible with current design of Atomic modeset framework Product: DRI Version: XOrg git Hardware: All OS: All Status: NEW Severity: normal Priority: medium Component: General Assignee: dri-devel(a)lists.freedesktop.org Reporter: sivakumar.… [View More]

1 2

[Bug 90889] Radeon driver with radeon.dpm=1 causes lockout
by bugzilla-daemon＠freedesktop.org 03 Sep '15

03 Sep '15

https://bugs.freedesktop.org/show_bug.cgi?id=90889 --- Comment #3 from lolwoot1234(a)gmail.com --- Issue still not fixed... Early KMS doesn't really change anything anything. -- You are receiving this mail because: You are the assignee for the bug.

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel September 2015