dri-devel July 2018

dri-devel@lists.freedesktop.org

277 participants
1883 discussions

[PATCH v5 5/7] drm/i2c: tda998x: split tda998x_encoder_dpms into enable/disable
by Peter Rosin 06 Jul '18

06 Jul '18

This fits better with the drm_bridge callbacks for when this driver becomes a drm_bridge. Suggested-by: Laurent Pinchart <laurent.pinchart(a)ideasonboard.com> Signed-off-by: Peter Rosin <peda(a)axentia.se> --- drivers/gpu/drm/i2c/tda998x_drv.c | 64 ++++++++++++++++++++++----------------- 1 file changed, 37 insertions(+), 27 deletions(-) diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998x_drv.c index 933d309d2e0f..3dda07a2fd2f 100644 --- a/drivers/gpu/drm/i2c/tda998x_drv.c +++ b/drivers/gpu/drm/i2c/tda998x_drv.c @@ -1163,36 +1163,42 @@ static int tda998x_connector_init(struct tda998x_priv *priv, /* DRM encoder functions */ -static void tda998x_encoder_dpms(struct drm_encoder *encoder, int mode) +static void tda998x_enable(struct tda998x_priv *priv) { - struct tda998x_priv *priv = enc_to_tda998x_priv(encoder); - bool on; + if (priv->is_on) + return; - /* we only care about on or off: */ - on = mode == DRM_MODE_DPMS_ON; + /* enable video ports, audio will be enabled later */ + reg_write(priv, REG_ENA_VP_0, 0xff); + reg_write(priv, REG_ENA_VP_1, 0xff); + reg_write(priv, REG_ENA_VP_2, 0xff); + /* set muxing after enabling ports: */ + reg_write(priv, REG_VIP_CNTRL_0, priv->vip_cntrl_0); + reg_write(priv, REG_VIP_CNTRL_1, priv->vip_cntrl_1); + reg_write(priv, REG_VIP_CNTRL_2, priv->vip_cntrl_2); - if (on == priv->is_on) - return; + priv->is_on = true; +} - if (on) { - /* enable video ports, audio will be enabled later */ - reg_write(priv, REG_ENA_VP_0, 0xff); - reg_write(priv, REG_ENA_VP_1, 0xff); - reg_write(priv, REG_ENA_VP_2, 0xff); - /* set muxing after enabling ports: */ - reg_write(priv, REG_VIP_CNTRL_0, priv->vip_cntrl_0); - reg_write(priv, REG_VIP_CNTRL_1, priv->vip_cntrl_1); - reg_write(priv, REG_VIP_CNTRL_2, priv->vip_cntrl_2); - - priv->is_on = true; - } else { - /* disable video ports */ - reg_write(priv, REG_ENA_VP_0, 0x00); - reg_write(priv, REG_ENA_VP_1, 0x00); - reg_write(priv, REG_ENA_VP_2, 0x00); +static void tda998x_disable(struct tda998x_priv *priv) +{ + /* disable video ports */ + reg_write(priv, REG_ENA_VP_0, 0x00); + reg_write(priv, REG_ENA_VP_1, 0x00); + reg_write(priv, REG_ENA_VP_2, 0x00); - priv->is_on = false; - } + priv->is_on = false; +} + +static void tda998x_encoder_dpms(struct drm_encoder *encoder, int mode) +{ + struct tda998x_priv *priv = enc_to_tda998x_priv(encoder); + + /* we only care about on or off: */ + if (mode == DRM_MODE_DPMS_ON) + tda998x_enable(priv); + else + tda998x_disable(priv); } static void @@ -1606,12 +1612,16 @@ static int tda998x_create(struct i2c_client *client, struct tda998x_priv *priv) static void tda998x_encoder_prepare(struct drm_encoder *encoder) { - tda998x_encoder_dpms(encoder, DRM_MODE_DPMS_OFF); + struct tda998x_priv *priv = enc_to_tda998x_priv(encoder); + + tda998x_disable(priv); } static void tda998x_encoder_commit(struct drm_encoder *encoder) { - tda998x_encoder_dpms(encoder, DRM_MODE_DPMS_ON); + struct tda998x_priv *priv = enc_to_tda998x_priv(encoder); + + tda998x_enable(priv); } static const struct drm_encoder_helper_funcs tda998x_encoder_helper_funcs = { -- 2.11.0

2 1

[PATCH 1/4] drm/v3d: Delay the scheduler timeout if we're still making progress.
by Eric Anholt 06 Jul '18

06 Jul '18

GTF-GLES2.gtf.GL.acos.acos_float_vert_xvary submits jobs that take 4 seconds at maximum resolution, but we still want to reset quickly if a job is really hung. Sample the CL's current address and the return address (since we call into tile lists repeatedly) and if either has changed then assume we've made progress. Signed-off-by: Eric Anholt <eric(a)anholt.net> Cc: Lucas Stach <l.stach(a)pengutronix.de> --- drivers/gpu/drm/v3d/v3d_drv.h | 2 ++ drivers/gpu/drm/v3d/v3d_regs.h | 1 + drivers/gpu/drm/v3d/v3d_sched.c | 18 ++++++++++++++++++ 3 files changed, 21 insertions(+) diff --git a/drivers/gpu/drm/v3d/v3d_drv.h b/drivers/gpu/drm/v3d/v3d_drv.h index f546e0ab9562..a5d96d823416 100644 --- a/drivers/gpu/drm/v3d/v3d_drv.h +++ b/drivers/gpu/drm/v3d/v3d_drv.h @@ -189,6 +189,8 @@ struct v3d_job { /* GPU virtual addresses of the start/end of the CL job. */ u32 start, end; + + u32 timedout_ctca, timedout_ctra; }; struct v3d_exec_info { diff --git a/drivers/gpu/drm/v3d/v3d_regs.h b/drivers/gpu/drm/v3d/v3d_regs.h index fc13282dfc2f..854046565989 100644 --- a/drivers/gpu/drm/v3d/v3d_regs.h +++ b/drivers/gpu/drm/v3d/v3d_regs.h @@ -222,6 +222,7 @@ #define V3D_CLE_CTNCA(n) (V3D_CLE_CT0CA + 4 * n) #define V3D_CLE_CT0RA 0x00118 #define V3D_CLE_CT1RA 0x0011c +#define V3D_CLE_CTNRA(n) (V3D_CLE_CT0RA + 4 * n) #define V3D_CLE_CT0LC 0x00120 #define V3D_CLE_CT1LC 0x00124 #define V3D_CLE_CT0PC 0x00128 diff --git a/drivers/gpu/drm/v3d/v3d_sched.c b/drivers/gpu/drm/v3d/v3d_sched.c index 808bc901f567..00667c733dca 100644 --- a/drivers/gpu/drm/v3d/v3d_sched.c +++ b/drivers/gpu/drm/v3d/v3d_sched.c @@ -153,7 +153,25 @@ v3d_job_timedout(struct drm_sched_job *sched_job) struct v3d_job *job = to_v3d_job(sched_job); struct v3d_exec_info *exec = job->exec; struct v3d_dev *v3d = exec->v3d; + enum v3d_queue job_q = job == &exec->bin ? V3D_BIN : V3D_RENDER; enum v3d_queue q; + u32 ctca = V3D_CORE_READ(0, V3D_CLE_CTNCA(job_q)); + u32 ctra = V3D_CORE_READ(0, V3D_CLE_CTNRA(job_q)); + + /* If the current address or return address have changed, then + * the GPU has probably made progress and we should delay the + * reset. This could fail if the GPU got in an infinite loop + * in the CL, but that is pretty unlikely outside of an i-g-t + * testcase. + */ + if (job->timedout_ctca != ctca || job->timedout_ctra != ctra) { + job->timedout_ctca = ctca; + job->timedout_ctra = ctra; + + schedule_delayed_work(&job->base.work_tdr, + job->base.sched->timeout); + return; + } mutex_lock(&v3d->reset_lock); -- 2.18.0

4 8

[PATCHv8 0/3] drm/i915: add DisplayPort CEC-Tunneling-over-AUX support
by Hans Verkuil 06 Jul '18

06 Jul '18

From: Hans Verkuil <hans.verkuil(a)cisco.com> This patch series adds support for the DisplayPort CEC-Tunneling-over-AUX feature. This patch series is based on the current media master branch (https://git.linuxtv.org/media_tree.git/log/) but it applies fine on top of the current mainline tree. This patch series has been tested with my NUC7i5BNK, a Google USB-C to HDMI adapter and a Club 3D DisplayPort MST Hub + modified UpTab DP-to-HDMI adapter (where the CEC pin is wired up). The latter is to check that replacing a USB-C to HDMI adapter by a USB-C MST Hub works correctly. CEC for MST is currently not supported. Please note this comment at the start of drm_dp_cec.c: ---------------------------------------------------------------------- Unfortunately it turns out that we have a chicken-and-egg situation here. Quite a few active (mini-)DP-to-HDMI or USB-C-to-HDMI adapters have a converter chip that supports CEC-Tunneling-over-AUX (usually the Parade PS176), but they do not wire up the CEC pin, thus making CEC useless. Sadly there is no way for this driver to know this. What happens is that a /dev/cecX device is created that is isolated and unable to see any of the other CEC devices. Quite literally the CEC wire is cut (or in this case, never connected in the first place). The reason so few adapters support this is that this tunneling protocol was never supported by any OS. So there was no easy way of testing it, and no incentive to correctly wire up the CEC pin. Hopefully by creating this driver it will be easier for vendors to finally fix their adapters and test the CEC functionality. I keep a list of known working adapters here: https://hverkuil.home.xs4all.nl/cec-status.txt Please mail me (hverkuil(a)xs4all.nl) if you find an adapter that works and is not yet listed there. Note that the current implementation does not support CEC over an MST hub. As far as I can see there is no mechanism defined in the DisplayPort standard to transport CEC interrupts over an MST device. It might be possible to do this through polling, but I have not been able to get that to work. ---------------------------------------------------------------------- I really hope that this work will provide an incentive for vendors to finally connect the CEC pin. It's a shame that there are so few adapters that work (I found only three USB-C to HDMI adapters that work, and no (mini-)DP to HDMI adapters at all). It is a very nice feature for HTPC boxes. This v8 incorporates Ville's suggested cleanups from his review of v7 and it adds his Reviewed-by tag. Regards, Hans Changes since v7: - Drop unnecessary aux->cec.adap check from drm_dp_cec_unregister_work() - Cancel unregister_work at the start of drm_dp_cec_unset_edid(). This simplifies the remainder of the code in that function. Changes since v6: - Made struct edid const in drm_dp_cec_set_edid() - Changed drm_dp_cec_unregister_delay behavior: 0 == no unregister delay, >= 1000 == never unregister. - Fixed potential deadlock in drm_dp_cec_unset_edid(). - Moved all cec fields in struct drm_dp_aux to a struct drm_dp_aux_cec. Changes since v5: - Moved the logic of when to unregister a CEC adapter to the drm core code, since this is independent of the actual driver implementation. - Simplified the calls the driver needs to make: the core code is informed when a connector is (un)registered, when the EDID is unset or set and when a DP short pulse is seen and you need to check if that is for a CEC interrupt. - Added the drm_dp_cec_unregister_delay module option to set the delay between unsetting the EDID and unregistering the CEC adapter. Changes since v4: - Updated comment at the start of drm_dp_cec.c - Add edid pointer to drm_dp_cec_configure_adapter - Reworked the last patch (adding CEC to i915) based on Ville's comments and my MST testing: - register/unregister CEC in intel_dp_connector_register/unregister - add comment and check if connector is registered in long_pulse - unregister CEC if an MST 'connector' is detected. Hans Verkuil (3): drm: add support for DisplayPort CEC-Tunneling-over-AUX drm-kms-helpers.rst: document the DP CEC helpers drm/i915: add DisplayPort CEC-Tunneling-over-AUX support Documentation/gpu/drm-kms-helpers.rst | 9 + drivers/gpu/drm/Kconfig | 10 + drivers/gpu/drm/Makefile | 1 + drivers/gpu/drm/drm_dp_cec.c | 427 ++++++++++++++++++++++++++ drivers/gpu/drm/drm_dp_helper.c | 1 + drivers/gpu/drm/i915/intel_dp.c | 17 +- include/drm/drm_dp_helper.h | 56 ++++ 7 files changed, 519 insertions(+), 2 deletions(-) create mode 100644 drivers/gpu/drm/drm_dp_cec.c -- 2.18.0

2 6

[GIT PULL] tilcdc changes for 4.19
by Jyri Sarha 06 Jul '18

06 Jul '18

Hi Dave, Please pull the tilcdc changes for Linux v4.19. Best regards and thanks, Jyri The following changes since commit 021c91791a5e7e85c567452f1be3e4c2c6cb6063: Linux 4.18-rc3 (2018-07-01 16:04:53 -0700) are available in the git repository at: https://github.com/jsarha/linux tags/tilcdc-4.19 for you to fetch changes up to a132b5a5081ca106193a02e0835e01db7c4055ec: drm/tilcdc: Defer probe if there are no connectors (2018-07-05 14:06:22 +0300) ---------------------------------------------------------------- tilcdc pull request for v4.19 ---------------------------------------------------------------- Sjoerd Simons (1): drm/tilcdc: Defer probe if there are no connectors drivers/gpu/drm/tilcdc/tilcdc_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki

1 0

[PATCH] drm/tilcdc: Defer probe if there are no connectors
by Sjoerd Simons 06 Jul '18

06 Jul '18

During probe there may not be any connectors yet if e.g. the panel failed or hasn't been probed yet. I hitting this in practice the panels probing was being delayed due to using a gpio backlight. Fix this by returning -EPROBE_DEFER so the probing will be retried. Signed-off-by: Sjoerd Simons <sjoerd.simons(a)collabora.co.uk> --- drivers/gpu/drm/tilcdc/tilcdc_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/tilcdc/tilcdc_drv.c b/drivers/gpu/drm/tilcdc/tilcdc_drv.c index 1afde61f1247..59f0a44bb6e3 100644 --- a/drivers/gpu/drm/tilcdc/tilcdc_drv.c +++ b/drivers/gpu/drm/tilcdc/tilcdc_drv.c @@ -380,7 +380,7 @@ static int tilcdc_init(struct drm_driver *ddrv, struct device *dev) if (!priv->external_connector && ((priv->num_encoders == 0) || (priv->num_connectors == 0))) { dev_err(dev, "no encoders/connectors found\n"); - ret = -ENXIO; + ret = -EPROBE_DEFER; goto init_failed; } -- 2.16.3

2 1

[GIT PULL] etnaviv-fixes for 4.18
by Lucas Stach 06 Jul '18

06 Jul '18

Hi Dave, a couple of small fixes: - 2 patches from Fabio to fix module reloading - one patch to fix a userspace visible regression, where the job timeout is a bit too eager and kills legitimate jobs Regards, Lucas The following changes since commit ce397d215ccd07b8ae3f71db689aedb85d56ab40: Linux 4.18-rc1 (2018-06-17 08:04:49 +0900) are available in the Git repository at: https://git.pengutronix.de/git/lst/linux etnaviv/fixes for you to fetch changes up to 2c83a726d6fbb5d130d8f2edd82a258adb675ac3: drm/etnaviv: bring back progress check in job timeout handler (2018-07-05 14:16:20 +0200) ---------------------------------------------------------------- Fabio Estevam (2): drm/etnaviv: Check for platform_device_register_simple() failure drm/etnaviv: Fix driver unregistering Lucas Stach (1): drm/etnaviv: bring back progress check in job timeout handler drivers/gpu/drm/etnaviv/etnaviv_drv.c | 24 ++++++++++++++++++++---- drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 3 +++ drivers/gpu/drm/etnaviv/etnaviv_sched.c | 24 ++++++++++++++++++++++++ 3 files changed, 47 insertions(+), 4 deletions(-)

1 0

[PATCH v5 0/4] DT: Fix spelling of standard properties
by Geert Uytterhoeven 06 Jul '18

06 Jul '18

Hi all, This patch series fixes misspellings of various standard DT properties in DT binding documentation, DTS files, and examples. While most of these are harmless, some of them may cause hard-to-debug failures. Changes compared to v5: - Add Acked-by. Changes compared to v4: - Drop patches that have been applied already, - Add Acked-by. Changes compared to v3: - Drop patches that have been applied already, - Add Acked-by, - Add new patches 5 and 6. Changes compared to v2: - Drop patches that have been applied already, - Add Rob Herring's Acked-by, - Add new patch "[PATCH v2 3/6] arm64: dts: lg1313: DT fix s/#interrupts-cells/#interrupt-cells/". Thanks for applying! Geert Uytterhoeven (4): arm64: dts: lg1312: DT fix s/#interrupts-cells/#interrupt-cells/ arm64: dts: lg1313: DT fix s/#interrupts-cells/#interrupt-cells/ dt-bindings: display: amlogic: DT fix s/resets-names/reset-names/ dt-bindings: net: btusb: DT fix s/interrupt-name/interrupt-names/ .../devicetree/bindings/display/amlogic,meson-dw-hdmi.txt | 2 +- Documentation/devicetree/bindings/net/btusb.txt | 2 +- arch/arm64/boot/dts/lg/lg1312.dtsi | 2 +- arch/arm64/boot/dts/lg/lg1313.dtsi | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) -- 2.17.1 Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert(a)linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds

1 4

[PATCH v1 0/7] Remove debugfs from sti display driver
by Benjamin Gaignard 06 Jul '18

06 Jul '18

Thanks to the various atomic_print_state hooks in drm structure all custom debugfs code could be remove from sti driver (~ -330 lines). This patchset does two addtion in drm core: - printing normalized zpos of each plane - add "atomic_print" hook in encoder structure to be able to dump encoders at the same time than the others elements All other patches are implemeting the various hooks in sti driver. Benjamin Gaignard (7): drm: print plane state normalized zpos value drm: add hook to print encoder status drm: sti: make planes use atomic_print_state instead of debugfs drm: sti: make connectors use atomic_print_state instead of debugfs drm: sti: make crtc use atomic_print_state instead of debugfs drm: sti: make encoders use atomic_print_state instead of debugfs drm: sti: remove the last call to debugfs drivers/gpu/drm/drm_atomic.c | 16 +++ drivers/gpu/drm/sti/sti_compositor.c | 16 --- drivers/gpu/drm/sti/sti_compositor.h | 3 - drivers/gpu/drm/sti/sti_crtc.c | 17 +-- drivers/gpu/drm/sti/sti_cursor.c | 65 ++++-------- drivers/gpu/drm/sti/sti_drv.c | 50 --------- drivers/gpu/drm/sti/sti_dvo.c | 60 +++-------- drivers/gpu/drm/sti/sti_gdp.c | 196 +++++++++++------------------------ drivers/gpu/drm/sti/sti_hda.c | 75 ++++---------- drivers/gpu/drm/sti/sti_hdmi.c | 132 ++++++++++------------- drivers/gpu/drm/sti/sti_hqvdp.c | 149 +++++++++++--------------- drivers/gpu/drm/sti/sti_mixer.c | 89 +++++----------- drivers/gpu/drm/sti/sti_mixer.h | 3 +- drivers/gpu/drm/sti/sti_tvout.c | 162 +++++++++++------------------ drivers/gpu/drm/sti/sti_vid.c | 60 ++++------- drivers/gpu/drm/sti/sti_vid.h | 2 +- include/drm/drm_encoder.h | 12 +++ 17 files changed, 386 insertions(+), 721 deletions(-) -- 2.15.0

3 17

[PATCH] drm/stm: ltdc: rework reset sequence
by Yannick Fertre 06 Jul '18

06 Jul '18

Reset must be properly assert before deassert. This is important if there is an early boot splash screen before the kernel start up. Signed-off-by: Yannick Fertre <yannick.fertre(a)st.com> --- drivers/gpu/drm/stm/ltdc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/stm/ltdc.c b/drivers/gpu/drm/stm/ltdc.c index 96d20c2..8f4606d 100644 --- a/drivers/gpu/drm/stm/ltdc.c +++ b/drivers/gpu/drm/stm/ltdc.c @@ -1130,8 +1130,11 @@ int ltdc_load(struct drm_device *ddev) } } - if (!IS_ERR(rstc)) + if (!IS_ERR(rstc)) { + reset_control_assert(rstc); + usleep_range(10, 20); reset_control_deassert(rstc); + } /* Disable interrupts */ reg_clear(ldev->regs, LTDC_IER, -- 1.9.1

3 2

[PATCH] drm/stm: ltdc: filter mode pixel clock vs pad constraint
by Yannick Fertre 06 Jul '18

06 Jul '18

Filter the requested mode pixel clock frequency according to the pad maximum supported frequency. Signed-off-by: Yannick Fertre <yannick.fertre(a)st.com> --- drivers/gpu/drm/stm/ltdc.c | 16 ++++++++++++---- drivers/gpu/drm/stm/ltdc.h | 1 + 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/stm/ltdc.c b/drivers/gpu/drm/stm/ltdc.c index 00e3262..96d20c2 100644 --- a/drivers/gpu/drm/stm/ltdc.c +++ b/drivers/gpu/drm/stm/ltdc.c @@ -491,6 +491,14 @@ static void ltdc_crtc_atomic_disable(struct drm_crtc *crtc, int target_max = target + CLK_TOLERANCE_HZ; int result; + result = clk_round_rate(ldev->pixel_clk, target); + + DRM_DEBUG_DRIVER("clk rate target %d, available %d\n", target, result); + + /* Filter modes according to the max frequency supported by the pads */ + if (result > ldev->caps.pad_max_freq_hz) + return MODE_CLOCK_HIGH; + /* * Accept all "preferred" modes: * - this is important for panels because panel clock tolerances are @@ -502,10 +510,6 @@ static void ltdc_crtc_atomic_disable(struct drm_crtc *crtc, if (mode->type & DRM_MODE_TYPE_PREFERRED) return MODE_OK; - result = clk_round_rate(ldev->pixel_clk, target); - - DRM_DEBUG_DRIVER("clk rate target %d, available %d\n", target, result); - /* * Filter modes according to the clock value, particularly useful for * hdmi modes that require precise pixel clocks. @@ -1039,11 +1043,15 @@ static int ltdc_get_caps(struct drm_device *ddev) * does not work on 2nd layer. */ ldev->caps.non_alpha_only_l1 = true; + ldev->caps.pad_max_freq_hz = 90000000; + if (ldev->caps.hw_version == HWVER_10200) + ldev->caps.pad_max_freq_hz = 65000000; break; case HWVER_20101: ldev->caps.reg_ofs = REG_OFS_4; ldev->caps.pix_fmt_hw = ltdc_pix_fmt_a1; ldev->caps.non_alpha_only_l1 = false; + ldev->caps.pad_max_freq_hz = 150000000; break; default: return -ENODEV; diff --git a/drivers/gpu/drm/stm/ltdc.h b/drivers/gpu/drm/stm/ltdc.h index c14e4db..0294d38 100644 --- a/drivers/gpu/drm/stm/ltdc.h +++ b/drivers/gpu/drm/stm/ltdc.h @@ -20,6 +20,7 @@ struct ltdc_caps { u32 bus_width; /* bus width (32 or 64 bits) */ const u32 *pix_fmt_hw; /* supported pixel formats */ bool non_alpha_only_l1; /* non-native no-alpha formats on layer 1 */ + int pad_max_freq_hz; /* max frequency supported by pad */ }; #define LTDC_MAX_LAYER 4 -- 1.9.1

3 2

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel July 2018