dri-devel June 2015

dri-devel@lists.freedesktop.org

188 participants
1140 discussions

Re: [PATCH 1/7] drm/i915: Initialize Color Manager
by Jindal, Sonika 02 Jun '15

02 Jun '15

On 6/2/2015 1:22 AM, Kausal Malladi wrote: > From: Kausal Malladi <Kausal.Malladi(a)intel.com> > > Color Manager is an extension in i915 driver to handle color correction > and enhancements across various Intel platforms. > > This patch initializes color manager framework by : > 1. Adding two new files, intel_color_manager(.c/.h) > 2. Introducing new pointers in DRM mode_config structure to > carry CSC and Gamma color correction properties. > 3. Creating these DRM properties in Color Manager initialization > sequence. > > Signed-off-by: Shashank Sharma <shashank.sharma(a)intel.com> > Signed-off-by: Kausal Malladi <Kausal.Malladi(a)intel.com> > --- > drivers/gpu/drm/i915/Makefile | 3 ++ > drivers/gpu/drm/i915/intel_color_manager.c | 49 ++++++++++++++++++++++++++++ > drivers/gpu/drm/i915/intel_color_manager.h | 32 ++++++++++++++++++ > drivers/gpu/drm/i915/intel_display.c | 5 +++ > include/drm/drm_crtc.h | 4 +++ > 5 files changed, 93 insertions(+) > create mode 100644 drivers/gpu/drm/i915/intel_color_manager.c > create mode 100644 drivers/gpu/drm/i915/intel_color_manager.h > > diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile > index b7ddf48..c62d048 100644 > --- a/drivers/gpu/drm/i915/Makefile > +++ b/drivers/gpu/drm/i915/Makefile > @@ -89,6 +89,9 @@ i915-y += i915_vgpu.o > # legacy horrors > i915-y += i915_dma.o > > +# Color Management > +i915-y += intel_color_manager.o > + > obj-$(CONFIG_DRM_I915) += i915.o > > CFLAGS_i915_trace_points.o := -I$(src) > diff --git a/drivers/gpu/drm/i915/intel_color_manager.c b/drivers/gpu/drm/i915/intel_color_manager.c > new file mode 100644 > index 0000000..c83a212 > --- /dev/null > +++ b/drivers/gpu/drm/i915/intel_color_manager.c > @@ -0,0 +1,49 @@ > +/* > + * Copyright © 2015 Intel Corporation > + * > + * Permission is hereby granted, free of charge, to any person obtaining a > + * copy of this software and associated documentation files (the "Software"), > + * to deal in the Software without restriction, including without limitation > + * the rights to use, copy, modify, merge, publish, distribute, sublicense, > + * and/or sell copies of the Software, and to permit persons to whom the > + * Software is furnished to do so, subject to the following conditions: > + * > + * The above copyright notice and this permission notice (including the next > + * paragraph) shall be included in all copies or substantial portions of the > + * Software. > + * > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL > + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER > + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS > + * IN THE SOFTWARE. > + * > + * Authors: > + * Shashank Sharma <shashank.sharma(a)intel.com> > + * Kausal Malladi <Kausal.Malladi(a)intel.com> > + */ > + > +#include "intel_color_manager.h" > + > +int intel_color_manager_init(struct drm_device *dev) > +{ > + struct drm_mode_config *config = &dev->mode_config; > + > + /* Create Gamma and CSC properties */ > + config->gamma_property = drm_property_create(dev, > + DRM_MODE_PROP_BLOB, "gamma_property", 0); > + if (!config->gamma_property) > + DRM_ERROR("Gamma property creation failed\n"); > + > + DRM_DEBUG_DRIVER("Created Gamma property\n"); > + > + config->csc_property = drm_property_create(dev, > + DRM_MODE_PROP_BLOB, "csc_property", 0); > + if (!config->csc_property) > + DRM_ERROR("CSC property creation failed\n"); > + > + DRM_DEBUG_DRIVER("Created CSC property\n"); > + return 0; > +} > diff --git a/drivers/gpu/drm/i915/intel_color_manager.h b/drivers/gpu/drm/i915/intel_color_manager.h > new file mode 100644 > index 0000000..3cff09d > --- /dev/null > +++ b/drivers/gpu/drm/i915/intel_color_manager.h > @@ -0,0 +1,32 @@ > +/* > + * Copyright © 2015 Intel Corporation > + * > + * Permission is hereby granted, free of charge, to any person obtaining a > + * copy of this software and associated documentation files (the "Software"), > + * to deal in the Software without restriction, including without limitation > + * the rights to use, copy, modify, merge, publish, distribute, sublicense, > + * and/or sell copies of the Software, and to permit persons to whom the > + * Software is furnished to do so, subject to the following conditions: > + * > + * The above copyright notice and this permission notice (including the next > + * paragraph) shall be included in all copies or substantial portions of the > + * Software. > + * > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL > + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER > + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS > + * IN THE SOFTWARE. > + * > + * Authors: > + * Shashank Sharma <shashank.sharma(a)intel.com> > + * Kausal Malladi <Kausal.Malladi(a)intel.com> > + */ > + > +#include <drm/drmP.h> > +#include <drm/drm_crtc_helper.h> > + > +/* Generic Function prototypes */ > +int intel_color_manager_init(struct drm_device *dev); > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index 067b1de..93eed31 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -44,6 +44,7 @@ > #include <drm/drm_plane_helper.h> > #include <drm/drm_rect.h> > #include <linux/dma_remapping.h> > +#include "intel_color_manager.h" > > /* Primary plane formats for gen <= 3 */ > static const uint32_t i8xx_primary_formats[] = { > @@ -14670,6 +14671,10 @@ void intel_modeset_init(struct drm_device *dev) > > intel_init_pm(dev); > > + ret = intel_color_manager_init(dev); This call never fails, you might want to add returning of errors Also, it is better to move this initialization after the num_pipes check, so that we are not initializing the color manager when modeset fails. > + if (ret) > + DRM_ERROR("Color Manager initialization failed\n"); > + > if (INTEL_INFO(dev)->num_pipes == 0) > return; > > diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h > index 3b4d8a4..4085339 100644 > --- a/include/drm/drm_crtc.h > +++ b/include/drm/drm_crtc.h > @@ -1187,6 +1187,10 @@ struct drm_mode_config { > > /* cursor size */ > uint32_t cursor_width, cursor_height; > + > + /* Color Management Properties */ > + struct drm_property *gamma_property; > + struct drm_property *csc_property; This can be moved near the property section in the same struct. > }; > > /** >

1 0

[PATCH v3 0/4] Add virtio gpu driver.
by Gerd Hoffmann 02 Jun '15

02 Jun '15

Hi, It's been a while, but now I finally found to time to send v3 to the list. No big changes in there. Collected some review and ack lines. Fixed some minor issues found in review. Rebased to 4.1-rc4. Dropped the vga compatibility bits for now, this needs to be sorted on the qemu side first. But I don't want delay these patches until this is done. cheers, Gerd Dave Airlie (1): Add virtio gpu driver. Gerd Hoffmann (3): localversion: branch virtio-gpu break kconfig dependency loop drm_vblank_get: don't WARN_ON in case vblanks are not initialized drivers/gpu/drm/Kconfig | 2 + drivers/gpu/drm/Makefile | 1 + drivers/gpu/drm/drm_irq.c | 3 + drivers/gpu/drm/virtio/Kconfig | 14 + drivers/gpu/drm/virtio/Makefile | 11 + drivers/gpu/drm/virtio/virtgpu_debugfs.c | 64 ++++ drivers/gpu/drm/virtio/virtgpu_display.c | 485 ++++++++++++++++++++++++ drivers/gpu/drm/virtio/virtgpu_drm_bus.c | 91 +++++ drivers/gpu/drm/virtio/virtgpu_drv.c | 136 +++++++ drivers/gpu/drm/virtio/virtgpu_drv.h | 350 ++++++++++++++++++ drivers/gpu/drm/virtio/virtgpu_fb.c | 431 ++++++++++++++++++++++ drivers/gpu/drm/virtio/virtgpu_fence.c | 119 ++++++ drivers/gpu/drm/virtio/virtgpu_gem.c | 140 +++++++ drivers/gpu/drm/virtio/virtgpu_kms.c | 164 +++++++++ drivers/gpu/drm/virtio/virtgpu_object.c | 170 +++++++++ drivers/gpu/drm/virtio/virtgpu_plane.c | 120 ++++++ drivers/gpu/drm/virtio/virtgpu_ttm.c | 469 +++++++++++++++++++++++ drivers/gpu/drm/virtio/virtgpu_vq.c | 614 +++++++++++++++++++++++++++++++ drivers/iommu/Kconfig | 3 + drivers/media/platform/Kconfig | 2 +- include/drm/drmP.h | 1 + include/uapi/linux/Kbuild | 1 + include/uapi/linux/virtio_gpu.h | 204 ++++++++++ include/uapi/linux/virtio_ids.h | 1 + localversion-virtio-gpu | 1 + 25 files changed, 3596 insertions(+), 1 deletion(-) create mode 100644 drivers/gpu/drm/virtio/Kconfig create mode 100644 drivers/gpu/drm/virtio/Makefile create mode 100644 drivers/gpu/drm/virtio/virtgpu_debugfs.c create mode 100644 drivers/gpu/drm/virtio/virtgpu_display.c create mode 100644 drivers/gpu/drm/virtio/virtgpu_drm_bus.c create mode 100644 drivers/gpu/drm/virtio/virtgpu_drv.c create mode 100644 drivers/gpu/drm/virtio/virtgpu_drv.h create mode 100644 drivers/gpu/drm/virtio/virtgpu_fb.c create mode 100644 drivers/gpu/drm/virtio/virtgpu_fence.c create mode 100644 drivers/gpu/drm/virtio/virtgpu_gem.c create mode 100644 drivers/gpu/drm/virtio/virtgpu_kms.c create mode 100644 drivers/gpu/drm/virtio/virtgpu_object.c create mode 100644 drivers/gpu/drm/virtio/virtgpu_plane.c create mode 100644 drivers/gpu/drm/virtio/virtgpu_ttm.c create mode 100644 drivers/gpu/drm/virtio/virtgpu_vq.c create mode 100644 include/uapi/linux/virtio_gpu.h create mode 100644 localversion-virtio-gpu -- 1.8.3.1

4 12

[PATCH] drm/ttm: dma: Don't crash on memory in the vmalloc range
by Alexandre Courbot 01 Jun '15

01 Jun '15

dma_alloc_coherent() can return memory in the vmalloc range. virt_to_page() cannot handle such addresses and crashes. This patch detects such cases and obtains the struct page * using vmalloc_to_page() instead. Signed-off-by: Alexandre Courbot <acourbot(a)nvidia.com> --- This patch is a follow-up of the following discussion: https://www.marc.info/?l=dri-devel&m=141579595431254&w=3 It works for me on both 32-bit and 64-bit Tegra, so I am not convinced that Thierry's initial change from virt_to_page() to phys_to_page() is still required - Thierry, can you confirm whether your patch is still relevant after this one? drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c index 01e1d27eb078..3077f1554099 100644 --- a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c +++ b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c @@ -342,9 +342,12 @@ static struct dma_page *__ttm_dma_alloc_page(struct dma_pool *pool) d_page->vaddr = dma_alloc_coherent(pool->dev, pool->size, &d_page->dma, pool->gfp_flags); - if (d_page->vaddr) - d_page->p = virt_to_page(d_page->vaddr); - else { + if (d_page->vaddr) { + if (is_vmalloc_addr(d_page->vaddr)) + d_page->p = vmalloc_to_page(d_page->vaddr); + else + d_page->p = virt_to_page(d_page->vaddr); + } else { kfree(d_page); d_page = NULL; } -- 2.4.0

4 5

[PATCH] drm/exynos: use adjusted_mode of crtc_state instead of mode
by Joonyoung Shim 01 Jun '15

01 Jun '15

Handle changes by removing copy from adjusted_mode to mode as using adjusted_mode of crtc_state. Signed-off-by: Joonyoung Shim <jy0922.shim(a)samsung.com> --- This is based on a patch "[PATCH v9 04/18] drm/exynos: atomic phase 1: add .mode_set_nofb() callback" of Gustavo. drivers/gpu/drm/exynos/exynos7_drm_decon.c | 4 ++-- drivers/gpu/drm/exynos/exynos_drm_fimd.c | 2 +- drivers/gpu/drm/exynos/exynos_drm_plane.c | 13 +++++++------ 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos7_drm_decon.c b/drivers/gpu/drm/exynos/exynos7_drm_decon.c index 6714e5b..f29e4be 100644 --- a/drivers/gpu/drm/exynos/exynos7_drm_decon.c +++ b/drivers/gpu/drm/exynos/exynos7_drm_decon.c @@ -175,7 +175,7 @@ static bool decon_mode_fixup(struct exynos_drm_crtc *crtc, static void decon_commit(struct exynos_drm_crtc *crtc) { struct decon_context *ctx = crtc->ctx; - struct drm_display_mode *mode = &crtc->base.mode; + struct drm_display_mode *mode = &crtc->base.state->adjusted_mode; u32 val, clkdiv; if (ctx->suspended) @@ -395,7 +395,7 @@ static void decon_shadow_protect_win(struct decon_context *ctx, static void decon_win_commit(struct exynos_drm_crtc *crtc, unsigned int win) { struct decon_context *ctx = crtc->ctx; - struct drm_display_mode *mode = &crtc->base.mode; + struct drm_display_mode *mode = &crtc->base.state->adjusted_mode; struct exynos_drm_plane *plane; int padding; unsigned long val, alpha; diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c index a0edab8..b326b31 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c +++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c @@ -337,7 +337,7 @@ static bool fimd_mode_fixup(struct exynos_drm_crtc *crtc, static void fimd_commit(struct exynos_drm_crtc *crtc) { struct fimd_context *ctx = crtc->ctx; - struct drm_display_mode *mode = &crtc->base.mode; + struct drm_display_mode *mode = &crtc->base.state->adjusted_mode; struct fimd_driver_data *driver_data = ctx->driver_data; void *timing_base = ctx->regs + driver_data->timing_base; u32 val, clkdiv; diff --git a/drivers/gpu/drm/exynos/exynos_drm_plane.c b/drivers/gpu/drm/exynos/exynos_drm_plane.c index 6e1341e..f0067f7 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_plane.c +++ b/drivers/gpu/drm/exynos/exynos_drm_plane.c @@ -95,11 +95,12 @@ void exynos_plane_mode_set(struct drm_plane *plane, struct drm_crtc *crtc, uint32_t src_w, uint32_t src_h) { struct exynos_drm_plane *exynos_plane = to_exynos_plane(plane); + struct drm_display_mode *mode = &crtc->state->adjusted_mode; unsigned int actual_w; unsigned int actual_h; - actual_w = exynos_plane_get_size(crtc_x, crtc_w, crtc->mode.hdisplay); - actual_h = exynos_plane_get_size(crtc_y, crtc_h, crtc->mode.vdisplay); + actual_w = exynos_plane_get_size(crtc_x, crtc_w, mode->hdisplay); + actual_h = exynos_plane_get_size(crtc_y, crtc_h, mode->vdisplay); if (crtc_x < 0) { if (actual_w) @@ -135,10 +136,10 @@ void exynos_plane_mode_set(struct drm_plane *plane, struct drm_crtc *crtc, exynos_plane->crtc_height = actual_h; /* set drm mode data. */ - exynos_plane->mode_width = crtc->mode.hdisplay; - exynos_plane->mode_height = crtc->mode.vdisplay; - exynos_plane->refresh = crtc->mode.vrefresh; - exynos_plane->scan_flag = crtc->mode.flags; + exynos_plane->mode_width = mode->hdisplay; + exynos_plane->mode_height = mode->vdisplay; + exynos_plane->refresh = mode->vrefresh; + exynos_plane->scan_flag = mode->flags; DRM_DEBUG_KMS("plane : offset_x/y(%d,%d), width/height(%d,%d)", exynos_plane->crtc_x, exynos_plane->crtc_y, -- 1.9.1

2 3

XDC2015: Call for papers
by Tom Stellard 01 Jun '15

01 Jun '15

Hello, I have the pleasure to announce that the X.org Developer Conference 2015 will be held in Toronto, Canada from September 16 to September 18. The venue is located at Seneca College's campus at York University. The official page for the event is http://www.x.org/wiki/Events/XDC2015 while the call for paper is at http://www.x.org/wiki/Other/Press/CFP2015/ As usual, we are open to talks across the layers of the graphics stack, from the kernel to desktop environments / graphical applications and about how to make things better for the developers who build them. If you're not sure if something might fit, mail me or add it to the ideas list found in the program page. The conference is free of charge and opened to the general public. If you plan on coming, please add yourself to the attendees list. We'll use this list to make badges and plan for the catering, so if you are attending please add your name as early as possible. I am looking forward to seeing you there, if you have any inquiries/questions, please send them to me (please also CC: board at foundation.x.org). Tom Stellard

1 0

[Bug 90534] integrated LVDS displays stays dark (firmware-linux-nonfree-0.43)
by bugzilla-daemon＠freedesktop.org 01 Jun '15

01 Jun '15

https://bugs.freedesktop.org/show_bug.cgi?id=90534 --- Comment #19 from Alex Deucher <alexdeucher(a)gmail.com> --- It's always been the same firmware. firmware is firmware. Different distros have changed their packaging polices with respect to firmware. That might be the case for you (e.g., distro used to just include the firmware with the kernel and now ships it as a separate package). As to narrowing it down, I'd suggest trying interim kernels between the last know good one and most recent one you've tried to see of you can narrow down when it broke. E.g., if kernel 3.14 worked and 3.15 is bad you know the regression happened in the 3.15 kernel cycle. -- You are receiving this mail because: You are the assignee for the bug.

1 0

[Bug 90534] integrated LVDS displays stays dark (firmware-linux-nonfree-0.43)
by bugzilla-daemon＠freedesktop.org 01 Jun '15

01 Jun '15

https://bugs.freedesktop.org/show_bug.cgi?id=90534 --- Comment #18 from Christian König <deathsimple(a)vodafone.de> --- (In reply to Elmar Stellnberger from comment #17) > So bisect the kernel and leave Xorg in peace? Yes, exactly. Any idea what kernel version did you used before? -- You are receiving this mail because: You are the assignee for the bug.

1 0

[Bug 90534] integrated LVDS displays stays dark (firmware-linux-nonfree-0.43)
by bugzilla-daemon＠freedesktop.org 01 Jun '15

01 Jun '15

https://bugs.freedesktop.org/show_bug.cgi?id=90534 --- Comment #17 from Elmar Stellnberger <estellnb(a)elstel.org> --- So bisect the kernel and leave Xorg in peace? -- You are receiving this mail because: You are the assignee for the bug.

1 0

[Bug 90534] integrated LVDS displays stays dark (firmware-linux-nonfree-0.43)
by bugzilla-daemon＠freedesktop.org 01 Jun '15

01 Jun '15

https://bugs.freedesktop.org/show_bug.cgi?id=90534 --- Comment #16 from Christian König <deathsimple(a)vodafone.de> --- (In reply to Elmar Stellnberger from comment #15) > Formerly this firmware was OSS and as far as I can remember it had always > been working while the firmware had been OSS. The firmware for radeon has always been proprietary, but you only need it for acceleration. Pure modesetting should still work without. The problem is that we rarely test without the firmware, so this breaks from time to time. Since your bug sounds like an external display still works I would expect that acceleration actually works perfectly fine. So the firmware most likely isn't the cause of the problem. I would rather guess that it is an issue with the newer kernel. Please try downgrading that one first and see if you can find a working version. Then bisect from those two points in time. -- You are receiving this mail because: You are the assignee for the bug.

1 0

[Bug 90534] integrated LVDS displays stays dark (firmware-linux-nonfree-0.43)
by bugzilla-daemon＠freedesktop.org 01 Jun '15

01 Jun '15

https://bugs.freedesktop.org/show_bug.cgi?id=90534 --- Comment #15 from Elmar Stellnberger <estellnb(a)elstel.org> --- Formerly this firmware was OSS and as far as I can remember it had always been working while the firmware had been OSS. Alex, it would be very nice if you could give me a hint from where on I should start to test. From which point in time on was there a non-OSS firmware in use for radeon? Note that it still works without this firmware. Maybe I do not need to bisect Xorg but very likely just the firmware. -- 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 June 2015