dri-devel April 2021

dri-devel@lists.freedesktop.org

317 participants
715 discussions

[PATCH] drm/amd/display: Try YCbCr420 color when YCbCr444 fails
by Werner Sembach 01 Apr '21

01 Apr '21

When encoder validation of a display mode fails, retry with less bandwidth heavy YCbCr420 color mode, if available. This enables some HDMI 1.4 setups to support 4k60Hz output, which previously failed silently. On some setups, while the monitor and the gpu support display modes with pixel clocks of up to 600MHz, the link encoder might not. This prevents YCbCr444 and RGB encoding for 4k60Hz, but YCbCr420 encoding might still be possible. However, which color mode is used is decided before the link encoder capabilities are checked. This patch fixes the problem by retrying to find a display mode with YCbCr420 enforced and using it, if it is valid. Signed-off-by: Werner Sembach <wse(a)tuxedocomputers.com> Cc: <stable(a)vger.kernel.org> --- >From c9398160caf4ff20e63b8ba3a4366d6ef95c4ac3 Mon Sep 17 00:00:00 2001 From: Werner Sembach <wse(a)tuxedocomputers.com> Date: Wed, 17 Mar 2021 12:52:22 +0100 Subject: [PATCH] Retry forcing YCbCr420 color on failed encoder validation --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 961abf1cf040..2d16389b5f1e 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -5727,6 +5727,15 @@ create_validate_stream_for_sink(struct amdgpu_dm_connector *aconnector, } while (stream == NULL && requested_bpc >= 6); + if (dc_result == DC_FAIL_ENC_VALIDATE && !aconnector->force_yuv420_output) { + DRM_DEBUG_KMS("Retry forcing YCbCr420 encoding\n"); + + aconnector->force_yuv420_output = true; + stream = create_validate_stream_for_sink(aconnector, drm_mode, + dm_state, old_stream); + aconnector->force_yuv420_output = false; + } + return stream; } -- 2.25.1

3 4

[PATCH 00/32] Fix broken documentation file references
by Mauro Carvalho Chehab 01 Apr '21

01 Apr '21

Each patch on this series can be applied independently. They fix broken file references. Most of them are due to DT binding renames, but there are also other unrelated changes. This series is based on next-20210401. Mauro Carvalho Chehab (32): MAINTAINERS: update adi,ad5758.yaml reference MAINTAINERS: update ste,mcde.yaml reference MAINTAINERS: update brcm,bcm-v3d.yaml reference MAINTAINERS: update fsl,dpaa2-console.yaml reference MAINTAINERS: update st,hts221.yaml reference MAINTAINERS: update dpot-dac.yaml reference MAINTAINERS: update envelope-detector.yaml reference MAINTAINERS: update current-sense-amplifier.yaml reference MAINTAINERS: update current-sense-shunt.yaml reference MAINTAINERS: update voltage-divider.yaml reference MAINTAINERS: update invensense,mpu3050.yaml reference MAINTAINERS: update lego,ev3-battery.yaml reference MAINTAINERS: update marvell,armada-3700-utmi-phy.yaml reference MAINTAINERS: update mtk-sd.yaml reference MAINTAINERS: update atmel,sama5d2-adc.yaml reference MAINTAINERS: update pni,rm3100.yaml reference MAINTAINERS: update renesas,rcar-gyroadc.yaml reference MAINTAINERS: update st,lsm6dsx.yaml reference MAINTAINERS: update st,vl53l0x.yaml reference MAINTAINERS: update snps,dw-axi-dmac.yaml reference MAINTAINERS: update ti,dac7612.yaml reference MAINTAINERS: update nxp,imx8-jpeg.yaml reference MAINTAINERS: update ovti,ov2680.yaml reference MAINTAINERS: update imi,rdacm2x-gmsl.yaml reference dt-bindings:iio:dac: update microchip,mcp4725.yaml reference dt-bindings: iommu: mediatek: update mediatek,iommu.yaml references dt-bindings: i3c: update i3c.yaml references dt-bindings: power: update battery.yaml reference docs: dt: update writing-schema.rst references Documentation: net: dsa: update configuration.rst reference Documentation: update sysfs-platform_profile.rst reference pinctrl: update pin-control.rst references .../display/mediatek/mediatek,disp.txt | 2 +- .../bindings/i3c/cdns,i3c-master.txt | 6 +-- .../bindings/i3c/snps,dw-i3c-master.txt | 6 +-- .../bindings/media/mediatek-jpeg-decoder.txt | 2 +- .../bindings/media/mediatek-jpeg-encoder.txt | 2 +- .../bindings/media/mediatek-mdp.txt | 2 +- .../bindings/media/mediatek-vcodec.txt | 2 +- .../bindings/submitting-patches.rst | 2 +- Documentation/filesystems/cifs/cifsd.rst | 2 +- Documentation/power/power_supply_class.rst | 2 +- MAINTAINERS | 48 +++++++++---------- include/linux/device.h | 2 +- include/linux/iio/dac/mcp4725.h | 2 +- include/linux/mfd/madera/pdata.h | 2 +- include/linux/pinctrl/pinconf-generic.h | 2 +- include/linux/platform_profile.h | 2 +- scripts/checkpatch.pl | 2 +- 17 files changed, 44 insertions(+), 44 deletions(-) -- 2.30.2

1 1

[PATCH] drm/i915/pmu: Check actual RC6 status
by Tvrtko Ursulin 01 Apr '21

01 Apr '21

From: Tvrtko Ursulin <tvrtko.ursulin(a)intel.com> RC6 support cannot be simply established by looking at the static device HAS_RC6() flag. There are cases which disable RC6 at driver load time so use the status of those check when deciding whether to enumerate the rc6 counter. Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin(a)intel.com> Reported-by: Eero T Tamminen <eero.t.tamminen(a)intel.com> --- drivers/gpu/drm/i915/i915_pmu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_pmu.c b/drivers/gpu/drm/i915/i915_pmu.c index 41651ac255fa..a75cd1db320b 100644 --- a/drivers/gpu/drm/i915/i915_pmu.c +++ b/drivers/gpu/drm/i915/i915_pmu.c @@ -476,6 +476,8 @@ engine_event_status(struct intel_engine_cs *engine, static int config_status(struct drm_i915_private *i915, u64 config) { + struct intel_gt *gt = &i915->gt; + switch (config) { case I915_PMU_ACTUAL_FREQUENCY: if (IS_VALLEYVIEW(i915) || IS_CHERRYVIEW(i915)) @@ -489,7 +491,7 @@ config_status(struct drm_i915_private *i915, u64 config) case I915_PMU_INTERRUPTS: break; case I915_PMU_RC6_RESIDENCY: - if (!HAS_RC6(i915)) + if (!gt->rc6.supported) return -ENODEV; break; case I915_PMU_SOFTWARE_GT_AWAKE_TIME: -- 2.27.0

3 5

[PULL] drm-misc-next
by Maxime Ripard 01 Apr '21

01 Apr '21

Hi Dave, Daniel, It's still a fairly quiet week, but here's what should be our last drm-misc-next PR for 5.13 Maxime drm-misc-next-2021-04-01: drm-misc-next for 5.13: UAPI Changes: Cross-subsystem Changes: Core Changes: - mst: Improve topology logging - edid: Rework and improvements for displayid Driver Changes: - anx7625: Regulators support - bridge: Support for the Chipone ICN6211, Lontium LT8912B - lt9611: Fix 4k panels handling The following changes since commit 51c3b916a4d7e24b4918925965867fdd9bd8dd59: Merge tag 'drm-misc-next-2021-03-03' of git://anongit.freedesktop.org/drm/drm-misc into drm-next (2021-03-16 17:08:46 +1000) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-next-2021-04-01 for you to fetch changes up to 6c744983004ebc66756e582294672f8b991288d5: drm/bridge: anx7625: disable regulators when power off (2021-04-01 10:38:02 +0200) ---------------------------------------------------------------- drm-misc-next for 5.13: UAPI Changes: Cross-subsystem Changes: Core Changes: - mst: Improve topology logging - edid: Rework and improvements for displayid Driver Changes: - anx7625: Regulators support - bridge: Support for the Chipone ICN6211, Lontium LT8912B - lt9611: Fix 4k panels handling ---------------------------------------------------------------- Adrien Grassein (2): dt-bindings: display: bridge: Add documentation for LT8912B drm/bridge: Introduce LT8912B DSI to HDMI bridge Arnd Bergmann (3): fbdev: omapfb: avoid -Wempty-body warning vgaarb: avoid -Wempty-body warnings drm/omap: fix misleading indentation in pixinc() Bhaskar Chowdhury (2): drm: Few typo fixes drm/meson: Fix few typo Christian König (9): drm/sched: select new rq even if there is only one v3 drm/qxl: clean up qxl_bo_move_notify drm/nouveau: clean up nouveau_bo_move_ntfy drm/vmwgfx: clean up vmw_move_notify v2 drm/ttm: move swapout logic around v3 drm/ttm: remove swap LRU v3 drm/ttm: switch to per device LRU lock drm/ttm: fix invalid NULL deref drm/ttm: switch back to static allocation limits for now Dafna Hirschfeld (1): drm: Fix 3 typos in the inline doc Daniel Vetter (1): dma-fence: Document recoverable page fault implications Dario Binacchi (3): drm/tilcdc: rename req_rate to pclk_rate drm/tilcdc: fix LCD pixel clock setting drm/tilcdc: fix pixel clock setting warning message Dmitry Vyukov (1): drm/vkms: fix misuse of WARN_ON Douglas Anderson (6): drm/panel-simple: Undo enable if HPD never asserts drm/panel-simple: Don't wait longer for HPD than hpd_absent_delay drm/panel-simple: Retry if we timeout waiting for HPD dt-bindings: dt-bindings: display: simple: Add N116BCA-EA1 drm/panel-simple: Add N116BCA-EA1 drm: panel: simple: Set enable delay for BOE NV110WTM-N61 Eryk Brol (1): drm/mst: Enhance MST topology logging Hsin-Yi Wang (2): dt-bindings: drm/bridge: anx7625: Add power supplies drm/bridge: anx7625: disable regulators when power off Jagan Teki (3): drm/stm: ltdc: Use simple encoder dt-bindings: display: bridge: Add Chipone ICN6211 bindings drm: bridge: Add Chipone ICN6211 MIPI-DSI to RGB bridge Jani Nikula (8): drm/edid: make a number of functions, parameters and variables const drm/displayid: add separate drm_displayid.c drm/displayid: add new displayid section/block iterators drm/edid: use the new displayid iterator for detailed modes drm/edid: use the new displayid iterator for finding CEA extension drm/edid: use the new displayid iterator for tile info drm/displayid: allow data blocks with 0 payload length drm/displayid: rename displayid_hdr to displayid_header Jianhui Zhao (1): docs: gpu: fix typo Jiapeng Chong (1): drm: bridge: convert sysfs sprintf/snprintf family to sysfs_emit Linus Walleij (1): drm/mcde/panel: Inverse misunderstood flag Lyude Paul (9): drm/bridge/tc358767: Don't register DP AUX channel until bridge is attached drm/bridge/ti-sn65dsi86: (Un)register aux device on bridge attach/detach drm/bridge/analogix/anx78xx: Add missing drm_dp_aux_unregister() call drm/bridge/analogix/anx78xx: Setup encoder before registering connector drm/bridge/analogix/anx78xx: Cleanup on error in anx78xx_bridge_attach() drm/bridge/analogix/anx6345: Add missing drm_dp_aux_unregister() call drm/bridge/analogix/anx6345: Don't link encoder until after connector registration drm/bridge/analogix/anx6345: Cleanup on errors in anx6345_bridge_attach() drm/bridge/analogix/dp_core: Unregister DP AUX channel on error in analogix_dp_probe() Matthew Wilcox (Oracle) (1): fb_defio: Remove custom address_space_operations Maxime Ripard (2): Merge drm/drm-next into drm-misc-next drm/rockchip: Remove unused variable Noralf Trønnes (3): drm/uapi: Add USB connector type drm/probe-helper: Check epoch counter in output_poll_execute() drm: Add GUD USB Display driver Paul Cercueil (4): drm/ingenic: Fix non-OSD mode drm: bridge/panel: Cleanup connector on bridge detach drm/encoder: Add macro drmm_plain_encoder_alloc() drm/ingenic: Register devm action to cleanup encoders Robert Foss (2): MAINTAINERS: Update Maintainers of DRM Bridge Drivers drm/bridge: lt9611: Fix handling of 4k panels Simon Ser (1): drm/uapi: document kernel capabilities Tian Tao (2): drm/vboxvideo: Use managed VRAM-helper initialization drm/sysfs: Convert sysfs sprintf/snprintf family to sysfs_emit Wan Jiabing (1): drm/omap: Remove duplicate declaration Yang Li (3): drm/gma500: use NULL instead of using plain integer as pointer drm/tilcdc: panel: fix platform_no_drv_owner.cocci warnings drm/omap: dsi: Add missing IRQF_ONESHOT Yannick Fertre (1): drm/stm: dsi: Avoid printing errors for -EPROBE_DEFER kernel test robot (2): drm/gud: fix sizeof use drm/gud: Remove unneeded semicolon xndcn (1): drm/virtio: fix possible leak/unlock virtio_gpu_object_array .../bindings/display/bridge/analogix,anx7625.yaml | 15 + .../bindings/display/bridge/chipone,icn6211.yaml | 99 +++ .../bindings/display/bridge/lontium,lt8912b.yaml | 102 +++ .../bindings/display/panel/panel-simple.yaml | 2 + Documentation/driver-api/dma-buf.rst | 76 ++ Documentation/gpu/todo.rst | 2 +- MAINTAINERS | 21 + drivers/gpu/drm/Kconfig | 2 + drivers/gpu/drm/Makefile | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 8 +- drivers/gpu/drm/bridge/Kconfig | 27 + drivers/gpu/drm/bridge/Makefile | 2 + drivers/gpu/drm/bridge/analogix/analogix-anx6345.c | 27 +- drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c | 27 +- drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 1 + drivers/gpu/drm/bridge/analogix/anx7625.c | 34 + drivers/gpu/drm/bridge/analogix/anx7625.h | 1 + drivers/gpu/drm/bridge/chipone-icn6211.c | 293 ++++++++ drivers/gpu/drm/bridge/lontium-lt8912b.c | 765 +++++++++++++++++++++ drivers/gpu/drm/bridge/lontium-lt9611.c | 8 +- drivers/gpu/drm/bridge/lontium-lt9611uxc.c | 2 +- drivers/gpu/drm/bridge/panel.c | 12 + drivers/gpu/drm/bridge/tc358767.c | 20 +- drivers/gpu/drm/bridge/ti-sn65dsi86.c | 18 +- drivers/gpu/drm/drm_atomic_helper.c | 15 +- drivers/gpu/drm/drm_connector.c | 1 + drivers/gpu/drm/drm_displayid.c | 132 ++++ drivers/gpu/drm/drm_dp_mst_topology.c | 59 +- drivers/gpu/drm/drm_edid.c | 171 +---- drivers/gpu/drm/drm_probe_helper.c | 7 +- drivers/gpu/drm/drm_property.c | 4 +- drivers/gpu/drm/drm_sysfs.c | 9 +- drivers/gpu/drm/gma500/psb_drv.c | 2 +- drivers/gpu/drm/gud/Kconfig | 14 + drivers/gpu/drm/gud/Makefile | 4 + drivers/gpu/drm/gud/gud_connector.c | 729 ++++++++++++++++++++ drivers/gpu/drm/gud/gud_drv.c | 661 ++++++++++++++++++ drivers/gpu/drm/gud/gud_internal.h | 154 +++++ drivers/gpu/drm/gud/gud_pipe.c | 552 +++++++++++++++ drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 28 +- drivers/gpu/drm/mcde/mcde_dsi.c | 2 +- drivers/gpu/drm/meson/meson_venc.c | 2 +- drivers/gpu/drm/nouveau/nouveau_bo.c | 13 +- drivers/gpu/drm/omapdrm/dss/dispc.c | 5 +- drivers/gpu/drm/omapdrm/dss/dsi.c | 3 +- drivers/gpu/drm/omapdrm/dss/omapdss.h | 9 +- drivers/gpu/drm/panel/panel-novatek-nt35510.c | 3 +- drivers/gpu/drm/panel/panel-samsung-s6d16d0.c | 4 +- drivers/gpu/drm/panel/panel-samsung-s6e63m0-dsi.c | 1 - drivers/gpu/drm/panel/panel-simple.c | 85 ++- drivers/gpu/drm/panel/panel-sony-acx424akp.c | 3 +- drivers/gpu/drm/qxl/qxl_release.c | 5 +- drivers/gpu/drm/qxl/qxl_ttm.c | 16 +- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 2 - drivers/gpu/drm/scheduler/sched_entity.c | 6 +- drivers/gpu/drm/stm/dw_mipi_dsi-stm.c | 9 +- drivers/gpu/drm/stm/ltdc.c | 12 +- drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 19 +- drivers/gpu/drm/tilcdc/tilcdc_panel.c | 1 - drivers/gpu/drm/ttm/ttm_bo.c | 135 ++-- drivers/gpu/drm/ttm/ttm_bo_util.c | 1 - drivers/gpu/drm/ttm/ttm_device.c | 85 ++- drivers/gpu/drm/ttm/ttm_execbuf_util.c | 8 +- drivers/gpu/drm/ttm/ttm_resource.c | 9 +- drivers/gpu/drm/ttm/ttm_tt.c | 114 ++- drivers/gpu/drm/vboxvideo/vbox_ttm.c | 7 +- drivers/gpu/drm/virtio/virtgpu_ioctl.c | 2 +- drivers/gpu/drm/virtio/virtgpu_object.c | 1 + drivers/gpu/drm/vkms/vkms_crtc.c | 3 +- drivers/gpu/drm/vmwgfx/ttm_memory.c | 3 +- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 3 +- drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 9 +- drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 27 +- drivers/video/fbdev/core/fb_defio.c | 35 - drivers/video/fbdev/core/fbmem.c | 4 - drivers/video/fbdev/omap2/omapfb/omapfb.h | 2 +- include/drm/drm_displayid.h | 30 +- include/drm/drm_drv.h | 2 +- include/drm/drm_edid.h | 3 + include/drm/drm_encoder.h | 18 + include/drm/gud.h | 333 +++++++++ include/drm/ttm/ttm_bo_api.h | 4 +- include/drm/ttm/ttm_bo_driver.h | 5 +- include/drm/ttm/ttm_device.h | 13 +- include/drm/ttm/ttm_tt.h | 3 +- include/linux/fb.h | 3 - include/linux/vgaarb.h | 4 +- include/uapi/drm/drm.h | 125 +++- include/uapi/drm/drm_mode.h | 1 + 90 files changed, 4725 insertions(+), 578 deletions(-) create mode 100644 Documentation/devicetree/bindings/display/bridge/chipone,icn6211.yaml create mode 100644 Documentation/devicetree/bindings/display/bridge/lontium,lt8912b.yaml create mode 100644 drivers/gpu/drm/bridge/chipone-icn6211.c create mode 100644 drivers/gpu/drm/bridge/lontium-lt8912b.c create mode 100644 drivers/gpu/drm/drm_displayid.c create mode 100644 drivers/gpu/drm/gud/Kconfig create mode 100644 drivers/gpu/drm/gud/Makefile create mode 100644 drivers/gpu/drm/gud/gud_connector.c create mode 100644 drivers/gpu/drm/gud/gud_drv.c create mode 100644 drivers/gpu/drm/gud/gud_internal.h create mode 100644 drivers/gpu/drm/gud/gud_pipe.c create mode 100644 include/drm/gud.h

1 0

[GIT PULL] drm/imx: fixes for v5.12
by Philipp Zabel 01 Apr '21

01 Apr '21

Hi Dave, Daniel, this PR includes a regression fix for the imx-ldb driver, which fails to register channel 1 if channel 0 is disabled since v5.12-rc2. Also, there's an imx-ldb build warning fix for W=1 builds and a fix for a memory leak in the imx-drm-core bind error path. The following changes since commit a38fd8748464831584a19438cbb3082b5a2dab15: Linux 5.12-rc2 (2021-03-05 17:33:41 -0800) are available in the Git repository at: git://git.pengutronix.de/git/pza/linux.git tags/imx-drm-fixes-2021-04-01 for you to fetch changes up to 33ce7f2f95cabb5834cf0906308a5cb6103976da: drm/imx: imx-ldb: fix out of bounds array access warning (2021-03-25 07:48:34 +0100) ---------------------------------------------------------------- drm/imx: imx-drm-core and imx-ldb fixes Fix a memory leak in an error path during DRM device initialization, fix the LDB driver to register channel 1 even if channel 0 is unused, and fix an out of bounds array access warning in the LDB driver. ---------------------------------------------------------------- Arnd Bergmann (1): drm/imx: imx-ldb: fix out of bounds array access warning Liu Ying (1): drm/imx: imx-ldb: Register LDB channel1 when it is the only channel to be used Pan Bian (1): drm/imx: fix memory leak when fails to init drivers/gpu/drm/imx/imx-drm-core.c | 2 +- drivers/gpu/drm/imx/imx-ldb.c | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-)

1 0

[PULL] drm-intel-next
by Jani Nikula 01 Apr '21

01 Apr '21

Hi Dave & Daniel - The final drm-intel-next feature pull for v5.13. Or, truthfully, a pull request of refactoring both to clean up and prepare for future. Joonas will still send a drm-intel-gt-next pull request, probably next week due to easter holidays. We'll do backmerges to sync up after everything's in drm-next. BR, Jani. drm-intel-next-2021-04-01: Features: - Add support for FBs requiring a power-of-two stride padding (Imre) Refactoring: - Disassociate display version from gen (Matt) - Refactor legacy DP and HDMI code to separate files (Ville) - Refactor FB plane code to a separate file (Imre) - Refactor VBT child device info parsing and usage (Jani) - Refactor KBL/TGL/ADL-S display and gt stepping schemes (Jani) Fixes: - DP Link-Training Tunable PHY Repeaters (LTTPR) fixes (Imre) - HDCP fixes (Anshuman) - DP 2.0 HDMI 2.1 PCON Fixed Rate Link (FRL) fixes (Ankit) - Set HDA link parameters in driver (Kai) - Fix enabled_planes bitmask (Ville) - Fix transposed arguments to skl_plane_wm_level() (Ville) - Stop adding planes to the commit needlessly (Ville) BR, Jani. The following changes since commit 2b25fb31a38d4fe8e745754036052ef8b16fe712: Merge tag 'gvt-next-2021-03-16' of https://github.com/intel/gvt-linux into drm-intel-next (2021-03-16 13:42:33 +0200) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-intel tags/drm-intel-next-2021-04-01 for you to fetch changes up to 81f1f8f1e1489c0bf051d5241ec10da07869b911: drm/i915: Fix docbook header for __intel_runtime_pm_get_if_active() (2021-03-31 16:57:33 +0300) ---------------------------------------------------------------- Features: - Add support for FBs requiring a power-of-two stride padding (Imre) Refactoring: - Disassociate display version from gen (Matt) - Refactor legacy DP and HDMI code to separate files (Ville) - Refactor FB plane code to a separate file (Imre) - Refactor VBT child device info parsing and usage (Jani) - Refactor KBL/TGL/ADL-S display and gt stepping schemes (Jani) Fixes: - DP Link-Training Tunable PHY Repeaters (LTTPR) fixes (Imre) - HDCP fixes (Anshuman) - DP 2.0 HDMI 2.1 PCON Fixed Rate Link (FRL) fixes (Ankit) - Set HDA link parameters in driver (Kai) - Fix enabled_planes bitmask (Ville) - Fix transposed arguments to skl_plane_wm_level() (Ville) - Stop adding planes to the commit needlessly (Ville) ---------------------------------------------------------------- Ankit Nautiyal (3): drm/i915/display: Remove FRL related code from disable DP sequence for older platforms drm/dp_helper: Define options for FRL training for HDMI2.1 PCON drm/i915/display: Configure HDMI2.1 Pcon for FRL only if Src-Ctl mode is available Anshuman Gupta (6): drm/i915/hdcp: mst streams type1 capability check drm/i915/hdcp: HDCP2.2 MST Link failure recovery drm/i915/hdcp: link hdcp2 recovery on link enc stopped drm/i915/hdcp: return correct error code drm/i915/hdcp: Add DP HDCP2.2 timeout to read entire msg drm/hdcp: DP HDCP2.2 errata LC_Send_L_Prime=16 Bhaskar Chowdhury (1): drm/i915/display: Fix a typo Imre Deak (29): drm/i915/ilk-glk: Fix link training on links with LTTPRs drm/i915: Disable LTTPR support when the DPCD rev < 1.4 drm/i915: Disable LTTPR support when the LTTPR rev < 1.4 drm/i915: Fix the GT fence revocation runtime PM logic drm/i915: Fix rotation setup during plane HW readout drm/i915/selftest: Fix error handling in igt_vma_remapped_gtt() drm/i915/selftest: Fix debug message in igt_vma_remapped_gtt() drm/i915: Make sure i915_ggtt_view is inited when creating an FB drm/i915/selftest: Make sure to init i915_ggtt_view in igt_vma_rotate_remap() drm/i915/intel_fb: Pull FB plane functions from intel_display_types.h drm/i915/intel_fb: Pull FB plane functions from skl_universal_plane.c drm/i915/intel_fb: Pull is_surface_linear() from intel_display.c/skl_universal_plane.c drm/i915/intel_fb: Pull FB plane functions from intel_sprite.c drm/i915/intel_fb: Pull FB plane functions from intel_display.c drm/i915/intel_fb: Unexport intel_fb_check_stride() drm/i915/intel_fb: s/dev_priv/i915/ drm/i915/intel_fb: Factor out convert_plane_offset_to_xy() drm/i915/intel_fb: Factor out calc_plane_aligned_offset() drm/i915/intel_fb: Factor out calc_plane_normal_size() drm/i915: Unify the FB and plane state view information into one struct drm/i915: Store the normal view FB pitch in FB's intel_fb_view drm/i915: Simplify copying the FB view state to the plane state drm/i915/intel_fb: Factor out calc_plane_remap_info() drm/i915: Shrink the size of intel_remapped_plane_info struct drm/i915/selftest: Unify use of intel_remapped_plane_info in igt_vma_rotate_remap() drm/i915: s/stride/src_stride/ in the intel_remapped_plane_info struct drm/i915: Add support for FBs requiring a POT stride alignment drm/i915/selftest: Add remap/rotate vma subtests when dst_stride!=width/height drm/i915: Fix docbook header for __intel_runtime_pm_get_if_active() Jani Nikula (23): drm/i915: remove unused ADLS_REVID_* macros drm/i915/bios: mass convert dev_priv to i915 drm/i915/bios: store bdb version in i915 drm/i915/bios: reduce indent in sanitize_ddc_pin and sanitize_aux_ch drm/i915/bios: move aux ch and ddc checks at a lower level drm/i915/bios: limit default outputs by platform on missing VBT drm/i915/bios: limit default outputs to ports A through F drm/i915/bios: create fake child devices on missing VBT drm/i915/bios: rename display_device_data to intel_bios_encoder_data drm/i915/bios: add i915 backpointer to intel_bios_encoder_data drm/i915/bios: add helper functions to check output support drm/i915/bios: save a higher level pointer in ddi_vbt_port_info[] drm/i915/bios: start using the intel_bios_encoder_data directly drm/i915/bios: start using intel_bios_encoder_data for Type-C USB and TBT drm/i915/bios: add intel_bios_encoder_data to encoder, use for iboost drm/i915/dsc: fix DSS CTL register usage for ICL DSI transcoders drm/i915: split out stepping info to a new file drm/i915: add new helpers for accessing stepping info drm/i915: switch KBL to the new stepping scheme drm/i915: switch TGL and ADL to the new stepping scheme drm/i915: rename DISP_STEPPING->DISPLAY_STEP and GT_STEPPING->GT_STEP drm/i915: rename disp_stepping->display_step and gt_stepping->gt_step drm/i915: rename i915_rev_steppings->intel_step_info Kai Vehmanen (1): drm/i915/audio: set HDA link parameters in driver Matt Roper (6): drm/i915/display: Convert gen5/gen6 tests to IS_IRONLAKE/IS_SANDYBRIDGE drm/i915: Add DISPLAY_VER() and related macros drm/i915/display: Eliminate most usage of INTEL_GEN() drm/i915: Convert INTEL_GEN() to DISPLAY_VER() as appropriate in intel_pm.c drm/i915: Convert INTEL_GEN() to DISPLAY_VER() as appropriate in i915_irq.c drm/i915/display: Simplify GLK display version tests Ville Syrjälä (10): drm/i915: Remove dead TPS3->TPS2 fallback code drm/i915: Remove dead signal level debugs drm/i915: Relocate intel_dp_program_link_training_pattern() drm/i915: Split intel_ddi_encoder_reset() from intel_dp_encoder_reset() drm/i915: Introduce g4x_dp.c drm/i915: Introduce g4x_hdmi.c drm/i915: Give g4x_{dp,hdmi}.c g4x_ namespace drm/i915: Fix enabled_planes bitmask drm/i915: Fix transposed arguments to skl_plane_wm_level() drm/i915: Stop adding planes to the commit needlessly Wan Jiabing (1): drm/i915: Remove repeated declaration drivers/gpu/drm/drm_dp_helper.c | 24 +- drivers/gpu/drm/i915/Makefile | 4 + drivers/gpu/drm/i915/display/g4x_dp.c | 1432 ++++++++++++++++ drivers/gpu/drm/i915/display/g4x_dp.h | 30 + drivers/gpu/drm/i915/display/g4x_hdmi.c | 616 +++++++ drivers/gpu/drm/i915/display/g4x_hdmi.h | 19 + drivers/gpu/drm/i915/display/i9xx_plane.c | 77 +- drivers/gpu/drm/i915/display/icl_dsi.c | 14 +- drivers/gpu/drm/i915/display/intel_atomic.c | 7 +- drivers/gpu/drm/i915/display/intel_atomic_plane.c | 5 +- drivers/gpu/drm/i915/display/intel_audio.c | 48 +- drivers/gpu/drm/i915/display/intel_bios.c | 1114 +++++++------ drivers/gpu/drm/i915/display/intel_bios.h | 17 +- drivers/gpu/drm/i915/display/intel_bw.c | 10 +- drivers/gpu/drm/i915/display/intel_cdclk.c | 66 +- drivers/gpu/drm/i915/display/intel_color.c | 32 +- drivers/gpu/drm/i915/display/intel_combo_phy.c | 8 +- drivers/gpu/drm/i915/display/intel_crt.c | 12 +- drivers/gpu/drm/i915/display/intel_crt.h | 1 - drivers/gpu/drm/i915/display/intel_crtc.c | 20 +- drivers/gpu/drm/i915/display/intel_csr.c | 4 +- drivers/gpu/drm/i915/display/intel_cursor.c | 29 +- drivers/gpu/drm/i915/display/intel_ddi.c | 143 +- drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c | 4 +- drivers/gpu/drm/i915/display/intel_display.c | 1160 ++----------- drivers/gpu/drm/i915/display/intel_display.h | 14 - .../gpu/drm/i915/display/intel_display_debugfs.c | 47 +- drivers/gpu/drm/i915/display/intel_display_power.c | 54 +- drivers/gpu/drm/i915/display/intel_display_types.h | 100 +- drivers/gpu/drm/i915/display/intel_dp.c | 1718 ++------------------ drivers/gpu/drm/i915/display/intel_dp.h | 11 - drivers/gpu/drm/i915/display/intel_dp_aux.c | 19 +- drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 84 +- .../gpu/drm/i915/display/intel_dp_link_training.c | 108 +- .../gpu/drm/i915/display/intel_dp_link_training.h | 5 +- drivers/gpu/drm/i915/display/intel_dp_mst.c | 20 +- drivers/gpu/drm/i915/display/intel_dpll.c | 12 +- drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 22 +- drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 4 +- drivers/gpu/drm/i915/display/intel_fb.c | 962 +++++++++++ drivers/gpu/drm/i915/display/intel_fb.h | 54 + drivers/gpu/drm/i915/display/intel_fbc.c | 68 +- drivers/gpu/drm/i915/display/intel_fdi.c | 6 +- drivers/gpu/drm/i915/display/intel_fifo_underrun.c | 8 +- drivers/gpu/drm/i915/display/intel_gmbus.c | 2 +- drivers/gpu/drm/i915/display/intel_hdcp.c | 54 +- drivers/gpu/drm/i915/display/intel_hdmi.c | 647 +------- drivers/gpu/drm/i915/display/intel_hdmi.h | 3 - drivers/gpu/drm/i915/display/intel_lvds.c | 12 +- drivers/gpu/drm/i915/display/intel_overlay.c | 12 +- drivers/gpu/drm/i915/display/intel_panel.c | 18 +- drivers/gpu/drm/i915/display/intel_pipe_crc.c | 16 +- drivers/gpu/drm/i915/display/intel_pps.c | 7 +- drivers/gpu/drm/i915/display/intel_psr.c | 51 +- drivers/gpu/drm/i915/display/intel_sdvo.c | 8 +- drivers/gpu/drm/i915/display/intel_sprite.c | 74 +- drivers/gpu/drm/i915/display/intel_sprite.h | 1 - drivers/gpu/drm/i915/display/intel_tc.c | 8 +- drivers/gpu/drm/i915/display/intel_tv.c | 8 +- drivers/gpu/drm/i915/display/intel_vdsc.c | 22 +- drivers/gpu/drm/i915/display/intel_vga.c | 4 +- drivers/gpu/drm/i915/display/intel_vrr.h | 1 - drivers/gpu/drm/i915/display/skl_scaler.c | 8 +- drivers/gpu/drm/i915/display/skl_universal_plane.c | 182 +-- drivers/gpu/drm/i915/display/skl_universal_plane.h | 2 - drivers/gpu/drm/i915/gt/gen8_engine_cs.c | 2 +- drivers/gpu/drm/i915/gt/intel_ggtt.c | 56 +- drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c | 13 +- drivers/gpu/drm/i915/gt/intel_workarounds.c | 55 +- drivers/gpu/drm/i915/i915_debugfs.c | 16 +- drivers/gpu/drm/i915/i915_drv.c | 3 +- drivers/gpu/drm/i915/i915_drv.h | 150 +- drivers/gpu/drm/i915/i915_irq.c | 66 +- drivers/gpu/drm/i915/i915_pci.c | 3 +- drivers/gpu/drm/i915/i915_vma_types.h | 12 +- drivers/gpu/drm/i915/intel_device_info.c | 2 +- drivers/gpu/drm/i915/intel_device_info.h | 6 + drivers/gpu/drm/i915/intel_pm.c | 146 +- drivers/gpu/drm/i915/intel_runtime_pm.c | 29 +- drivers/gpu/drm/i915/intel_runtime_pm.h | 5 + drivers/gpu/drm/i915/intel_step.c | 106 ++ drivers/gpu/drm/i915/intel_step.h | 40 + drivers/gpu/drm/i915/selftests/i915_vma.c | 219 ++- include/drm/drm_dp_helper.h | 6 +- include/drm/drm_hdcp.h | 5 +- 85 files changed, 5466 insertions(+), 4826 deletions(-) create mode 100644 drivers/gpu/drm/i915/display/g4x_dp.c create mode 100644 drivers/gpu/drm/i915/display/g4x_dp.h create mode 100644 drivers/gpu/drm/i915/display/g4x_hdmi.c create mode 100644 drivers/gpu/drm/i915/display/g4x_hdmi.h create mode 100644 drivers/gpu/drm/i915/display/intel_fb.c create mode 100644 drivers/gpu/drm/i915/display/intel_fb.h create mode 100644 drivers/gpu/drm/i915/intel_step.c create mode 100644 drivers/gpu/drm/i915/intel_step.h -- Jani Nikula, Intel Open Source Graphics Center

1 0

[PATCH] drm/nouveau: remove unused code
by Jiapeng Chong 01 Apr '21

01 Apr '21

Fix the following whitescan warning: drivers/gpu/drm/nouveau/nouveau_bo.c:1287:17: warning: variable ‘dev’ set but not used [-Wunused-but-set-variable]. Reported-by: Abaci Robot <abaci(a)linux.alibaba.com> Signed-off-by: Jiapeng Chong <jiapeng.chong(a)linux.alibaba.com> --- drivers/gpu/drm/nouveau/nouveau_bo.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c index f2720a0..b661d0d 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bo.c +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c @@ -1284,14 +1284,12 @@ vm_fault_t nouveau_ttm_fault_reserve_notify(struct ttm_buffer_object *bo) struct ttm_tt *ttm) { struct nouveau_drm *drm; - struct device *dev; bool slave = !!(ttm->page_flags & TTM_PAGE_FLAG_SG); if (slave) return; drm = nouveau_bdev(bdev); - dev = drm->dev->dev; return ttm_pool_free(&drm->ttm.bdev.pool, ttm); } -- 1.8.3.1

1 0

[RESEND PATCH v4 1/2] dt-bindings: drm/bridge: anx7625: Add power supplies
by Hsin-Yi Wang 01 Apr '21

01 Apr '21

anx7625 requires 3 power supply regulators. Signed-off-by: Hsin-Yi Wang <hsinyi(a)chromium.org> Reviewed-by: Rob Herring <robh(a)kernel.org> Reviewed-by: Robert Foss <robert.foss(a)linaro.org> --- v3->v4: rebase to drm-misc/for-linux-next --- .../bindings/display/bridge/analogix,anx7625.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/Documentation/devicetree/bindings/display/bridge/analogix,anx7625.yaml b/Documentation/devicetree/bindings/display/bridge/analogix,anx7625.yaml index c789784efe306..ab48ab2f4240d 100644 --- a/Documentation/devicetree/bindings/display/bridge/analogix,anx7625.yaml +++ b/Documentation/devicetree/bindings/display/bridge/analogix,anx7625.yaml @@ -34,6 +34,15 @@ properties: description: used for reset chip control, RESET_N pin B7. maxItems: 1 + vdd10-supply: + description: Regulator that provides the supply 1.0V power. + + vdd18-supply: + description: Regulator that provides the supply 1.8V power. + + vdd33-supply: + description: Regulator that provides the supply 3.3V power. + ports: $ref: /schemas/graph.yaml#/properties/ports @@ -55,6 +64,9 @@ properties: required: - compatible - reg + - vdd10-supply + - vdd18-supply + - vdd33-supply - ports additionalProperties: false @@ -72,6 +84,9 @@ examples: reg = <0x58>; enable-gpios = <&pio 45 GPIO_ACTIVE_HIGH>; reset-gpios = <&pio 73 GPIO_ACTIVE_HIGH>; + vdd10-supply = <&pp1000_mipibrdg>; + vdd18-supply = <&pp1800_mipibrdg>; + vdd33-supply = <&pp3300_mipibrdg>; ports { #address-cells = <1>; -- 2.31.0.291.g576ba9dcdaf-goog

2 2

[PATCH] fix NULL pointer deference crash
by Hassan Shahbazi 01 Apr '21

01 Apr '21

The patch has fixed a NULL pointer deference crash in hiding the cursor. It is verified by syzbot patch tester. Reported by: syzbot https://syzkaller.appspot.com/bug?id=defb47bf56e1c14d5687280c7bb91ce7b608b9… Signed-off-by: Hassan Shahbazi <h.shahbazi.git(a)gmail.com> --- drivers/video/fbdev/core/fbcon.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c index 44a5cd2f54cc..ee252d1c43c6 100644 --- a/drivers/video/fbdev/core/fbcon.c +++ b/drivers/video/fbdev/core/fbcon.c @@ -1333,8 +1333,9 @@ static void fbcon_cursor(struct vc_data *vc, int mode) ops->cursor_flash = (mode == CM_ERASE) ? 0 : 1; - ops->cursor(vc, info, mode, get_color(vc, info, c, 1), - get_color(vc, info, c, 0)); + if (ops && ops->cursor) + ops->cursor(vc, info, mode, get_color(vc, info, c, 1), + get_color(vc, info, c, 0)); } static int scrollback_phys_max = 0; -- 2.26.3

3 4

linux-next: manual merge of the drm-intel tree with the drm tree
by Stephen Rothwell 01 Apr '21

01 Apr '21

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/display/intel_display.c between commit: 1b321026e213 ("drm/i915: Pass ww ctx to intel_pin_to_display_plane") from the drm tree and commit: 61169987c4d9 ("drm/i915: Unify the FB and plane state view information into one struct") from the drm-intel tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/i915/display/intel_display.c index aa524eff20e1,bdb2adb4d748..000000000000 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@@ -1185,13 -1094,13 +1112,13 @@@ retry * mode that matches the user configuration. */ ret = i915_vma_pin_fence(vma); - if (ret != 0 && INTEL_GEN(dev_priv) < 4) { + if (ret != 0 && DISPLAY_VER(dev_priv) < 4) { i915_vma_unpin(vma); - vma = ERR_PTR(ret); - goto err; + goto err_unpin; } + ret = 0; - if (ret == 0 && vma->fence) + if (vma->fence) *out_flags |= PLANE_HAS_FENCE; } @@@ -11363,12 -10508,20 +10536,12 @@@ int intel_plane_pin_fb(struct intel_pla struct drm_i915_private *dev_priv = to_i915(plane->base.dev); struct drm_framebuffer *fb = plane_state->hw.fb; struct i915_vma *vma; + bool phys_cursor = + plane->id == PLANE_CURSOR && + INTEL_INFO(dev_priv)->display.cursor_needs_physical; - if (plane->id == PLANE_CURSOR && - INTEL_INFO(dev_priv)->display.cursor_needs_physical) { - struct drm_i915_gem_object *obj = intel_fb_obj(fb); - const int align = intel_cursor_alignment(dev_priv); - int err; - - err = i915_gem_object_attach_phys(obj, align); - if (err) - return err; - } - - vma = intel_pin_and_fence_fb_obj(fb, + vma = intel_pin_and_fence_fb_obj(fb, phys_cursor, - &plane_state->view, + &plane_state->view.gtt, intel_plane_uses_fence(plane_state), &plane_state->flags); if (IS_ERR(vma))

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel April 2021