dri-devel February 2019

dri-devel@lists.freedesktop.org

256 participants
1976 discussions

[PATCH] fbdev: Use of_node_name_eq for node name comparisons
by Rob Herring 08 Feb '19

08 Feb '19

Convert string compares of DT node names to use of_node_name_eq helper instead. This removes direct access to the node name pointer. For instances using of_node_cmp, this has the side effect of now using case sensitive comparisons. This should not matter for any FDT based system which omap is. Cc: Benjamin Herrenschmidt <benh(a)kernel.crashing.org> Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie(a)samsung.com> Cc: linux-fbdev(a)vger.kernel.org Cc: dri-devel(a)lists.freedesktop.org Cc: linux-omap(a)vger.kernel.org Signed-off-by: Rob Herring <robh(a)kernel.org> --- drivers/video/fbdev/aty/radeon_pm.c | 6 +++--- drivers/video/fbdev/cg14.c | 4 ++-- drivers/video/fbdev/cg3.c | 2 +- drivers/video/fbdev/ffb.c | 2 +- drivers/video/fbdev/imsttfb.c | 4 ++-- drivers/video/fbdev/offb.c | 2 +- drivers/video/fbdev/omap2/omapfb/dss/dss-of.c | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/video/fbdev/aty/radeon_pm.c b/drivers/video/fbdev/aty/radeon_pm.c index e695adb0e573..2dc5703eac51 100644 --- a/drivers/video/fbdev/aty/radeon_pm.c +++ b/drivers/video/fbdev/aty/radeon_pm.c @@ -2844,8 +2844,8 @@ void radeonfb_pm_init(struct radeonfb_info *rinfo, int dynclk, int ignore_devlis * in some desktop G4s), Via (M9+ chip on iBook G4) and * Snowy (M11 chip on iBook G4 manufactured after July 2005) */ - if (!strcmp(rinfo->of_node->name, "ATY,JasperParent") || - !strcmp(rinfo->of_node->name, "ATY,SnowyParent")) { + if (of_node_name_eq(rinfo->of_node, "ATY,JasperParent") || + of_node_name_eq(rinfo->of_node, "ATY,SnowyParent")) { rinfo->reinit_func = radeon_reinitialize_M10; rinfo->pm_mode |= radeon_pm_off; } @@ -2855,7 +2855,7 @@ void radeonfb_pm_init(struct radeonfb_info *rinfo, int dynclk, int ignore_devlis rinfo->pm_mode |= radeon_pm_off; } #endif - if (!strcmp(rinfo->of_node->name, "ATY,ViaParent")) { + if (of_node_name_eq(rinfo->of_node, "ATY,ViaParent")) { rinfo->reinit_func = radeon_reinitialize_M9P; rinfo->pm_mode |= radeon_pm_off; } diff --git a/drivers/video/fbdev/cg14.c b/drivers/video/fbdev/cg14.c index 9af54c2368fd..a6dce1a78490 100644 --- a/drivers/video/fbdev/cg14.c +++ b/drivers/video/fbdev/cg14.c @@ -486,8 +486,8 @@ static int cg14_probe(struct platform_device *op) info->var.xres); info->fix.smem_len = PAGE_ALIGN(linebytes * info->var.yres); - if (!strcmp(dp->parent->name, "sbus") || - !strcmp(dp->parent->name, "sbi")) { + if (of_node_name_eq(dp->parent, "sbus") || + of_node_name_eq(dp->parent, "sbi")) { info->fix.smem_start = op->resource[0].start; par->iospace = op->resource[0].flags & IORESOURCE_BITS; } else { diff --git a/drivers/video/fbdev/cg3.c b/drivers/video/fbdev/cg3.c index 1bd95b02f3aa..6d42def8436b 100644 --- a/drivers/video/fbdev/cg3.c +++ b/drivers/video/fbdev/cg3.c @@ -369,7 +369,7 @@ static int cg3_probe(struct platform_device *op) info->var.red.length = 8; info->var.green.length = 8; info->var.blue.length = 8; - if (!strcmp(dp->name, "cgRDI")) + if (of_node_name_eq(dp, "cgRDI")) par->flags |= CG3_FLAG_RDI; if (par->flags & CG3_FLAG_RDI) cg3_rdi_maybe_fixup_var(&info->var, dp); diff --git a/drivers/video/fbdev/ffb.c b/drivers/video/fbdev/ffb.c index 6b1915872af1..b7aee0c427a8 100644 --- a/drivers/video/fbdev/ffb.c +++ b/drivers/video/fbdev/ffb.c @@ -944,7 +944,7 @@ static int ffb_probe(struct platform_device *op) info->var.accel_flags = FB_ACCELF_TEXT; - if (!strcmp(dp->name, "SUNW,afb")) + if (of_node_name_eq(dp, "SUNW,afb")) par->flags |= FFB_FLAG_AFB; par->board_type = of_getintprop_default(dp, "board_type", 0); diff --git a/drivers/video/fbdev/imsttfb.c b/drivers/video/fbdev/imsttfb.c index 901ca4ed10e9..b268570b019d 100644 --- a/drivers/video/fbdev/imsttfb.c +++ b/drivers/video/fbdev/imsttfb.c @@ -1498,8 +1498,8 @@ static int imsttfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) switch (pdev->device) { case PCI_DEVICE_ID_IMS_TT128: /* IMS,tt128mbA */ par->ramdac = IBM; - if (dp && ((strcmp(dp->name, "IMS,tt128mb8") == 0) || - (strcmp(dp->name, "IMS,tt128mb8A") == 0))) + if (of_node_name_eq(dp, "IMS,tt128mb8") || + of_node_name_eq(dp, "IMS,tt128mb8A")) par->ramdac = TVP; break; case PCI_DEVICE_ID_IMS_TT3D: /* IMS,tt3d */ diff --git a/drivers/video/fbdev/offb.c b/drivers/video/fbdev/offb.c index 31f769d67195..7b452a520e85 100644 --- a/drivers/video/fbdev/offb.c +++ b/drivers/video/fbdev/offb.c @@ -646,7 +646,7 @@ static void __init offb_init_nodriver(struct device_node *dp, int no_real_node) } #endif /* kludge for valkyrie */ - if (strcmp(dp->name, "valkyrie") == 0) + if (of_node_name_eq(dp, "valkyrie")) address += 0x1000; offb_init_fb(no_real_node ? "bootx" : NULL, width, height, depth, pitch, address, diff --git a/drivers/video/fbdev/omap2/omapfb/dss/dss-of.c b/drivers/video/fbdev/omap2/omapfb/dss/dss-of.c index f1eb8b0f8a2a..5ce893c1923d 100644 --- a/drivers/video/fbdev/omap2/omapfb/dss/dss-of.c +++ b/drivers/video/fbdev/omap2/omapfb/dss/dss-of.c @@ -60,7 +60,7 @@ omapdss_of_get_next_port(const struct device_node *parent, return NULL; } prev = port; - } while (of_node_cmp(port->name, "port") != 0); + } while (!of_node_name_eq(port, "port")); of_node_put(ports); } @@ -83,7 +83,7 @@ omapdss_of_get_next_endpoint(const struct device_node *parent, if (!ep) return NULL; prev = ep; - } while (of_node_cmp(ep->name, "endpoint") != 0); + } while (!of_node_name_eq(ep, "endpoint")); return ep; } -- 2.19.1

2 1

[PATCH] fbcon: use kvmalloc() for scrollback buffer
by Konstantin Khorenko 08 Feb '19

08 Feb '19

Scrollback frame buffer is rather big - 32K, so it requires 3rd order page, so let's use kvmalloc() instead of ordinary kmalloc() for it. Signed-off-by: Konstantin Khorenko <khorenko(a)virtuozzo.com> --- drivers/video/fbdev/core/fbcon.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c index 8958ccc8b1ac..2b1a34d3f5e2 100644 --- a/drivers/video/fbdev/core/fbcon.c +++ b/drivers/video/fbdev/core/fbcon.c @@ -992,7 +992,7 @@ static const char *fbcon_startup(void) if (!softback_buf) { softback_buf = (unsigned long) - kmalloc(fbcon_softback_size, + kvmalloc(fbcon_softback_size, GFP_KERNEL); if (!softback_buf) { fbcon_softback_size = 0; @@ -1001,7 +1001,7 @@ static const char *fbcon_startup(void) } } else { if (softback_buf) { - kfree((void *) softback_buf); + kvfree((void *) softback_buf); softback_buf = 0; softback_top = 0; } @@ -3665,7 +3665,7 @@ static void fbcon_exit(void) } #endif - kfree((void *)softback_buf); + kvfree((void *)softback_buf); softback_buf = 0UL; for_each_registered_fb(i) { -- 2.15.1

2 3

[PATCH] fbdev/via: fix spelling mistake "Expandsion" -> "Expansion"
by Colin King 08 Feb '19

08 Feb '19

From: Colin Ian King <colin.king(a)canonical.com> Trivial fix to spelling mistake in MODULE_PARM_DESC text Signed-off-by: Colin Ian King <colin.king(a)canonical.com> --- drivers/video/fbdev/via/viafbdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/video/fbdev/via/viafbdev.c b/drivers/video/fbdev/via/viafbdev.c index 7bb7e90b8f00..bdf5a0ea876d 100644 --- a/drivers/video/fbdev/via/viafbdev.c +++ b/drivers/video/fbdev/via/viafbdev.c @@ -2110,7 +2110,7 @@ MODULE_PARM_DESC(viafb_lcd_panel_id, module_param(viafb_lcd_dsp_method, int, S_IRUSR); MODULE_PARM_DESC(viafb_lcd_dsp_method, - "Set Flat Panel display scaling method.(Default=Expandsion)"); + "Set Flat Panel display scaling method.(Default=Expansion)"); module_param(viafb_SAMM_ON, int, S_IRUSR); MODULE_PARM_DESC(viafb_SAMM_ON, -- 2.17.1

2 1

[PULL] drm-intel-next
by Rodrigo Vivi 08 Feb '19

08 Feb '19

Hi Dave and Daniel, This is the last batch from us targeting 5.1 Here goes drm-intel-next-2019-02-07: UAPI Changes: - Expose RPCS (SSEU) configuration to userspace for Ice Lake in order to allow userspace to reconfigure the subslice config per context basis. (Tvrtko, Lionel) Driver Changes: - Execbuf and preemption improvements including selftests (Chris) - Rename HAS_GMCH_DISPLAY/HAS_GMCH (Rodrigo) - Debugfs error handling fix for robustness (Greg) - Improve reg_rw traces (Ville) - Push clear_intel_crtc_state onto the heap (Chris) - Watermark fixes for Ice Lake (Ville) - Fix enable count array size and bounds checking (Tvrtko) - MST Fixes (Lyude) - Prevent race and handle error on I915_GEM_MMAP (Joonas) - Initial rework for an full atomic gamma mode (Ville) Thanks, Rodrigo. The following changes since commit 46c0cd8c562bc3e4a99cbaa4ba0904b6871b7b4b: drm/i915: Update DRIVER_DATE to 20190202 (2019-02-02 00:14:28 -0800) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-intel tags/drm-intel-next-2019-02-07 for you to fetch changes up to c09d39166d8a3f3788680b32dbb0a40a70de32e2: drm/i915: Update DRIVER_DATE to 20190207 (2019-02-07 12:45:32 -0800) ---------------------------------------------------------------- UAPI Changes: - Expose RPCS (SSEU) configuration to userspace for Ice Lake in order to allow userspace to reconfigure the subslice config per context basis. (Tvrtko, Lionel) Driver Changes: - Execbuf and preemption improvements including selftests (Chris) - Rename HAS_GMCH_DISPLAY/HAS_GMCH (Rodrigo) - Debugfs error handling fix for robustness (Greg) - Improve reg_rw traces (Ville) - Push clear_intel_crtc_state onto the heap (Chris) - Watermark fixes for Ice Lake (Ville) - Fix enable count array size and bounds checking (Tvrtko) - MST Fixes (Lyude) - Prevent race and handle error on I915_GEM_MMAP (Joonas) - Initial rework for an full atomic gamma mode (Ville) ---------------------------------------------------------------- Chris Wilson (9): drm/i915: Allow normal clients to always preempt idle priority clients drm/i915: Trim NEWCLIENT boosting drm/i915/selftests: Exercise some AB...BA preemption chains drm/i915: Generalise GPU activity tracking drm/i915: Release the active tracker tree upon idling drm/i915: Allocate active tracking nodes from a slabcache drm/i915: Pull i915_gem_active into the i915_active family drm/i915: Push clear_intel_crtc_state() onto the heap drm/i915: Hack and slash, throttle execbuffer hogs Greg Kroah-Hartman (1): drm/i915: do not return invalid pointers as a *dentry Joonas Lahtinen (2): drm/i915: Prevent a race during I915_GEM_MMAP ioctl with WC set drm/i915: Handle vm_mmap error during I915_GEM_MMAP ioctl with WC set Lionel Landwerlin (2): drm/i915: Record the sseu configuration per-context & engine drm/i915/perf: lock powergating configuration to default when active Lyude Paul (3): drm/i915: Block fbdev HPD processing during suspend drm/i915: Don't send MST hotplugs during resume drm/i915: Don't send hotplug in intel_dp_check_mst_status() Rodrigo Vivi (2): drm/i915: Rename HAS_GMCH drm/i915: Update DRIVER_DATE to 20190207 Tvrtko Ursulin (4): drm/i915: Add timeline barrier support drm/i915: Expose RPCS (SSEU) configuration to userspace (Gen11 only) drm/i915/selftests: Context SSEU reconfiguration tests drm/i915/pmu: Fix enable count array size and bounds checking Ville Syrjälä (14): drm/i915: Include register polling in reg_rw traces drm/i915: Fix wm latency==0 disable on skl+ drm/i915: Extract icl_set_pipe_chicken() drm/i915: Setup PIPE_CHICKEN for fastsets too drm/i915: W/A for underruns with WM1+ disabled on icl drm/i915: Bump skl+ wm blocks to 11 bits drm/i915: Just use icl+ definition for PLANE_WM blocks field drm/i915: Don't set update_wm_post on g4x+ drm/i915: Split the gamma/csc enable bits from the plane_ctl() function drm/i915: Precompute gamma_mode drm/i915: Constify the state arguments to the color management stuff drm/i915: Pull GAMMA_MODE write out from haswell_load_luts() drm/i915: Split color mgmt based on single vs. double buffered registers drm/i915: Move LUT programming to happen after vblank waits drivers/gpu/drm/i915/Makefile | 4 +- drivers/gpu/drm/i915/i915_active.c | 286 +++++++++++++ drivers/gpu/drm/i915/i915_active.h | 425 +++++++++++++++++++ drivers/gpu/drm/i915/i915_active_types.h | 36 ++ drivers/gpu/drm/i915/i915_debugfs.c | 6 +- drivers/gpu/drm/i915/i915_drv.c | 12 +- drivers/gpu/drm/i915/i915_drv.h | 38 +- drivers/gpu/drm/i915/i915_gem.c | 34 +- drivers/gpu/drm/i915/i915_gem_context.c | 359 +++++++++++++++- drivers/gpu/drm/i915/i915_gem_context.h | 20 + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 67 +++ drivers/gpu/drm/i915/i915_gem_fence_reg.c | 4 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 5 +- drivers/gpu/drm/i915/i915_gem_object.h | 2 +- drivers/gpu/drm/i915/i915_gpu_error.c | 10 +- drivers/gpu/drm/i915/i915_pci.c | 14 +- drivers/gpu/drm/i915/i915_perf.c | 13 +- drivers/gpu/drm/i915/i915_pmu.c | 22 +- drivers/gpu/drm/i915/i915_pmu.h | 2 + drivers/gpu/drm/i915/i915_reg.h | 6 +- drivers/gpu/drm/i915/i915_request.c | 36 +- drivers/gpu/drm/i915/i915_request.h | 383 ----------------- drivers/gpu/drm/i915/i915_reset.c | 2 +- drivers/gpu/drm/i915/i915_suspend.c | 4 +- drivers/gpu/drm/i915/i915_timeline.c | 4 +- drivers/gpu/drm/i915/i915_timeline.h | 30 +- drivers/gpu/drm/i915/i915_vma.c | 183 ++------ drivers/gpu/drm/i915/i915_vma.h | 11 +- drivers/gpu/drm/i915/intel_color.c | 247 ++++++----- drivers/gpu/drm/i915/intel_device_info.h | 2 +- drivers/gpu/drm/i915/intel_display.c | 300 ++++++++----- drivers/gpu/drm/i915/intel_dp.c | 31 +- drivers/gpu/drm/i915/intel_drv.h | 17 +- drivers/gpu/drm/i915/intel_engine_cs.c | 2 +- drivers/gpu/drm/i915/intel_fbdev.c | 33 +- drivers/gpu/drm/i915/intel_fifo_underrun.c | 6 +- drivers/gpu/drm/i915/intel_guc_log.c | 3 + drivers/gpu/drm/i915/intel_hdmi.c | 6 +- drivers/gpu/drm/i915/intel_hotplug.c | 2 +- drivers/gpu/drm/i915/intel_i2c.c | 2 +- drivers/gpu/drm/i915/intel_lrc.c | 61 ++- drivers/gpu/drm/i915/intel_lrc.h | 2 + drivers/gpu/drm/i915/intel_overlay.c | 33 +- drivers/gpu/drm/i915/intel_pm.c | 21 +- drivers/gpu/drm/i915/intel_ringbuffer.c | 13 - drivers/gpu/drm/i915/intel_ringbuffer.h | 36 +- drivers/gpu/drm/i915/intel_sprite.c | 54 ++- drivers/gpu/drm/i915/intel_uncore.c | 3 + drivers/gpu/drm/i915/selftests/i915_active.c | 157 +++++++ drivers/gpu/drm/i915/selftests/i915_gem_context.c | 467 +++++++++++++++++++++ .../gpu/drm/i915/selftests/i915_live_selftests.h | 3 +- drivers/gpu/drm/i915/selftests/intel_lrc.c | 103 +++++ drivers/gpu/drm/i915/selftests/mock_timeline.c | 3 +- drivers/gpu/drm/i915/vlv_dsi.c | 4 +- include/uapi/drm/i915_drm.h | 64 +++ 55 files changed, 2756 insertions(+), 937 deletions(-) create mode 100644 drivers/gpu/drm/i915/i915_active.c create mode 100644 drivers/gpu/drm/i915/i915_active.h create mode 100644 drivers/gpu/drm/i915/i915_active_types.h create mode 100644 drivers/gpu/drm/i915/selftests/i915_active.c

1 0

[v11 0/4] Add Colorspace connector property interface
by Uma Shankar 08 Feb '19

08 Feb '19

This patch series creates a new connector property to program colorspace to sink devices. Modern sink devices support more than 1 type of colorspace like 601, 709, BT2020 etc. This helps to switch based on content type which is to be displayed. The decision lies with compositors as to in which scenarios, a particular colorspace will be picked. This will be helpful mostly to switch to higher gamut colorspaces like BT2020 when the media content is encoded as BT2020. Thereby giving a good visual experience to users. The expectation from userspace is that it should parse the EDID and get supported colorspaces. Use this property and switch to the one supported. Sink supported colorspaces should be retrieved by userspace from EDID and driver will not explicitly expose them. Basically the expectation from userspace is: - Set up CRTC DEGAMMA/CTM/GAMMA to convert to some sink colorspace - Set this new property to let the sink know what it converted the CRTC output to. - This property is just to inform sink what colorspace source is trying to drive. Have tested this using xrandr by using below command: xrandr --output HDMI2 --set "Colorspace" "BT2020_rgb" v2: Addressed Ville and Maarten's review comments. Merged the 2nd and 3rd patch into one common logical patch. v3: Removed Adobe references from enum definitions as per Ville, Hans Verkuil and Jonas Karlman suggestions. Changed default to an unset state where driver will assign the colorspace when not chosen by user, suggested by Ville and Maarten. Addressed other misc review comments from Maarten. Split the changes to have separate colorspace property for DP and HDMI. v4: Addressed Chris and Ville's review comments, and created a common colorspace property for DP and HDMI, filtered the list v5: Modified the colorspace property creation helper to take platform specific enum list based on the capabilities of the platform as suggested by Shashank. With this there is no need for segregation between DP and HDMI. v6: Addressed Shashank's review comments. v7: Added defines instead of enum in uapi as per Brian Starkey's suggestion in order to go with string matching at userspace. Updated the kernel doc as well with more details. v8: Addressed Maarten's review comments. v9: Removed macro defines from uapi as per Brian Starkey and Daniel Stone's comments and moved to drm include file. Moved back to older design with exposing all HDMI colorspaces to userspace since infoframe capability is there even on legacy platforms, as per Ville's review comments. v10: Addressed Maarten' review comment, updated the RB from Maarten and Jani Nikula's ack. Also fixed sparse warnings and checkpatch complaints. v11: Addressed Ville's review comments. Modified MACRO names, added infoframe helper for colorspace to drm layer. Added DCI-P3 colorspace macro definitions defined in CTA 861.G. Currently linux/hdmi lacks support for ACE formats, will be added as a separate series. Uma Shankar (4): drm: Add HDMI colorspace property drm: Add DP colorspace property drm: Add colorspace info to AVI Infoframe drm/i915: Attach colorspace property and enable modeset drivers/gpu/drm/drm_atomic_uapi.c | 4 ++ drivers/gpu/drm/drm_connector.c | 104 +++++++++++++++++++++++++++++++++ drivers/gpu/drm/drm_edid.c | 28 +++++++++ drivers/gpu/drm/i915/intel_atomic.c | 1 + drivers/gpu/drm/i915/intel_connector.c | 8 +++ drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_hdmi.c | 13 +++++ include/drm/drm_connector.h | 50 ++++++++++++++++ include/drm/drm_edid.h | 6 ++ 9 files changed, 215 insertions(+) -- 1.9.1

4 21

[PATCH] gma500: fix some indentation issues
by Colin King 08 Feb '19

08 Feb '19

From: Colin Ian King <colin.king(a)canonical.com> There are several statements that are indented incorrectly. Fix these. Signed-off-by: Colin Ian King <colin.king(a)canonical.com> --- drivers/gpu/drm/gma500/cdv_intel_dp.c | 5 ++--- drivers/gpu/drm/gma500/mid_bios.c | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/gma500/cdv_intel_dp.c b/drivers/gpu/drm/gma500/cdv_intel_dp.c index 90ed20083009..52b18410fdef 100644 --- a/drivers/gpu/drm/gma500/cdv_intel_dp.c +++ b/drivers/gpu/drm/gma500/cdv_intel_dp.c @@ -1528,8 +1528,7 @@ cdv_intel_dp_start_link_train(struct gma_encoder *encoder) clock_recovery = false; DRM_DEBUG_KMS("Start train\n"); - reg = DP | DP_LINK_TRAIN_PAT_1; - + reg = DP | DP_LINK_TRAIN_PAT_1; for (;;) { /* Use intel_dp->train_set[0] to set the voltage and pre emphasis values */ @@ -1604,7 +1603,7 @@ cdv_intel_dp_complete_link_train(struct gma_encoder *encoder) channel_eq = false; DRM_DEBUG_KMS("\n"); - reg = DP | DP_LINK_TRAIN_PAT_2; + reg = DP | DP_LINK_TRAIN_PAT_2; for (;;) { diff --git a/drivers/gpu/drm/gma500/mid_bios.c b/drivers/gpu/drm/gma500/mid_bios.c index 237041a37532..0b47c1b202db 100644 --- a/drivers/gpu/drm/gma500/mid_bios.c +++ b/drivers/gpu/drm/gma500/mid_bios.c @@ -63,7 +63,7 @@ static void mid_get_fuse_settings(struct drm_device *dev) dev_priv->iLVDS_enable ? "LVDS display" : "MIPI display"); /* Prevent runtime suspend at start*/ - if (dev_priv->iLVDS_enable) { + if (dev_priv->iLVDS_enable) { dev_priv->is_lvds_on = true; dev_priv->is_mipi_on = false; } else { -- 2.20.1

1 0

[PATCHv2] drm/omap: dsi: Fix PM for display blank with paired dss_pll calls
by Tony Lindgren 08 Feb '19

08 Feb '19

Currently dsi_display_init_dsi() calls dss_pll_enable() but it is not paired with dss_pll_disable() in dsi_display_uninit_dsi(). This leaves the DSS clocks enabled when the display is blanked wasting about extra 5mW of power while idle. The clock that is left on by not calling dss_pll_disable() is DSS_CLKCTRL bit 10 OPTFCLKEN_SYS_CLK that is the source clock for DSI PLL. We can fix this issue by by making the current dsi_pll_uninit() into dsi_pll_disable(). This way we can just call dss_pll_disable() from dsi_display_uninit_dsi() and the code becomes a bit easier to follow. However, we need to also consider that DSI PLL can be muxed for DVI too as pointed out by Tomi Valkeinen <tomi.valkeinen(a)ti.com>. In the DVI case, we want to unconditionally disable the clocks. To get around this issue, we separate out the DSI lane handling from dsi_pll_enable() and dsi_pll_disable() as suggested by Tomi in an earlier experimental patch. So we must only toggle the DSI regulator based on the vdds_dsi_enabled flag from dsi_display_init_dsi() and dsi_display_uninit_dsi(). We need to make these two changes together to avoid breaking things for DVI when fixing the DSI clock handling. And this all causes a slight renumbering of the error path for dsi_display_init_dsi(). Suggested-by: Tomi Valkeinen <tomi.valkeinen(a)ti.com> Signed-off-by: Tony Lindgren <tony(a)atomide.com> --- Changes since v1: - Updated with Tomi's suggested changes to not break DVI with regulator_enable() made conditional for dsi_display_init_dsi() - Updated comments to better describe what all goes wrong --- drivers/gpu/drm/omapdrm/dss/dsi.c | 60 ++++++++++++++++--------------- 1 file changed, 31 insertions(+), 29 deletions(-) diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c --- a/drivers/gpu/drm/omapdrm/dss/dsi.c +++ b/drivers/gpu/drm/omapdrm/dss/dsi.c @@ -1342,12 +1342,9 @@ static int dsi_pll_enable(struct dss_pll *pll) */ dsi_enable_scp_clk(dsi); - if (!dsi->vdds_dsi_enabled) { - r = regulator_enable(dsi->vdds_dsi_reg); - if (r) - goto err0; - dsi->vdds_dsi_enabled = true; - } + r = regulator_enable(dsi->vdds_dsi_reg); + if (r) + goto err0; /* XXX PLL does not come out of reset without this... */ dispc_pck_free_enable(dsi->dss->dispc, 1); @@ -1372,36 +1369,25 @@ static int dsi_pll_enable(struct dss_pll *pll) return 0; err1: - if (dsi->vdds_dsi_enabled) { - regulator_disable(dsi->vdds_dsi_reg); - dsi->vdds_dsi_enabled = false; - } + regulator_disable(dsi->vdds_dsi_reg); err0: dsi_disable_scp_clk(dsi); dsi_runtime_put(dsi); return r; } -static void dsi_pll_uninit(struct dsi_data *dsi, bool disconnect_lanes) +static void dsi_pll_disable(struct dss_pll *pll) { + struct dsi_data *dsi = container_of(pll, struct dsi_data, pll); + dsi_pll_power(dsi, DSI_PLL_POWER_OFF); - if (disconnect_lanes) { - WARN_ON(!dsi->vdds_dsi_enabled); - regulator_disable(dsi->vdds_dsi_reg); - dsi->vdds_dsi_enabled = false; - } + + regulator_disable(dsi->vdds_dsi_reg); dsi_disable_scp_clk(dsi); dsi_runtime_put(dsi); - DSSDBG("PLL uninit done\n"); -} - -static void dsi_pll_disable(struct dss_pll *pll) -{ - struct dsi_data *dsi = container_of(pll, struct dsi_data, pll); - - dsi_pll_uninit(dsi, true); + DSSDBG("PLL disable done\n"); } static int dsi_dump_dsi_clocks(struct seq_file *s, void *p) @@ -4096,11 +4082,11 @@ static int dsi_display_init_dsi(struct dsi_data *dsi) r = dss_pll_enable(&dsi->pll); if (r) - goto err0; + return r; r = dsi_configure_dsi_clocks(dsi); if (r) - goto err1; + goto err0; dss_select_dsi_clk_source(dsi->dss, dsi->module_id, dsi->module_id == 0 ? @@ -4108,6 +4094,14 @@ static int dsi_display_init_dsi(struct dsi_data *dsi) DSSDBG("PLL OK\n"); + if (!dsi->vdds_dsi_enabled) { + r = regulator_enable(dsi->vdds_dsi_reg); + if (r) + goto err1; + + dsi->vdds_dsi_enabled = true; + } + r = dsi_cio_init(dsi); if (r) goto err2; @@ -4136,10 +4130,13 @@ static int dsi_display_init_dsi(struct dsi_data *dsi) err3: dsi_cio_uninit(dsi); err2: - dss_select_dsi_clk_source(dsi->dss, dsi->module_id, DSS_CLK_SRC_FCK); + regulator_disable(dsi->vdds_dsi_reg); + dsi->vdds_dsi_enabled = false; err1: - dss_pll_disable(&dsi->pll); + dss_select_dsi_clk_source(dsi->dss, dsi->module_id, DSS_CLK_SRC_FCK); err0: + dss_pll_disable(&dsi->pll); + return r; } @@ -4158,7 +4155,12 @@ static void dsi_display_uninit_dsi(struct dsi_data *dsi, bool disconnect_lanes, dss_select_dsi_clk_source(dsi->dss, dsi->module_id, DSS_CLK_SRC_FCK); dsi_cio_uninit(dsi); - dsi_pll_uninit(dsi, disconnect_lanes); + dss_pll_disable(&dsi->pll); + + if (disconnect_lanes) { + regulator_disable(dsi->vdds_dsi_reg); + dsi->vdds_dsi_enabled = false; + } } static int dsi_display_enable(struct omap_dss_device *dssdev) -- 2.20.1

2 2

[GIT PULL] drm/tegra: Changes for v5.1-rc1
by Thierry Reding 08 Feb '19

08 Feb '19

Hi Dave, The following changes since commit bfeffd155283772bbe78c6a05dec7c0128ee500c: Linux 5.0-rc1 (2019-01-06 17:08:20 -0800) are available in the Git repository at: git://anongit.freedesktop.org/tegra/linux tags/drm/tegra/for-5.1-rc1 for you to fetch changes up to 79930bafe2802c3a67a70ad4904032d9154bf3fa: gpu: host1x: Continue CDMA execution starting with a next job (2019-02-07 18:34:25 +0100) Thanks, Thierry ---------------------------------------------------------------- drm/tegra: Changes for v5.1-rc1 This set of changes starts of with some refactoring of the CEC support to make it reusable on Tegra210 and later. Following are a couple of fixes for HDMI audio support (via HDA). The bulk here is a set of preparatory patches working towards enabling Tegra186 support for host1x and VIC. Additional patches will be needed to fully enable this, but they're not quite ready yet. To round things off, this also adds support for configuring the SOR crossbar using device tree, and fixes a couple of job-related issues in the host1x code. ---------------------------------------------------------------- Alban Bedel (1): drm/tegra: hdmi: Fix audio to work with any pixel clock rate Arnd Bergmann (1): gpu: host1x: Use completion instead of semaphore Dmitry Osipenko (3): gpu: host1x: Cancel only job that actually got stuck gpu: host1x: Don't complete a completed job gpu: host1x: Continue CDMA execution starting with a next job Thierry Reding (21): drm/tegra: Refactor CEC support drm/tegra: sor: Parse more data from HDA format drm/tegra: hda: Extract HDA format parsing code drm/tegra: hdmi: Reuse common HDA format parser gpu: host1x: Represent host1x bus devices in debugfs gpu: host1x: Set up stream ID table gpu: host1x: Program the channel stream ID gpu: host1x: Introduce support for wide opcodes gpu: host1x: Support 40-bit addressing gpu: host1x: Restrict IOVA space to DMA mask gpu: host1x: Support 40-bit addressing on Tegra186 gpu: host1x: Use correct semantics for HOST1X_CHANNEL_DMAEND gpu: host1x: Optimize CDMA push buffer memory usage drm/tegra: Store parent pointer in Tegra DRM clients drm/tegra: vic: Load firmware on demand drm/tegra: Setup shared IOMMU domain after initialization drm/tegra: Restrict IOVA space to DMA mask drm/tegra: vic: Do not clear driver data drm/tegra: vic: Support stream ID register programming dt-bindings: display: tegra: Support SOR crossbar configuration drm/tegra: sor: Support device tree crossbar configuration .../display/tegra/nvidia,tegra20-host1x.txt | 3 + drivers/gpu/drm/tegra/Makefile | 1 + drivers/gpu/drm/tegra/drm.c | 57 +++--- drivers/gpu/drm/tegra/drm.h | 3 +- drivers/gpu/drm/tegra/hda.c | 63 ++++++ drivers/gpu/drm/tegra/hda.h | 20 ++ drivers/gpu/drm/tegra/hdmi.c | 217 ++++++--------------- drivers/gpu/drm/tegra/output.c | 11 +- drivers/gpu/drm/tegra/sor.c | 64 +++--- drivers/gpu/drm/tegra/vic.c | 75 +++++-- drivers/gpu/drm/tegra/vic.h | 9 + drivers/gpu/host1x/bus.c | 35 ++++ drivers/gpu/host1x/cdma.c | 189 +++++++++++++----- drivers/gpu/host1x/cdma.h | 8 +- drivers/gpu/host1x/dev.c | 49 ++++- drivers/gpu/host1x/dev.h | 8 + drivers/gpu/host1x/hw/cdma_hw.c | 46 +++-- drivers/gpu/host1x/hw/channel_hw.c | 43 +++- drivers/gpu/host1x/hw/host1x06_hardware.h | 6 + drivers/gpu/host1x/hw/host1x07_hardware.h | 6 + drivers/gpu/host1x/hw/hw_host1x06_channel.h | 11 ++ drivers/gpu/host1x/hw/hw_host1x07_channel.h | 11 ++ include/trace/events/host1x.h | 26 +++ 23 files changed, 650 insertions(+), 311 deletions(-) create mode 100644 drivers/gpu/drm/tegra/hda.c create mode 100644 drivers/gpu/drm/tegra/hda.h create mode 100644 drivers/gpu/host1x/hw/hw_host1x06_channel.h create mode 100644 drivers/gpu/host1x/hw/hw_host1x07_channel.h

1 0

[Bug 109586] Kernel backtrace with 60Hz on 4K screen
by bugzilla-daemon＠freedesktop.org 08 Feb '19

08 Feb '19

https://bugs.freedesktop.org/show_bug.cgi?id=109586 Bug ID: 109586 Summary: Kernel backtrace with 60Hz on 4K screen Product: DRI Version: unspecified Hardware: x86-64 (AMD64) OS: All Status: NEW Severity: normal Priority: medium Component: DRM/AMDgpu Assignee: dri-devel(a)lists.freedesktop.org Reporter: michael.pfeiffer(a)eichenstein.de Hi, I have a Radeon RX 580 connected a Dell P2415Q monitor (via DisplayPort) running kernel 4.20.6 from Arch Linux. On a 3840x2160 resolution, a 29.98 Hz refresh rate works fine. However switching to 59.98 Hz does not work and produces the following backtrace in dmesg: [Feb 8 11:37] [drm] Failed to updateMST allocation table forpipe idx:0 [ +0,000059] WARNING: CPU: 6 PID: 1161 at drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_link.c:2410 core_link_enable_stream+0x68f/0x1040 [amdgpu] [ +0,000000] Modules linked in: fuse amdgpu nls_iso8859_1 nls_cp437 vfat fat edac_mce_amd kvm_amd kvm irqbypass chash amd_iommu_v2 gpu_sched i2c_algo_bit ttm snd_hda_codec_realtek snd_hda_codec_generic drm_kms_helper snd_hda_codec_hdmi snd_hda_intel drm crct10dif_pclmul snd_hda_codec crc32_pclmul ghash_clmulni_intel snd_hda_core snd_hwdep agpgart snd_pcm syscopyarea mousedev wmi_bmof ccp joydev input_leds aesni_intel sysfillrect snd_timer sysimgblt fb_sys_fops r8169 aes_x86_64 snd sp5100_tco crypto_simd cryptd realtek soundcore i2c_piix4 glue_helper libphy rng_core k10temp pcspkr wmi pinctrl_amd gpio_amdpt evdev mac_hid pcc_cpufreq acpi_cpufreq crypto_user ip_tables x_tables ext4 crc32c_generic crc16 mbcache jbd2 fscrypto raid1 md_mod sr_mod cdrom hid_generic usbhid hid sd_mod ahci libahci libata crc32c_intel xhci_pci scsi_mod xhci_hcd [ +0,000032] CPU: 6 PID: 1161 Comm: gnome-shell Not tainted 4.20.6-arch1-1-ARCH #1 [ +0,000001] Hardware name: To Be Filled By O.E.M. To Be Filled By O.E.M./AB350 Pro4, BIOS P5.40 12/19/2018 [ +0,000040] RIP: 0010:core_link_enable_stream+0x68f/0x1040 [amdgpu] [ +0,000001] Code: 48 8b 81 f0 02 00 00 41 0f b6 54 24 5a 44 89 de d0 ea 48 8b b8 98 00 00 00 83 e2 01 e8 0a 95 00 00 49 8b 0c 24 e9 ea fb ff ff <0f> 0b e9 2a fe ff ff 48 8b 80 80 02 00 00 48 8b 40 50 48 8b 40 30 [ +0,000001] RSP: 0018:ffffad5c0260f8c0 EFLAGS: 00010246 [ +0,000001] RAX: 0000000000000000 RBX: ffff91d0032e0188 RCX: 0000000000000000 [ +0,000001] RDX: 0000000000000005 RSI: ffffffffc0f08ab0 RDI: 0000000000000004 [ +0,000001] RBP: ffff91d03f278000 R08: 0000000000000005 R09: 0000000000000000 [ +0,000000] R10: 0000000000000001 R11: 0000000000000000 R12: ffff91d048fd5400 [ +0,000001] R13: ffff91d048fd5590 R14: ffff91d00736e800 R15: 0000000000000006 [ +0,000001] FS: 00007f0623aa5c00(0000) GS:ffff91d04eb80000(0000) knlGS:0000000000000000 [ +0,000001] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ +0,000001] CR2: 00007f06222fe000 CR3: 0000000406544000 CR4: 00000000003406e0 [ +0,000000] Call Trace: [ +0,000047] ? dce110_opp_program_fmt+0x52/0x200 [amdgpu] [ +0,000041] dce110_apply_ctx_to_hw+0x427/0x490 [amdgpu] [ +0,000040] dc_commit_state+0x2c3/0x520 [amdgpu] [ +0,000043] amdgpu_dm_atomic_commit_tail+0x2a9/0xd20 [amdgpu] [ +0,000004] ? preempt_count_add+0x79/0xb0 [ +0,000003] ? _raw_spin_lock_irq+0x1a/0x40 [ +0,000001] ? _raw_spin_unlock_irq+0x1d/0x30 [ +0,000001] ? wait_for_common+0x113/0x190 [ +0,000001] ? _raw_spin_unlock_irq+0x1d/0x30 [ +0,000001] ? wait_for_common+0x113/0x190 [ +0,000007] commit_tail+0x3d/0x70 [drm_kms_helper] [ +0,000005] drm_atomic_helper_commit+0x103/0x110 [drm_kms_helper] [ +0,000005] drm_atomic_helper_set_config+0x80/0x90 [drm_kms_helper] [ +0,000009] drm_mode_setcrtc+0x193/0x6c0 [drm] [ +0,000010] ? drm_mode_getcrtc+0x180/0x180 [drm] [ +0,000007] drm_ioctl_kernel+0xaf/0xf0 [drm] [ +0,000007] drm_ioctl+0x333/0x3e0 [drm] [ +0,000008] ? drm_mode_getcrtc+0x180/0x180 [drm] [ +0,000025] amdgpu_drm_ioctl+0x49/0x80 [amdgpu] [ +0,000003] do_vfs_ioctl+0xa4/0x630 [ +0,000003] ksys_ioctl+0x60/0x90 [ +0,000002] __x64_sys_ioctl+0x16/0x20 [ +0,000003] do_syscall_64+0x5b/0x170 [ +0,000001] entry_SYSCALL_64_after_hwframe+0x44/0xa9 [ +0,000002] RIP: 0033:0x7f062d25580b [ +0,000002] Code: 0f 1e fa 48 8b 05 55 b6 0c 00 64 c7 00 26 00 00 00 48 c7 c0 ff ff ff ff c3 66 0f 1f 44 00 00 f3 0f 1e fa b8 10 00 00 00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 25 b6 0c 00 f7 d8 64 89 01 48 [ +0,000000] RSP: 002b:00007fff79fca318 EFLAGS: 00000246 ORIG_RAX: 0000000000000010 [ +0,000002] RAX: ffffffffffffffda RBX: 00007fff79fca350 RCX: 00007f062d25580b [ +0,000000] RDX: 00007fff79fca350 RSI: 00000000c06864a2 RDI: 000000000000000b [ +0,000001] RBP: 00007fff79fca350 R08: 0000000000000000 R09: 000055871fa797e0 [ +0,000001] R10: 000055871fa990f0 R11: 0000000000000246 R12: 00000000c06864a2 [ +0,000000] R13: 000000000000000b R14: 0000000000000000 R15: 000055871fa990f0 [ +0,000002] ---[ end trace bd6eba6f481fec44 ]--- Please let me know if you need any further info. -- You are receiving this mail because: You are the assignee for the bug.

1 1

[PATCH] drm/virtio: do NOT reuse resource ids
by Gerd Hoffmann 08 Feb '19

08 Feb '19

Bisected guest kernel changes crashing qemu. Landed at "6c1cd97bda drm/virtio: fix resource id handling". Looked again, and noticed we where not only leaking *some* ids, but *all* ids. The old code never ever called virtio_gpu_resource_id_put(). So, commit 6c1cd97bda effectively makes the linux kernel starting re-using IDs after releasing them, and apparently virglrenderer can't deal with that. Oops. This patch puts a temporary stopgap into place for the 5.0 release. Cc: David Airlie <airlied(a)redhat.com> Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com> --- Notes: Hi Dave, I'll be offline next week, so please commit to drm-next-fixes if you think this patch is acceptable. drivers/gpu/drm/virtio/virtgpu_object.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/drivers/gpu/drm/virtio/virtgpu_object.c b/drivers/gpu/drm/virtio/virtgpu_object.c index f39a183d59..e7e9460350 100644 --- a/drivers/gpu/drm/virtio/virtgpu_object.c +++ b/drivers/gpu/drm/virtio/virtgpu_object.c @@ -28,10 +28,21 @@ static int virtio_gpu_resource_id_get(struct virtio_gpu_device *vgdev, uint32_t *resid) { +#if 0 int handle = ida_alloc(&vgdev->resource_ida, GFP_KERNEL); if (handle < 0) return handle; +#else + static int handle; + + /* + * FIXME: dirty hack to avoid re-using IDs, virglrenderer + * can't deal with that. Needs fixing in virglrenderer, also + * should figure a better way to handle that in the guest. + */ + handle++; +#endif *resid = handle + 1; return 0; @@ -39,7 +50,9 @@ static int virtio_gpu_resource_id_get(struct virtio_gpu_device *vgdev, static void virtio_gpu_resource_id_put(struct virtio_gpu_device *vgdev, uint32_t id) { +#if 0 ida_free(&vgdev->resource_ida, id - 1); +#endif } static void virtio_gpu_ttm_bo_destroy(struct ttm_buffer_object *tbo) -- 2.9.3

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel February 2019