dri-devel February 2020

dri-devel@lists.freedesktop.org

302 participants
679 discussions

[PATCH 00/12] drm/i915/display: conversion to drm_device based logging macros
by Wambui Karuga 04 Feb '20

04 Feb '20

This series continues the conversion of the printk based logging macros to the new struct drm_device based logging macros in the drm/i915/display folder. This series was achieved using the following coccinelle script that transforms based on the existence of a struct drm_i915_private instance in the function: @@ identifier fn, T; @@ fn(...) { ... struct drm_i915_private *T = ...; <+... ( -DRM_INFO( +drm_info(&T->drm, ...) | -DRM_ERROR( +drm_err(&T->drm, ...) | -DRM_WARN( +drm_warn(&T->drm, ...) | -DRM_DEBUG( +drm_dbg(&T->drm, ...) | -DRM_DEBUG_KMS( +drm_dbg_kms(&T->drm, ...) | -DRM_DEBUG_DRIVER( +drm_dbg(&T->drm, ...) | -DRM_DEBUG_ATOMIC( +drm_dbg_atomic(&T->drm, ...) ) ...+> } @@ identifier fn, T; @@ fn(...,struct drm_i915_private *T,...) { <+... ( -DRM_INFO( +drm_info(&T->drm, ...) | -DRM_ERROR( +drm_err(&T->drm, ...) | -DRM_WARN( +drm_warn(&T->drm, ...) | -DRM_DEBUG( +drm_dbg(&T->drm, ...) | -DRM_DEBUG_DRIVER( +drm_dbg(&T->drm, ...) | -DRM_DEBUG_KMS( +drm_dbg_kms(&T->drm, ...) | -DRM_DEBUG_ATOMIC( +drm_dbg_atomic(&T->drm, ...) ) ...+> } Wambui Karuga (12): drm/i915/vlv_dsi_pll: conversion to struct drm_device logging macros. drm/i915/vlv_dsi: conversion to drm_device based logging macros. drm/i915/vga: conversion to drm_device based logging macros. drm/i915/vdsc: convert to struct drm_device based logging macros. drm/i915/tv: automatic conversion to drm_device based logging macros. drm/i915/tc: automatic conversion to drm_device based logging macros. drm/i915/sprite: automatic conversion to drm_device based logging macros drm/i915/sdvo: automatic conversion to drm_device based logging macros. drm/i915/quirks: automatic conversion to drm_device based logging macros. drm/i915/psr: automatic conversion to drm_device based logging macros. drm/i915/pipe_crc: automatic conversion to drm_device based logging macros. drm/i915/panel: automatic conversion to drm_device based logging macros. drivers/gpu/drm/i915/display/intel_panel.c | 100 ++++++++------ drivers/gpu/drm/i915/display/intel_pipe_crc.c | 7 +- drivers/gpu/drm/i915/display/intel_psr.c | 128 +++++++++++------- drivers/gpu/drm/i915/display/intel_quirks.c | 10 +- drivers/gpu/drm/i915/display/intel_sdvo.c | 29 ++-- drivers/gpu/drm/i915/display/intel_sprite.c | 60 ++++---- drivers/gpu/drm/i915/display/intel_tc.c | 33 +++-- drivers/gpu/drm/i915/display/intel_tv.c | 26 ++-- drivers/gpu/drm/i915/display/intel_vdsc.c | 28 ++-- drivers/gpu/drm/i915/display/intel_vga.c | 7 +- drivers/gpu/drm/i915/display/vlv_dsi.c | 80 ++++++----- drivers/gpu/drm/i915/display/vlv_dsi_pll.c | 47 ++++--- 12 files changed, 322 insertions(+), 233 deletions(-) -- 2.25.0

2 12

[Intel-gfx] [PATCH v5 00/21] drm: Introduce struct drm_device based WARN* and use them in i915
by Pankaj Bharadiya 04 Feb '20

04 Feb '20

Device specific dev_WARN and dev_WARN_ONCE macros available in kernel include device information in the backtrace, so we know what device the warnings originate from. Similar to this, add new struct drm_device based drm_WARN* macros. These macros include device information in the backtrace, so we know what device the warnings originate from. Knowing the device specific information in the backtrace would be helpful in development all around. This patch series aims to convert calls of WARN(), WARN_ON(), WARN_ONCE() and WARN_ON_ONCE() in i915 driver to use the drm device-specific variants automatically wherever struct device pointer is available. To do this, this patch series - - introduces new struct drm_device based WARN* macros - automatically converts WARN* with device specific dev_WARN* variants using coccinelle semantic patch scripts. The goal is to convert all the calls of WARN* with drm_WARN* in i915, but there are still cases where device pointer is not readily available in some functions (or I missed them somehow) using WARN* hence some manual churning is needed. Handle such remaining cases separately later. changes since v4: - Address Jani's comment - split major i915/display related conversions per file into seperate patches so that non conflicting patches can be merged. changes since v3: - rebase pending unmerged patches on drm-tip (bc626bbb5b6e drm-tip: 2020y-01m-25d-14h-28m-41s UTC integration manifest) changes since v2: - rebase pending unmerged patches on drm-tip changes since v1: - Address Jani's review comments - Fix typo in comment of patch 0001 - Get rid of helper functions - Split patches by directory Changes since RFC at [1] - Introduce drm_WARN* macros and use them as suggested by Sam and Jani - Get rid of extra local variables [1] https://patchwork.freedesktop.org/series/71668/ Pankaj Bharadiya (21): drm/i915/display/icl_dsi: Make WARN* drm specific where drm_priv ptr is available drm/i915/display/audio: Make WARN* drm specific where drm_priv ptr is available drm/i915/display/cdclk: Make WARN* drm specific where drm_priv ptr is available drm/i915/display/crt: Make WARN* drm specific where drm_priv ptr is available drm/i915/display/ddi: Make WARN* drm specific where drm_device ptr is available drm/i915/display/display: Make WARN* drm specific where drm_device ptr is available drm/i915/display/power: Make WARN* drm specific where drm_priv ptr is available drm/i915/display/dp: Make WARN* drm specific where drm_device ptr is available drm/i915/display/dpll_mgr: Make WARN* drm specific where drm_device ptr is available drm/i915/display/fbc: Make WARN* drm specific where drm_priv ptr is available drm/i915/fbdev: Make WARN* drm specific where drm_device ptr is available drm/i915/display/hdcp: Make WARN* drm specific where drm_priv ptr is available drm/i915/display/hdmi: Make WARN* drm specific where drm_device ptr is available drm/i915/display/overlay: Make WARN* drm specific where drm_priv ptr is available drm/i915/display/panel: Make WARN* drm specific where drm_priv ptr is available drm/i915/display/psr: Make WARN* drm specific where drm_priv ptr is available drm/i915/display/sdvo: Make WARN* drm specific where drm_priv ptr is available drm/i915/display/tc: Make WARN* drm specific where drm_priv ptr is available drm/i915/display: Make WARN* drm specific where drm_device ptr is available drm/i915/gvt: Make WARN* drm specific where drm_priv ptr is available drm/i915/gvt: Make WARN* drm specific where vgpu ptr is available drivers/gpu/drm/i915/display/icl_dsi.c | 14 +- drivers/gpu/drm/i915/display/intel_atomic.c | 6 +- drivers/gpu/drm/i915/display/intel_audio.c | 19 +- drivers/gpu/drm/i915/display/intel_bios.c | 10 +- drivers/gpu/drm/i915/display/intel_bw.c | 3 +- drivers/gpu/drm/i915/display/intel_cdclk.c | 81 ++++--- drivers/gpu/drm/i915/display/intel_color.c | 3 +- .../gpu/drm/i915/display/intel_combo_phy.c | 2 +- .../gpu/drm/i915/display/intel_connector.c | 3 +- drivers/gpu/drm/i915/display/intel_crt.c | 10 +- drivers/gpu/drm/i915/display/intel_ddi.c | 92 +++---- drivers/gpu/drm/i915/display/intel_display.c | 226 ++++++++++-------- .../drm/i915/display/intel_display_power.c | 168 +++++++------ drivers/gpu/drm/i915/display/intel_dp.c | 117 +++++---- drivers/gpu/drm/i915/display/intel_dp_mst.c | 10 +- drivers/gpu/drm/i915/display/intel_dpio_phy.c | 3 +- drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 37 +-- drivers/gpu/drm/i915/display/intel_dsb.c | 6 +- .../i915/display/intel_dsi_dcs_backlight.c | 2 +- drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 5 +- drivers/gpu/drm/i915/display/intel_fbc.c | 23 +- drivers/gpu/drm/i915/display/intel_fbdev.c | 13 +- drivers/gpu/drm/i915/display/intel_gmbus.c | 3 +- drivers/gpu/drm/i915/display/intel_hdcp.c | 21 +- drivers/gpu/drm/i915/display/intel_hdmi.c | 52 ++-- drivers/gpu/drm/i915/display/intel_hotplug.c | 7 +- .../gpu/drm/i915/display/intel_lpe_audio.c | 2 +- drivers/gpu/drm/i915/display/intel_lvds.c | 7 +- drivers/gpu/drm/i915/display/intel_opregion.c | 7 +- drivers/gpu/drm/i915/display/intel_overlay.c | 12 +- drivers/gpu/drm/i915/display/intel_panel.c | 19 +- drivers/gpu/drm/i915/display/intel_pipe_crc.c | 7 +- drivers/gpu/drm/i915/display/intel_psr.c | 32 +-- drivers/gpu/drm/i915/display/intel_sdvo.c | 14 +- drivers/gpu/drm/i915/display/intel_sprite.c | 5 +- drivers/gpu/drm/i915/display/intel_tc.c | 18 +- drivers/gpu/drm/i915/display/intel_vdsc.c | 2 +- drivers/gpu/drm/i915/display/vlv_dsi.c | 2 +- drivers/gpu/drm/i915/gvt/aperture_gm.c | 6 +- drivers/gpu/drm/i915/gvt/cfg_space.c | 23 +- drivers/gpu/drm/i915/gvt/cmd_parser.c | 4 +- drivers/gpu/drm/i915/gvt/display.c | 6 +- drivers/gpu/drm/i915/gvt/dmabuf.c | 4 +- drivers/gpu/drm/i915/gvt/edid.c | 19 +- drivers/gpu/drm/i915/gvt/gtt.c | 21 +- drivers/gpu/drm/i915/gvt/gvt.c | 4 +- drivers/gpu/drm/i915/gvt/handlers.c | 22 +- drivers/gpu/drm/i915/gvt/interrupt.c | 16 +- drivers/gpu/drm/i915/gvt/kvmgt.c | 10 +- drivers/gpu/drm/i915/gvt/mmio.c | 30 ++- drivers/gpu/drm/i915/gvt/mmio_context.c | 8 +- drivers/gpu/drm/i915/gvt/scheduler.c | 6 +- drivers/gpu/drm/i915/gvt/vgpu.c | 6 +- 53 files changed, 716 insertions(+), 532 deletions(-) -- 2.23.0

2 22

[git pull] drm ttm/mm for 5.6-rc1
by Dave Airlie 04 Feb '20

04 Feb '20

Hi Linus, Thomas Hellstrom has some more changes to the TTM layer that needed a patch to the mm subsystem, this adds a new mm API vmf_insert_mixed_prot to avoid an ugly hack that has limitations in the TTM layer. Should be all correctly acked. Regards, Dave. drm-next-2020-02-04: drm ttm/mm changes for 5.6-rc1 The following changes since commit d47c7f06268082bc0082a15297a07c0da59b0fc4: Merge branch 'linux-5.6' of git://github.com/skeggsb/linux into drm-next (2020-01-30 15:18:38 +1000) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm tags/drm-next-2020-02-04 for you to fetch changes up to b45f1b3b585e195a7daead16d914e164310b1df6: Merge branch 'ttm-prot-fix' of git://people.freedesktop.org/~thomash/linux into drm-next (2020-01-31 16:58:35 +1000) ---------------------------------------------------------------- drm ttm/mm changes for 5.6-rc1 ---------------------------------------------------------------- Dave Airlie (1): Merge branch 'ttm-prot-fix' of git://people.freedesktop.org/~thomash/linux into drm-next Thomas Hellstrom (2): mm: Add a vmf_insert_mixed_prot() function mm, drm/ttm: Fix vm page protection handling drivers/gpu/drm/ttm/ttm_bo_vm.c | 22 ++++++++++++++------- include/linux/mm.h | 2 ++ include/linux/mm_types.h | 7 ++++++- mm/memory.c | 44 +++++++++++++++++++++++++++++++++++++---- 4 files changed, 63 insertions(+), 12 deletions(-)

2 1

[PATCH v2 0/4] drm/vram: Check display modes against available VRAM
by Thomas Zimmermann 04 Feb '20

04 Feb '20

This adds drm_vram_helper_mode_valid(), which tests a display mode against the available video memory. It's a helper function to sort out display modes that cannot be used because of a lack of video memory. The ast driver already implemented this test for a while. The patchset converts ast over to the helper and adds the test to the over drivers that use VRAM helpers; except mgag200. I left out mgag200 as it doesn't have atomic modesetting yet and needs adjustments to memory management first. v2: * WARN_ON if VRAM memory manager has not been initialized (Daniel) * unexport drm_vram_helper_mode_valid_internal() (Daniel) * documentation formatting (Daniel) * remove bochs_connector_mode_valid() (Gerd) Thomas Zimmermann (4): drm/vram: Add helpers to validate a display mode's memory requirements drm/bochs: Implement struct drm_mode_config_funcs.mode_valid drm/hibmc: Implement struct drm_mode_config_funcs.mode_valid drm/vboxvideo: Implement struct drm_mode_config_funcs.mode_valid drivers/gpu/drm/ast/ast_main.c | 24 +------- drivers/gpu/drm/bochs/bochs_kms.c | 21 +------ drivers/gpu/drm/drm_gem_vram_helper.c | 61 +++++++++++++++++++++ drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 1 + drivers/gpu/drm/vboxvideo/vbox_mode.c | 1 + include/drm/drm_gem_vram_helper.h | 9 +++ 6 files changed, 74 insertions(+), 43 deletions(-) -- 2.25.0

2 5

[PATCH 00/18] In order to readout DP SDPs, refactors the handling of DP SDPs
by Gwan-gyeong Mun 03 Feb '20

03 Feb '20

In order to readout DP SDPs (Secondary Data Packet: DP HDR Metadata Infoframe SDP, DP VSC SDP), it refactors handling DP SDPs codes. It adds new compute routines for DP HDR Metadata Infoframe SDP and DP VSC SDP. And new writing routines of DP SDPs (Secondary Data Packet) that uses computed configs. New reading routines of DP SDPs are added for readout. It adds a logging function for DP VSC SDP. When receiving video it is very useful to be able to log DP VSC SDP. This greatly simplifies debugging. In order to use a common VSC SDP Colorimetry calculating code on PSR, it uses a new psr vsc sdp compute routine. Gwan-gyeong Mun (18): drm: add DP 1.4 VSC SDP Payload related enums drm/i915: Add DP VSC SDP payload data to intel_crtc_state.infoframes drm/i915/dp: Add compute routine for DP VSC SDP drm/i915/dp: Add compute routine for DP HDR Metadata Infoframe SDP drm/i915/dp: Add writing of DP SDPs (Secondary Data Packet) video/hdmi: Add Unpack only function for DRM infoframe drm/i915/dp: Read out DP SDPs (Secondary Data Packet) drm/i915/dp: Add logging function for DP VSC SDP drm/i915: Include HDMI DRM infoframe in the crtc state dump drm/i915: Include DP HDR Metadata Infoframe SDP in the crtc state dump drm/i915: Include DP VSC SDP in the crtc state dump drm/i915: Program DP SDPs with computed configs drm/i915: Add state readout for DP HDR Metadata Infoframe SDP drm/i915: Add state readout for DP VSC SDP drm/i915: Program DP SDPs on pipe updates drm/i915: Stop sending DP SDPs on intel_ddi_post_disable_dp() drm/i915/dp: Add compute routine for DP PSR VSC SDP drm/i915/psr: Use new DP VSC SDP compute routine on PSR drivers/gpu/drm/i915/display/intel_ddi.c | 19 +- drivers/gpu/drm/i915/display/intel_display.c | 62 ++ .../drm/i915/display/intel_display_types.h | 1 + drivers/gpu/drm/i915/display/intel_dp.c | 775 ++++++++++++++---- drivers/gpu/drm/i915/display/intel_dp.h | 21 +- drivers/gpu/drm/i915/display/intel_psr.c | 54 +- drivers/gpu/drm/i915/display/intel_psr.h | 6 +- drivers/gpu/drm/i915/i915_drv.h | 12 + drivers/video/hdmi.c | 58 +- include/drm/drm_dp_helper.h | 45 + include/linux/hdmi.h | 2 + 11 files changed, 837 insertions(+), 218 deletions(-) -- 2.24.1

3 20

[PATCH v2] drm/radeon: have the callers of set_memory_*() check the return value
by Tianlin Li 03 Feb '20

03 Feb '20

Right now several architectures allow their set_memory_*() family of functions to fail, but callers may not be checking the return values. If set_memory_*() returns with an error, call-site assumptions may be infact wrong to assume that it would either succeed or not succeed at all. Ideally, the failure of set_memory_*() should be passed up the call stack, and callers should examine the failure and deal with it. Need to fix the callers and add the __must_check attribute. They also may not provide any level of atomicity, in the sense that the memory protections may be left incomplete on failure. This issue likely has a few steps on effects architectures: 1)Have all callers of set_memory_*() helpers check the return value. 2)Add __must_check to all set_memory_*() helpers so that new uses do not ignore the return value. 3)Add atomicity to the calls so that the memory protections aren't left in a partial state. This series is part of step 1. Make drm/radeon check the return value of set_memory_*(). Signed-off-by: Tianlin Li <tli(a)digitalocean.com> --- v2: The hardware is too old to be tested on and the code cannot be simply removed from the kernel, so this is the solution for the short term. - Just print an error when something goes wrong - Remove patch 2. v1: https://lore.kernel.org/lkml/20200107192555.20606-1-tli@digitalocean.com/ --- drivers/gpu/drm/radeon/radeon_gart.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_gart.c b/drivers/gpu/drm/radeon/radeon_gart.c index f178ba321715..a2cc864aa08d 100644 --- a/drivers/gpu/drm/radeon/radeon_gart.c +++ b/drivers/gpu/drm/radeon/radeon_gart.c @@ -80,8 +80,9 @@ int radeon_gart_table_ram_alloc(struct radeon_device *rdev) #ifdef CONFIG_X86 if (rdev->family == CHIP_RS400 || rdev->family == CHIP_RS480 || rdev->family == CHIP_RS690 || rdev->family == CHIP_RS740) { - set_memory_uc((unsigned long)ptr, - rdev->gart.table_size >> PAGE_SHIFT); + if (set_memory_uc((unsigned long)ptr, + rdev->gart.table_size >> PAGE_SHIFT)) + DRM_ERROR("set_memory_uc failed.\n"); } #endif rdev->gart.ptr = ptr; @@ -106,8 +107,9 @@ void radeon_gart_table_ram_free(struct radeon_device *rdev) #ifdef CONFIG_X86 if (rdev->family == CHIP_RS400 || rdev->family == CHIP_RS480 || rdev->family == CHIP_RS690 || rdev->family == CHIP_RS740) { - set_memory_wb((unsigned long)rdev->gart.ptr, - rdev->gart.table_size >> PAGE_SHIFT); + if (set_memory_wb((unsigned long)rdev->gart.ptr, + rdev->gart.table_size >> PAGE_SHIFT)) + DRM_ERROR("set_memory_wb failed.\n"); } #endif pci_free_consistent(rdev->pdev, rdev->gart.table_size, -- 2.17.1

2 2

[PATCH V5] drm: Add support for DP 1.4 Compliance edid corruption test
by Jerry (Fangzhi) Zuo 03 Feb '20

03 Feb '20

Unlike DP 1.2 edid corruption test, DP 1.4 requires to calculate real CRC value of the last edid data block, and write it back. Current edid CRC calculates routine adds the last CRC byte, and check if non-zero. This behavior is not accurate; actually, we need to return the actual CRC value when corruption is detected. This commit changes this issue by returning the calculated CRC, and initiate the required sequence. Change since v5 - Obtain real CRC value before dumping bad edid Change since v4 - Fix for CI.CHECKPATCH Change since v3 - Fix a minor typo. Change since v2 - Rewrite checksum computation routine to avoid duplicated code. - Rename to avoid confusion. Change since v1 - Have separate routine for returning real CRC. Signed-off-by: Jerry (Fangzhi) Zuo <Jerry.Zuo(a)amd.com> --- drivers/gpu/drm/drm_dp_helper.c | 35 +++++++++++++++++++++++++++++++++ drivers/gpu/drm/drm_edid.c | 23 ++++++++++++++++++---- include/drm/drm_connector.h | 6 ++++++ include/drm/drm_dp_helper.h | 3 +++ 4 files changed, 63 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/drm_dp_helper.c b/drivers/gpu/drm/drm_dp_helper.c index f629fc5494a4..18b285fa1a42 100644 --- a/drivers/gpu/drm/drm_dp_helper.c +++ b/drivers/gpu/drm/drm_dp_helper.c @@ -351,6 +351,41 @@ int drm_dp_dpcd_read_link_status(struct drm_dp_aux *aux, } EXPORT_SYMBOL(drm_dp_dpcd_read_link_status); +/** + * drm_dp_send_real_edid_checksum() - send back real edid checksum value + * @aux: DisplayPort AUX channel + * @real_edid_checksum: real edid checksum for the last block + * + * Returns true on success + */ +bool drm_dp_send_real_edid_checksum(struct drm_dp_aux *aux, + u8 real_edid_checksum) +{ + u8 link_edid_read = 0, auto_test_req = 0, test_resp = 0; + + drm_dp_dpcd_read(aux, DP_DEVICE_SERVICE_IRQ_VECTOR, &auto_test_req, 1); + auto_test_req &= DP_AUTOMATED_TEST_REQUEST; + + drm_dp_dpcd_read(aux, DP_TEST_REQUEST, &link_edid_read, 1); + link_edid_read &= DP_TEST_LINK_EDID_READ; + + if (!auto_test_req || !link_edid_read) { + DRM_DEBUG_KMS("Source DUT does not support TEST_EDID_READ\n"); + return false; + } + + drm_dp_dpcd_write(aux, DP_DEVICE_SERVICE_IRQ_VECTOR, &auto_test_req, 1); + + /* send back checksum for the last edid extension block data */ + drm_dp_dpcd_write(aux, DP_TEST_EDID_CHECKSUM, &real_edid_checksum, 1); + + test_resp |= DP_TEST_EDID_CHECKSUM_WRITE; + drm_dp_dpcd_write(aux, DP_TEST_RESPONSE, &test_resp, 1); + + return true; +} +EXPORT_SYMBOL(drm_dp_send_real_edid_checksum); + /** * drm_dp_downstream_max_clock() - extract branch device max * pixel rate for legacy VGA diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index 99769d6c9f84..f064e75fb4c5 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -1590,11 +1590,22 @@ static int validate_displayid(u8 *displayid, int length, int idx); static int drm_edid_block_checksum(const u8 *raw_edid) { int i; - u8 csum = 0; - for (i = 0; i < EDID_LENGTH; i++) + u8 csum = 0, crc = 0; + + for (i = 0; i < EDID_LENGTH - 1; i++) csum += raw_edid[i]; - return csum; + crc = 0x100 - csum; + + return crc; +} + +static bool drm_edid_block_checksum_diff(const u8 *raw_edid, u8 real_checksum) +{ + if (raw_edid[EDID_LENGTH - 1] != real_checksum) + return true; + else + return false; } static bool drm_edid_is_zero(const u8 *in_edid, int length) @@ -1652,7 +1663,7 @@ bool drm_edid_block_valid(u8 *raw_edid, int block, bool print_bad_edid, } csum = drm_edid_block_checksum(raw_edid); - if (csum) { + if (drm_edid_block_checksum_diff(raw_edid, csum)) { if (edid_corrupt) *edid_corrupt = true; @@ -1793,6 +1804,10 @@ static void connector_bad_edid(struct drm_connector *connector, u8 *edid, int num_blocks) { int i; + u8 num_of_ext = edid[0x7e]; + + /* Calculate real checksum for the last edid extension block data */ + connector->real_edid_checksum = drm_edid_block_checksum(edid + num_of_ext * EDID_LENGTH); if (connector->bad_edid_counter++ && !drm_debug_enabled(DRM_UT_KMS)) return; diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h index 2113500b4075..b3815371c271 100644 --- a/include/drm/drm_connector.h +++ b/include/drm/drm_connector.h @@ -1357,6 +1357,12 @@ struct drm_connector { * rev1.1 4.2.2.6 */ bool edid_corrupt; + /** + * @real_edid_checksum: real edid checksum for corrupted edid block. + * Required in Displayport 1.4 compliance testing + * rev1.1 4.2.2.6 + */ + u8 real_edid_checksum; /** @debugfs_entry: debugfs directory for this connector */ struct dentry *debugfs_entry; diff --git a/include/drm/drm_dp_helper.h b/include/drm/drm_dp_helper.h index 127d6e1d3338..957a3d00ee05 100644 --- a/include/drm/drm_dp_helper.h +++ b/include/drm/drm_dp_helper.h @@ -1459,6 +1459,9 @@ static inline ssize_t drm_dp_dpcd_writeb(struct drm_dp_aux *aux, int drm_dp_dpcd_read_link_status(struct drm_dp_aux *aux, u8 status[DP_LINK_STATUS_SIZE]); +bool drm_dp_send_real_edid_checksum(struct drm_dp_aux *aux, + u8 real_edid_checksum); + int drm_dp_downstream_max_clock(const u8 dpcd[DP_RECEIVER_CAP_SIZE], const u8 port_cap[4]); int drm_dp_downstream_max_bpc(const u8 dpcd[DP_RECEIVER_CAP_SIZE], -- 2.17.1

3 2

[PATCH v2] drm: Parse Colorimetry data block from EDID
by Abhinav Kumar 03 Feb '20

03 Feb '20

From: Uma Shankar <uma.shankar(a)intel.com> CEA 861.3 spec adds colorimetry data block for HDMI. Parsing the block to get the colorimetry data from panel. This was posted by Uma Shankar at https://patchwork.kernel.org/patch/10861327/ Modified by Abhinav Kumar: - Use macros to distinguish the bit fields for clarity Changes in v2: - Use the drm_edid.h macros in drm_edid.c (Stephen Boyd) Signed-off-by: Uma Shankar <uma.shankar(a)intel.com> Signed-off-by: Abhinav Kumar <abhinavk(a)codeaurora.org> --- drivers/gpu/drm/drm_edid.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ include/drm/drm_connector.h | 3 +++ include/drm/drm_edid.h | 14 ++++++++++++++ 3 files changed, 62 insertions(+) diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index 99769d6..9a82fb8 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -3136,6 +3136,7 @@ static int drm_cvt_modes(struct drm_connector *connector, #define VIDEO_BLOCK 0x02 #define VENDOR_BLOCK 0x03 #define SPEAKER_BLOCK 0x04 +#define COLORIMETRY_DATA_BLOCK 0x5 #define HDR_STATIC_METADATA_BLOCK 0x6 #define USE_EXTENDED_TAG 0x07 #define EXT_VIDEO_CAPABILITY_BLOCK 0x00 @@ -4199,6 +4200,48 @@ static void fixup_detailed_cea_mode_clock(struct drm_display_mode *mode) mode->clock = clock; } +static bool cea_db_is_hdmi_colorimetry_data_block(const u8 *db) +{ + if (cea_db_tag(db) != USE_EXTENDED_TAG) + return false; + + if (db[1] != COLORIMETRY_DATA_BLOCK) + return false; + + if (cea_db_payload_len(db) < 2) + return false; + + return true; +} + +static void +drm_parse_colorimetry_data_block(struct drm_connector *connector, const u8 *db) +{ + struct drm_hdmi_info *info = &connector->display_info.hdmi; + + if (db[2] & DRM_EDID_CLRMETRY_xvYCC_601) + info->colorimetry |= DRM_EDID_CLRMETRY_xvYCC_601; + if (db[2] & DRM_EDID_CLRMETRY_xvYCC_709) + info->colorimetry |= DRM_EDID_CLRMETRY_xvYCC_709; + if (db[2] & DRM_EDID_CLRMETRY_sYCC_601) + info->colorimetry |= DRM_EDID_CLRMETRY_sYCC_601; + if (db[2] & DRM_EDID_CLRMETRY_ADBYCC_601) + info->colorimetry |= DRM_EDID_CLRMETRY_ADBYCC_601; + if (db[2] & DRM_EDID_CLRMETRY_ADB_RGB) + info->colorimetry |= DRM_EDID_CLRMETRY_ADB_RGB; + if (db[2] & DRM_EDID_CLRMETRY_BT2020_CYCC) + info->colorimetry |= DRM_EDID_CLRMETRY_BT2020_CYCC; + if (db[2] & DRM_EDID_CLRMETRY_BT2020_YCC) + info->colorimetry |= DRM_EDID_CLRMETRY_BT2020_YCC; + if (db[2] & DRM_EDID_CLRMETRY_BT2020_RGB) + info->colorimetry |= DRM_EDID_CLRMETRY_BT2020_RGB; + /* Byte 4 Bit 7: DCI-P3 */ + if (db[3] & BIT(7)) + info->colorimetry |= DRM_EDID_CLRMETRY_DCI_P3; + + DRM_DEBUG_KMS("Supported Colorimetry 0x%x\n", info->colorimetry); +} + static bool cea_db_is_hdmi_hdr_metadata_block(const u8 *db) { if (cea_db_tag(db) != USE_EXTENDED_TAG) @@ -4877,6 +4920,8 @@ static void drm_parse_cea_ext(struct drm_connector *connector, drm_parse_vcdb(connector, db); if (cea_db_is_hdmi_hdr_metadata_block(db)) drm_parse_hdr_metadata_block(connector, db); + if (cea_db_is_hdmi_colorimetry_data_block(db)) + drm_parse_colorimetry_data_block(connector, db); } } diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h index 2219109..a996ee3 100644 --- a/include/drm/drm_connector.h +++ b/include/drm/drm_connector.h @@ -207,6 +207,9 @@ struct drm_hdmi_info { /** @y420_dc_modes: bitmap of deep color support index */ u8 y420_dc_modes; + + /* @colorimetry: bitmap of supported colorimetry modes */ + u16 colorimetry; }; /** diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h index f0b03d4..4f22f22 100644 --- a/include/drm/drm_edid.h +++ b/include/drm/drm_edid.h @@ -224,6 +224,20 @@ struct detailed_timing { DRM_EDID_YCBCR420_DC_36 | \ DRM_EDID_YCBCR420_DC_30) +/* + * Supported Colorimetry from colorimetry data block + * as per CEA 861-G spec + */ +#define DRM_EDID_CLRMETRY_xvYCC_601 (1 << 0) +#define DRM_EDID_CLRMETRY_xvYCC_709 (1 << 1) +#define DRM_EDID_CLRMETRY_sYCC_601 (1 << 2) +#define DRM_EDID_CLRMETRY_ADBYCC_601 (1 << 3) +#define DRM_EDID_CLRMETRY_ADB_RGB (1 << 4) +#define DRM_EDID_CLRMETRY_BT2020_CYCC (1 << 5) +#define DRM_EDID_CLRMETRY_BT2020_YCC (1 << 6) +#define DRM_EDID_CLRMETRY_BT2020_RGB (1 << 7) +#define DRM_EDID_CLRMETRY_DCI_P3 (1 << 15) + /* ELD Header Block */ #define DRM_ELD_HEADER_BLOCK_SIZE 4 -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project

3 2

[trivial PATCH] drm: Use kvcalloc
by Joe Perches 03 Feb '20

03 Feb '20

Use the equivalent call to allocate a zeroed array. Done with a trivial coccinelle script: $ cat kvmalloc_array.cocci @@ expression a; expression b; expression c; @@ - kvmalloc_array(a, b, c | __GFP_ZERO) + kvcalloc(a, b, c) Signed-off-by: Joe Perches <joe(a)perches.com> --- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 5 ++--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 5 ++--- drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 3 +-- drivers/gpu/drm/drm_gem.c | 3 +-- drivers/gpu/drm/exynos/exynos_drm_gem.c | 4 ++-- drivers/gpu/drm/panfrost/panfrost_drv.c | 17 ++++++++--------- drivers/gpu/drm/panfrost/panfrost_mmu.c | 8 ++++---- drivers/gpu/drm/radeon/radeon_cs.c | 4 ++-- drivers/gpu/drm/ttm/ttm_tt.c | 15 ++++++--------- drivers/gpu/drm/v3d/v3d_gem.c | 5 ++--- drivers/gpu/drm/vc4/vc4_gem.c | 5 ++--- 11 files changed, 32 insertions(+), 42 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c index 1125a4..dd3125 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c @@ -556,9 +556,8 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p, bool userpage_invalidated = false; int i; - e->user_pages = kvmalloc_array(bo->tbo.ttm->num_pages, - sizeof(struct page *), - GFP_KERNEL | __GFP_ZERO); + e->user_pages = kvcalloc(bo->tbo.ttm->num_pages, + sizeof(struct page *), GFP_KERNEL); if (!e->user_pages) { DRM_ERROR("calloc failure\n"); return -ENOMEM; diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c index 5cb182..d0f756 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c @@ -903,9 +903,8 @@ static int amdgpu_vm_alloc_pts(struct amdgpu_device *adev, unsigned num_entries; num_entries = amdgpu_vm_num_entries(adev, cursor->level); - entry->entries = kvmalloc_array(num_entries, - sizeof(*entry->entries), - GFP_KERNEL | __GFP_ZERO); + entry->entries = kvcalloc(num_entries, + sizeof(*entry->entries), GFP_KERNEL); if (!entry->entries) return -ENOMEM; } diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c index 82a329..052c03 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c @@ -353,8 +353,7 @@ static int amdgpu_vram_mgr_new(struct ttm_mem_type_manager *man, num_nodes = DIV_ROUND_UP(mem->num_pages, pages_per_node); } - nodes = kvmalloc_array((uint32_t)num_nodes, sizeof(*nodes), - GFP_KERNEL | __GFP_ZERO); + nodes = kvcalloc((uint32_t)num_nodes, sizeof(*nodes), GFP_KERNEL); if (!nodes) { atomic64_sub(mem_bytes, &mgr->usage); return -ENOMEM; diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c index a9e4a6..b5b02f8 100644 --- a/drivers/gpu/drm/drm_gem.c +++ b/drivers/gpu/drm/drm_gem.c @@ -705,8 +705,7 @@ int drm_gem_objects_lookup(struct drm_file *filp, void __user *bo_handles, if (!count) return 0; - objs = kvmalloc_array(count, sizeof(struct drm_gem_object *), - GFP_KERNEL | __GFP_ZERO); + objs = kvcalloc(count, sizeof(struct drm_gem_object *), GFP_KERNEL); if (!objs) return -ENOMEM; diff --git a/drivers/gpu/drm/exynos/exynos_drm_gem.c b/drivers/gpu/drm/exynos/exynos_drm_gem.c index d734d9d..9a794df 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_gem.c +++ b/drivers/gpu/drm/exynos/exynos_drm_gem.c @@ -55,8 +55,8 @@ static int exynos_drm_alloc_buf(struct exynos_drm_gem *exynos_gem) nr_pages = exynos_gem->size >> PAGE_SHIFT; - exynos_gem->pages = kvmalloc_array(nr_pages, sizeof(struct page *), - GFP_KERNEL | __GFP_ZERO); + exynos_gem->pages = kvcalloc(nr_pages, sizeof(struct page *), + GFP_KERNEL); if (!exynos_gem->pages) { DRM_DEV_ERROR(to_dma_dev(dev), "failed to allocate pages.\n"); return -ENOMEM; diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c b/drivers/gpu/drm/panfrost/panfrost_drv.c index 6da59f..91bded 100644 --- a/drivers/gpu/drm/panfrost/panfrost_drv.c +++ b/drivers/gpu/drm/panfrost/panfrost_drv.c @@ -138,9 +138,9 @@ panfrost_lookup_bos(struct drm_device *dev, if (!job->bo_count) return 0; - job->implicit_fences = kvmalloc_array(job->bo_count, - sizeof(struct dma_fence *), - GFP_KERNEL | __GFP_ZERO); + job->implicit_fences = kvcalloc(job->bo_count, + sizeof(struct dma_fence *), + GFP_KERNEL); if (!job->implicit_fences) return -ENOMEM; @@ -150,9 +150,9 @@ panfrost_lookup_bos(struct drm_device *dev, if (ret) return ret; - job->mappings = kvmalloc_array(job->bo_count, - sizeof(struct panfrost_gem_mapping *), - GFP_KERNEL | __GFP_ZERO); + job->mappings = kvcalloc(job->bo_count, + sizeof(struct panfrost_gem_mapping *), + GFP_KERNEL); if (!job->mappings) return -ENOMEM; @@ -200,9 +200,8 @@ panfrost_copy_in_sync(struct drm_device *dev, if (!job->in_fence_count) return 0; - job->in_fences = kvmalloc_array(job->in_fence_count, - sizeof(struct dma_fence *), - GFP_KERNEL | __GFP_ZERO); + job->in_fences = kvcalloc(job->in_fence_count, + sizeof(struct dma_fence *), GFP_KERNEL); if (!job->in_fences) { DRM_DEBUG("Failed to allocate job in fences\n"); return -ENOMEM; diff --git a/drivers/gpu/drm/panfrost/panfrost_mmu.c b/drivers/gpu/drm/panfrost/panfrost_mmu.c index 763cfca..6ff501 100644 --- a/drivers/gpu/drm/panfrost/panfrost_mmu.c +++ b/drivers/gpu/drm/panfrost/panfrost_mmu.c @@ -470,16 +470,16 @@ static int panfrost_mmu_map_fault_addr(struct panfrost_device *pfdev, int as, mutex_lock(&bo->base.pages_lock); if (!bo->base.pages) { - bo->sgts = kvmalloc_array(bo->base.base.size / SZ_2M, - sizeof(struct sg_table), GFP_KERNEL | __GFP_ZERO); + bo->sgts = kvcalloc(bo->base.base.size / SZ_2M, + sizeof(struct sg_table), GFP_KERNEL); if (!bo->sgts) { mutex_unlock(&bo->base.pages_lock); ret = -ENOMEM; goto err_bo; } - pages = kvmalloc_array(bo->base.base.size >> PAGE_SHIFT, - sizeof(struct page *), GFP_KERNEL | __GFP_ZERO); + pages = kvcalloc(bo->base.base.size >> PAGE_SHIFT, + sizeof(struct page *), GFP_KERNEL); if (!pages) { kfree(bo->sgts); bo->sgts = NULL; diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c index 0d0ab8e0..c52ea22 100644 --- a/drivers/gpu/drm/radeon/radeon_cs.c +++ b/drivers/gpu/drm/radeon/radeon_cs.c @@ -93,8 +93,8 @@ static int radeon_cs_parser_relocs(struct radeon_cs_parser *p) p->dma_reloc_idx = 0; /* FIXME: we assume that each relocs use 4 dwords */ p->nrelocs = chunk->length_dw / 4; - p->relocs = kvmalloc_array(p->nrelocs, sizeof(struct radeon_bo_list), - GFP_KERNEL | __GFP_ZERO); + p->relocs = kvcalloc(p->nrelocs, sizeof(struct radeon_bo_list), + GFP_KERNEL); if (p->relocs == NULL) { return -ENOMEM; } diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c index 2ec448..6415a1 100644 --- a/drivers/gpu/drm/ttm/ttm_tt.c +++ b/drivers/gpu/drm/ttm/ttm_tt.c @@ -84,8 +84,7 @@ int ttm_tt_create(struct ttm_buffer_object *bo, bool zero_alloc) */ static int ttm_tt_alloc_page_directory(struct ttm_tt *ttm) { - ttm->pages = kvmalloc_array(ttm->num_pages, sizeof(void*), - GFP_KERNEL | __GFP_ZERO); + ttm->pages = kvcalloc(ttm->num_pages, sizeof(void *), GFP_KERNEL); if (!ttm->pages) return -ENOMEM; return 0; @@ -93,10 +92,9 @@ static int ttm_tt_alloc_page_directory(struct ttm_tt *ttm) static int ttm_dma_tt_alloc_page_directory(struct ttm_dma_tt *ttm) { - ttm->ttm.pages = kvmalloc_array(ttm->ttm.num_pages, - sizeof(*ttm->ttm.pages) + - sizeof(*ttm->dma_address), - GFP_KERNEL | __GFP_ZERO); + ttm->ttm.pages = kvcalloc(ttm->ttm.num_pages, + sizeof(*ttm->ttm.pages) + sizeof(*ttm->dma_address), + GFP_KERNEL); if (!ttm->ttm.pages) return -ENOMEM; ttm->dma_address = (void *) (ttm->ttm.pages + ttm->ttm.num_pages); @@ -105,9 +103,8 @@ static int ttm_dma_tt_alloc_page_directory(struct ttm_dma_tt *ttm) static int ttm_sg_tt_alloc_page_directory(struct ttm_dma_tt *ttm) { - ttm->dma_address = kvmalloc_array(ttm->ttm.num_pages, - sizeof(*ttm->dma_address), - GFP_KERNEL | __GFP_ZERO); + ttm->dma_address = kvcalloc(ttm->ttm.num_pages, + sizeof(*ttm->dma_address), GFP_KERNEL); if (!ttm->dma_address) return -ENOMEM; return 0; diff --git a/drivers/gpu/drm/v3d/v3d_gem.c b/drivers/gpu/drm/v3d/v3d_gem.c index 549dde..012d1ff 100644 --- a/drivers/gpu/drm/v3d/v3d_gem.c +++ b/drivers/gpu/drm/v3d/v3d_gem.c @@ -304,9 +304,8 @@ v3d_lookup_bos(struct drm_device *dev, return -EINVAL; } - job->bo = kvmalloc_array(job->bo_count, - sizeof(struct drm_gem_cma_object *), - GFP_KERNEL | __GFP_ZERO); + job->bo = kvcalloc(job->bo_count, sizeof(struct drm_gem_cma_object *), + GFP_KERNEL); if (!job->bo) { DRM_DEBUG("Failed to allocate validated BO pointers\n"); return -ENOMEM; diff --git a/drivers/gpu/drm/vc4/vc4_gem.c b/drivers/gpu/drm/vc4/vc4_gem.c index e1cfc3..0f07300 100644 --- a/drivers/gpu/drm/vc4/vc4_gem.c +++ b/drivers/gpu/drm/vc4/vc4_gem.c @@ -743,9 +743,8 @@ vc4_cl_lookup_bos(struct drm_device *dev, return -EINVAL; } - exec->bo = kvmalloc_array(exec->bo_count, - sizeof(struct drm_gem_cma_object *), - GFP_KERNEL | __GFP_ZERO); + exec->bo = kvcalloc(exec->bo_count, + sizeof(struct drm_gem_cma_object *), GFP_KERNEL); if (!exec->bo) { DRM_ERROR("Failed to allocate validated BO pointers\n"); return -ENOMEM;

1 0

[Bug 206387] New: amdgpu with amdgpu.dc=1 and multiple monitors on DisplayPort keeps changing devices
by bugzilla-daemon＠bugzilla.kernel.org 03 Feb '20

03 Feb '20

https://bugzilla.kernel.org/show_bug.cgi?id=206387 Bug ID: 206387 Summary: amdgpu with amdgpu.dc=1 and multiple monitors on DisplayPort keeps changing devices Product: Drivers Version: 2.5 Kernel Version: 5.5.0 Hardware: All OS: Linux Tree: Mainline Status: NEW Severity: normal Priority: P1 Component: Video(DRI - non Intel) Assignee: drivers_video-dri(a)kernel-bugs.osdl.org Reporter: alexpereira(a)disroot.org Regression: No Hi, I have an amd rx580 with 2 monitors connected by display port. The 2 monitors are the same brand and model. When using the amdgpu driver with amdgpu.dc=0, the device names ( DisplayPort-2 and DisplayPort-3 ) stay consistent, but when using amdgpu.dc=1, the device names change randomly ( or at least not consistent ). They sometimes are DisplayPort-4 and DisplayPort-5 , sometimes DisplayPort-4 and DisplayPort-6, making me have to configure Xorg at every boot ( to correct the placement of the monitors, which is left and which is right ) and configure kde plasma and sway ( because they base their configurations on the device names ). Currently I switched to using amdgpu.dc=1 because amdgpu.dc=0 locks computer after a wake up from suspend ( with amdgpu.dc=1 it does not ). Thanks ! -- You are receiving this mail because: You are watching the assignee of the bug.

1 4

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel February 2020