dri-devel June 2015

dri-devel@lists.freedesktop.org

188 participants
1140 discussions

[PULL] drm-intel-fixes
by Jani Nikula 05 Jun '15

05 Jun '15

Hi Dave, sorry I'm late with the fixes pull and I see you already sent yours forward to Linus too. If you get the vibes there might be a release this weekend, would be nice to get these in. Otherwise can wait until next week, and I might have a few more on top then. BR, Jani. The following changes since commit c65b99f046843d2455aa231747b5a07a999a9f3d: Linux 4.1-rc6 (2015-05-31 19:01:07 -0700) are available in the git repository at: git://anongit.freedesktop.org/drm-intel tags/drm-intel-fixes-2015-06-05 for you to fetch changes up to 4f47c99a9be7e9b90a7f3c2c4599ea6b7c2ec49d: drm/i915: Move WaBarrierPerformanceFixDisable:skl to skl code from chv code (2015-06-04 14:15:45 +0300) ---------------------------------------------------------------- Ander Conselvan de Oliveira (1): drm/i915: Include G4X/VLV/CHV in self refresh status Arun Siluvery (1): drm/i915: Initialize HWS page address after GPU reset Jim Bride (1): drm/i915/hsw: Fix workaround for server AUX channel clock divisor Ville Syrjälä (2): drm/i915: Don't skip request retirement if the active list is empty drm/i915: Move WaBarrierPerformanceFixDisable:skl to skl code from chv code drivers/gpu/drm/i915/i915_debugfs.c | 5 ++++- drivers/gpu/drm/i915/i915_gem.c | 3 --- drivers/gpu/drm/i915/intel_dp.c | 5 ++--- drivers/gpu/drm/i915/intel_lrc.c | 6 ++++++ drivers/gpu/drm/i915/intel_ringbuffer.c | 14 +++++++------- 5 files changed, 19 insertions(+), 14 deletions(-) -- Jani Nikula, Intel Open Source Technology Center

1 0

[PATCH 01/27] drm/bridge: ptn3460: #include <linux/gpio/consumer.h>, depend on GPIOLIB
by Geert Uytterhoeven 05 Jun '15

05 Jun '15

If GPIOLIB=n and asm-generic/gpio.h is not used: drivers/gpu/drm/bridge/ptn3460.c: In function ‘ptn3460_pre_enable’: drivers/gpu/drm/bridge/ptn3460.c:135: error: implicit declaration of function ‘gpiod_set_value’ drivers/gpu/drm/bridge/ptn3460.c: In function ‘ptn3460_probe’: drivers/gpu/drm/bridge/ptn3460.c:333: error: implicit declaration of function ‘devm_gpiod_get’ drivers/gpu/drm/bridge/ptn3460.c:333: warning: assignment makes pointer from integer without a cast drivers/gpu/drm/bridge/ptn3460.c:340: error: implicit declaration of function ‘gpiod_direction_output’ drivers/gpu/drm/bridge/ptn3460.c:346: warning: assignment makes pointer from integer without a cast Add the missing #include <linux/gpio/consumer.h> to fix this. As the resulting driver won't work with GPIOLIB=n anyway, make DRM_PTN3460 depend on GPIOLIB || COMPILE_TEST. Signed-off-by: Geert Uytterhoeven <geert(a)linux-m68k.org> Cc: David Airlie <airlied(a)linux.ie> Cc: dri-devel(a)lists.freedesktop.org --- drivers/gpu/drm/bridge/Kconfig | 4 ++-- drivers/gpu/drm/bridge/ptn3460.c | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/bridge/Kconfig b/drivers/gpu/drm/bridge/Kconfig index acef3223772cb899..6cdcd2ec4848edec 100644 --- a/drivers/gpu/drm/bridge/Kconfig +++ b/drivers/gpu/drm/bridge/Kconfig @@ -5,8 +5,8 @@ config DRM_DW_HDMI config DRM_PTN3460 tristate "PTN3460 DP/LVDS bridge" - depends on DRM - depends on OF + depends on DRM && OF + depends on GPIOLIB || COMPILE_TEST select DRM_KMS_HELPER select DRM_PANEL ---help--- diff --git a/drivers/gpu/drm/bridge/ptn3460.c b/drivers/gpu/drm/bridge/ptn3460.c index 9d2f053382e1889a..63a09e4079f358ff 100644 --- a/drivers/gpu/drm/bridge/ptn3460.c +++ b/drivers/gpu/drm/bridge/ptn3460.c @@ -15,6 +15,7 @@ #include <linux/delay.h> #include <linux/gpio.h> +#include <linux/gpio/consumer.h> #include <linux/i2c.h> #include <linux/module.h> #include <linux/of.h> -- 1.9.1

2 4

[PATCH] drm/nouveau/disp: Use NULL for pointers
by Thierry Reding 05 Jun '15

05 Jun '15

From: Thierry Reding <treding(a)nvidia.com> The return type of exec_lookup() is struct nvkm_output *, so it should return NULL rather than 0. Signed-off-by: Thierry Reding <treding(a)nvidia.com> --- drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c b/drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c index fa30d8196f35..ebf64e1d0a70 100644 --- a/drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c +++ b/drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c @@ -939,7 +939,7 @@ exec_lookup(struct nv50_disp_priv *priv, int head, int or, u32 ctrl, case 0x00000900: type = DCB_OUTPUT_DP; mask = 2; break; default: nv_error(priv, "unknown SOR mc 0x%08x\n", ctrl); - return 0x0000; + return NULL; } } -- 2.0.1

2 3

[PATCH] drm: bridge/dw_hdmi: Return num_modes in dw_hdmi_connector_get_modes
by Doug Anderson 05 Jun '15

05 Jun '15

The dw_hdmi_connector_get_modes() function accidentally forgets to return the number of modes it added, although it has this information stored in a local variable. Let's fix that. Without this fix, drm_helper_probe_single_connector_modes_merge_bits() could get confused and always call drm_add_modes_noedid(). That's not right. Signed-off-by: Doug Anderson <dianders(a)chromium.org> --- drivers/gpu/drm/bridge/dw_hdmi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/bridge/dw_hdmi.c b/drivers/gpu/drm/bridge/dw_hdmi.c index 594f84c..816d104 100644 --- a/drivers/gpu/drm/bridge/dw_hdmi.c +++ b/drivers/gpu/drm/bridge/dw_hdmi.c @@ -1395,7 +1395,7 @@ static int dw_hdmi_connector_get_modes(struct drm_connector *connector) struct dw_hdmi *hdmi = container_of(connector, struct dw_hdmi, connector); struct edid *edid; - int ret; + int ret = 0; if (!hdmi->ddc) return 0; @@ -1412,7 +1412,7 @@ static int dw_hdmi_connector_get_modes(struct drm_connector *connector) dev_dbg(hdmi->dev, "failed to get edid\n"); } - return 0; + return ret; } static enum drm_mode_status -- 2.2.0.rc0.207.ga3a616c

3 2

RE: [PATCH v2 00/10] Color Manager Implementation
by Jindal, Sonika 05 Jun '15

05 Jun '15

HI Kausal, You don't need to send the entire series again . Just send the updated patch --in-reply-to to the last message. Otherwise the thread gets lost. You can send the entire series once the review is complete and you feel that the patches are too nested inside. Please keep sending the patches using --in-reply-to tag. Regards, Sonika -----Original Message----- From: Malladi, Kausal Sent: Thursday, June 4, 2015 7:13 PM To: Roper, Matthew D; Barnes, Jesse; Lespiau, Damien; Jindal, Sonika; R, Durgadoss; Purushothaman, Vijay A; intel-gfx(a)lists.freedesktop.org; dri-devel(a)lists.freedesktop.org Cc: Vetter, Daniel; Sharma, Shashank; Kamath, Sunil; Mukherjee, Indranil; Matheson, Annie J; R, Dhanya p; Palleti, Avinash Reddy; Malladi, Kausal Subject: [PATCH v2 00/10] Color Manager Implementation From: Kausal Malladi <Kausal.Malladi(a)intel.com> This patch set adds color manager implementation in drm/i915 layer. Color Manager is an extension in i915 driver to support color correction/enhancement. Various Intel platforms support several color correction capabilities. Color Manager provides abstraction of these properties and allows a user space UI agent to correct/enhance the display. The first three patches add code for the framework, which will be common across all the Intel platforms. drm/i915: Initialize Color Manager drm/i915: Attach color properties to CRTC drm/i915: Add Set property interface for CRTC In the next patches, we are adding support for Gamma and CSC color properties. Please note that: 1. The current implementation is only limited for CHV/BSW platforms, and the support for other platforms will be following up soon. 2. The current patch set implements only the "set" part of the properties, "get" part will be following up soon. The design of color management on linux is done by: Jesse Barnes Sirisha Muppavarapu Shashank Sharma Susanta Bhattacharjee The complete design is explained in the design document, which is available at https://docs.google.com/document/d/1jyfNSAStKHEpmIUZd_1Gd68cPuyiyr8wmJXThSD… v2: Addressed review comments from Sonika and Daniel Stone. Kausal Malladi (10): drm/i915: Initialize Color Manager drm/i915: Attach color properties to CRTC drm/i915: Add atomic set property interface for CRTC drm: Add Gamma correction structure drm: Add a new function for updating color blob drm: Avoid atomic commit path for CRTC property (Gamma) drm/i915: Add pipe level Gamma correction for CHV/BSW drm: Add CSC correction structure drm: Avoid atomic commit path for CSC property on CRTC drm/i915: Add CSC support for CHV/BSW drivers/gpu/drm/drm_atomic_helper.c | 18 +- drivers/gpu/drm/drm_crtc.c | 15 ++ drivers/gpu/drm/i915/Makefile | 3 + drivers/gpu/drm/i915/intel_atomic.c | 19 +- drivers/gpu/drm/i915/intel_color_manager.c | 348 +++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_color_manager.h | 122 ++++++++++ drivers/gpu/drm/i915/intel_display.c | 8 + drivers/gpu/drm/i915/intel_drv.h | 4 + include/drm/drm_crtc.h | 12 + include/uapi/drm/drm.h | 18 ++ 10 files changed, 563 insertions(+), 4 deletions(-) create mode 100644 drivers/gpu/drm/i915/intel_color_manager.c create mode 100644 drivers/gpu/drm/i915/intel_color_manager.h -- 2.4.2

2 1

[PATCH 0/2] drm/sti: CEA-861E video format timing error
by Vincent Abriou 05 Jun '15

05 Jun '15

This set of patches fixes hdmi timing errors reported by an HDMI protocol analyser. Vincent Abriou (2): drm/sti: hdmi fix CEA-861E video format timing error drm/sti: vtg fix CEA-861E video format timing error drivers/gpu/drm/sti/sti_hdmi.c | 4 ++-- drivers/gpu/drm/sti/sti_vtg.c | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) -- 1.9.1

1 2

[PATCH 1/1] drm/sti: VTG interrupt names are badly displayed
by Vincent Abriou 05 Jun '15

05 Jun '15

VTG interrupt names are badly displayed using "cat /proc/interrupts". Simply use the VTG device name while registering the VTG interrupts to fix it. Signed-off-by: Vincent Abriou <vincent.abriou(a)st.com> --- drivers/gpu/drm/sti/sti_vtg.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/sti/sti_vtg.c b/drivers/gpu/drm/sti/sti_vtg.c index 9564f25..eda62c8 100644 --- a/drivers/gpu/drm/sti/sti_vtg.c +++ b/drivers/gpu/drm/sti/sti_vtg.c @@ -311,7 +311,6 @@ static int vtg_probe(struct platform_device *pdev) struct device_node *np; struct sti_vtg *vtg; struct resource *res; - char irq_name[32]; int ret; vtg = devm_kzalloc(dev, sizeof(*vtg), GFP_KERNEL); @@ -342,13 +341,11 @@ static int vtg_probe(struct platform_device *pdev) return vtg->irq; } - snprintf(irq_name, sizeof(irq_name), "vsync-%s", - dev_name(vtg->dev)); - RAW_INIT_NOTIFIER_HEAD(&vtg->notifier_list); ret = devm_request_threaded_irq(dev, vtg->irq, vtg_irq, - vtg_irq_thread, IRQF_ONESHOT, irq_name, vtg); + vtg_irq_thread, IRQF_ONESHOT, + dev_name(dev), vtg); if (IS_ERR_VALUE(ret)) { DRM_ERROR("Failed to register VTG interrupt\n"); return ret; -- 1.9.1

1 0

[git pull] drm fixes
by Dave Airlie 05 Jun '15

05 Jun '15

Hi Linus, just two small fixes, one radeon, one amdkfd. Dave. The following changes since commit c65b99f046843d2455aa231747b5a07a999a9f3d: Linux 4.1-rc6 (2015-05-31 19:01:07 -0700) are available in the git repository at: git://people.freedesktop.org/~airlied/linux drm-fixes for you to fetch changes up to e08f28fdda4ef0df5254d47ef44397c0f99d32ea: Merge tag 'drm-amdkfd-fixes-2015-06-03' of git://people.freedesktop.org/~gabbayo/linux into drm-fixes (2015-06-04 12:29:04 +1000) ---------------------------------------------------------------- Alex Deucher (1): drm/radeon: use proper ACR regisiter for DCE3.2 Alexey Skidanov (1): drm/amdkfd: fix topology bug with capability attr. Dave Airlie (2): Merge branch 'drm-fixes-4.1' of git://people.freedesktop.org/~agd5f/linux into drm-fixes Merge tag 'drm-amdkfd-fixes-2015-06-03' of git://people.freedesktop.org/~gabbayo/linux into drm-fixes drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 4 ++-- drivers/gpu/drm/radeon/dce3_1_afmt.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)

1 0

[PATCH v3 0/2] drm/msm/hdmi: Use pinctrl in HDMI driver
by Stephane Viau 04 Jun '15

04 Jun '15

Pinctrl support for HDMI needs a small fix before the actual implementation... Stephane Viau (2): drm/msm/hdmi: Point to the right struct device drm/msm/hdmi: Use pinctrl in HDMI driver Documentation/devicetree/bindings/drm/msm/hdmi.txt | 6 +++ drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 43 ++++++++++++++-------- 2 files changed, 33 insertions(+), 16 deletions(-) -- Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project

1 2

[RFC PATCH 00/11] drm/i915: Expose OA metrics via perf PMU
by Robert Bragg 04 Jun '15

04 Jun '15

This is an updated series adding support for an "i915_oa" perf PMU for configuring the Intel Gen graphics Observability unit (Haswell only to start with) and forwarding periodic counter reports as perf samples. Compared to the series I sent out last year: The driver is now hooked into context switching so we no longer require a context to be pinned for the full lifetime of a perf event fd (when profiling a specific context). Not visible in the series, but I can say we've also gained some experience from looking at enabling Broadwell within the same architecture. There are some fiddly challenges ahead with enabling Broadwell but I do feel comfortable that it can be supported in the same kind of way via perf. I haven't updated my Broadwell branches for a little while now but if anyone is interested I can share this code as a point of reference if that's helpful. As I've had interest from folks looking at developing tools based on this interface to not require root, but we are following the precedent of not exposing system wide metrics to unprivileged processes, I've added a sysctl directly comparable to kernel.perf_event_paranoid (dev.i915.oa_event_paranoid) that lets users optionally allow unprivileged access to system wide gpu metrics. This series is able to expose more than just the A (aggregating) counters and demonstrates selecting a more counters that are useful when benchmarking 3D render workloads. The expectation is to add further configurations later geared towards media or gpgpu workloads for example. I've changed the uapi for configuring the i915_oa specific attributes when calling perf_event_open(2) whereby instead of cramming lots of bitfields into the perf_event_attr config members, I'm now daisy-chaining a drm_i915_oa_event_attr_t structure off of a single config member that's extensible and validated in the same way as the perf_event_attr struct. I've found this much nicer to work with while being neatly extensible too. I've made a few more (small) changes to core perf infrastructure: I've added a PERF_EVENT_IOC_FLUSH ioctl that can be used to explicitly ask the driver to flush buffered samples. In our case this makes sure to forward all reports currently in the gpu mapped, circular, oabuffer as perf samples. This issue was discussed a bit on LKML last year and previously I was overloading our PMU's read() hook but decided that the cleaner approach would be to add a dedicated ioctl instead. To allow device-driver PMUs to define their own types for records written to the perf circular buffer I've introduced a PERF_RECORD_DEVICE type whereby drivers can then document their own header defining a driver specific scheme for sub-types. This is then used in the i915_oa driver for reporting hw status conditions such as OABUFFER overruns or report lost conditions from the hw. For examples of using the i915_oa driver I have a branch of Mesa that enables support for the INTEL_performance_query extension based on this: https://github.com/rib/drm wip/rib/oa-hsw-4.0.0 https://github.com/rib/mesa wip/rib/oa-hsw-4.0.0 For reference I sent out a corresponding series for the Mesa work for review yesterday: http://lists.freedesktop.org/archives/mesa-dev/2015-May/083519.html I also have a minimal gputop tool that can both test Mesa's INTEL_performance_query implementation to view per-context metrics or it can view system wide gpu metrics collected directly from perf (gputop/gputop-perf.c would be the main code of interest): https://github.com/rib/gputop If it's convenient for testing, my kernel patches can also be fetched from here: https://github.com/rib/linux wip/rib/oa-hsw-4.0.0 One specific patch comment: [RFC PATCH 11/11] WIP: drm/i915: constrain unit gating while using OA I didn't want to hold up getting feedback due to this issue that I'm currently investigating (since the effect on the driver should be trivial) but I've included a work-in-progress patch since it does address a known problem with collecting reliable periodic metrics. Besides the last patch, I feel like this series is in pretty good shape now and by testing it with Mesa and several profiling tools as well as starting the work to enable Broadwell I feel quite happy with our approach of leveraging perf infrastructure. I'd really appreciate any feedback on the core perf changes I've made, as well as general feedback on the PMU driver itself. Since it's been quite a long time since I last sent out patches for this work; in case it's helpful to refer back to some of the discussion last year: https://lkml.org/lkml/2014/10/22/462 For anyone interested to know more details about this hardware, this PRM is a good starting point: https://01.org/sites/default/files/documentation/ observability_performance_counters_haswell.pdf Kind regards, - Robert Robert Bragg (11): perf: export perf_event_overflow perf: Add PERF_PMU_CAP_IS_DEVICE flag perf: Add PERF_EVENT_IOC_FLUSH ioctl perf: Add a PERF_RECORD_DEVICE event type perf: allow drivers more control over event logging drm/i915: rename OACONTROL GEN7_OACONTROL drm/i915: Expose PMU for Observation Architecture drm/i915: add OA config for 3D render counters drm/i915: Add dev.i915.oa_event_paranoid sysctl option drm/i915: report OA buf overrun + report lost status WIP: drm/i915: constrain unit gating while using OA drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/i915_cmd_parser.c | 4 +- drivers/gpu/drm/i915/i915_dma.c | 6 + drivers/gpu/drm/i915/i915_drv.h | 62 +++ drivers/gpu/drm/i915/i915_gem_context.c | 45 +- drivers/gpu/drm/i915/i915_oa_perf.c | 951 ++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/i915_reg.h | 311 ++++++++++- include/linux/perf_event.h | 15 + include/uapi/drm/i915_drm.h | 58 ++ include/uapi/linux/perf_event.h | 14 + kernel/events/core.c | 47 +- kernel/events/internal.h | 9 - kernel/events/ring_buffer.c | 3 + 13 files changed, 1498 insertions(+), 28 deletions(-) create mode 100644 drivers/gpu/drm/i915/i915_oa_perf.c -- 2.3.2

5 31

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel June 2015