dri-devel March 2016

dri-devel@lists.freedesktop.org

206 participants
1222 discussions

[PATCH v5 1/5] staging/android: add num_fences field to struct sync_file_info
by Gustavo Padovan 02 Mar '16

02 Mar '16

From: Gustavo Padovan <gustavo.padovan(a)collabora.co.uk> Inform userspace how many fences are in the sync_fence_info field. Signed-off-by: Gustavo Padovan <gustavo.padovan(a)collabora.co.uk> Reviewed-by: Maarten Lankhorst <maarten.lankhorst(a)linux.intel.com> --- drivers/staging/android/sync.c | 2 ++ drivers/staging/android/uapi/sync.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/drivers/staging/android/sync.c b/drivers/staging/android/sync.c index 3a8f210..31aa462 100644 --- a/drivers/staging/android/sync.c +++ b/drivers/staging/android/sync.c @@ -525,6 +525,8 @@ static long sync_file_ioctl_fence_info(struct sync_file *sync_file, if (info->status >= 0) info->status = !info->status; + info->num_fences = sync_file->num_fences; + len = sizeof(struct sync_file_info); for (i = 0; i < sync_file->num_fences; ++i) { diff --git a/drivers/staging/android/uapi/sync.h b/drivers/staging/android/uapi/sync.h index a0cf357..4ffb7cc 100644 --- a/drivers/staging/android/uapi/sync.h +++ b/drivers/staging/android/uapi/sync.h @@ -47,12 +47,14 @@ struct sync_fence_info { * userspace including pt_info. * @name: name of fence * @status: status of fence. 1: signaled 0:active <0:error + * @num_fences number of fences in the sync_file * @sync_fence_info: array of sync_fence_info for every fence in the sync_file */ struct sync_file_info { __u32 len; char name[32]; __s32 status; + __u32 num_fences; __u8 sync_fence_info[0]; }; -- 2.5.0

2 6

[PATCH v3 00/10] drm/msm/hdmi: HDMI support on MSM8996
by Archit Taneja 02 Mar '16

02 Mar '16

HDMI on MSM8996 has a TX block that is compatible with the older versions apart from some minor changes. The HDMI PHY and PLL on MSM8996 are new. The series refactors the code such that there is a separate HDMI PHY driver, similar to what we already have for DSI. This makes it easier to integrate new PHYs like the one in msm8996. Changes in v3: - Drop the patches that split the makefiles and prevent building the driver as a module. - Use generic PHY bindings. - Add a patch that constifies the MDP IOMMU port names. Changes in v2: - Fix copy/paste error in dt-binding patch. - Update commit messages to point out that HDMI functionality will break if we pull in the commits that adds the PHY driver, but not the commit that updates PHY/PLL register offsets. - Change the order of patches such that bisectability issues are reduced to a minimum. Archit Taneja (10): drm/msm/hdmi: Clean up connector gpio usage drm/msm/hdmi: Fix connector detect when there is no HPD gpio drm/msm/hdmi: Create a separate HDMI PHY driver drm/msm/hdmi: Manage HDMI PLL through PHY driver drm/msm/hdmi: Make HDMI core get its PHY drm/msm/hdmi: Convert PHY files according to new design drm/msm/hdmi: Update generated headers to split PHY/PLL offsets drm/msm/hdmi: Update generated headers for HDMI 8996 PHY drm/msm/hdmi: HDMI 8996 PHY/PLL support dt-bindings: msm/hdmi: Add HDMI PHY bindings .../devicetree/bindings/display/msm/hdmi.txt | 46 +- drivers/gpu/drm/msm/Makefile | 3 + drivers/gpu/drm/msm/hdmi/hdmi.c | 98 ++- drivers/gpu/drm/msm/hdmi/hdmi.h | 78 ++- drivers/gpu/drm/msm/hdmi/hdmi.xml.h | 657 +++++++++++++++--- drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 8 +- drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 138 ++-- drivers/gpu/drm/msm/hdmi/hdmi_phy.c | 230 +++++++ drivers/gpu/drm/msm/hdmi/hdmi_phy_8960.c | 503 +------------- drivers/gpu/drm/msm/hdmi/hdmi_phy_8996.c | 766 +++++++++++++++++++++ drivers/gpu/drm/msm/hdmi/hdmi_phy_8x60.c | 196 ++---- drivers/gpu/drm/msm/hdmi/hdmi_phy_8x74.c | 94 +-- drivers/gpu/drm/msm/hdmi/hdmi_pll_8960.c | 461 +++++++++++++ 13 files changed, 2388 insertions(+), 890 deletions(-) create mode 100644 drivers/gpu/drm/msm/hdmi/hdmi_phy.c create mode 100644 drivers/gpu/drm/msm/hdmi/hdmi_phy_8996.c create mode 100644 drivers/gpu/drm/msm/hdmi/hdmi_pll_8960.c -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation

3 14

[PATCH v2 0/7] drm/msm: Misc patches
by Archit Taneja 02 Mar '16

02 Mar '16

These are mainly small fixes in drm/msm. The last patch adds a way to parse DSI lanes information via DT. Changes in v2: - Updated the patch VDD regulator patch for MSM8916. After studying schematics and looking at DSI specs again carefully, we realized that the vdd supply is meant for the panels that connect to the dsi host. The downstream driver controlled it within the DSI driver itself, which led to the confusion. - Updated the DT bindings for parsing DSI data lanes - Added a patch to constify iommu port names - Fixed some checkpatch warnings. Archit Taneja (5): drm/msm/mdp: Use atomic helper to set crtc property drm/msm: Free fb helper resources in msm_unload drm/msm/dsi: Remove incorrect warning on host attach drm/msm/dsi: Drop VDD regulator for MSM8916 drm/msm/dsi: Parse DSI lanes via DT Rob Clark (1): drm/msm: make iommu port names const'ier Sricharan R (1): drm/msm/mdp: Detach iommu in mdp4_destroy .../devicetree/bindings/display/msm/dsi.txt | 32 +++++- drivers/gpu/drm/msm/dsi/dsi_cfg.c | 3 +- drivers/gpu/drm/msm/dsi/dsi_host.c | 118 +++++++++++++++++---- drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c | 9 +- drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 17 ++- drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h | 1 + drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 9 +- drivers/gpu/drm/msm/msm_drv.c | 5 + drivers/gpu/drm/msm/msm_drv.h | 1 + drivers/gpu/drm/msm/msm_iommu.c | 6 +- drivers/gpu/drm/msm/msm_mmu.h | 4 +- 11 files changed, 154 insertions(+), 51 deletions(-) -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation

2 8

[PATCH 1/2] drm/radeon: disable runtime pm on PX laptops without dGPU power control
by Alex Deucher 02 Mar '16

02 Mar '16

Some PX laptops don't provide an ACPI method to control dGPU power. On those systems, the driver is responsible for handling the dGPU power state. Disable runtime PM on them until support for this is implemented. Signed-off-by: Alex Deucher <alexander.deucher(a)amd.com> Cc: stable(a)vger.kernel.org --- drivers/gpu/drm/radeon/radeon_atpx_handler.c | 8 ++++---- drivers/gpu/drm/radeon/radeon_device.c | 8 +++++++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_atpx_handler.c b/drivers/gpu/drm/radeon/radeon_atpx_handler.c index c4b4f29..9bc408c 100644 --- a/drivers/gpu/drm/radeon/radeon_atpx_handler.c +++ b/drivers/gpu/drm/radeon/radeon_atpx_handler.c @@ -62,6 +62,10 @@ bool radeon_has_atpx(void) { return radeon_atpx_priv.atpx_detected; } +bool radeon_has_atpx_dgpu_power_cntl(void) { + return radeon_atpx_priv.atpx.functions.power_cntl; +} + /** * radeon_atpx_call - call an ATPX method * @@ -141,10 +145,6 @@ static void radeon_atpx_parse_functions(struct radeon_atpx_functions *f, u32 mas */ static int radeon_atpx_validate(struct radeon_atpx *atpx) { - /* make sure required functions are enabled */ - /* dGPU power control is required */ - atpx->functions.power_cntl = true; - if (atpx->functions.px_params) { union acpi_object *info; struct atpx_px_params output; diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c index 902b59c..4de23ae 100644 --- a/drivers/gpu/drm/radeon/radeon_device.c +++ b/drivers/gpu/drm/radeon/radeon_device.c @@ -103,6 +103,12 @@ static const char radeon_family_name[][16] = { "LAST", }; +#if defined(CONFIG_VGA_SWITCHEROO) +bool radeon_has_atpx_dgpu_power_cntl(void); +#else +static inline bool radeon_has_atpx_dgpu_power_cntl(void) { return false; } +#endif + #define RADEON_PX_QUIRK_DISABLE_PX (1 << 0) #define RADEON_PX_QUIRK_LONG_WAKEUP (1 << 1) @@ -1433,7 +1439,7 @@ int radeon_device_init(struct radeon_device *rdev, * ignore it */ vga_client_register(rdev->pdev, rdev, NULL, radeon_vga_set_decode); - if (rdev->flags & RADEON_IS_PX) + if ((rdev->flags & RADEON_IS_PX) && radeon_has_atpx_dgpu_power_cntl()) runtime = true; vga_switcheroo_register_client(rdev->pdev, &radeon_switcheroo_ops, runtime); if (runtime) -- 2.5.0

1 1

[PATCH 1/4] drm: bridge/dw-hdmi: cache edid data
by Philipp Zabel 02 Mar '16

02 Mar '16

From: Sascha Hauer <s.hauer(a)pengutronix.de> Instead of rereading the edid data each time userspace asks for them, read them once and cache them in the previously unused edid field in struct dw_hdmi. When the connector is disconnected, drop the cached edid data. Signed-off-by: Sascha Hauer <s.hauer(a)pengutronix.de> Signed-off-by: Philipp Zabel <p.zabel(a)pengutronix.de> --- drivers/gpu/drm/bridge/dw-hdmi.c | 43 ++++++++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/drivers/gpu/drm/bridge/dw-hdmi.c b/drivers/gpu/drm/bridge/dw-hdmi.c index 6fbec99..b0ebf92 100644 --- a/drivers/gpu/drm/bridge/dw-hdmi.c +++ b/drivers/gpu/drm/bridge/dw-hdmi.c @@ -117,7 +117,7 @@ struct dw_hdmi { int vic; - u8 edid[HDMI_EDID_LEN]; + struct edid *edid; bool cable_plugin; bool phy_enabled; @@ -1437,32 +1437,41 @@ dw_hdmi_connector_detect(struct drm_connector *connector, bool force) dw_hdmi_update_phy_mask(hdmi); mutex_unlock(&hdmi->mutex); - return hdmi_readb(hdmi, HDMI_PHY_STAT0) & HDMI_PHY_HPD ? - connector_status_connected : connector_status_disconnected; + if (hdmi_readb(hdmi, HDMI_PHY_STAT0) & HDMI_PHY_HPD) + return connector_status_connected; + + /* free previous EDID block */ + if (hdmi->edid) { + drm_mode_connector_update_edid_property(connector, NULL); + kfree(hdmi->edid); + hdmi->edid = NULL; + } + + return connector_status_disconnected; } 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 = 0; - if (!hdmi->ddc) - return 0; - - edid = drm_get_edid(connector, hdmi->ddc); - if (edid) { - dev_dbg(hdmi->dev, "got edid: width[%d] x height[%d]\n", - edid->width_cm, edid->height_cm); + if (hdmi->ddc && !hdmi->edid) { + hdmi->edid = drm_get_edid(connector, hdmi->ddc); + if (hdmi->edid) { + hdmi->sink_is_hdmi = drm_detect_hdmi_monitor(hdmi->edid); + hdmi->sink_has_audio = drm_detect_monitor_audio(hdmi->edid); + drm_mode_connector_update_edid_property(connector, + hdmi->edid); + dev_dbg(hdmi->dev, "got edid: width[%d] x height[%d]\n", + hdmi->edid->width_cm, hdmi->edid->height_cm); + } + } - hdmi->sink_is_hdmi = drm_detect_hdmi_monitor(edid); - hdmi->sink_has_audio = drm_detect_monitor_audio(edid); - drm_mode_connector_update_edid_property(connector, edid); - ret = drm_add_edid_modes(connector, edid); + if (hdmi->edid) { + ret = drm_add_edid_modes(connector, hdmi->edid); /* Store the ELD */ - drm_edid_to_eld(connector, edid); - kfree(edid); + drm_edid_to_eld(connector, hdmi->edid); } else { dev_dbg(hdmi->dev, "failed to get edid\n"); } -- 2.6.4

3 7

[pull] radeon and amdgpu drm-fixes-4.5
by Alex Deucher 02 Mar '16

02 Mar '16

Hi Dave, Fixes for radeon and amdgpu: - Fix GPUVM flushing on CI and VI - Misc DPM and Powerplay fixes - VCE DPM fixes for CZ/ST - DP hotplug fix The following changes since commit 6378076bcfdcd1d4f8d726d08d3fa044736873eb: drm/amdgpu: disable direct VM updates when vm_debug is set (2016-02-24 12:46:06 -0500) are available in the git repository at: git://people.freedesktop.org/~agd5f/linux drm-fixes-4.5 for you to fetch changes up to 0b39c531cfa12dad54eac238c2e303b994df1ef7: drm/amdgpu: return from atombios_dp_get_dpcd only when error (2016-03-02 11:01:25 -0500) ---------------------------------------------------------------- Alex Deucher (5): drm/amdgpu/pm: update current crtc info after setting the powerstate drm/radeon/pm: update current crtc info after setting the powerstate drm/amdgpu/cz: enable/disable vce dpm even if vce pg is disabled drm/amdgpu/powerplay/cz: enable/disable vce dpm independent of vce pg drm/amdgpu/cz: remove commented out call to enable vce pg Arindam Nath (1): drm/amdgpu: return from atombios_dp_get_dpcd only when error Christian König (1): drm/amdgpu: apply gfx_v8 fixes to gfx_v7 as well Chunming Zhou (1): drm/amdgpu/gfx8: specify which engine to wait before vm flush Rex Zhu (2): drm/amd/powerplay: export AMD_PP_EVENT_COMPLETE_INIT task to amdgpu. drm/amd/powerplay: send event to notify powerplay all modules are initialized. drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 6 +++--- drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c | 4 +++- drivers/gpu/drm/amd/amdgpu/cz_dpm.c | 7 ++----- drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 13 +++++++++++++ drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 3 ++- drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 5 ++++- drivers/gpu/drm/amd/powerplay/eventmgr/eventactionchains.c | 1 + drivers/gpu/drm/amd/powerplay/hwmgr/cz_clockpowergating.c | 2 +- drivers/gpu/drm/radeon/radeon_pm.c | 8 ++++---- 10 files changed, 34 insertions(+), 17 deletions(-)

1 0

[PATCH v2 1/2] dt-bindings: Add LG lp120up1 panel bindings
by Jitao Shi 02 Mar '16

02 Mar '16

Add documentation for lp120up1 panel Signed-off-by: Jitao Shi <jitao.shi(a)mediatek.com> Acked-by: Rob Herring <robh(a)kernel.org> --- Changes since v1: - add Acked-by: Rob Herring <robh(a)kernel.org> --- .../bindings/display/panel/lg,lp120up1.txt | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 Documentation/devicetree/bindings/display/panel/lg,lp120up1.txt diff --git a/Documentation/devicetree/bindings/display/panel/lg,lp120up1.txt b/Documentation/devicetree/bindings/display/panel/lg,lp120up1.txt new file mode 100644 index 0000000..8c5de69 --- /dev/null +++ b/Documentation/devicetree/bindings/display/panel/lg,lp120up1.txt @@ -0,0 +1,7 @@ +LG 12.0" (1920x1280 pixels) TFT LCD panel + +Required properties: +- compatible: should be "lg,lp120up1" + +This binding is compatible with the simple-panel binding, which is specified +in simple-panel.txt in this directory. -- 1.7.9.5

3 7

[PATCH] drm/panel: simple: fix g121x1_l03 hsync/vsync polarity
by Akshay Bhat 02 Mar '16

02 Mar '16

Set hsync/vsync to active low for g121x1_l03 panel to match the recommended setting in datasheet. Signed-off-by: Akshay Bhat <akshay.bhat(a)timesys.com> --- drivers/gpu/drm/panel/panel-simple.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c index 2164c99..5d11322 100644 --- a/drivers/gpu/drm/panel/panel-simple.c +++ b/drivers/gpu/drm/panel/panel-simple.c @@ -847,6 +847,7 @@ static const struct drm_display_mode innolux_g121x1_l03_mode = { .vsync_end = 768 + 38 + 1, .vtotal = 768 + 38 + 1 + 0, .vrefresh = 60, + .flags = DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC, }; static const struct panel_desc innolux_g121x1_l03 = { -- 2.7.2

2 1

[RFC 0/2] drm/dsi: DSI for devices with different control bus
by Archit Taneja 02 Mar '16

02 Mar '16

We are currently restricted when it comes to supporting DSI on devices that have a non-DSI control bus. For example, DSI encoder chips are available in the market that are configured via i2c. Configuring their registers via DSI bus is either optional or not available at all. These devices still need to pass DSI parameters (data lanes, mode flags etc) to the DSI host they are connected to. We don't have a way to do that at the moment. The method presented in these patches is to provide an API to create a 'dummy' mipi_dsi_device. This device is populated with the desired DSI params, which are passed on to the host via mipi_dsi_attach(). This method will require the device driver to get a phandle to the DSI host since there is no parent-child relation between the two. Is there a better way to do this? Please let me know! Archit Taneja (2): drm/dsi: Create dummy DSI devices drm/dsi: Get DSI host by DT device node drivers/gpu/drm/drm_mipi_dsi.c | 108 ++++++++++++++++++++++++++++++++++++++++- include/drm/drm_mipi_dsi.h | 4 ++ 2 files changed, 110 insertions(+), 2 deletions(-) -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation

8 83

[PATCH] drm/i915: Resume DP MST before doing any kind of modesetting
by Lyude 02 Mar '16

02 Mar '16

As it turns out, resuming DP MST is racey since we don't make sure MST is ready before we start modesetting, it just usually happens to be ready in time. This isn't the case on all systems, particularly a ThinkPad T560 with displays connected through the dock. On these systems, resuming the laptop while connected to the dock usually results in blank monitors. Making sure MST is ready before doing any kind of modesetting fixes this issue. We originally changed the resume order in commit e7d6f7d70829 ("drm/i915: resume MST after reading back hw state") to fix a ton of WARN_ON's after resume, but this doesn't seem to be an issue now anyhow. CC: stable(a)vger.kernel.org Signed-off-by: Lyude <cpaul(a)redhat.com> --- drivers/gpu/drm/i915/i915_drv.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index f357058..4dcf3dd 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -733,6 +733,14 @@ static int i915_drm_resume(struct drm_device *dev) intel_opregion_setup(dev); intel_init_pch_refclk(dev); + + /* + * We need to make sure that we resume MST before doing anything + * display related, otherwise we risk trying to bring up a display on + * MST before the hub is actually ready + */ + intel_dp_mst_resume(dev); + drm_mode_config_reset(dev); /* @@ -765,8 +773,6 @@ static int i915_drm_resume(struct drm_device *dev) intel_display_resume(dev); drm_modeset_unlock_all(dev); - intel_dp_mst_resume(dev); - /* * ... but also need to make sure that hotplug processing * doesn't cause havoc. Like in the driver load code we don't -- 2.5.0

6 12

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel March 2016