dri-devel July 2021

dri-devel@lists.freedesktop.org

321 participants
829 discussions

[PATCH] drm: clean up unused kerneldoc in drm_lease.c
by Desmond Cheong Zhi Xi 30 Jul '21

30 Jul '21

The kerneldoc in drm_lease.c is unused because none of the functions are driver interfaces as the symbols are not exported. Since they aren't used and much of the existing comments don't provide any insights (e.g. they just repeat the function name or list out the function parameters), they should be removed to make them easier to maintain and to make useful info more obvious. As a note, many of the comments mention whether idr_mutex should be held, but these are mostly redundant in cases where the function contains lockdep assertions or grabs the mutex. To simplify review, here's the reasoning behind each update. drm_lease_owner: function name is self-descriptive _drm_find_lessee: function name is self-descriptive _drm_lease_held_master: function name and signature are self-descriptive _drm_has_leased: kerneldoc is summarized into a comment because the function name could be interpreted ambiguously (check if the object has been leased VS check if the master has a lease on the object) _drm_lease_held: Retain the idr_mutex comment because the function does not directly grab the mutex or use a lockdep assertion. Otherwise, the function name is self-descriptive. drm_lease_held: function name is self-descriptive drm_lease_filter_crtcs: Kerneldoc is summarized into a comment because the function name could be interpreted ambiguously (filter leases based on crtcs mask VS filter crtcs mask based on leases) drm_lease_create: Kerneldoc removed. Useful function details such as atomic leasing are retained. Errno interpretations are useful and retained. drm_lease_destroy: function name is self-descriptive. Additional information is also removed as they're already present as comments inside the function. _drm_lease_revoke: function name is self-descriptive drm_lease_revoke: function name is self-descriptive drm_mode_create_lease_ioctl: Kerneldoc removed, but useful function details retained. drm_mode_list_lessees_ioctl: function name is self-descriptive. Additional details restate what the code does. drm_mode_get_lease_ioctl: Function summary retained to clarify that it's the leased objects that are returned, not the lease structure. drm_mode_revoke_lease_ioctl: Kerneldoc removed, but useful function details retained. Signed-off-by: Desmond Cheong Zhi Xi <desmondcheongzx(a)gmail.com> --- drivers/gpu/drm/drm_lease.c | 131 +++--------------------------------- 1 file changed, 8 insertions(+), 123 deletions(-) diff --git a/drivers/gpu/drm/drm_lease.c b/drivers/gpu/drm/drm_lease.c index 79be797e8689..dee4f24a1808 100644 --- a/drivers/gpu/drm/drm_lease.c +++ b/drivers/gpu/drm/drm_lease.c @@ -71,14 +71,6 @@ static uint64_t drm_lease_idr_object; -/** - * drm_lease_owner - return ancestor owner drm_master - * @master: drm_master somewhere within tree of lessees and lessors - * - * RETURN: - * - * drm_master at the top of the tree (i.e, with lessor NULL - */ struct drm_master *drm_lease_owner(struct drm_master *master) { while (master->lessor != NULL) @@ -86,16 +78,6 @@ struct drm_master *drm_lease_owner(struct drm_master *master) return master; } -/** - * _drm_find_lessee - find lessee by id (idr_mutex held) - * @master: drm_master of lessor - * @lessee_id: id - * - * RETURN: - * - * drm_master of the lessee if valid, NULL otherwise - */ - static struct drm_master* _drm_find_lessee(struct drm_master *master, int lessee_id) { @@ -103,17 +85,6 @@ _drm_find_lessee(struct drm_master *master, int lessee_id) return idr_find(&drm_lease_owner(master)->lessee_idr, lessee_id); } -/** - * _drm_lease_held_master - check to see if an object is leased (or owned) by master (idr_mutex held) - * @master: the master to check the lease status of - * @id: the id to check - * - * Checks if the specified master holds a lease on the object. Return - * value: - * - * true 'master' holds a lease on (or owns) the object - * false 'master' does not hold a lease. - */ static int _drm_lease_held_master(struct drm_master *master, int id) { lockdep_assert_held(&master->dev->mode_config.idr_mutex); @@ -122,17 +93,7 @@ static int _drm_lease_held_master(struct drm_master *master, int id) return true; } -/** - * _drm_has_leased - check to see if an object has been leased (idr_mutex held) - * @master: the master to check the lease status of - * @id: the id to check - * - * Checks if any lessee of 'master' holds a lease on 'id'. Return - * value: - * - * true Some lessee holds a lease on the object. - * false No lessee has a lease on the object. - */ +/* Checks if the given object has been leased to some lessee of drm_master */ static bool _drm_has_leased(struct drm_master *master, int id) { struct drm_master *lessee; @@ -144,17 +105,7 @@ static bool _drm_has_leased(struct drm_master *master, int id) return false; } -/** - * _drm_lease_held - check drm_mode_object lease status (idr_mutex held) - * @file_priv: the master drm_file - * @id: the object id - * - * Checks if the specified master holds a lease on the object. Return - * value: - * - * true 'master' holds a lease on (or owns) the object - * false 'master' does not hold a lease. - */ +/* Called with idr_mutex held */ bool _drm_lease_held(struct drm_file *file_priv, int id) { bool ret; @@ -172,17 +123,6 @@ bool _drm_lease_held(struct drm_file *file_priv, int id) return ret; } -/** - * drm_lease_held - check drm_mode_object lease status (idr_mutex not held) - * @file_priv: the master drm_file - * @id: the object id - * - * Checks if the specified master holds a lease on the object. Return - * value: - * - * true 'master' holds a lease on (or owns) the object - * false 'master' does not hold a lease. - */ bool drm_lease_held(struct drm_file *file_priv, int id) { struct drm_master *master; @@ -207,13 +147,9 @@ bool drm_lease_held(struct drm_file *file_priv, int id) return ret; } -/** - * drm_lease_filter_crtcs - restricted crtc set to leased values (idr_mutex not held) - * @file_priv: requestor file - * @crtcs_in: bitmask of crtcs to check - * - * Reconstructs a crtc mask based on the crtcs which are visible - * through the specified file. +/* + * Given a bitmask of crtcs to check, reconstructs a crtc mask based on the + * crtcs which are visible through the specified file. */ uint32_t drm_lease_filter_crtcs(struct drm_file *file_priv, uint32_t crtcs_in) { @@ -258,10 +194,6 @@ uint32_t drm_lease_filter_crtcs(struct drm_file *file_priv, uint32_t crtcs_in) } /* - * drm_lease_create - create a new drm_master with leased objects (idr_mutex not held) - * @lessor: lease holder (or owner) of objects - * @leases: objects to lease to the new drm_master - * * Uses drm_master_create to allocate a new drm_master, then checks to * make sure all of the desired objects can be leased, atomically * leasing them to the new drmmaster. @@ -330,15 +262,6 @@ static struct drm_master *drm_lease_create(struct drm_master *lessor, struct idr return ERR_PTR(error); } -/** - * drm_lease_destroy - a master is going away (idr_mutex not held) - * @master: the drm_master being destroyed - * - * All lessees will have been destroyed as they - * hold a reference on their lessor. Notify any - * lessor for this master so that it can check - * the list of lessees. - */ void drm_lease_destroy(struct drm_master *master) { struct drm_device *dev = master->dev; @@ -372,10 +295,6 @@ void drm_lease_destroy(struct drm_master *master) DRM_DEBUG_LEASE("drm_lease_destroy done %d\n", master->lessee_id); } -/** - * _drm_lease_revoke - revoke access to all leased objects (idr_mutex held) - * @top: the master losing its lease - */ static void _drm_lease_revoke(struct drm_master *top) { int object; @@ -414,10 +333,6 @@ static void _drm_lease_revoke(struct drm_master *top) } } -/** - * drm_lease_revoke - revoke access to all leased objects (idr_mutex not held) - * @top: the master losing its lease - */ void drm_lease_revoke(struct drm_master *top) { mutex_lock(&top->dev->mode_config.idr_mutex); @@ -549,12 +464,7 @@ static int fill_object_idr(struct drm_device *dev, return ret; } -/** - * drm_mode_create_lease_ioctl - create a new lease - * @dev: the drm device - * @data: pointer to struct drm_mode_create_lease - * @lessor_priv: the file being manipulated - * +/* * The master associated with the specified file will have a lease * created containing the objects specified in the ioctl structure. * A file descriptor will be allocated for that and returned to the @@ -676,18 +586,6 @@ int drm_mode_create_lease_ioctl(struct drm_device *dev, return ret; } -/** - * drm_mode_list_lessees_ioctl - list lessee ids - * @dev: the drm device - * @data: pointer to struct drm_mode_list_lessees - * @lessor_priv: the file being manipulated - * - * Starting from the master associated with the specified file, - * the master with the provided lessee_id is found, and then - * an array of lessee ids associated with leases from that master - * are returned. - */ - int drm_mode_list_lessees_ioctl(struct drm_device *dev, void *data, struct drm_file *lessor_priv) { @@ -734,15 +632,7 @@ int drm_mode_list_lessees_ioctl(struct drm_device *dev, return ret; } -/** - * drm_mode_get_lease_ioctl - list leased objects - * @dev: the drm device - * @data: pointer to struct drm_mode_get_lease - * @lessee_priv: the file being manipulated - * - * Return the list of leased objects for the specified lessee - */ - +/* Return the list of leased objects for the specified lessee */ int drm_mode_get_lease_ioctl(struct drm_device *dev, void *data, struct drm_file *lessee_priv) { @@ -796,12 +686,7 @@ int drm_mode_get_lease_ioctl(struct drm_device *dev, return ret; } -/** - * drm_mode_revoke_lease_ioctl - revoke lease - * @dev: the drm device - * @data: pointer to struct drm_mode_revoke_lease - * @lessor_priv: the file being manipulated - * +/* * This removes all of the objects from the lease without * actually getting rid of the lease itself; that way all * references to it still work correctly -- 2.25.1

1 0

[PATCH] drm: msm: Add 680 gpu to the adreno gpu list
by Bjorn Andersson 30 Jul '21

30 Jul '21

This patch adds a Adreno 680 entry to the gpulist. Signed-off-by: Bjorn Andersson <bjorn.andersson(a)linaro.org> --- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 5 +++-- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 12 +++++++----- drivers/gpu/drm/msm/adreno/a6xx_hfi.c | 2 +- drivers/gpu/drm/msm/adreno/adreno_device.c | 13 +++++++++++++ drivers/gpu/drm/msm/adreno/adreno_gpu.h | 5 +++++ 5 files changed, 29 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c index b349692219b7..1c0d75e1189f 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c @@ -521,7 +521,8 @@ static void a6xx_gmu_rpmh_init(struct a6xx_gmu *gmu) if (adreno_is_a650(adreno_gpu) || adreno_is_a660(adreno_gpu)) pdc_in_aop = true; - else if (adreno_is_a618(adreno_gpu) || adreno_is_a640(adreno_gpu)) + else if (adreno_is_a618(adreno_gpu) || adreno_is_a640(adreno_gpu) || + adreno_is_a680(adreno_gpu)) pdc_address_offset = 0x30090; else pdc_address_offset = 0x30080; @@ -1522,7 +1523,7 @@ int a6xx_gmu_init(struct a6xx_gpu *a6xx_gpu, struct device_node *node) SZ_16M - SZ_16K, 0x04000); if (ret) goto err_memory; - } else if (adreno_is_a640(adreno_gpu)) { + } else if (adreno_is_a640(adreno_gpu) || adreno_is_a680(adreno_gpu)) { ret = a6xx_gmu_memory_alloc(gmu, &gmu->icache, SZ_256K - SZ_16K, 0x04000); if (ret) diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c index 9c5e4618aa0a..5cdafc6c8bb0 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c @@ -683,7 +683,7 @@ static void a6xx_set_ubwc_config(struct msm_gpu *gpu) if (adreno_is_a618(adreno_gpu)) return; - if (adreno_is_a640(adreno_gpu)) + if (adreno_is_a640(adreno_gpu) || adreno_is_a680(adreno_gpu)) amsbc = 1; if (adreno_is_a650(adreno_gpu) || adreno_is_a660(adreno_gpu)) { @@ -757,7 +757,7 @@ static bool a6xx_ucode_check_version(struct a6xx_gpu *a6xx_gpu, * a660 targets have all the critical security fixes from the start */ if (adreno_is_a618(adreno_gpu) || adreno_is_a630(adreno_gpu) || - adreno_is_a640(adreno_gpu)) { + adreno_is_a640(adreno_gpu) || adreno_is_a680(adreno_gpu)) { /* * If the lowest nibble is 0xa that is an indication that this * microcode has been patched. The actual version is in dword @@ -897,7 +897,8 @@ static int a6xx_hw_init(struct msm_gpu *gpu) a6xx_set_hwcg(gpu, true); /* VBIF/GBIF start*/ - if (adreno_is_a640(adreno_gpu) || adreno_is_a650_family(adreno_gpu)) { + if (adreno_is_a640(adreno_gpu) || adreno_is_a650_family(adreno_gpu) || + adreno_is_a680(adreno_gpu)) { gpu_write(gpu, REG_A6XX_GBIF_QSB_SIDE0, 0x00071620); gpu_write(gpu, REG_A6XX_GBIF_QSB_SIDE1, 0x00071620); gpu_write(gpu, REG_A6XX_GBIF_QSB_SIDE2, 0x00071620); @@ -935,7 +936,8 @@ static int a6xx_hw_init(struct msm_gpu *gpu) gpu_write(gpu, REG_A6XX_UCHE_FILTER_CNTL, 0x804); gpu_write(gpu, REG_A6XX_UCHE_CACHE_WAYS, 0x4); - if (adreno_is_a640(adreno_gpu) || adreno_is_a650_family(adreno_gpu)) + if (adreno_is_a640(adreno_gpu) || adreno_is_a650_family(adreno_gpu) || + adreno_is_a680(adreno_gpu)) gpu_write(gpu, REG_A6XX_CP_ROQ_THRESHOLDS_2, 0x02000140); else gpu_write(gpu, REG_A6XX_CP_ROQ_THRESHOLDS_2, 0x010000c0); @@ -952,7 +954,7 @@ static int a6xx_hw_init(struct msm_gpu *gpu) */ if (adreno_is_a650(adreno_gpu) || adreno_is_a660(adreno_gpu)) gpu_write(gpu, REG_A6XX_PC_DBG_ECO_CNTL, 0x00300200); - else if (adreno_is_a640(adreno_gpu)) + else if (adreno_is_a640(adreno_gpu) || adreno_is_a680(adreno_gpu)) gpu_write(gpu, REG_A6XX_PC_DBG_ECO_CNTL, 0x00200200); else gpu_write(gpu, REG_A6XX_PC_DBG_ECO_CNTL, 0x00180000); diff --git a/drivers/gpu/drm/msm/adreno/a6xx_hfi.c b/drivers/gpu/drm/msm/adreno/a6xx_hfi.c index 919433732b43..df8af237cf6a 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_hfi.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_hfi.c @@ -428,7 +428,7 @@ static int a6xx_hfi_send_bw_table(struct a6xx_gmu *gmu) if (adreno_is_a618(adreno_gpu)) a618_build_bw_table(&msg); - else if (adreno_is_a640(adreno_gpu)) + else if (adreno_is_a640(adreno_gpu) || adreno_is_a680(adreno_gpu)) a640_build_bw_table(&msg); else if (adreno_is_a650(adreno_gpu)) a650_build_bw_table(&msg); diff --git a/drivers/gpu/drm/msm/adreno/adreno_device.c b/drivers/gpu/drm/msm/adreno/adreno_device.c index 6dad8015c9a1..799e4a35ca44 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_device.c +++ b/drivers/gpu/drm/msm/adreno/adreno_device.c @@ -300,6 +300,19 @@ static const struct adreno_info gpulist[] = { .init = a6xx_gpu_init, .zapfw = "a660_zap.mdt", .hwcg = a660_hwcg, + }, { + .rev = ADRENO_REV(6, 8, 0, ANY_ID), + .revn = 680, + .name = "A680", + .fw = { + [ADRENO_FW_SQE] = "a630_sqe.fw", + [ADRENO_FW_GMU] = "a640_gmu.bin", + }, + .gmem = SZ_2M, + .inactive_period = DRM_MSM_INACTIVE_PERIOD, + .init = a6xx_gpu_init, + .zapfw = "a640_zap.mdt", + .hwcg = a640_hwcg, }, }; diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.h b/drivers/gpu/drm/msm/adreno/adreno_gpu.h index 8dbe0d157520..a7e843e81b1e 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.h +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.h @@ -258,6 +258,11 @@ static inline int adreno_is_a650_family(struct adreno_gpu *gpu) return gpu->revn == 650 || gpu->revn == 620 || gpu->revn == 660; } +static inline int adreno_is_a680(struct adreno_gpu *gpu) +{ + return gpu->revn == 680; +} + int adreno_get_param(struct msm_gpu *gpu, uint32_t param, uint64_t *value); const struct firmware *adreno_request_fw(struct adreno_gpu *adreno_gpu, const char *fwname); -- 2.29.2

3 3

[pull] amdgpu, amdkfd, radeon drm-next-5.15
by Alex Deucher 30 Jul '21

30 Jul '21

Hi Dave, Daniel, New stuff for 5.15. The following changes since commit b322a50d17ede5cff6622040f345228afecdcc45: Merge tag 'amd-drm-next-5.14-2021-06-22-1' of https://gitlab.freedesktop.org/agd5f/linux into drm-next (2021-06-24 07:57:41 +1000) are available in the Git repository at: https://gitlab.freedesktop.org/agd5f/linux.git tags/amd-drm-next-5.15-2021-07-29 for you to fetch changes up to 544dcd74b7093ad4befac99b11d90331aa73348e: drm/amd/pm: Fix a bug in semaphore double-lock (2021-07-28 22:15:44 -0400) ---------------------------------------------------------------- amd-drm-next-5.15-2021-07-29: amdgpu: - VCN/JPEG power down sequencing fixes - Various navi pcie link handling fixes - Clockgating fixes - Yellow Carp fixes - Beige Goby fixes - Misc code cleanups - S0ix fixes - SMU i2c bus rework - EEPROM handling rework - PSP ucode handling cleanup - SMU error handling rework - AMD HDMI freesync fixes - USB PD firmware update rework - MMIO based vram access rework - Misc display fixes - Backlight fixes - Add initial Cyan Skillfish support - Overclocking fixes suspend/resume amdkfd: - Sysfs leak fix - Add counters for vm faults and migration - GPUVM TLB optimizations radeon: - Misc fixes ---------------------------------------------------------------- Aaron Liu (5): drm/amdgpu: enable tmz on yellow carp drm/amdgpu: enable sdma0 tmz for Raven/Renoir(V2) drm/amd/pm: Add waiting for response of mode-reset message for yellow carp drm/amdgpu: update yellow carp external rev_id handling drm/amdgpu: add yellow carp pci id (v2) Aaron Rice (1): drm/amdgpu: rework smu11 i2c for generic operation Alex Deucher (16): drm/amdgpu/display: drop unused variable drm/amdgpu: add new dimgrey cavefish DID drm/amdgpu: add a mutex for the smu11 i2c bus (v2) drm/amdgpu/pm: rework i2c xfers on sienna cichlid (v4) drm/amdgpu/pm: rework i2c xfers on arcturus (v5) drm/amdgpu/pm: add smu i2c implementation for navi1x (v5) drm/amdgpu: add new helper for handling EEPROM i2c transfers drm/amdgpu/ras: switch ras eeprom handling to use generic helper drm/amdgpu/ras: switch fru eeprom handling to use generic helper (v2) drm/amdgpu: i2c subsystem uses 7 bit addresses drm/amdgpu: add I2C_CLASS_HWMON to SMU i2c buses drm/amdgpu: only set restart on first cmd of the smu i2c transaction drm/amdgpu: fix 64 bit divide in eeprom code drm/amdgpu: add license to umc_8_7_0_sh_mask.h drm/amdgpu/display: only enable aux backlight control for OLED panels drm/amdgpu/display: add support for multiple backlights Alex Sierra (11): drm/amdkfd: inc counter on child ranges with xnack off drm/amdkfd: device pgmap owner at the svm migrate init drm/amdkfd: add owner ref param to get hmm pages drm/amdkfd: set owner ref to svm range prefault drm/amdgpu: get owner ref in validate and map drm/amdkfd: use hmm range fault to get both domain pfns drm/amdkfd: classify and map mixed svm range pages in GPU drm/amdkfd: skip invalid pages during migrations drm/amdkfd: skip migration for pages already in VRAM drm/amdkfd: add invalid pages debug at vram migration drm/amdkfd: Maintain svm_bo reference in page->zone_device_data Alvin Lee (1): drm/amd/display: Adjust types and formatting for future development Andrey Grodzovsky (8): drm/amdgpu: Remember to wait 10ms for write buffer flush v2 dmr/amdgpu: Add RESTART handling also to smu_v11_0_i2c (VG20) drm/amdgpu: Drop i > 0 restriction for issuing RESTART drm/amdgpu: Send STOP for the last byte of msg only drm/amd/pm: SMU I2C: Return number of messages processed drm/amdgpu/pm: ADD I2C quirk adapter table drm/amdgpu: Switch to VRAM buffer for USBC PD FW. drm/amdgpu: Switch to LFB for USBC PD FW in psp v13 Anson Jacob (4): drm/amdgpu: Fix documentaion for amdgpu_bo_add_to_shadow_list drm/amd/amdgpu: Update debugfs link_settings output link_rate field in hex drm/amd/amdgpu: Add a new line to debugfs phy_settings output drm/amdgpu: Fix documentaion for dm_dmub_outbox1_low_irq Anthony Koo (4): drm/amd/display: [FW Promotion] Release 0.0.72 drm/amd/display: [FW Promotion] Release 0.0.73 drm/amd/display: [FW Promotion] Release 0.0.75 drm/amd/display: [FW Promotion] Release 0.0.76 Aric Cyr (7): drm/amd/display: 3.2.142 drm/amd/display: Round KHz up when calculating clock requests drm/amd/display: increase max EDID size to 2k drm/amd/display: 3.2.143 drm/amd/display: 3.2.144 drm/amd/display: 3.2.145 drm/amd/display: 3.2.146 Aurabindo Pillai (1): drm/amd/display: add debug print for DCC validation failure Bindu Ramamurthy (2): drm/amd/display: Populate socclk entries for dcn3.02/3.03 drm/amd/display: Populate dtbclk entries for dcn3.02/3.03 Camille Cho (1): drm/amd/display: Only set default brightness for OLED Candice Li (1): drm/amd/amdgpu: add consistent PSP FW loading size checking Charlene Liu (1): drm/amd/display: reset dpcd_cap.dpcd_rev for passive dongle. Chengming Gui (2): drm/amd/amdgpu: enable gpu recovery for beige_goby drm/amd/pm: Fix BACO state setting for Beige_Goby Chengzhe Liu (3): drm/amdgpu: Power down VCN and JPEG before disabling SMU features drm/amdgpu: Clear doorbell interrupt status for Sienna Cichlid drm/amdgpu: Add msix restore for pass-through mode Chun-Liang Chang (1): drm/amd/display: DMUB Outbound Interrupt Process-X86 Colin Ian King (1): drm/amdgpu/display: make a const array common_rates static, makes object smaller Dale Zhao (1): drm/amd/display: ensure dentist display clock update finished in DCN20 Dan Carpenter (4): drm/amdgpu: fix a signedness bug in __verify_ras_table_checksum() drm/amdgpu: Fix signedness bug in __amdgpu_eeprom_xfer() drm/amdgpu: unlock on error in amdgpu_ras_debugfs_table_read() drm/amdgpu: return -EFAULT if copy_to_user() fails Darren Powell (1): amdgpu/pm: remove code duplication in show_power_cap calls Dmytro Laktyushkin (2): drm/amd/display: remove faulty assert drm/amd/display: remove compbuf size wait Emily Deng (1): drm/amdgpu: Correct the irq numbers for virtual crtc Emily.Deng (1): drm/amdgpu: Restore msix after FLR Eric Bernstein (1): drm/amd/display: Always wait for update lock status Eric Huang (12): drm/amdkfd: Only apply TLB flush optimization on ALdebaran Revert "drm/amdkfd: Only apply TLB flush optimization on ALdebaran" Revert "drm/amdkfd: Add memory sync before TLB flush on unmap" Revert "drm/amdgpu: Fix warning of Function parameter or member not described" Revert "drm/amdkfd: Make TLB flush conditional on mapping" Revert "drm/amdgpu: Add table_freed parameter to amdgpu_vm_bo_update" Revert "drm/amdkfd: Add heavy-weight TLB flush after unmapping" Revert "Revert "drm/amdkfd: Add heavy-weight TLB flush after unmapping"" Revert "Revert "drm/amdgpu: Add table_freed parameter to amdgpu_vm_bo_update"" Revert "Revert "drm/amdkfd: Make TLB flush conditional on mapping"" Revert "Revert "drm/amdgpu: Fix warning of Function parameter or member not described"" Revert "Revert "drm/amdkfd: Add memory sync before TLB flush on unmap"" Eric Yang (5): drm/amd/display: implement workaround for riommu related hang drm/amd/display: add workaround for riommu invalidation request hang drm/amd/display: change zstate allow msg condition drm/amd/display: fix missing reg offset drm/amd/display: refactor riommu invalidation wa Evan Quan (12): drm/amdgpu: correct tcp harvest setting drm/amdgpu: fix Navi1x tcp power gating hang when issuing lightweight invalidaiton drm/amdgpu: fix NAK-G generation during PCI-e link width switch drm/amdgpu: fix the hang caused by PCIe link width switch drm/amdgpu: correct clock gating settings on feature unsupported drm/amdgpu: update GFX MGCG settings drm/amdgpu: update HDP LS settings drm/amd/pm: new SmuMetrics data structure for Sienna Cichlid drm/amd/pm: update the gpu metrics data retrieving for Sienna Cichlid drm/amd/pm: bump DRIVER_IF_VERSION for Sienna Cichlid drm/amd/pm: restore user customized OD settings properly for NV1x drm/amd/pm: restore user customized OD settings properly for Sienna Cichlid Felix Kuehling (1): drm/amdkfd: Allow CPU access for all VRAM BOs Graham Sider (1): drm/amdkfd: Update SMI throttle event bitmask Guchun Chen (3): drm/amd/display: fix incorrrect valid irq check drm/amd/display: fix null pointer access in gpu reset drm/amd/display: avoid printing ERROR for unknown CEA parse(v2) Hawking Zhang (1): drm/amdgpu: retire sdma v5_2 golden settings from driver Huang Rui (3): drm/amdgpu: move apu flags initialization to the start of device init drm/amdgpu: remove the access of xxx_PSP_DEBUG on cycan_skillfish drm/amdgpu: enable psp front door loading by default for cyan_skillfish2 Ian Chen (1): drm/amd/display: Extend dmub_cmd_psr_copy_settings_data struct Jake Wang (1): drm/amd/display: Fixed hardware power down bypass during headless boot Jing Xiangfeng (1): drm/radeon: Add the missed drm_gem_object_put() in radeon_user_framebuffer_create() Jingwen Chen (2): drm/amdgpu: SRIOV flr_work should take write_lock drm/amd/amdgpu: consider kernel job always not guilty Jinzhou Su (1): drm/amdgpu: add another Renoir DID Jiri Kosina (2): drm/amdgpu: Fix resource leak on probe error path drm/amdgpu: Avoid printing of stack contents on firmware load error John Clements (6): drm/amdgpu: initialize umc ras function drm/amdgpu: Resolve bug in UMC 6.7 error offset calculation drm/amdgpu: Added latest PSP FW header drm/amdgpu: Added support for added psp driver binaries FW drm/amdgpu: Consolidated PSP13 BL FW loading drm/amdgpu: Added PSP13 BL loading support for additional drivers Jonathan Kim (3): drm/amdgpu: add psp command to get num xgmi links between direct peers drm/amdkfd: report xgmi bandwidth between direct peers to the kfd drm/amdkfd: report pcie bandwidth to the kfd Joseph Greathouse (1): drm/amdgpu: Update NV SIMD-per-CU to 2 Josip Pavic (1): drm/amd/display: log additional register state for debug Kai-Heng Feng (1): drm/amdgpu/acp: Make PM domain really work Kevin Wang (3): drm/amdgpu: split amdgpu_device_access_vram() into two small parts drm/amdgpu/ttm: replace duplicate code with exiting function drm/amdgpu/ttm: optimize vram access in amdgpu_ttm_access_memory() Krunoslav Kovac (2): drm/amd/display: Assume active upper layer owns the HW cursor drm/amd/display: Refine condition for cursor visibility Lang Yu (16): drm/amdgpu: add function to show ucode name via id drm/amdgpu: add function to show psp_gfx_cmd name via id drm/amdgpu: show explicit name instead of id in psp_cmd_submit_buf drm/amdgpu: adjust fw_name string length for toc drm/amdgpu: add mp 11.0.8 header for cyan_skillfish drm/amdgpu: add psp v11.0.8 driver for cyan_skillfish drm/amdgpu: init psp v11.0.8 function for cyan_skillfish drm/amdgpu: enable psp v11.0.8 for cyan_skillfish drm/amdgpu: use direct loading by default for cyan_skillfish2 drm/amdgpu: add smu_v11_8_pmfw header for cyan_skilfish drm/amdgpu: add smu_v11_8_ppsmc header for cyan_skilfish drm/amdgpu: add smu interface header for cyan_skilfish drm/amdgpu: add basic ppt functions for cyan_skilfish drm/amdgpu: add check_fw_version support for cyan_skillfish drm/amdgpu: enable SMU for cyan_skilfish drm/amdgpu: add autoload_supported check for RLC autoload Lijo Lazar (1): drm/amd/pm: Support board calibration on aldebaran Likun Gao (2): drm/amdgpu: update golden setting for sienna_cichlid drm/amdgpu: adjust fence driver enable sequence Liviu Dudau (1): drm/amd/display: Fix 10bit 4K display on CIK GPUs Luben Tuikov (32): drm/amdgpu: Fix Vega20 I2C to be agnostic (v2) drm/amdgpu: Fixes to the AMDGPU EEPROM driver drm/amdgpu: EEPROM respects I2C quirks drm/amdgpu: I2C EEPROM full memory addressing drm/amdgpu: RAS and FRU now use 19-bit I2C address drm/amdgpu: Fix wrap-around bugs in RAS drm/amdgpu: I2C class is HWMON drm/amdgpu: RAS: EEPROM --> RAS drm/amdgpu: Rename misspelled function drm/amdgpu: RAS xfer to read/write drm/amdgpu: EEPROM: add explicit read and write drm/amd/pm: Extend the I2C quirk table drm/amd/pm: Simplify managed I2C transfer functions drm/amdgpu: Fix width of I2C address drm/amdgpu: Return result fix in RAS drm/amdgpu: Fix amdgpu_ras_eeprom_init() drm/amdgpu: Simplify RAS EEPROM checksum calculations drm/amdgpu: Use explicit cardinality for clarity drm/amdgpu: Nerf buff drm/amdgpu: Some renames drm/amdgpu: Get rid of test function drm/amdgpu: Optimize EEPROM RAS table I/O drm/amdgpu: RAS EEPROM table is now in debugfs drm/amdgpu: Fix koops when accessing RAS EEPROM drm/amdgpu: Use a single loop drm/amdgpu: Correctly disable the I2C IP block drm/amd/pm: Simplify managed I2C transfer of Aldebaran drm/amd/pm: Add I2C quirk table to Aldebaran drm/amdgpu: The I2C IP doesn't support 0 writes/reads drm/amdgpu: Return error if no RAS drm/amd/pm: Fix a bug communicating with the SMU (v5) drm/amd/pm: Fix a bug in semaphore double-lock Lukas Bulwahn (1): drm/amdgpu: rectify line endings in umc v8_7_0 IP headers Mark Morra (1): drm/amd/display: Fixed EdidUtility build errors Michael Strauss (1): drm/amd/display: Enable eDP ILR on DCN2.1 Michal Suchanek (1): drm/amdgpu/dc: Really fix DCN3.1 Makefile for PPC64 Mikita Lipski (3): drm/amd/display: Prevent Diags from entering S2 drm/amd/display: Remove MALL function from DCN3.1 drm/amd/display: Fix PSR command version Mukul Joshi (1): drm/amdgpu: Conditionally reset SDMA RAS error counts Nevenko Stupar (1): drm/amd/display: Line Buffer changes Nicholas Kazlauskas (5): drm/amd/display: Extend DMUB diagnostic logging to DCN3.1 drm/amd/display: Fix updating infoframe for DCN3.1 eDP drm/amd/display: Fix max vstartup calculation for modes with borders drm/amd/display: Query VCO frequency from register for DCN3.1 drm/amd/display: Update bounding box for DCN3.1 Nirmoy Das (2): drm/amdgpu: use xarray for storing pasid in vm drm/amdgpu: separate out vm pasid assignment Oak Zeng (6): drm/amdgpu: Set ttm caching flags during bo allocation drm/amdgpu: Fix a printing message drm/amdgpu: Change a few function names drm/amdkfd: Renaming dqm->packets to dqm->packet_mgr drm/amdkfd: Set priv_queue to NULL after it is freed drm/amdkfd: Fix a concurrency issue during kfd recovery Oliver Logush (1): drm/amd/display: Fix timer_per_pixel unit error Philip Yang (5): drm/amdkfd: add helper function for kfd sysfs create drm/amdkfd: fix sysfs kobj leak drm/amdkfd: add sysfs counters for vm fault and migration drm/amdkfd: implement counters for vm fault and migration drm/amdkfd: handle fault counters on invalid address Pratik Vishwakarma (2): drm/amdgpu: Check pmops for desired suspend state drm/amdgpu: Rename amdgpu_acpi_is_s0ix_supported Reka Norman (1): drm/amd/display: Respect CONFIG_FRAME_WARN=0 in dml Makefile Rodrigo Siqueira (1): Revert "drm/amd/display: Fix overlay validation by considering cursors" Roy Sun (3): drm/amdgpu: Change the imprecise function name drm/amdgpu: Add error message when programing registers fails drm/amdgpu: Change the imprecise output Shyam Sundar S K (1): drm/amd/pm: skip PrepareMp1ForUnload message in s0ix Simon Ser (1): maintainers: add bugs and chat URLs for amdgpu Stylon Wang (2): drm/amd/display: Add Freesync HDMI support to DM with DMUB drm/amd/display: Fix ASSR regression on embedded panels Tao Zhou (18): drm/amdgpu: update gc golden setting for dimgrey_cavefish drm/amd/pm: update DRIVER_IF_VERSION for beige_goby drm/amdgpu: increase size for sdma fw name string drm/amdgpu: add cyan_skillfish asic type drm/amdgpu: dynamic initialize ip offset for cyan_skillfish drm/amdgpu: init family name for cyan_skillfish drm/amdgpu: set ip blocks for cyan_skillfish drm/amdgpu: add cp/rlc fw loading support for cyan_skillfish drm/amdgpu: add sdma fw loading support for cyan_skillfish drm/amdgpu: load fw direclty for cyan_skillfish drm/amdgpu: add cyan_skillfish support in gmc v10 drm/amdgpu: add cyan_skillfish support in gfx v10 drm/amdgpu: add sdma v5 golden settings for cyan_skillfish drm/amdgpu: add gc v10 golden settings for cyan_skillfish drm/amdkfd: enable cyan_skillfish KFD drm/amdgpu: add chip early init for cyan_skillfish drm/amdgpu: add nbio support for cyan_skillfish drm/amdgpu: add pci device id for cyan_skillfish Tiezhu Yang (1): drm/radeon: Call radeon_suspend_kms() in radeon_pci_shutdown() for Loongson64 Veerabadhran Gopalakrishnan (4): amdgpu/nv.c - Added codec query for Beige Goby amdgpu/nv.c - Added video codec support for Yellow Carp amdgpu/nv.c - Optimize code for video codec support structure drm/amdgpu - Corrected the video codecs array name for yellow carp Victor Lu (3): drm/amd/display: Fix comparison error in dcn21 DML drm/amd/display: Guard DST_Y_PREFETCH register overflow in DCN21 drm/amd/display: Add missing DCN21 IP parameter Wang (1): drm/amd/display: Add null checks Wenjing Liu (3): drm/amd/display: isolate link training setting override to its own function drm/amd/display: add update authentication interface drm/amd/display: remove unused functions Wesley Chalmers (2): Revert "drm/amd/display: Always write repeater mode regardless of LTTPR" drm/amd/display: Add copyright notice to new files Wyatt Wood (2): drm/amd/display: Add ETW logging for AUX failures drm/amd/display: Add ETW log to dmub_psr_get_state Xiaojian Du (1): drm/amdgpu: update the golden setting for vangogh Xiaomeng Hou (2): drm/amd/pm: drop smu_v13_0_1.c|h files for yellow carp drm/amd/display: update header file name YuBiao Wang (1): drm/amdgpu: Read clock counter via MMIO to reduce delay (v5) Zhan Liu (3): drm/amd/display: Enabling eDP no power sequencing with DAL feature mask drm/amdgpu/display - only update eDP's backlight level when necessary drm/amd/display: Reduce delay when sink device not able to ACK 00340h write sunglee (1): drm/amd/display: DCN2X Prefer ODM over bottom pipe to find second pipe MAINTAINERS | 2 + drivers/gpu/drm/amd/amdgpu/Makefile | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 18 +- drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c | 54 +- drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 11 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 83 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 16 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 178 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 23 +- drivers/gpu/drm/amd/amdgpu/amdgpu_eeprom.c | 239 ++++ .../inc/smu_v13_0_1.h => amdgpu/amdgpu_eeprom.h} | 40 +- drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 44 +- drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c | 32 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 18 + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 18 +- drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_mn.h | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h | 3 + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 369 ++++-- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 54 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 165 +-- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 7 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 1258 +++++++++++++------- drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.h | 70 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 7 +- drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 96 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 86 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 61 +- drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 147 +-- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 10 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 5 + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 12 + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h | 2 + drivers/gpu/drm/amd/amdgpu/athub_v2_0.c | 12 +- .../gpu/drm/amd/amdgpu/cyan_skillfish_reg_init.c | 51 + drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 2 +- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 429 +++++-- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 4 +- drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 3 + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 13 + drivers/gpu/drm/amd/amdgpu/hdp_v5_0.c | 85 +- drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 10 +- drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 4 +- drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c | 4 +- drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 72 +- drivers/gpu/drm/amd/amdgpu/nv.c | 298 ++--- drivers/gpu/drm/amd/amdgpu/nv.h | 1 + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 49 +- drivers/gpu/drm/amd/amdgpu/psp_v11_0_8.c | 208 ++++ drivers/gpu/drm/amd/amdgpu/psp_v11_0_8.h | 30 + drivers/gpu/drm/amd/amdgpu/psp_v12_0.c | 11 +- drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 126 +- drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 4 +- drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 11 +- drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 50 +- drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 17 - drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c | 324 ++--- drivers/gpu/drm/amd/amdgpu/smuio_v11_0.c | 5 +- drivers/gpu/drm/amd/amdgpu/soc15.c | 190 +-- drivers/gpu/drm/amd/amdgpu/soc15_common.h | 8 +- drivers/gpu/drm/amd/amdgpu/ta_xgmi_if.h | 14 +- drivers/gpu/drm/amd/amdgpu/umc_v6_7.c | 15 + drivers/gpu/drm/amd/amdgpu/umc_v6_7.h | 15 + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 2 +- drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 17 + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 30 +- .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 39 +- .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 1 + drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 100 +- drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 5 + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 11 +- drivers/gpu/drm/amd/amdkfd/kfd_process.c | 272 +++-- .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 1 + drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c | 10 +- drivers/gpu/drm/amd/amdkfd/kfd_smi_events.h | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 242 ++-- drivers/gpu/drm/amd/amdkfd/kfd_svm.h | 19 +- drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 3 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 273 +++-- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 4 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 18 +- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 4 +- .../drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr.c | 12 +- .../dc/clk_mgr/dcn10/rv1_clk_mgr_vbios_smu.c | 4 +- .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 14 +- .../dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.c | 16 +- .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 29 +- .../drm/amd/display/dc/clk_mgr/dcn301/dcn301_smu.c | 10 +- .../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c | 2 +- .../amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c | 59 +- .../amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.h | 54 - .../drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.c | 14 +- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 118 +- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 147 +-- drivers/gpu/drm/amd/display/dc/core/dc_link_dpcd.c | 25 + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 2 +- drivers/gpu/drm/amd/display/dc/core/dc_stat.c | 24 + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 3 + drivers/gpu/drm/amd/display/dc/dc.h | 131 +- drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 1 + drivers/gpu/drm/amd/display/dc/dc_stat.h | 1 + drivers/gpu/drm/amd/display/dc/dc_types.h | 83 +- drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 8 + drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h | 4 +- drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 21 +- .../amd/display/dc/dce110/dce110_hw_sequencer.c | 31 +- .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_dscl.c | 7 +- .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.h | 19 +- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 29 + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h | 4 + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 42 +- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 6 + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h | 2 + .../gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.c | 21 + .../gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.h | 33 +- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c | 17 + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 60 +- .../gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.c | 1 + .../gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.h | 14 +- drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubp.c | 2 +- .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 4 +- drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.c | 16 - drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.h | 3 +- .../gpu/drm/amd/display/dc/dcn30/dcn30_hubbub.c | 1 + .../gpu/drm/amd/display/dc/dcn30/dcn30_hubbub.h | 14 +- drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 25 +- drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.c | 8 +- .../gpu/drm/amd/display/dc/dcn301/dcn301_hubbub.c | 1 + .../drm/amd/display/dc/dcn302/dcn302_resource.c | 13 +- .../drm/amd/display/dc/dcn303/dcn303_resource.c | 13 +- drivers/gpu/drm/amd/display/dc/dcn31/Makefile | 2 + .../gpu/drm/amd/display/dc/dcn31/dcn31_hubbub.c | 33 +- .../gpu/drm/amd/display/dc/dcn31/dcn31_hubbub.h | 15 +- drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c | 8 +- drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.h | 1 + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_init.c | 1 - .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 3 + drivers/gpu/drm/amd/display/dc/dml/Makefile | 8 +- .../amd/display/dc/dml/dcn21/display_mode_vba_21.c | 16 +- .../amd/display/dc/dml/dcn30/display_mode_vba_30.c | 18 +- .../amd/display/dc/dml/dcn31/display_mode_vba_31.c | 15 +- .../drm/amd/display/dc/dml/display_mode_enums.h | 4 +- .../drm/amd/display/dc/dml/display_mode_structs.h | 2 + .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 12 +- .../gpu/drm/amd/display/dc/dml/display_mode_vba.h | 4 +- drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 393 +++--- drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 1 - .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 5 + drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 11 + drivers/gpu/drm/amd/display/dc/inc/hw/transform.h | 3 + drivers/gpu/drm/amd/display/dc/inc/link_dpcd.h | 25 + drivers/gpu/drm/amd/display/dc/irq/irq_service.c | 4 +- drivers/gpu/drm/amd/display/dc/irq_types.h | 4 +- drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 18 + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 47 +- drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c | 80 +- drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.h | 22 +- drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 22 +- drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c | 70 +- drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h | 2 - .../drm/amd/display/modules/hdcp/hdcp1_execution.c | 6 - .../drm/amd/display/modules/hdcp/hdcp2_execution.c | 3 - .../gpu/drm/amd/display/modules/hdcp/hdcp_psp.c | 53 +- drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h | 12 +- drivers/gpu/drm/amd/include/amd_shared.h | 11 +- .../amd/include/asic_reg/dcn/dcn_3_1_2_sh_mask.h | 4 + .../drm/amd/include/asic_reg/mp/mp_11_0_8_offset.h | 352 ++++++ .../drm/amd/include/asic_reg/mp/mp_13_0_1_offset.h | 355 ------ .../amd/include/asic_reg/mp/mp_13_0_1_sh_mask.h | 531 --------- .../amd/include/asic_reg/umc/umc_8_7_0_sh_mask.h | 179 +-- .../gpu/drm/amd/include/cyan_skillfish_ip_offset.h | 714 +++++++++++ drivers/gpu/drm/amd/include/navi10_enum.h | 2 +- drivers/gpu/drm/amd/pm/amdgpu_pm.c | 95 +- drivers/gpu/drm/amd/pm/inc/aldebaran_ppsmc.h | 3 +- drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 1 + drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 8 + .../amd/pm/inc/smu11_driver_if_cyan_skillfish.h | 95 ++ .../amd/pm/inc/smu11_driver_if_sienna_cichlid.h | 65 +- drivers/gpu/drm/amd/pm/inc/smu_types.h | 3 +- drivers/gpu/drm/amd/pm/inc/smu_v11_0.h | 7 +- drivers/gpu/drm/amd/pm/inc/smu_v11_8_pmfw.h | 152 +++ drivers/gpu/drm/amd/pm/inc/smu_v11_8_ppsmc.h | 70 ++ drivers/gpu/drm/amd/pm/inc/smu_v13_0.h | 1 + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 21 +- drivers/gpu/drm/amd/pm/swsmu/smu11/Makefile | 1 + drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 246 ++-- .../drm/amd/pm/swsmu/smu11/cyan_skillfish_ppt.c | 76 ++ .../drm/amd/pm/swsmu/smu11/cyan_skillfish_ppt.h | 29 + drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 173 ++- .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 494 ++++---- drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 29 + drivers/gpu/drm/amd/pm/swsmu/smu13/Makefile | 2 +- drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 289 ++--- drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 24 + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_1.c | 311 ----- .../gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 52 +- drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 286 ++++- drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 3 +- drivers/gpu/drm/radeon/radeon_display.c | 1 + drivers/gpu/drm/radeon/radeon_drv.c | 8 +- include/drm/amd_asic_type.h | 17 +- 211 files changed, 8211 insertions(+), 4872 deletions(-) create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_eeprom.c rename drivers/gpu/drm/amd/{pm/inc/smu_v13_0_1.h => amdgpu/amdgpu_eeprom.h} (53%) create mode 100644 drivers/gpu/drm/amd/amdgpu/cyan_skillfish_reg_init.c create mode 100644 drivers/gpu/drm/amd/amdgpu/psp_v11_0_8.c create mode 100644 drivers/gpu/drm/amd/amdgpu/psp_v11_0_8.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_11_0_8_offset.h delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_13_0_1_offset.h delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_13_0_1_sh_mask.h create mode 100644 drivers/gpu/drm/amd/include/cyan_skillfish_ip_offset.h create mode 100644 drivers/gpu/drm/amd/pm/inc/smu11_driver_if_cyan_skillfish.h create mode 100644 drivers/gpu/drm/amd/pm/inc/smu_v11_8_pmfw.h create mode 100644 drivers/gpu/drm/amd/pm/inc/smu_v11_8_ppsmc.h create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu11/cyan_skillfish_ppt.c create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu11/cyan_skillfish_ppt.h delete mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_1.c

1 0

[PATCH] gpu/drm/radeon: Fix typo in comments
by Cai Huoqing 30 Jul '21

30 Jul '21

Remove the repeated word 'the' from comments Signed-off-by: Cai Huoqing <caihuoqing(a)baidu.com> --- drivers/gpu/drm/radeon/atombios.h | 4 ++-- drivers/gpu/drm/radeon/r300_reg.h | 2 +- drivers/gpu/drm/radeon/radeon_device.c | 2 +- drivers/gpu/drm/radeon/radeon_fence.c | 2 +- drivers/gpu/drm/radeon/radeon_vm.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/radeon/atombios.h b/drivers/gpu/drm/radeon/atombios.h index 4b86e8b45009..83e8b8547f9b 100644 --- a/drivers/gpu/drm/radeon/atombios.h +++ b/drivers/gpu/drm/radeon/atombios.h @@ -2802,8 +2802,8 @@ ucMaxNBVoltageHigh: Voltage regulator dependent PWM value. High 8 bits of t ucMinNBVoltageHigh: Voltage regulator dependent PWM value. High 8 bits of the value for the min voltage.Set this one to 0x00 if VC without PWM or no VC at all. -usInterNBVoltageLow: Voltage regulator dependent PWM value. The value makes the the voltage >=Min NB voltage but <=InterNBVoltageHigh. Set this to 0x0000 if VC without PWM or no VC at all. -usInterNBVoltageHigh: Voltage regulator dependent PWM value. The value makes the the voltage >=InterNBVoltageLow but <=Max NB voltage.Set this to 0x0000 if VC without PWM or no VC at all. +usInterNBVoltageLow: Voltage regulator dependent PWM value. The value makes the voltage >=Min NB voltage but <=InterNBVoltageHigh. Set this to 0x0000 if VC without PWM or no VC at all. +usInterNBVoltageHigh: Voltage regulator dependent PWM value. The value makes the voltage >=InterNBVoltageLow but <=Max NB voltage.Set this to 0x0000 if VC without PWM or no VC at all. */ diff --git a/drivers/gpu/drm/radeon/r300_reg.h b/drivers/gpu/drm/radeon/r300_reg.h index 00c0d2ba22d3..60d5413bafa1 100644 --- a/drivers/gpu/drm/radeon/r300_reg.h +++ b/drivers/gpu/drm/radeon/r300_reg.h @@ -353,7 +353,7 @@ # define R300_PVS_CNTL_1_PROGRAM_START_SHIFT 0 # define R300_PVS_CNTL_1_POS_END_SHIFT 10 # define R300_PVS_CNTL_1_PROGRAM_END_SHIFT 20 -/* Addresses are relative the the vertex program parameters area. */ +/* Addresses are relative the vertex program parameters area. */ #define R300_VAP_PVS_CNTL_2 0x22D4 # define R300_PVS_CNTL_2_PARAM_OFFSET_SHIFT 0 # define R300_PVS_CNTL_2_PARAM_COUNT_SHIFT 16 diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c index cec03238e14d..ac8c3251b616 100644 --- a/drivers/gpu/drm/radeon/radeon_device.c +++ b/drivers/gpu/drm/radeon/radeon_device.c @@ -406,7 +406,7 @@ void radeon_doorbell_free(struct radeon_device *rdev, u32 doorbell) /* * radeon_wb_*() - * Writeback is the the method by which the the GPU updates special pages + * Writeback is the method by which the GPU updates special pages * in memory with the status of certain GPU events (fences, ring pointers, * etc.). */ diff --git a/drivers/gpu/drm/radeon/radeon_fence.c b/drivers/gpu/drm/radeon/radeon_fence.c index 18f2c2e0dfb3..e9c47ec28ade 100644 --- a/drivers/gpu/drm/radeon/radeon_fence.c +++ b/drivers/gpu/drm/radeon/radeon_fence.c @@ -50,7 +50,7 @@ * for GPU/CPU synchronization. When the fence is written, * it is expected that all buffers associated with that fence * are no longer in use by the associated ring on the GPU and - * that the the relevant GPU caches have been flushed. Whether + * that the relevant GPU caches have been flushed. Whether * we use a scratch register or memory location depends on the asic * and whether writeback is enabled. */ diff --git a/drivers/gpu/drm/radeon/radeon_vm.c b/drivers/gpu/drm/radeon/radeon_vm.c index 36a38adaaea9..bb53016f3138 100644 --- a/drivers/gpu/drm/radeon/radeon_vm.c +++ b/drivers/gpu/drm/radeon/radeon_vm.c @@ -41,7 +41,7 @@ * (uncached system pages). * Each VM has an ID associated with it and there is a page table * associated with each VMID. When execting a command buffer, - * the kernel tells the the ring what VMID to use for that command + * the kernel tells the ring what VMID to use for that command * buffer. VMIDs are allocated dynamically as commands are submitted. * The userspace drivers maintain their own address space and the kernel * sets up their pages tables accordingly when they submit their -- 2.25.1

2 1

[PATCH] drm/amd/display: Fix typo in comments
by Cai Huoqing 30 Jul '21

30 Jul '21

Remove the repeated word 'the' from comments Signed-off-by: Cai Huoqing <caihuoqing(a)baidu.com> --- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 2 +- .../gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20.c | 2 +- .../drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20v2.c | 2 +- .../gpu/drm/amd/display/dc/dml/dcn21/display_rq_dlg_calc_21.c | 2 +- .../gpu/drm/amd/display/dc/dml/dcn30/display_rq_dlg_calc_30.c | 2 +- .../gpu/drm/amd/display/dc/dml/dcn31/display_rq_dlg_calc_31.c | 2 +- drivers/gpu/drm/amd/display/dc/dml/dml1_display_rq_dlg_calc.c | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c index 1596f6b7fed7..7f12ca902f7d 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c @@ -1030,7 +1030,7 @@ bool resource_build_scaling_params(struct pipe_ctx *pipe_ctx) /* Timing borders are part of vactive that we are also supposed to skip in addition * to any stream dst offset. Since dm logic assumes dst is in addressable - * space we need to add the the left and top borders to dst offsets temporarily. + * space we need to add the left and top borders to dst offsets temporarily. * TODO: fix in DM, stream dst is supposed to be in vactive */ pipe_ctx->stream->dst.x += timing->h_border_left; diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20.c b/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20.c index 799bae229e67..2091dd8c252d 100644 --- a/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20.c +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20.c @@ -488,7 +488,7 @@ static void get_meta_and_pte_attr(struct display_mode_lib *mode_lib, log2_meta_req_bytes = 6; // meta request is 64b and is 8x8byte meta element // each 64b meta request for dcn is 8x8 meta elements and - // a meta element covers one 256b block of the the data surface. + // a meta element covers one 256b block of the data surface. log2_meta_req_height = log2_blk256_height + 3; // meta req is 8x8 byte, each byte represent 1 blk256 log2_meta_req_width = log2_meta_req_bytes + 8 - log2_bytes_per_element - log2_meta_req_height; diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20v2.c b/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20v2.c index 6a6d5970d1d5..1a0c14e465fa 100644 --- a/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20v2.c +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20v2.c @@ -488,7 +488,7 @@ static void get_meta_and_pte_attr(struct display_mode_lib *mode_lib, log2_meta_req_bytes = 6; // meta request is 64b and is 8x8byte meta element // each 64b meta request for dcn is 8x8 meta elements and - // a meta element covers one 256b block of the the data surface. + // a meta element covers one 256b block of the data surface. log2_meta_req_height = log2_blk256_height + 3; // meta req is 8x8 byte, each byte represent 1 blk256 log2_meta_req_width = log2_meta_req_bytes + 8 - log2_bytes_per_element - log2_meta_req_height; diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn21/display_rq_dlg_calc_21.c b/drivers/gpu/drm/amd/display/dc/dml/dcn21/display_rq_dlg_calc_21.c index dc1c81a6e377..287e31052b30 100644 --- a/drivers/gpu/drm/amd/display/dc/dml/dcn21/display_rq_dlg_calc_21.c +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn21/display_rq_dlg_calc_21.c @@ -482,7 +482,7 @@ static void get_meta_and_pte_attr( log2_meta_req_bytes = 6; // meta request is 64b and is 8x8byte meta element // each 64b meta request for dcn is 8x8 meta elements and - // a meta element covers one 256b block of the the data surface. + // a meta element covers one 256b block of the data surface. log2_meta_req_height = log2_blk256_height + 3; // meta req is 8x8 byte, each byte represent 1 blk256 log2_meta_req_width = log2_meta_req_bytes + 8 - log2_bytes_per_element - log2_meta_req_height; diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn30/display_rq_dlg_calc_30.c b/drivers/gpu/drm/amd/display/dc/dml/dcn30/display_rq_dlg_calc_30.c index 04601a767a8f..0d934fae1c3a 100644 --- a/drivers/gpu/drm/amd/display/dc/dml/dcn30/display_rq_dlg_calc_30.c +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn30/display_rq_dlg_calc_30.c @@ -549,7 +549,7 @@ static void get_meta_and_pte_attr(struct display_mode_lib *mode_lib, log2_meta_req_bytes = 6; // meta request is 64b and is 8x8byte meta element // each 64b meta request for dcn is 8x8 meta elements and - // a meta element covers one 256b block of the the data surface. + // a meta element covers one 256b block of the data surface. log2_meta_req_height = log2_blk256_height + 3; // meta req is 8x8 byte, each byte represent 1 blk256 log2_meta_req_width = log2_meta_req_bytes + 8 - log2_bytes_per_element - log2_meta_req_height; diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn31/display_rq_dlg_calc_31.c b/drivers/gpu/drm/amd/display/dc/dml/dcn31/display_rq_dlg_calc_31.c index 3def093ef88e..c23905bc733a 100644 --- a/drivers/gpu/drm/amd/display/dc/dml/dcn31/display_rq_dlg_calc_31.c +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn31/display_rq_dlg_calc_31.c @@ -563,7 +563,7 @@ static void get_meta_and_pte_attr( log2_meta_req_bytes = 6; // meta request is 64b and is 8x8byte meta element // each 64b meta request for dcn is 8x8 meta elements and - // a meta element covers one 256b block of the the data surface. + // a meta element covers one 256b block of the data surface. log2_meta_req_height = log2_blk256_height + 3; // meta req is 8x8 byte, each byte represent 1 blk256 log2_meta_req_width = log2_meta_req_bytes + 8 - log2_bytes_per_element - log2_meta_req_height; meta_req_width = 1 << log2_meta_req_width; diff --git a/drivers/gpu/drm/amd/display/dc/dml/dml1_display_rq_dlg_calc.c b/drivers/gpu/drm/amd/display/dc/dml/dml1_display_rq_dlg_calc.c index 414da64f5734..8f2b1684c231 100644 --- a/drivers/gpu/drm/amd/display/dc/dml/dml1_display_rq_dlg_calc.c +++ b/drivers/gpu/drm/amd/display/dc/dml/dml1_display_rq_dlg_calc.c @@ -456,7 +456,7 @@ static void dml1_rq_dlg_get_row_heights( log2_meta_req_bytes = 6; /* meta request is 64b and is 8x8byte meta element */ /* each 64b meta request for dcn is 8x8 meta elements and - * a meta element covers one 256b block of the the data surface. + * a meta element covers one 256b block of the data surface. */ log2_meta_req_height = log2_blk256_height + 3; /* meta req is 8x8 */ log2_meta_req_width = log2_meta_req_bytes + 8 - log2_bytes_per_element @@ -718,7 +718,7 @@ static void get_surf_rq_param( log2_meta_req_bytes = 6; /* meta request is 64b and is 8x8byte meta element */ /* each 64b meta request for dcn is 8x8 meta elements and - * a meta element covers one 256b block of the the data surface. + * a meta element covers one 256b block of the data surface. */ log2_meta_req_height = log2_blk256_height + 3; /* meta req is 8x8 byte, each byte represent 1 blk256 */ log2_meta_req_width = log2_meta_req_bytes + 8 - log2_bytes_per_element -- 2.25.1

2 1

[PATCH v4 00/14] drm/i915/guc/slpc: Enable GuC based power management features
by Vinay Belgaumkar 30 Jul '21

30 Jul '21

This series enables Single Loop Power Control (SLPC) feature in GuC. GuC implements various power management algorithms as part of it's operation. These need to be specifically enabled by KMD. They replace the legacy host based management of these features. With this series, we will enable two PM features - GTPerf and GuCRC. These are the Turbo and RC6 equivalents of the host based version. GuC provides various interfaces via host-to-guc messaging, which allows KMD to enable these features after GuC is loaded and GuC submission is enabled. We will specifically disable the IA/GT Balancer and Duty Cycle control features in SLPC. To enable GTPerf, KMD sends a specific h2g message after setting up some shared data structures. As part of this, we will gate host RPS as well. GuC takes over the duties of requesting frequencies by monitoring GPU busyness. We can influence what GuC requests by modifying the min and max frequencies setup by SLPC through the sysfs interfaces that have been exposed by legacy Turbo. SLPC typically requests efficient frequency instead of minimum frequency to optimize performance. It also does not necessarily stick to platform max, and can request frequencies that are much higher since pcode will ultimately grant the appropriate values. However, we will force it to adhere to platform min and max values so as to maintain legacy behavior. SLPC does not have the concept of waitboost, so the boost_freq sysfs will show a '0' value for now. There is a patch forthcoming to ensure the interface is not exposed when SLPC is enabled. GuCRC is enabled similarly through a h2g message. We still need to enable RC6 feature bit (GEN6_RC_CTL_RC6_ENABLE) before we send this out. Render/Media power gating still needs to be enabled by host as before. GuC will take care of setting up the hysterisis values for RC6, host does not need to set this up anymore. v2: Address review comments (Michal W) v3: More comments, optimizations (Michal W) v4: Address comments (Michal W, Matt Roper, Matthew Brost) Signed-off-by: Vinay Belgaumkar <vinay.belgaumkar(a)intel.com> Vinay Belgaumkar (14): drm/i915/guc/slpc: Initial definitions for SLPC drm/i915/guc/slpc: Gate Host RPS when SLPC is enabled drm/i915/guc/slpc: Adding SLPC communication interfaces drm/i915/guc/slpc: Allocate, initialize and release SLPC drm/i915/guc/slpc: Enable SLPC and add related H2G events drm/i915/guc/slpc: Remove BUG_ON in guc_submission_disable drm/i915/guc/slpc: Add methods to set min/max frequency drm/i915/guc/slpc: Add get max/min freq hooks drm/i915/guc/slpc: Add debugfs for SLPC info drm/i915/guc/slpc: Enable ARAT timer interrupt drm/i915/guc/slpc: Cache platform frequency limits drm/i915/guc/slpc: Sysfs hooks for SLPC drm/i915/guc/slpc: Add SLPC selftest drm/i915/guc/rc: Setup and enable GuCRC feature drivers/gpu/drm/i915/Makefile | 2 + drivers/gpu/drm/i915/gt/intel_gt.c | 2 +- drivers/gpu/drm/i915/gt/intel_rc6.c | 47 +- drivers/gpu/drm/i915/gt/intel_rps.c | 198 ++++++ drivers/gpu/drm/i915/gt/intel_rps.h | 10 + drivers/gpu/drm/i915/gt/selftest_slpc.c | 309 +++++++++ .../gpu/drm/i915/gt/uc/abi/guc_actions_abi.h | 7 +- .../drm/i915/gt/uc/abi/guc_actions_slpc_abi.h | 234 +++++++ drivers/gpu/drm/i915/gt/uc/intel_guc.c | 17 + drivers/gpu/drm/i915/gt/uc/intel_guc.h | 4 + .../gpu/drm/i915/gt/uc/intel_guc_debugfs.c | 22 + drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h | 7 + drivers/gpu/drm/i915/gt/uc/intel_guc_rc.c | 80 +++ drivers/gpu/drm/i915/gt/uc/intel_guc_rc.h | 31 + drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c | 609 ++++++++++++++++++ drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.h | 42 ++ .../gpu/drm/i915/gt/uc/intel_guc_slpc_types.h | 29 + .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 4 - drivers/gpu/drm/i915/gt/uc/intel_uc.c | 25 +- drivers/gpu/drm/i915/gt/uc/intel_uc.h | 4 + drivers/gpu/drm/i915/i915_pmu.c | 2 +- drivers/gpu/drm/i915/i915_reg.h | 5 + drivers/gpu/drm/i915/i915_sysfs.c | 83 +-- .../drm/i915/selftests/i915_live_selftests.h | 1 + 24 files changed, 1684 insertions(+), 90 deletions(-) create mode 100644 drivers/gpu/drm/i915/gt/selftest_slpc.c create mode 100644 drivers/gpu/drm/i915/gt/uc/abi/guc_actions_slpc_abi.h create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_guc_rc.c create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_guc_rc.h create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.h create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_guc_slpc_types.h -- 2.25.0

5 24

[PATCH 1/2] dt-bindings: display: simple: Add AUO B133HAN05 & B140HAN06
by Bjorn Andersson 29 Jul '21

29 Jul '21

Add bindings for the two AUO panels B133HAN05 and B140HAN06, both 1920x1080 panels with 16.7M colors, first being 13.3" and the latter 14.0". Signed-off-by: Bjorn Andersson <bjorn.andersson(a)linaro.org> --- .../devicetree/bindings/display/panel/panel-simple.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Documentation/devicetree/bindings/display/panel/panel-simple.yaml b/Documentation/devicetree/bindings/display/panel/panel-simple.yaml index b3797ba2698b..7f624cb1199a 100644 --- a/Documentation/devicetree/bindings/display/panel/panel-simple.yaml +++ b/Documentation/devicetree/bindings/display/panel/panel-simple.yaml @@ -46,9 +46,13 @@ properties: # AU Optronics Corporation 11.6" HD (1366x768) color TFT-LCD panel - auo,b116xw03 # AU Optronics Corporation 13.3" FHD (1920x1080) color TFT-LCD panel + - auo,b133han05 + # AU Optronics Corporation 13.3" FHD (1920x1080) color TFT-LCD panel - auo,b133htn01 # AU Optronics Corporation 13.3" WXGA (1366x768) TFT LCD panel - auo,b133xtn01 + # AU Optronics Corporation 14.0" FHD (1920x1080) color TFT-LCD panel + - auo,b140han06 # AU Optronics Corporation 7.0" FHD (800 x 480) TFT LCD panel - auo,g070vvn01 # AU Optronics Corporation 10.1" (1280x800) color TFT LCD panel -- 2.29.2

3 3

[RFC PATCH 0/8] eDP: Support probing eDP panels dynamically instead of hardcoding
by Douglas Anderson 29 Jul '21

29 Jul '21

The goal of this patch series is to move away from hardcoding exact eDP panels in device tree files. As discussed in the various patches in this series (I'm not repeating everything here), most eDP panels are 99% probable and we can get that last 1% by allowing two "power up" delays to be specified in the device tree file and then using the panel ID (found in the EDID) to look up additional power sequencing delays for the panel. This patch series is the logical contiunation of a previous patch series where I proposed solving this problem by adding a board-specific compatible string [1]. In the discussion that followed it sounded like people were open to something like the solution proposed in this new series. [1] https://lore.kernel.org/r/YFKQaXOmOwYyeqvM@google.com/ Douglas Anderson (8): dt-bindings: drm/panel-simple: Introduce generic eDP panels drm/edid: Break out reading block 0 of the EDID drm/edid: Allow the querying/working with the panel ID from the EDID drm/panel-simple: Don't re-read the EDID every time we power off the panel drm/panel-simple: Copy "desc" into driver data; don't store a pointer drm/panel-simple: Split the delay structure out of the panel description drm/panel-simple: Implement generic "edp-panel"s probed by EDID arm64: dts: qcom: sc7180: trogdor devices can use probable eDP panels .../bindings/display/panel/panel-edp.yaml | 196 ++++++ .../bindings/display/panel/panel-simple.yaml | 559 +++++++++--------- .../boot/dts/qcom/sc7180-trogdor-coachz.dtsi | 2 +- .../sc7180-trogdor-lazor-limozeen-nots.dts | 2 +- .../qcom/sc7180-trogdor-lazor-limozeen.dts | 2 +- .../boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 3 +- .../boot/dts/qcom/sc7180-trogdor-pompom.dtsi | 2 +- drivers/gpu/drm/drm_edid.c | 113 +++- drivers/gpu/drm/panel/panel-simple.c | 497 +++++++++++----- include/drm/drm_edid.h | 47 ++ 10 files changed, 965 insertions(+), 458 deletions(-) create mode 100644 Documentation/devicetree/bindings/display/panel/panel-edp.yaml -- 2.32.0.432.gabb21c7263-goog

3 10

[PULL] drm-misc-next
by Maarten Lankhorst 29 Jul '21

29 Jul '21

drm-misc-next-2021-07-29: drm-misc-next for v5.15: UAPI Changes: - Add modifiers for arm fixed rate compression. Cross-subsystem Changes: - Assorted dt binding fixes. - Convert ssd1307fb to json-schema. - Update a lot of irc channels to point to OFTC, as everyone moved there. - Fix the same divide by zero for asilantfb, kyro, rivafb. Core Changes: - Document requirements for new atomic properties. - Add drm_gem_fb_(begin/end)_cpu_access helpers, and use them in some drivers. - Document drm_property_enum.value for bitfields. - Add explicit _NO_ for MIPI_DSI flags that disable features. - Assorted documentation fixes. - Update fb_damage handling, and move drm_plane_enable_fb_damage_clips to core. - Add logging and docs to RMFB ioctl. - Assorted small fixes to dp_mst, master handling. - Clarify drm lease usage. Driver Changes: - Assorted small fixes to panfrost, hibmc, bridge/nwl-dsi, rockchip, vc4. - More drm -> linux irq conversions. - Add support for some Logic Technologies and Multi-Inno panels. - Expose phy-functionality for drm/rockchip, to allow controlling from the media subsystem. - Add support for 2 AUO panels. - Add damage handling to ssd1307fb. - Improve FIFO handling on mxsfb. - Assorted small fixes to vmwgfx, and bump version to 2.19 for the new ioctls. - Improve sony acx424akp backlight handling. The following changes since commit 15d27b15de965043d6f8e23bc7f34386fcd1a772: efi: sysfb_efi: fix build when EFI is not set (2021-07-27 11:52:51 +0200) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-next-2021-07-29 for you to fetch changes up to c7d30623540b6e979d7e8647fab18feab4688808: drm/vc4: hdmi: Remove unused struct (2021-07-29 10:41:16 +0200) ---------------------------------------------------------------- drm-misc-next for v5.15: UAPI Changes: - Add modifiers for arm fixed rate compression. Cross-subsystem Changes: - Assorted dt binding fixes. - Convert ssd1307fb to json-schema. - Update a lot of irc channels to point to OFTC, as everyone moved there. - Fix the same divide by zero for asilantfb, kyro, rivafb. Core Changes: - Document requirements for new atomic properties. - Add drm_gem_fb_(begin/end)_cpu_access helpers, and use them in some drivers. - Document drm_property_enum.value for bitfields. - Add explicit _NO_ for MIPI_DSI flags that disable features. - Assorted documentation fixes. - Update fb_damage handling, and move drm_plane_enable_fb_damage_clips to core. - Add logging and docs to RMFB ioctl. - Assorted small fixes to dp_mst, master handling. - Clarify drm lease usage. Driver Changes: - Assorted small fixes to panfrost, hibmc, bridge/nwl-dsi, rockchip, vc4. - More drm -> linux irq conversions. - Add support for some Logic Technologies and Multi-Inno panels. - Expose phy-functionality for drm/rockchip, to allow controlling from the media subsystem. - Add support for 2 AUO panels. - Add damage handling to ssd1307fb. - Improve FIFO handling on mxsfb. - Assorted small fixes to vmwgfx, and bump version to 2.19 for the new ioctls. - Improve sony acx424akp backlight handling. ---------------------------------------------------------------- Alexander Sverdlin (1): video: ep93xx: Prepare clock before using it Alyssa Rosenzweig (2): documentation: Update #nouveau IRC channel network maintainers: Update freedesktop.org IRC channels Artjom Vejsel (1): dt-bindings: Add QiShenglong vendor prefix Bjorn Andersson (2): dt-bindings: display: simple: Add AUO B133HAN05 & B140HAN06 drm/panel: simple: Add support for two more AUO panels Chris Morgan (1): drm/panfrost: devfreq: Don't display error for EPROBE_DEFER Daniel Vetter (3): drm/plane: remove drm_helper_get_plane_damage_clips drm/plane: check that fb_damage is set up when used drm/plane: Move drm_plane_enable_fb_damage_clips into core Desmond Cheong Zhi Xi (2): drm: use the lookup lock in drm_is_current_master drm: clarify usage of drm leases Geert Uytterhoeven (7): drm/bridge: nwl-dsi: Avoid potential multiplication overflow on 32-bit dt-bindings: display: ssd1307fb: Convert to json-schema video: fbdev: ssd1307fb: Propagate errors via ssd1307fb_update_display() video: fbdev: ssd1307fb: Simplify ssd1307fb_update_display() video: fbdev: ssd1307fb: Extract ssd1307fb_set_{col,page}_range() video: fbdev: ssd1307fb: Optimize screen updates video: fbdev: ssd1307fb: Cache address ranges Heiko Stuebner (3): drm/rockchip: dsi: add own additional pclk handling dt-bindings: display: rockchip-dsi: add optional #phy-cells property drm/rockchip: dsi: add ability to work as a phy instead of full dsi Jagan Teki (1): drm/bridge: dw-mipi-dsi: Find the possible DSI devices Jose Maria Casanova Crespo (1): drm/prime: fix comment on PRIME Helpers Linus Walleij (1): drm/panel-sony-acx424akp: Modernize backlight handling Maarten Lankhorst (1): Backmerge remote-tracking branch 'drm/drm-next' into drm-misc-next Marek Vasut (4): drm: mxsfb: Enable recovery on underflow drm: mxsfb: Increase number of outstanding requests on V4 and newer HW drm: mxsfb: Use bus_format from the nearest bridge if present drm: mxsfb: Clear FIFO_CLEAR bit Maxime Ripard (3): Documentation: gpu: Mention the requirements for new properties drm/vc4: hdmi: Remove redundant variables drm/vc4: hdmi: Remove unused struct Nicolas Boichat (1): drm/dsi: Add _NO_ to MIPI_DSI_* flags disabling features Normunds Rieksts (1): drm/fourcc: Add modifier definitions for Arm Fixed Rate Compression Oleksij Rempel (1): dt-bindings: display: simple: add some Logic Technologies and Multi-Inno panels Rajkumar Subbiah (1): drm/dp_mst: Fix return code on sideband message failure Simon Ser (3): drm: document drm_property_enum.value for bitfields drm: add logging for RMFB ioctl drm: document DRM_IOCTL_MODE_RMFB Thomas Zimmermann (9): drm/hisilicon/hibmc: Remove variable 'priv' from hibmc_unload() drm/gem: Provide drm_gem_fb_{begin,end}_cpu_access() helpers drm/udl: Use framebuffer dma-buf helpers drm/mipi-dbi: Use framebuffer dma-buf helpers drm/gud: Use framebuffer dma-buf helpers drm/gm12u320: Use framebuffer dma-buf helpers drm/repaper: Use framebuffer dma-buf helpers drm/st7586: Use framebuffer dma-buf helpers drm/shmobile: Convert to Linux IRQ interfaces Zack Rusin (4): drm/vmwgfx: Switch to using DRM_IOCTL_DEF_DRV drm/vmwgfx: Cleanup logging drm/vmwgfx: Be a lot more flexible with MOB limits drm/vmwgfx: Use 2.19 version number to recognize mks-stats ioctls Zheyu Ma (3): video: fbdev: asiliantfb: Error out if 'pixclock' equals zero video: fbdev: kyro: Error out if 'pixclock' equals zero video: fbdev: riva: Error out if 'pixclock' equals zero .../bindings/display/panel/panel-simple.yaml | 10 + .../display/rockchip/dw_mipi_dsi_rockchip.txt | 1 + .../bindings/display/solomon,ssd1307fb.yaml | 208 +++++++++++ .../devicetree/bindings/display/ssd1307fb.txt | 60 --- .../devicetree/bindings/vendor-prefixes.yaml | 2 + .../driver-api/thermal/nouveau_thermal.rst | 2 +- Documentation/gpu/drm-kms.rst | 33 +- Documentation/gpu/drm-uapi.rst | 9 + MAINTAINERS | 6 +- drivers/gpu/drm/bridge/adv7511/adv7533.c | 2 +- drivers/gpu/drm/bridge/analogix/anx7625.c | 2 +- drivers/gpu/drm/bridge/cdns-dsi.c | 4 +- drivers/gpu/drm/bridge/lontium-lt8912b.c | 2 +- drivers/gpu/drm/bridge/nwl-dsi.c | 2 +- drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 58 ++- drivers/gpu/drm/bridge/tc358768.c | 2 +- drivers/gpu/drm/drm_atomic.c | 2 +- drivers/gpu/drm/drm_auth.c | 9 +- drivers/gpu/drm/drm_crtc_internal.h | 2 + drivers/gpu/drm/drm_damage_helper.c | 56 +-- drivers/gpu/drm/drm_dp_mst_topology.c | 10 +- drivers/gpu/drm/drm_framebuffer.c | 22 +- drivers/gpu/drm/drm_gem_framebuffer_helper.c | 89 +++++ drivers/gpu/drm/drm_lease.c | 51 +++ drivers/gpu/drm/drm_mipi_dbi.c | 20 +- drivers/gpu/drm/drm_plane.c | 104 ++++++ drivers/gpu/drm/drm_prime.c | 2 +- drivers/gpu/drm/exynos/exynos_drm_dsi.c | 8 +- drivers/gpu/drm/gud/gud_pipe.c | 13 +- drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 1 - drivers/gpu/drm/mcde/mcde_dsi.c | 2 +- drivers/gpu/drm/mediatek/mtk_dsi.c | 4 +- drivers/gpu/drm/msm/dsi/dsi_host.c | 8 +- drivers/gpu/drm/mxsfb/mxsfb_drv.c | 3 + drivers/gpu/drm/mxsfb/mxsfb_drv.h | 1 + drivers/gpu/drm/mxsfb/mxsfb_kms.c | 72 +++- drivers/gpu/drm/mxsfb/mxsfb_regs.h | 9 + .../gpu/drm/panel/panel-asus-z00t-tm5p5-n35596.c | 2 +- drivers/gpu/drm/panel/panel-dsi-cm.c | 2 +- drivers/gpu/drm/panel/panel-elida-kd35t133.c | 2 +- drivers/gpu/drm/panel/panel-khadas-ts050.c | 2 +- drivers/gpu/drm/panel/panel-leadtek-ltk050h3146w.c | 2 +- drivers/gpu/drm/panel/panel-leadtek-ltk500hd1829.c | 2 +- drivers/gpu/drm/panel/panel-osd-osd101t2587-53ts.c | 2 +- drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c | 2 +- drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c | 4 +- drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c | 2 +- drivers/gpu/drm/panel/panel-simple.c | 68 +++- drivers/gpu/drm/panel/panel-sony-acx424akp.c | 82 ++-- drivers/gpu/drm/panel/panel-xinpeng-xpp055c272.c | 2 +- drivers/gpu/drm/panfrost/panfrost_devfreq.c | 3 +- drivers/gpu/drm/rockchip/Kconfig | 2 + drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 349 +++++++++++++++++ drivers/gpu/drm/shmobile/shmob_drm_drv.c | 14 +- drivers/gpu/drm/shmobile/shmob_drm_drv.h | 1 + drivers/gpu/drm/tiny/gm12u320.c | 19 +- drivers/gpu/drm/tiny/repaper.c | 18 +- drivers/gpu/drm/tiny/st7586.c | 18 +- drivers/gpu/drm/udl/udl_modeset.c | 29 +- drivers/gpu/drm/vc4/vc4_hdmi.c | 38 +- drivers/gpu/drm/vc4/vc4_hdmi.h | 2 - drivers/gpu/drm/vmwgfx/vmwgfx_cmd.c | 3 +- drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c | 3 +- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 411 +++++++++++---------- drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 9 +- drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 36 +- drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 10 + drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 5 +- drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 4 - drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 5 +- drivers/video/fbdev/asiliantfb.c | 3 + drivers/video/fbdev/ep93xx-fb.c | 4 +- drivers/video/fbdev/kyro/fbdev.c | 3 + drivers/video/fbdev/riva/fbdev.c | 3 + drivers/video/fbdev/ssd1307fb.c | 151 +++++--- include/drm/drm_auth.h | 67 +++- include/drm/drm_damage_helper.h | 18 - include/drm/drm_gem_framebuffer_helper.h | 6 + include/drm/drm_mipi_dsi.h | 8 +- include/drm/drm_plane.h | 39 +- include/drm/drm_property.h | 9 +- include/drm/drm_rect.h | 3 + include/uapi/drm/drm.h | 10 + include/uapi/drm/drm_fourcc.h | 109 +++++- 84 files changed, 1797 insertions(+), 680 deletions(-) create mode 100644 Documentation/devicetree/bindings/display/solomon,ssd1307fb.yaml delete mode 100644 Documentation/devicetree/bindings/display/ssd1307fb.txt

1 0

[PATCH 0/5] drm/msm/dp: Allow variation in register regions
by Bjorn Andersson 29 Jul '21

29 Jul '21

It turns out that sc8180x (among others) doesn't have the same internal layout of the 4 subblocks. This series therefor modifies the binding to require all four regions to be described individually and then extends the driver to read these four regions. The driver will fall back to read the old single-reg format and apply the original offsets and sizes. Bjorn Andersson (5): dt-bindings: msm/dp: Change reg definition drm/msm/dp: Use devres for ioremap() drm/msm/dp: Refactor ioremap wrapper drm/msm/dp: Store each subblock in the io region drm/msm/dp: Allow sub-regions to be specified in DT .../bindings/display/msm/dp-controller.yaml | 11 +- drivers/gpu/drm/msm/dp/dp_catalog.c | 64 ++++------- drivers/gpu/drm/msm/dp/dp_parser.c | 102 +++++++++++------- drivers/gpu/drm/msm/dp/dp_parser.h | 10 +- 4 files changed, 102 insertions(+), 85 deletions(-) -- 2.29.2

4 16

← Newer
1
...
22
23
24
25
26
27
28
...
83
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel July 2021