dri-devel June 2015

dri-devel@lists.freedesktop.org

188 participants
1140 discussions

drm/amdkfd: bad CONFIG_ prefix for enum entries
by Valentin Rothberg 04 Jun '15

04 Jun '15

Hi Yair, your commit fbeb661bfa89 ("drm/amdkfd: Add skeleton H/W debugger module support") has shown up in today's linux-next tree (i.e., next-20150604). The commit adds the following lines of code to drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.h: +/* CONFIG reg space definition */ +enum { + CONFIG_REG_BASE = 0x2000, /* in dwords */ + CONFIG_REG_END = 0x2B00, + CONFIG_REG_SIZE = CONFIG_REG_END - CONFIG_REG_BASE +}; There is a problem with the 'CONFIG_' prefix of those entries. This prefix is reserved for Kconfig options in Make/Kbuild and CPP syntax, so that static analysis tools (and readers of the code) may mistakenly assume that the symbol is defined somewhere in a Kconfig file. I detected the issue with ./scripts/checkkconfigsymbols.py. Would you mind renaming those entries to something without the 'CONFIG_' prefix? I can also take care of it if you wish to. Kind regards, Valentin

4 7

[PATCH libdrm 0/2] Blob and atomic wrappers
by Daniel Stone 04 Jun '15

04 Jun '15

Hi, Nothing big here, just the wrappers for the blob-property API, as well as the atomic API now it's been validated by Weston. The blob work is my own, where the atomic work is a mega-squash of commits from Ville and Rob in particular, with my own changes to modify the user-facing API a little, and resync with the kernel interface. Cheers, Daniel

2 3

[Bug 87649] After archlinux system update switching on both of internal and external graphics card does not work anymore (vgaswitcheroo)
by bugzilla-daemon＠freedesktop.org 04 Jun '15

04 Jun '15

https://bugs.freedesktop.org/show_bug.cgi?id=87649 --- Comment #13 from Alex Deucher <alexdeucher(a)gmail.com> --- (In reply to gofabian from comment #11) > Created attachment 112056 [details] > dmesg_v3.19rc2_without_switch_refuse It's a radeon GPU hang. Is there something specific that you were doing to trigger it? E.g., running some app? -- You are receiving this mail because: You are the assignee for the bug.

1 0

[Bug 87649] After archlinux system update switching on both of internal and external graphics card does not work anymore (vgaswitcheroo)
by bugzilla-daemon＠freedesktop.org 04 Jun '15

04 Jun '15

1 0

[PATCH] drm/tegra: Support kernel mappings with IOMMU
by Arto Merilainen 04 Jun '15

04 Jun '15

Host1x command buffer patching requires that the buffer object can be mapped into kernel address space, however, the recent addition of IOMMU did not account to this requirement. Therefore Host1x engines cannot be used if IOMMU is enabled. This patch implements kmap, kunmap, mmap and munmap functions to host1x bo objects. Signed-off-by: Arto Merilainen <amerilainen(a)nvidia.com> --- drivers/gpu/drm/tegra/gem.c | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c index 1217272a51f2..89ca8d35f555 100644 --- a/drivers/gpu/drm/tegra/gem.c +++ b/drivers/gpu/drm/tegra/gem.c @@ -2,7 +2,7 @@ * NVIDIA Tegra DRM GEM helper functions * * Copyright (C) 2012 Sascha Hauer, Pengutronix - * Copyright (C) 2013 NVIDIA CORPORATION, All rights reserved. + * Copyright (C) 2013-2015 NVIDIA CORPORATION, All rights reserved. * * Based on the GEM/CMA helpers * @@ -50,23 +50,51 @@ static void *tegra_bo_mmap(struct host1x_bo *bo) { struct tegra_bo *obj = host1x_to_tegra_bo(bo); - return obj->vaddr; + if (obj->vaddr) + return obj->vaddr; + else if (obj->gem.import_attach) + return dma_buf_vmap(obj->gem.import_attach->dmabuf); + else + return vmap(obj->pages, obj->num_pages, VM_MAP, + pgprot_writecombine(PAGE_KERNEL)); } static void tegra_bo_munmap(struct host1x_bo *bo, void *addr) { + struct tegra_bo *obj = host1x_to_tegra_bo(bo); + + if (obj->vaddr) + return; + else if (obj->gem.import_attach) + dma_buf_vunmap(obj->gem.import_attach->dmabuf, addr); + else + vunmap(addr); } static void *tegra_bo_kmap(struct host1x_bo *bo, unsigned int page) { struct tegra_bo *obj = host1x_to_tegra_bo(bo); - return obj->vaddr + page * PAGE_SIZE; + if (obj->vaddr) + return obj->vaddr + page * PAGE_SIZE; + else if (obj->gem.import_attach) + return dma_buf_kmap(obj->gem.import_attach->dmabuf, page); + else + return vmap(obj->pages + page, 1, VM_MAP, + pgprot_writecombine(PAGE_KERNEL)); } static void tegra_bo_kunmap(struct host1x_bo *bo, unsigned int page, void *addr) { + struct tegra_bo *obj = host1x_to_tegra_bo(bo); + + if (obj->vaddr) + return; + else if (obj->gem.import_attach) + dma_buf_kunmap(obj->gem.import_attach->dmabuf, page, addr); + else + vunmap(addr); } static struct host1x_bo *tegra_bo_get(struct host1x_bo *bo) -- 1.8.1.5

1 0

Re: dri-devel Digest, Vol 63, Issue 41
by vinay simha 04 Jun '15

04 Jun '15

hi, where is the kernel.git for dri-devel ? so that i can git clone the kernel sources? Regards, vinay simha On Thu, Jun 4, 2015 at 4:36 PM, <dri-devel-request(a)lists.freedesktop.org> wrote: > Send dri-devel mailing list submissions to > dri-devel(a)lists.freedesktop.org > > To subscribe or unsubscribe via the World Wide Web, visit > http://lists.freedesktop.org/mailman/listinfo/dri-devel > or, via email, send a message with subject or body 'help' to > dri-devel-request(a)lists.freedesktop.org > > You can reach the person managing the list at > dri-devel-owner(a)lists.freedesktop.org > > When replying, please edit your Subject line so it is more specific > than "Re: Contents of dri-devel digest..." > > > Today's Topics: > > 1. [PATCHv2 20/45] drm: omapdrm: Replace encoder mode_fixup with > atomic_check (Tomi Valkeinen) > 2. [PATCHv2 27/45] drm: omapdrm: Remove omap_crtc enabled field > (Tomi Valkeinen) > 3. [PATCHv2 36/45] drm: omapdrm: Don't flush CRTC when enabling > or disabling it (Tomi Valkeinen) > 4. [PATCHv2 40/45] drm: omapdrm: if omap_plane_atomic_update > fails, disable plane (Tomi Valkeinen) > 5. [PATCHv2 14/45] drm: omapdrm: Wire up atomic state object > scaffolding (Tomi Valkeinen) > 6. [PATCHv2 17/45] drm: omapdrm: Switch plane update to atomic > helpers (Tomi Valkeinen) > 7. [PATCHv2 18/45] drm: omapdrm: Switch mode config to atomic > helpers (Tomi Valkeinen) > > > ---------------------------------------------------------------------- > > Message: 1 > Date: Thu, 4 Jun 2015 12:02:37 +0300 > From: Tomi Valkeinen <tomi.valkeinen(a)ti.com> > To: <dri-devel(a)lists.freedesktop.org>, Laurent Pinchart > <laurent.pinchart(a)ideasonboard.com> > Cc: Tomi Valkeinen <tomi.valkeinen(a)ti.com> > Subject: [PATCHv2 20/45] drm: omapdrm: Replace encoder mode_fixup with > atomic_check > Message-ID: <1433408582-9828-21-git-send-email-tomi.valkeinen(a)ti.com> > Content-Type: text/plain > > From: Laurent Pinchart <laurent.pinchart(a)ideasonboard.com> > > The encoder .mode_fixup() operation is legacy, atomic updates uses the > new .atomic_check() operation. Convert the encoder driver. > > Signed-off-by: Laurent Pinchart <laurent.pinchart(a)ideasonboard.com> > Signed-off-by: Tomi Valkeinen <tomi.valkeinen(a)ti.com> > --- > drivers/gpu/drm/omapdrm/omap_encoder.c | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/drivers/gpu/drm/omapdrm/omap_encoder.c b/drivers/gpu/drm/omapdrm/omap_encoder.c > index 2aeb41f0881a..54847ed089ef 100644 > --- a/drivers/gpu/drm/omapdrm/omap_encoder.c > +++ b/drivers/gpu/drm/omapdrm/omap_encoder.c > @@ -62,13 +62,6 @@ static const struct drm_encoder_funcs omap_encoder_funcs = { > .destroy = omap_encoder_destroy, > }; > > -static bool omap_encoder_mode_fixup(struct drm_encoder *encoder, > - const struct drm_display_mode *mode, > - struct drm_display_mode *adjusted_mode) > -{ > - return true; > -} > - > static void omap_encoder_mode_set(struct drm_encoder *encoder, > struct drm_display_mode *mode, > struct drm_display_mode *adjusted_mode) > @@ -117,11 +110,18 @@ static void omap_encoder_enable(struct drm_encoder *encoder) > { > } > > +static int omap_encoder_atomic_check(struct drm_encoder *encoder, > + struct drm_crtc_state *crtc_state, > + struct drm_connector_state *conn_state) > +{ > + return 0; > +} > + > static const struct drm_encoder_helper_funcs omap_encoder_helper_funcs = { > - .mode_fixup = omap_encoder_mode_fixup, > .mode_set = omap_encoder_mode_set, > .disable = omap_encoder_disable, > .enable = omap_encoder_enable, > + .atomic_check = omap_encoder_atomic_check, > }; > > /* > -- > 2.1.4 > > > > ------------------------------ > > Message: 2 > Date: Thu, 4 Jun 2015 12:02:44 +0300 > From: Tomi Valkeinen <tomi.valkeinen(a)ti.com> > To: <dri-devel(a)lists.freedesktop.org>, Laurent Pinchart > <laurent.pinchart(a)ideasonboard.com> > Cc: Tomi Valkeinen <tomi.valkeinen(a)ti.com> > Subject: [PATCHv2 27/45] drm: omapdrm: Remove omap_crtc enabled field > Message-ID: <1433408582-9828-28-git-send-email-tomi.valkeinen(a)ti.com> > Content-Type: text/plain > > From: Laurent Pinchart <laurent.pinchart(a)ideasonboard.com> > > The field tracks the CRTC state to avoid double-enable or -disable. As > the DRM atomic core guarantees that the CRTC enable and disable > functions won't be called on an already enabled or disabled CRTC, such > tracking isn't needed. Remove the enabled field. > > Signed-off-by: Laurent Pinchart <laurent.pinchart(a)ideasonboard.com> > Signed-off-by: Tomi Valkeinen <tomi.valkeinen(a)ti.com> > --- > drivers/gpu/drm/omapdrm/omap_crtc.c | 32 +++++++++----------------------- > 1 file changed, 9 insertions(+), 23 deletions(-) > > diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omapdrm/omap_crtc.c > index 430bf64521f0..e93ed34dea33 100644 > --- a/drivers/gpu/drm/omapdrm/omap_crtc.c > +++ b/drivers/gpu/drm/omapdrm/omap_crtc.c > @@ -46,7 +46,6 @@ struct omap_crtc { > struct omap_overlay_manager *mgr; > > struct omap_video_timings timings; > - bool enabled; > > struct omap_drm_irq vblank_irq; > struct omap_drm_irq error_irq; > @@ -126,7 +125,7 @@ static void omap_crtc_dss_start_update(struct omap_overlay_manager *mgr) > { > } > > -/* Called only from omap_crtc_setup and suspend/resume handlers. */ > +/* Called only from omap_crtc_encoder_setup and suspend/resume handlers. */ > static void omap_crtc_set_enabled(struct drm_crtc *crtc, bool enable) > { > struct drm_device *dev = crtc->dev; > @@ -385,14 +384,14 @@ int omap_crtc_flush(struct drm_crtc *crtc) > return 0; > } > > -static void omap_crtc_setup(struct drm_crtc *crtc) > +static void omap_crtc_encoder_setup(struct drm_crtc *crtc, bool enable) > { > struct omap_crtc *omap_crtc = to_omap_crtc(crtc); > struct omap_drm_private *priv = crtc->dev->dev_private; > struct drm_encoder *encoder = NULL; > unsigned int i; > > - DBG("%s: enabled=%d", omap_crtc->name, omap_crtc->enabled); > + DBG("%s: enable=%d", omap_crtc->name, enable); > > dispc_runtime_get(); > > @@ -408,14 +407,11 @@ static void omap_crtc_setup(struct drm_crtc *crtc) > > omap_crtc->current_encoder = encoder; > > - if (!omap_crtc->enabled) { > - if (encoder) > - omap_encoder_set_enabled(encoder, false); > - } else { > - if (encoder) { > - omap_encoder_set_enabled(encoder, false); > + if (encoder) { > + omap_encoder_set_enabled(encoder, false); > + if (enable) { > omap_encoder_update(encoder, omap_crtc->mgr, > - &omap_crtc->timings); > + &omap_crtc->timings); > omap_encoder_set_enabled(encoder, true); > } > } > @@ -456,9 +452,6 @@ static void omap_crtc_enable(struct drm_crtc *crtc) > > DBG("%s", omap_crtc->name); > > - if (omap_crtc->enabled) > - return; > - > /* Enable all planes associated with the CRTC. */ > for (i = 0; i < priv->num_planes; i++) { > struct drm_plane *plane = priv->planes[i]; > @@ -467,9 +460,7 @@ static void omap_crtc_enable(struct drm_crtc *crtc) > WARN_ON(omap_plane_set_enable(plane, true)); > } > > - omap_crtc->enabled = true; > - > - omap_crtc_setup(crtc); > + omap_crtc_encoder_setup(crtc, true); > omap_crtc_flush(crtc); > > dispc_runtime_get(); > @@ -485,9 +476,6 @@ static void omap_crtc_disable(struct drm_crtc *crtc) > > DBG("%s", omap_crtc->name); > > - if (!omap_crtc->enabled) > - return; > - > omap_crtc_wait_page_flip(crtc); > dispc_runtime_get(); > drm_crtc_vblank_off(crtc); > @@ -501,9 +489,7 @@ static void omap_crtc_disable(struct drm_crtc *crtc) > WARN_ON(omap_plane_set_enable(plane, false)); > } > > - omap_crtc->enabled = false; > - > - omap_crtc_setup(crtc); > + omap_crtc_encoder_setup(crtc, false); > omap_crtc_flush(crtc); > } > > -- > 2.1.4 > > > > ------------------------------ > > Message: 3 > Date: Thu, 4 Jun 2015 12:02:53 +0300 > From: Tomi Valkeinen <tomi.valkeinen(a)ti.com> > To: <dri-devel(a)lists.freedesktop.org>, Laurent Pinchart > <laurent.pinchart(a)ideasonboard.com> > Cc: Tomi Valkeinen <tomi.valkeinen(a)ti.com> > Subject: [PATCHv2 36/45] drm: omapdrm: Don't flush CRTC when enabling > or disabling it > Message-ID: <1433408582-9828-37-git-send-email-tomi.valkeinen(a)ti.com> > Content-Type: text/plain > > From: Laurent Pinchart <laurent.pinchart(a)ideasonboard.com> > > The omap_crtc_flush() call in omap_crtc_enable() and omap_crtc_disable() > is a no-op, as the display manager is always disabled at this point. Just > remove the function call. > > Signed-off-by: Laurent Pinchart <laurent.pinchart(a)ideasonboard.com> > Signed-off-by: Tomi Valkeinen <tomi.valkeinen(a)ti.com> > --- > drivers/gpu/drm/omapdrm/omap_crtc.c | 4 ---- > 1 file changed, 4 deletions(-) > > diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omapdrm/omap_crtc.c > index 2236f52f8bc3..701406e1f0ee 100644 > --- a/drivers/gpu/drm/omapdrm/omap_crtc.c > +++ b/drivers/gpu/drm/omapdrm/omap_crtc.c > @@ -405,8 +405,6 @@ static void omap_crtc_enable(struct drm_crtc *crtc) > WARN_ON(omap_plane_setup(plane)); > } > > - omap_crtc_flush(crtc); > - > drm_crtc_vblank_on(crtc); > } > > @@ -428,8 +426,6 @@ static void omap_crtc_disable(struct drm_crtc *crtc) > if (plane->crtc == crtc) > WARN_ON(omap_plane_setup(plane)); > } > - > - omap_crtc_flush(crtc); > } > > static void omap_crtc_mode_set_nofb(struct drm_crtc *crtc) > -- > 2.1.4 > > > > ------------------------------ > > Message: 4 > Date: Thu, 4 Jun 2015 12:02:57 +0300 > From: Tomi Valkeinen <tomi.valkeinen(a)ti.com> > To: <dri-devel(a)lists.freedesktop.org>, Laurent Pinchart > <laurent.pinchart(a)ideasonboard.com> > Cc: Tomi Valkeinen <tomi.valkeinen(a)ti.com> > Subject: [PATCHv2 40/45] drm: omapdrm: if omap_plane_atomic_update > fails, disable plane > Message-ID: <1433408582-9828-41-git-send-email-tomi.valkeinen(a)ti.com> > Content-Type: text/plain > > omap_plane_atomic_update() calls dispc_ovl_setup(), which can fail (but > shouldn't). To make the code a bit more robust, make sure the plane gets > disabled if dispc_ovl_setup() fails, as otherwise we might get illegal > HW configuration leading to error interrupts. > > Signed-off-by: Tomi Valkeinen <tomi.valkeinen(a)ti.com> > --- > drivers/gpu/drm/omapdrm/omap_plane.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/omapdrm/omap_plane.c b/drivers/gpu/drm/omapdrm/omap_plane.c > index b13fb2fd4a9a..cfa8276c4deb 100644 > --- a/drivers/gpu/drm/omapdrm/omap_plane.c > +++ b/drivers/gpu/drm/omapdrm/omap_plane.c > @@ -132,8 +132,10 @@ static void omap_plane_atomic_update(struct drm_plane *plane, > /* and finally, update omapdss: */ > ret = dispc_ovl_setup(omap_plane->id, &info, false, > omap_crtc_timings(state->crtc), false); > - if (WARN_ON(ret)) > + if (WARN_ON(ret)) { > + dispc_ovl_enable(omap_plane->id, false); > return; > + } > > dispc_ovl_enable(omap_plane->id, true); > } > -- > 2.1.4 > > > > ------------------------------ > > Message: 5 > Date: Thu, 4 Jun 2015 12:02:31 +0300 > From: Tomi Valkeinen <tomi.valkeinen(a)ti.com> > To: <dri-devel(a)lists.freedesktop.org>, Laurent Pinchart > <laurent.pinchart(a)ideasonboard.com> > Cc: Tomi Valkeinen <tomi.valkeinen(a)ti.com> > Subject: [PATCHv2 14/45] drm: omapdrm: Wire up atomic state object > scaffolding > Message-ID: <1433408582-9828-15-git-send-email-tomi.valkeinen(a)ti.com> > Content-Type: text/plain > > From: Laurent Pinchart <laurent.pinchart(a)ideasonboard.com> > > Hook up the default .reset(), .atomic_duplicate_state() and > .atomic_free_state() helpers to ensure that state objects are properly > created and destroyed, and call drm_mode_config_reset() at init time to > create the initial state objects. > > Framebuffer reference count also gets maintained automatically by the > transitional helpers except for the legacy page flip operation. Maintain > it explicitly there. > > Signed-off-by: Laurent Pinchart <laurent.pinchart(a)ideasonboard.com> > Signed-off-by: Tomi Valkeinen <tomi.valkeinen(a)ti.com> > --- > drivers/gpu/drm/omapdrm/omap_connector.c | 4 ++++ > drivers/gpu/drm/omapdrm/omap_crtc.c | 6 ++++++ > drivers/gpu/drm/omapdrm/omap_drv.c | 2 ++ > drivers/gpu/drm/omapdrm/omap_plane.c | 5 +++++ > 4 files changed, 17 insertions(+) > > diff --git a/drivers/gpu/drm/omapdrm/omap_connector.c b/drivers/gpu/drm/omapdrm/omap_connector.c > index cd1b10d660ac..d170f0cb1aa9 100644 > --- a/drivers/gpu/drm/omapdrm/omap_connector.c > +++ b/drivers/gpu/drm/omapdrm/omap_connector.c > @@ -17,6 +17,7 @@ > * this program. If not, see <http://www.gnu.org/licenses/>. > */ > > +#include <drm/drm_atomic_helper.h> > #include <drm/drm_crtc.h> > #include <drm/drm_crtc_helper.h> > > @@ -260,9 +261,12 @@ struct drm_encoder *omap_connector_attached_encoder( > > static const struct drm_connector_funcs omap_connector_funcs = { > .dpms = drm_helper_connector_dpms, > + .reset = drm_atomic_helper_connector_reset, > .detect = omap_connector_detect, > .fill_modes = drm_helper_probe_single_connector_modes, > .destroy = omap_connector_destroy, > + .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, > + .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, > }; > > static const struct drm_connector_helper_funcs omap_connector_helper_funcs = { > diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omapdrm/omap_crtc.c > index 0359a67f8f8d..5f4f5ad93345 100644 > --- a/drivers/gpu/drm/omapdrm/omap_crtc.c > +++ b/drivers/gpu/drm/omapdrm/omap_crtc.c > @@ -19,6 +19,8 @@ > > #include <linux/completion.h> > > +#include <drm/drm_atomic.h> > +#include <drm/drm_atomic_helper.h> > #include <drm/drm_crtc.h> > #include <drm/drm_crtc_helper.h> > #include <drm/drm_mode.h> > @@ -742,6 +744,7 @@ static int omap_crtc_page_flip(struct drm_crtc *crtc, > omap_crtc->flip_event = event; > omap_crtc->flip_state = OMAP_PAGE_FLIP_WAIT; > > + drm_atomic_set_fb_for_plane(primary->state, fb); > primary->fb = fb; > > spin_unlock_irqrestore(&dev->event_lock, flags); > @@ -771,10 +774,13 @@ static int omap_crtc_set_property(struct drm_crtc *crtc, > } > > static const struct drm_crtc_funcs omap_crtc_funcs = { > + .reset = drm_atomic_helper_crtc_reset, > .set_config = drm_crtc_helper_set_config, > .destroy = omap_crtc_destroy, > .page_flip = omap_crtc_page_flip, > .set_property = omap_crtc_set_property, > + .atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_state, > + .atomic_destroy_state = drm_atomic_helper_crtc_destroy_state, > }; > > static const struct drm_crtc_helper_funcs omap_crtc_helper_funcs = { > diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c > index dbd304691281..5bf4b2b71126 100644 > --- a/drivers/gpu/drm/omapdrm/omap_drv.c > +++ b/drivers/gpu/drm/omapdrm/omap_drv.c > @@ -350,6 +350,8 @@ static int omap_modeset_init(struct drm_device *dev) > > dev->mode_config.funcs = &omap_mode_config_funcs; > > + drm_mode_config_reset(dev); > + > return 0; > } > > diff --git a/drivers/gpu/drm/omapdrm/omap_plane.c b/drivers/gpu/drm/omapdrm/omap_plane.c > index 57d5b035d078..533dcc15f03c 100644 > --- a/drivers/gpu/drm/omapdrm/omap_plane.c > +++ b/drivers/gpu/drm/omapdrm/omap_plane.c > @@ -17,6 +17,8 @@ > * this program. If not, see <http://www.gnu.org/licenses/>. > */ > > +#include <drm/drm_atomic_helper.h> > + > #include "omap_dmm_tiler.h" > #include "omap_drv.h" > > @@ -287,8 +289,11 @@ int omap_plane_set_property(struct drm_plane *plane, > static const struct drm_plane_funcs omap_plane_funcs = { > .update_plane = omap_plane_update, > .disable_plane = omap_plane_disable, > + .reset = drm_atomic_helper_plane_reset, > .destroy = omap_plane_destroy, > .set_property = omap_plane_set_property, > + .atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state, > + .atomic_destroy_state = drm_atomic_helper_plane_destroy_state, > }; > > static void omap_plane_error_irq(struct omap_drm_irq *irq, uint32_t irqstatus) > -- > 2.1.4 > > > > ------------------------------ > > Message: 6 > Date: Thu, 4 Jun 2015 12:02:34 +0300 > From: Tomi Valkeinen <tomi.valkeinen(a)ti.com> > To: <dri-devel(a)lists.freedesktop.org>, Laurent Pinchart > <laurent.pinchart(a)ideasonboard.com> > Cc: Tomi Valkeinen <tomi.valkeinen(a)ti.com> > Subject: [PATCHv2 17/45] drm: omapdrm: Switch plane update to atomic > helpers > Message-ID: <1433408582-9828-18-git-send-email-tomi.valkeinen(a)ti.com> > Content-Type: text/plain > > From: Laurent Pinchart <laurent.pinchart(a)ideasonboard.com> > > This removes the legacy plane update code. Wire up the default atomic > check and atomic commit mode config helpers as needed by the plane > update atomic helpers. > > Signed-off-by: Laurent Pinchart <laurent.pinchart(a)ideasonboard.com> > Signed-off-by: Tomi Valkeinen <tomi.valkeinen(a)ti.com> > --- > drivers/gpu/drm/omapdrm/omap_drv.c | 3 +++ > drivers/gpu/drm/omapdrm/omap_plane.c | 4 ++-- > 2 files changed, 5 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c > index 5bf4b2b71126..ec0ae4220e72 100644 > --- a/drivers/gpu/drm/omapdrm/omap_drv.c > +++ b/drivers/gpu/drm/omapdrm/omap_drv.c > @@ -17,6 +17,7 @@ > * this program. If not, see <http://www.gnu.org/licenses/>. > */ > > +#include <drm/drm_atomic_helper.h> > #include <drm/drm_crtc_helper.h> > #include <drm/drm_fb_helper.h> > > @@ -58,6 +59,8 @@ static void omap_fb_output_poll_changed(struct drm_device *dev) > static const struct drm_mode_config_funcs omap_mode_config_funcs = { > .fb_create = omap_framebuffer_create, > .output_poll_changed = omap_fb_output_poll_changed, > + .atomic_check = drm_atomic_helper_check, > + .atomic_commit = drm_atomic_helper_commit, > }; > > static int get_connector_type(struct omap_dss_device *dssdev) > diff --git a/drivers/gpu/drm/omapdrm/omap_plane.c b/drivers/gpu/drm/omapdrm/omap_plane.c > index 7587bac1b222..fcc5d9603292 100644 > --- a/drivers/gpu/drm/omapdrm/omap_plane.c > +++ b/drivers/gpu/drm/omapdrm/omap_plane.c > @@ -316,8 +316,8 @@ int omap_plane_set_property(struct drm_plane *plane, > } > > static const struct drm_plane_funcs omap_plane_funcs = { > - .update_plane = drm_plane_helper_update, > - .disable_plane = drm_plane_helper_disable, > + .update_plane = drm_atomic_helper_update_plane, > + .disable_plane = drm_atomic_helper_disable_plane, > .reset = drm_atomic_helper_plane_reset, > .destroy = omap_plane_destroy, > .set_property = omap_plane_set_property, > -- > 2.1.4 > > > > ------------------------------ > > Message: 7 > Date: Thu, 4 Jun 2015 12:02:35 +0300 > From: Tomi Valkeinen <tomi.valkeinen(a)ti.com> > To: <dri-devel(a)lists.freedesktop.org>, Laurent Pinchart > <laurent.pinchart(a)ideasonboard.com> > Cc: Tomi Valkeinen <tomi.valkeinen(a)ti.com> > Subject: [PATCHv2 18/45] drm: omapdrm: Switch mode config to atomic > helpers > Message-ID: <1433408582-9828-19-git-send-email-tomi.valkeinen(a)ti.com> > Content-Type: text/plain > > From: Laurent Pinchart <laurent.pinchart(a)ideasonboard.com> > > This removes the legacy mode config code. The CRTC and encoder prepare > and commit operations are not used anymore, remove them. > > Signed-off-by: Laurent Pinchart <laurent.pinchart(a)ideasonboard.com> > Signed-off-by: Tomi Valkeinen <tomi.valkeinen(a)ti.com> > --- > drivers/gpu/drm/omapdrm/omap_crtc.c | 37 +--------------------------------- > drivers/gpu/drm/omapdrm/omap_encoder.c | 10 --------- > 2 files changed, 1 insertion(+), 46 deletions(-) > > diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omapdrm/omap_crtc.c > index 31d50533d538..68bf38bd0ce2 100644 > --- a/drivers/gpu/drm/omapdrm/omap_crtc.c > +++ b/drivers/gpu/drm/omapdrm/omap_crtc.c > @@ -571,23 +571,6 @@ static void omap_crtc_disable(struct drm_crtc *crtc) > WARN_ON(omap_plane_set_enable(plane, false)); > } > > - /* > - * HACK: Unpin the primary plane frame buffer if we're disabled without > - * going through full mode set. > - * HACK: The legacy set config helper drm_crtc_helper_set_config() that > - * we still use calls the .disable() operation directly when called with > - * a NULL frame buffer (for instance from drm_fb_release()). As a result > - * the CRTC is disabled without going through a full mode set, and the > - * primary plane' framebuffer is kept pin. Unpin it manually here until > - * we switch to the atomic set config helper. > - */ > - if (crtc->primary->fb) { > - const struct drm_plane_helper_funcs *funcs; > - > - funcs = crtc->primary->helper_private; > - funcs->cleanup_fb(crtc->primary, crtc->primary->fb, NULL); > - } > - > omap_crtc->enabled = false; > > omap_crtc_setup(crtc); > @@ -622,20 +605,6 @@ static void omap_crtc_dpms(struct drm_crtc *crtc, int mode) > omap_crtc_disable(crtc); > } > > -static void omap_crtc_prepare(struct drm_crtc *crtc) > -{ > - struct omap_crtc *omap_crtc = to_omap_crtc(crtc); > - DBG("%s", omap_crtc->name); > - omap_crtc_dpms(crtc, DRM_MODE_DPMS_OFF); > -} > - > -static void omap_crtc_commit(struct drm_crtc *crtc) > -{ > - struct omap_crtc *omap_crtc = to_omap_crtc(crtc); > - DBG("%s", omap_crtc->name); > - omap_crtc_dpms(crtc, DRM_MODE_DPMS_ON); > -} > - > static void omap_crtc_atomic_begin(struct drm_crtc *crtc) > { > dispc_runtime_get(); > @@ -771,7 +740,7 @@ static int omap_crtc_set_property(struct drm_crtc *crtc, > > static const struct drm_crtc_funcs omap_crtc_funcs = { > .reset = drm_atomic_helper_crtc_reset, > - .set_config = drm_crtc_helper_set_config, > + .set_config = drm_atomic_helper_set_config, > .destroy = omap_crtc_destroy, > .page_flip = omap_crtc_page_flip, > .set_property = omap_crtc_set_property, > @@ -782,11 +751,7 @@ static const struct drm_crtc_funcs omap_crtc_funcs = { > static const struct drm_crtc_helper_funcs omap_crtc_helper_funcs = { > .dpms = omap_crtc_dpms, > .mode_fixup = omap_crtc_mode_fixup, > - .mode_set = drm_helper_crtc_mode_set, > - .prepare = omap_crtc_prepare, > - .commit = omap_crtc_commit, > .mode_set_nofb = omap_crtc_mode_set_nofb, > - .mode_set_base = drm_helper_crtc_mode_set_base, > .disable = omap_crtc_disable, > .enable = omap_crtc_enable, > .atomic_begin = omap_crtc_atomic_begin, > diff --git a/drivers/gpu/drm/omapdrm/omap_encoder.c b/drivers/gpu/drm/omapdrm/omap_encoder.c > index 0734527808d5..96459f709147 100644 > --- a/drivers/gpu/drm/omapdrm/omap_encoder.c > +++ b/drivers/gpu/drm/omapdrm/omap_encoder.c > @@ -116,14 +116,6 @@ static void omap_encoder_mode_set(struct drm_encoder *encoder, > } > } > > -static void omap_encoder_prepare(struct drm_encoder *encoder) > -{ > -} > - > -static void omap_encoder_commit(struct drm_encoder *encoder) > -{ > -} > - > static void omap_encoder_disable(struct drm_encoder *encoder) > { > } > @@ -136,8 +128,6 @@ static const struct drm_encoder_helper_funcs omap_encoder_helper_funcs = { > .dpms = omap_encoder_dpms, > .mode_fixup = omap_encoder_mode_fixup, > .mode_set = omap_encoder_mode_set, > - .prepare = omap_encoder_prepare, > - .commit = omap_encoder_commit, > .disable = omap_encoder_disable, > .enable = omap_encoder_enable, > }; > -- > 2.1.4 > > > > ------------------------------ > > Subject: Digest Footer > > _______________________________________________ > dri-devel mailing list > dri-devel(a)lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel > > > ------------------------------ > > End of dri-devel Digest, Vol 63, Issue 41 > *****************************************

1 0

[PATCH 09/98] via_drm.h: include linux/types.h instead of non-existing via_drmclient.h
by Mikko Rapeli 04 Jun '15

04 Jun '15

Fixes compiler error: drm/via_drm.h:36:27: fatal error: via_drmclient.h: No such file or directory Signed-off-by: Mikko Rapeli <mikko.rapeli(a)iki.fi> --- include/uapi/drm/via_drm.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/include/uapi/drm/via_drm.h b/include/uapi/drm/via_drm.h index 8b0533c..791531e 100644 --- a/include/uapi/drm/via_drm.h +++ b/include/uapi/drm/via_drm.h @@ -24,6 +24,7 @@ #ifndef _VIA_DRM_H_ #define _VIA_DRM_H_ +#include <linux/types.h> #include <drm/drm.h> /* WARNING: These defines must be the same as what the Xserver uses. @@ -33,9 +34,6 @@ #ifndef _VIA_DEFINES_ #define _VIA_DEFINES_ -#ifndef __KERNEL__ -#include "via_drmclient.h" -#endif #define VIA_NR_SAREA_CLIPRECTS 8 #define VIA_NR_XVMC_PORTS 10 -- 2.1.4

2 2

[Bug 90704] Desktop will black when sliding mouse in touchpad after switching tty in my skylake machine
by bugzilla-daemon＠freedesktop.org 04 Jun '15

04 Jun '15

https://bugs.freedesktop.org/show_bug.cgi?id=90704 Bug ID: 90704 Summary: Desktop will black when sliding mouse in touchpad after switching tty in my skylake machine Product: DRI Version: XOrg git Hardware: Other OS: Linux (All) Status: NEW Severity: major Priority: medium Component: General Assignee: dri-devel(a)lists.freedesktop.org Reporter: vivianhu(a)linpus.com Created attachment 116112 --> https://bugs.freedesktop.org/attachment.cgi?id=116112&action=edit video:cycle between black and normal Environment: ----------------------------------- Platform:SKL Libdrm:libdrm-2.4.61 Mesa:10.6.0-rc2 Xserver:xorg-server-1.17.1 Xf86_video_intel:2.99.917 Cairo:1.14.2 Libva:1.5.1 Kernel:4.1-rc5 Machine info: --------------------------------------------- [root@localhost ~]# lspci -nn 00:00.0 Host bridge [0600]: Intel Corporation Sky Lake Host Bridge/DRAM Registers [8086:1904] (rev 03) 00:02.0 VGA compatible controller [0300]: Intel Corporation Sky Lake Integrated Graphics [8086:1916] (rev 02) 00:08.0 System peripheral [0880]: Intel Corporation Sky Lake Gaussian Mixture Model [8086:1911] 00:14.0 USB controller [0c03]: Intel Corporation Device [8086:9d2f] (rev 10) 00:14.2 Signal processing controller [1180]: Intel Corporation Device [8086:9d31] (rev 10) 00:16.0 Communication controller [0780]: Intel Corporation Device [8086:9d3a] (rev 10) 00:17.0 SATA controller [0106]: Intel Corporation Device [8086:9d03] (rev 10) 00:1c.0 PCI bridge [0604]: Intel Corporation Device [8086:9d14] (rev f0) 00:1d.0 PCI bridge [0604]: Intel Corporation Device [8086:9d18] (rev f0) 00:1f.0 ISA bridge [0601]: Intel Corporation Device [8086:9d48] (rev 10) 00:1f.2 Memory controller [0580]: Intel Corporation Device [8086:9d21] (rev 10) 00:1f.3 Audio device [0403]: Intel Corporation Device [8086:9d70] (rev 10) 00:1f.4 SMBus [0c05]: Intel Corporation Device [8086:9d23] (rev 10) 01:00.0 Ethernet controller [0200]: Realtek Semiconductor Co., Ltd. RTL8111/8168/8411 PCI Express Gigabit Ethernet Controller [10ec:8168] (rev 15) 02:00.0 Display controller [0380]: Advanced Micro Devices, Inc. [AMD/ATI] Sun XT [Radeon HD 8670A/8670M/8690M / R5 M330] [1002:6660] (rev 83) Reproduce steps ---------------------------- 1. poweron and enter to linux os,for example, fedora 22. 2. press ctrl+alt+F3, switching to tty3. 3. press ctrl+alt+F1, switching back to desktop, then you will see the desktop is black. 4. slide in touchpad, the desktop will show normally again. 5. slide in touchpad again, the desktop will black again. 6. The desktop will cycle between black and normal when sliding mouse in touchpad continually, please refer to the attached video. -- You are receiving this mail because: You are the assignee for the bug.

1 9

[PATCH] drm/exynos: dsi: check whether dsi is enabled before sending data
by Hyungwon Hwang 04 Jun '15

04 Jun '15

exynos_dsi_host_transfer() can be called through a panel driver while DSI is turning down. It is possible because the function checks only whether DSI is initialized or not, and there is a moment which DSI is set by uninitialized, but DSI is still turning down. To prevent it, DSI must be set by disabled before starting to be turned down, and exynos_dsi_host_transfer() must check whether DSI is enabled or not. Kernel dump: [ 4721.351448] Unhandled fault: synchronous external abort (0x96000210) at 0xffffff800015e018 [ 4721.351809] Internal error: : 96000210 [#1] PREEMPT SMP [ 4721.352031] Modules linked in: [ 4721.352173] CPU: 2 PID: 300 Comm: deviced Tainted: G W 4.0.4-01017-g7964a87 #1 [ 4721.353989] Hardware name: Samsung DRACO board (DT) [ 4721.358852] task: ffffffc0a0b70000 ti: ffffffc0a00ec000 task.ti: ffffffc0a00ec000 [ 4721.366327] PC is at exynos_dsi_enable_lane+0x14/0x5c [ 4721.371353] LR is at exynos_dsi_host_transfer+0x834/0x8d8 [ 4721.376731] pc : [<ffffffc000432bcc>] lr : [<ffffffc000434590>] pstate: 60000145 [ 4721.384107] sp : ffffffc0a00efbe0 [ 4721.387405] x29: ffffffc0a00efbe0 x28: ffffffc0a00ec000 [ 4721.392699] x27: ffffffc000968000 x26: 0000000000000040 [ 4721.397994] x25: ffffffc000f74dc0 x24: ffffffc0a00efec8 [ 4721.403290] x23: ffffffc0a4815400 x22: ffffffc0009f2729 [ 4721.408584] x21: ffffffc0a00efcc8 x20: ffffffc0a4a2a848 [ 4721.413879] x19: ffffffc0a4a2a818 x18: 0000000000000004 [ 4721.419173] x17: 0000007faa5cddf0 x16: ffffffc0001a40a8 [ 4721.424469] x15: 0000000000000009 x14: 000000000000000d [ 4721.429762] x13: 6e6e6f63206b726f x12: 0000000000000010 [ 4721.435058] x11: 0101010101010101 x10: 0000000000000000 [ 4721.440353] x9 : 000000000000000a x8 : 8386838282818381 [ 4721.445648] x7 : ffffffc0a201efe8 x6 : 0000000000000000 [ 4721.450943] x5 : 00000000fffffffa x4 : ffffffc0a201f170 [ 4721.456237] x3 : ffffff800015e000 x2 : ffffff800015e018 [ 4721.461531] x1 : 000000000000000f x0 : ffffffc0a4a2a818 [ 4721.466826] [ 4721.468305] Process deviced (pid: 300, stack limit = 0xffffffc0a00ec028) [ 4721.474989] Stack: (0xffffffc0a00efbe0 to 0xffffffc0a00f0000) [ 4721.480720] fbe0: a00efca0 ffffffc0 0042c944 ffffffc0 a0f2d680 ffffffc0 00000024 00000000 [ 4721.488895] fc00: a4b6d000 ffffffc0 009f2729 ffffffc0 a4815400 ffffffc0 a00efec8 ffffffc0 Signed-off-by: Hyungwon Hwang <human.hwang(a)samsung.com> --- drivers/gpu/drm/exynos/exynos_drm_dsi.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_dsi.c b/drivers/gpu/drm/exynos/exynos_drm_dsi.c index 1cfc4be07..6413339 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_dsi.c +++ b/drivers/gpu/drm/exynos/exynos_drm_dsi.c @@ -1408,6 +1408,9 @@ static ssize_t exynos_dsi_host_transfer(struct mipi_dsi_host *host, struct exynos_dsi_transfer xfer; int ret; + if (!(dsi->state & DSIM_STATE_ENABLED)) + return -EINVAL; + if (!(dsi->state & DSIM_STATE_INITIALIZED)) { ret = exynos_dsi_init(dsi); if (ret) @@ -1551,9 +1554,10 @@ static void exynos_dsi_disable(struct exynos_dsi *dsi) drm_panel_disable(dsi->panel); exynos_dsi_set_display_enable(dsi, false); drm_panel_unprepare(dsi->panel); - exynos_dsi_poweroff(dsi); dsi->state &= ~DSIM_STATE_ENABLED; + + exynos_dsi_poweroff(dsi); } static void exynos_dsi_dpms(struct exynos_drm_display *display, int mode) -- 1.9.1

1 0

[RFCv3 1/2] device: add dma_params->max_segment_count
by Sumit Semwal 04 Jun '15

04 Jun '15

From: Rob Clark <robdclark(a)gmail.com> For devices which have constraints about maximum number of segments in an sglist. For example, a device which could only deal with contiguous buffers would set max_segment_count to 1. The initial motivation is for devices sharing buffers via dma-buf, to allow the buffer exporter to know the constraints of other devices which have attached to the buffer. The dma_mask and fields in 'struct device_dma_parameters' tell the exporter everything else that is needed, except whether the importer has constraints about maximum number of segments. Signed-off-by: Rob Clark <robdclark(a)gmail.com> [sumits: Minor updates wrt comments] Signed-off-by: Sumit Semwal <sumit.semwal(a)linaro.org> --- v3: include Robin Murphy's fix[1] for handling '0' as a value for max_segment_count v2: minor updates wrt comments on the first version [1]: http://article.gmane.org/gmane.linux.kernel.iommu/8175/ include/linux/device.h | 1 + include/linux/dma-mapping.h | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/include/linux/device.h b/include/linux/device.h index fb506738f7b7..a32f9b67315c 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -647,6 +647,7 @@ struct device_dma_parameters { * sg limitations. */ unsigned int max_segment_size; + unsigned int max_segment_count; /* INT_MAX for unlimited */ unsigned long segment_boundary_mask; }; diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h index c3007cb4bfa6..d3351a36d5ec 100644 --- a/include/linux/dma-mapping.h +++ b/include/linux/dma-mapping.h @@ -154,6 +154,25 @@ static inline unsigned int dma_set_max_seg_size(struct device *dev, return -EIO; } +#define DMA_SEGMENTS_MAX_SEG_COUNT ((unsigned int) INT_MAX) + +static inline unsigned int dma_get_max_seg_count(struct device *dev) +{ + if (dev->dma_parms && dev->dma_parms->max_segment_count) + return dev->dma_parms->max_segment_count; + return DMA_SEGMENTS_MAX_SEG_COUNT; +} + +static inline int dma_set_max_seg_count(struct device *dev, + unsigned int count) +{ + if (dev->dma_parms) { + dev->dma_parms->max_segment_count = count; + return 0; + } + return -EIO; +} + static inline unsigned long dma_get_seg_boundary(struct device *dev) { return dev->dma_parms ? -- 1.9.1

9 62

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel June 2015