dri-devel June 2020

dri-devel@lists.freedesktop.org

315 participants
731 discussions

Re: linux-next: build failure after merge of the amdgpu tree
by Stephen Rothwell 26 Jun '20

26 Jun '20

Hi all, On Fri, 12 Jun 2020 10:25:52 +1000 Stephen Rothwell <sfr(a)canb.auug.org.au> wrote: > > After merging the amdgpu tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_process.c: In function 'kfd_sdma_activity_worker': > drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_process.c:118:2: error: implicit declaration of function 'use_mm' [-Werror=implicit-function-declaration] > 118 | use_mm(mm); > | ^~~~~~ > drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_process.c:145:2: error: implicit declaration of function 'unuse_mm' [-Werror=implicit-function-declaration] > 145 | unuse_mm(mm); > | ^~~~~~~~ > > Caused by commit > > 32cb59f31362 ("drm/amdkfd: Track SDMA utilization per process") > > interacting with commit > > f5678e7f2ac3 ("kernel: better document the use_mm/unuse_mm API contract") > > from Linus' tree. > > I have applied the following merge fix for today (that was previously > part of the akpm tree). The merge fix patch now looks like: From: Stephen Rothwell <sfr(a)canb.auug.org.au> Date: Thu, 28 May 2020 20:15:34 +1000 Subject: [PATCH] drm/amdkfd: fix up for {un}use_mm() rename Signed-off-by: Stephen Rothwell <sfr(a)canb.auug.org.au> --- drivers/gpu/drm/amd/amdkfd/kfd_process.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_process.c b/drivers/gpu/drm/amd/amdkfd/kfd_process.c index 013c2b018edc..40695d52e9a8 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_process.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_process.c @@ -184,7 +184,7 @@ static void kfd_sdma_activity_worker(struct work_struct *work) if (!mm) goto cleanup; - use_mm(mm); + kthread_use_mm(mm); list_for_each_entry(sdma_q, &sdma_q_list.list, list) { val = 0; @@ -198,7 +198,7 @@ static void kfd_sdma_activity_worker(struct work_struct *work) } } - unuse_mm(mm); + kthread_unuse_mm(mm); mmput(mm); /* -- Cheers, Stephen Rothwell

1 0

linux-next: manual merge of the drm-misc tree with Linus' tree
by Stephen Rothwell 26 Jun '20

26 Jun '20

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c between commit: eaad0c3aa978 ("drm/amdgpu: rename direct to immediate for VM updates") from the Linus' and commit: b1a8ef952a25 ("drm/amdgpu: move ttm bo->offset to amdgpu_bo") from the drm-misc tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c index 28bdfb3ac33d,2a7a6f62d627..000000000000 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c @@@ -144,8 -141,8 +144,8 @@@ static void amdgpu_vm_sdma_copy_ptes(st src += p->num_dw_left * 4; - pe += amdgpu_gmc_sign_extend(bo->tbo.offset); + pe += amdgpu_bo_gpu_offset_no_check(bo); - trace_amdgpu_vm_copy_ptes(pe, src, count, p->direct); + trace_amdgpu_vm_copy_ptes(pe, src, count, p->immediate); amdgpu_vm_copy_pte(p->adev, ib, pe, src, count); } @@@ -171,8 -168,8 +171,8 @@@ static void amdgpu_vm_sdma_set_ptes(str { struct amdgpu_ib *ib = p->job->ibs; - pe += amdgpu_gmc_sign_extend(bo->tbo.offset); + pe += amdgpu_bo_gpu_offset_no_check(bo); - trace_amdgpu_vm_set_ptes(pe, addr, count, incr, flags, p->direct); + trace_amdgpu_vm_set_ptes(pe, addr, count, incr, flags, p->immediate); if (count < 3) { amdgpu_vm_write_pte(p->adev, ib, pe, addr | flags, count, incr);

1 0

[radeon-alex:amd-staging-drm-next 9951/9999] drivers/gpu/drm/amd/amdgpu/uvd_v3_1.c:243:16: sparse: sparse: cast to restricted __le32
by kernel test robot 26 Jun '20

26 Jun '20

Hi Sonny, First bad commit (maybe != root cause): tree: git://people.freedesktop.org/~agd5f/linux.git amd-staging-drm-next head: cd5dd023c24f097393cd351bfaaba81284d1a15b commit: 788c2ef8c423ccd8c62a471c7e7debe115b3e124 [9951/9999] drm amdgpu: SI UVD add uvd_v3_1 to makefile config: s390-randconfig-s032-20200624 (attached as .config) compiler: s390-linux-gcc (GCC) 9.3.0 reproduce: # apt-get install sparse # sparse version: v0.6.2-dirty git checkout 788c2ef8c423ccd8c62a471c7e7debe115b3e124 # save the attached .config to linux build tree make W=1 C=1 ARCH=s390 CF='-fdiagnostic-prefix -D__CHECK_ENDIAN__' If you fix the issue, kindly add following tag as appropriate Reported-by: kernel test robot <lkp(a)intel.com> sparse warnings: (new ones prefixed by >>) drivers/gpu/drm/amd/amdgpu/../include/asic_reg/oss/oss_1_0_sh_mask.h:26:9: sparse: sparse: preprocessor token CC_DRM_ID_STRAPS__ATI_REV_ID_MASK redefined drivers/gpu/drm/amd/amdgpu/sid.h:2471:9: sparse: this was the original definition drivers/gpu/drm/amd/amdgpu/../include/asic_reg/oss/oss_1_0_sh_mask.h:27:9: sparse: sparse: preprocessor token CC_DRM_ID_STRAPS__ATI_REV_ID__SHIFT redefined drivers/gpu/drm/amd/amdgpu/sid.h:2472:9: sparse: this was the original definition drivers/gpu/drm/amd/amdgpu/../include/asic_reg/oss/oss_1_0_sh_mask.h:744:9: sparse: sparse: preprocessor token IH_RB_CNTL__WPTR_OVERFLOW_CLEAR_MASK redefined drivers/gpu/drm/amd/amdgpu/sid.h:2345:9: sparse: this was the original definition drivers/gpu/drm/amd/amdgpu/../include/asic_reg/oss/oss_1_0_sh_mask.h:760:9: sparse: sparse: preprocessor token IH_RB_WPTR__RB_OVERFLOW_MASK redefined drivers/gpu/drm/amd/amdgpu/sid.h:2344:9: sparse: this was the original definition drivers/gpu/drm/amd/amdgpu/../include/asic_reg/oss/oss_1_0_sh_mask.h:988:9: sparse: sparse: preprocessor token SRBM_SOFT_RESET__SOFT_RESET_IH_MASK redefined drivers/gpu/drm/amd/amdgpu/sid.h:2347:9: sparse: this was the original definition drivers/gpu/drm/amd/amdgpu/../include/asic_reg/oss/oss_1_0_sh_mask.h:1028:9: sparse: sparse: preprocessor token SRBM_STATUS__IH_BUSY_MASK redefined drivers/gpu/drm/amd/amdgpu/sid.h:2346:9: sparse: this was the original definition drivers/gpu/drm/amd/amdgpu/../include/asic_reg/oss/oss_1_0_sh_mask.h:1032:9: sparse: sparse: preprocessor token SRBM_STATUS__MCB_BUSY_MASK redefined drivers/gpu/drm/amd/amdgpu/sid.h:2435:9: sparse: this was the original definition drivers/gpu/drm/amd/amdgpu/../include/asic_reg/oss/oss_1_0_sh_mask.h:1033:9: sparse: sparse: preprocessor token SRBM_STATUS__MCB_BUSY__SHIFT redefined drivers/gpu/drm/amd/amdgpu/sid.h:2436:9: sparse: this was the original definition drivers/gpu/drm/amd/amdgpu/../include/asic_reg/oss/oss_1_0_sh_mask.h:1034:9: sparse: sparse: preprocessor token SRBM_STATUS__MCB_NON_DISPLAY_BUSY_MASK redefined drivers/gpu/drm/amd/amdgpu/sid.h:2437:9: sparse: this was the original definition drivers/gpu/drm/amd/amdgpu/../include/asic_reg/oss/oss_1_0_sh_mask.h:1035:9: sparse: sparse: preprocessor token SRBM_STATUS__MCB_NON_DISPLAY_BUSY__SHIFT redefined drivers/gpu/drm/amd/amdgpu/sid.h:2438:9: sparse: this was the original definition drivers/gpu/drm/amd/amdgpu/../include/asic_reg/oss/oss_1_0_sh_mask.h:1036:9: sparse: sparse: preprocessor token SRBM_STATUS__MCC_BUSY_MASK redefined drivers/gpu/drm/amd/amdgpu/sid.h:2439:9: sparse: this was the original definition drivers/gpu/drm/amd/amdgpu/../include/asic_reg/oss/oss_1_0_sh_mask.h:1037:9: sparse: sparse: preprocessor token SRBM_STATUS__MCC_BUSY__SHIFT redefined drivers/gpu/drm/amd/amdgpu/sid.h:2440:9: sparse: this was the original definition drivers/gpu/drm/amd/amdgpu/../include/asic_reg/oss/oss_1_0_sh_mask.h:1038:9: sparse: sparse: preprocessor token SRBM_STATUS__MCD_BUSY_MASK redefined drivers/gpu/drm/amd/amdgpu/sid.h:2441:9: sparse: this was the original definition drivers/gpu/drm/amd/amdgpu/../include/asic_reg/oss/oss_1_0_sh_mask.h:1039:9: sparse: sparse: preprocessor token SRBM_STATUS__MCD_BUSY__SHIFT redefined drivers/gpu/drm/amd/amdgpu/sid.h:2442:9: sparse: this was the original definition drivers/gpu/drm/amd/amdgpu/../include/asic_reg/oss/oss_1_0_sh_mask.h:1048:9: sparse: sparse: preprocessor token SRBM_STATUS__VMC_BUSY_MASK redefined drivers/gpu/drm/amd/amdgpu/sid.h:2443:9: sparse: this was the original definition drivers/gpu/drm/amd/amdgpu/../include/asic_reg/oss/oss_1_0_sh_mask.h:1049:9: sparse: sparse: preprocessor token SRBM_STATUS__VMC_BUSY__SHIFT redefined drivers/gpu/drm/amd/amdgpu/sid.h:2444:9: sparse: this was the original definition >> drivers/gpu/drm/amd/amdgpu/uvd_v3_1.c:243:16: sparse: sparse: cast to restricted __le32 >> drivers/gpu/drm/amd/amdgpu/uvd_v3_1.c:243:16: sparse: sparse: cast to restricted __le32 >> drivers/gpu/drm/amd/amdgpu/uvd_v3_1.c:243:16: sparse: sparse: cast to restricted __le32 >> drivers/gpu/drm/amd/amdgpu/uvd_v3_1.c:243:16: sparse: sparse: cast to restricted __le32 >> drivers/gpu/drm/amd/amdgpu/uvd_v3_1.c:243:16: sparse: sparse: cast to restricted __le32 >> drivers/gpu/drm/amd/amdgpu/uvd_v3_1.c:243:16: sparse: sparse: cast to restricted __le32 vim +243 drivers/gpu/drm/amd/amdgpu/uvd_v3_1.c 6f4ae872ee40de Sonny Jiang 2020-06-10 228 6f4ae872ee40de Sonny Jiang 2020-06-10 229 /** 6f4ae872ee40de Sonny Jiang 2020-06-10 230 * uvd_v3_1_mc_resume - memory controller programming 6f4ae872ee40de Sonny Jiang 2020-06-10 231 * 6f4ae872ee40de Sonny Jiang 2020-06-10 232 * @adev: amdgpu_device pointer 6f4ae872ee40de Sonny Jiang 2020-06-10 233 * 6f4ae872ee40de Sonny Jiang 2020-06-10 234 * Let the UVD memory controller know it's offsets 6f4ae872ee40de Sonny Jiang 2020-06-10 235 */ 6f4ae872ee40de Sonny Jiang 2020-06-10 236 static void uvd_v3_1_mc_resume(struct amdgpu_device *adev) 6f4ae872ee40de Sonny Jiang 2020-06-10 237 { 6f4ae872ee40de Sonny Jiang 2020-06-10 238 uint64_t addr; 6f4ae872ee40de Sonny Jiang 2020-06-10 239 uint32_t size; 6f4ae872ee40de Sonny Jiang 2020-06-10 240 6f4ae872ee40de Sonny Jiang 2020-06-10 241 /* programm the VCPU memory controller bits 0-27 */ 6f4ae872ee40de Sonny Jiang 2020-06-10 242 addr = (adev->uvd.inst->gpu_addr + AMDGPU_UVD_FIRMWARE_OFFSET) >> 3; 6f4ae872ee40de Sonny Jiang 2020-06-10 @243 size = AMDGPU_UVD_FIRMWARE_SIZE(adev) >> 3; 6f4ae872ee40de Sonny Jiang 2020-06-10 244 WREG32(mmUVD_VCPU_CACHE_OFFSET0, addr); 6f4ae872ee40de Sonny Jiang 2020-06-10 245 WREG32(mmUVD_VCPU_CACHE_SIZE0, size); 6f4ae872ee40de Sonny Jiang 2020-06-10 246 6f4ae872ee40de Sonny Jiang 2020-06-10 247 addr += size; 6f4ae872ee40de Sonny Jiang 2020-06-10 248 size = AMDGPU_UVD_HEAP_SIZE >> 3; 6f4ae872ee40de Sonny Jiang 2020-06-10 249 WREG32(mmUVD_VCPU_CACHE_OFFSET1, addr); 6f4ae872ee40de Sonny Jiang 2020-06-10 250 WREG32(mmUVD_VCPU_CACHE_SIZE1, size); 6f4ae872ee40de Sonny Jiang 2020-06-10 251 6f4ae872ee40de Sonny Jiang 2020-06-10 252 addr += size; 6f4ae872ee40de Sonny Jiang 2020-06-10 253 size = (AMDGPU_UVD_STACK_SIZE + 6f4ae872ee40de Sonny Jiang 2020-06-10 254 (AMDGPU_UVD_SESSION_SIZE * adev->uvd.max_handles)) >> 3; 6f4ae872ee40de Sonny Jiang 2020-06-10 255 WREG32(mmUVD_VCPU_CACHE_OFFSET2, addr); 6f4ae872ee40de Sonny Jiang 2020-06-10 256 WREG32(mmUVD_VCPU_CACHE_SIZE2, size); 6f4ae872ee40de Sonny Jiang 2020-06-10 257 6f4ae872ee40de Sonny Jiang 2020-06-10 258 /* bits 28-31 */ 6f4ae872ee40de Sonny Jiang 2020-06-10 259 addr = (adev->uvd.inst->gpu_addr >> 28) & 0xF; 6f4ae872ee40de Sonny Jiang 2020-06-10 260 WREG32(mmUVD_LMI_ADDR_EXT, (addr << 12) | (addr << 0)); 6f4ae872ee40de Sonny Jiang 2020-06-10 261 6f4ae872ee40de Sonny Jiang 2020-06-10 262 /* bits 32-39 */ 6f4ae872ee40de Sonny Jiang 2020-06-10 263 addr = (adev->uvd.inst->gpu_addr >> 32) & 0xFF; 6f4ae872ee40de Sonny Jiang 2020-06-10 264 WREG32(mmUVD_LMI_EXT40_ADDR, addr | (0x9 << 16) | (0x1 << 31)); 6f4ae872ee40de Sonny Jiang 2020-06-10 265 6f4ae872ee40de Sonny Jiang 2020-06-10 266 WREG32(mmUVD_UDEC_ADDR_CONFIG, adev->gfx.config.gb_addr_config); 6f4ae872ee40de Sonny Jiang 2020-06-10 267 WREG32(mmUVD_UDEC_DB_ADDR_CONFIG, adev->gfx.config.gb_addr_config); 6f4ae872ee40de Sonny Jiang 2020-06-10 268 WREG32(mmUVD_UDEC_DBW_ADDR_CONFIG, adev->gfx.config.gb_addr_config); 6f4ae872ee40de Sonny Jiang 2020-06-10 269 } 6f4ae872ee40de Sonny Jiang 2020-06-10 270 :::::: The code at line 243 was first introduced by commit :::::: 6f4ae872ee40de1d15b1808b207f4a39100025aa drm amdgpu: SI UVD v3_1 :::::: TO: Sonny Jiang <sonny.jiang(a)amd.com> :::::: CC: Sonny Jiang <sonny.jiang(a)amd.com> --- 0-DAY CI Kernel Test Service, Intel Corporation https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org

1 0

[PATCH v5] backlight: lms283gf05: Convert to GPIO descriptors
by Linus Walleij 25 Jun '20

25 Jun '20

This converts the lms283gf05 backlight driver to use GPIO descriptors and switches the single PXA Palm Z2 device over to defining these. Since the platform data was only used to convey GPIO information we can delete the platform data header. Notice that we define the proper active low semantics in the board file GPIO descriptor table (active low) and assert the reset line by bringing it to "1" (asserted). Cc: Marek Vasut <marex(a)denx.de> Cc: Daniel Mack <daniel(a)zonque.org> Cc: Haojian Zhuang <haojian.zhuang(a)gmail.com> Cc: Robert Jarzmik <robert.jarzmik(a)free.fr> Reviewed-by: Daniel Thompson <daniel.thompson(a)linaro.org> Signed-off-by: Linus Walleij <linus.walleij(a)linaro.org> --- ChangeLog v4->v5: - Rebase on v5.8-rc1 - Collected Daniel's Reviewed-by tag. ChangeLog v3->v4: - Check IS_ERR() on the returned GPIO descriptor. - Unconditionally set consumer name since the API tolerates NULL. ChangeLog v2->v3: - Fix a use-before-allocated bug discovered by compile tests. - Remove unused ret variable as autobuilders complained. ChangeLog v1->v2: - Bring up the GPIO de-asserted in probe() Marek: I saw this was written by you, are you regularly testing the Z2 device? --- arch/arm/mach-pxa/z2.c | 12 +++++--- drivers/video/backlight/lms283gf05.c | 43 +++++++++++----------------- include/linux/spi/lms283gf05.h | 16 ----------- 3 files changed, 25 insertions(+), 46 deletions(-) delete mode 100644 include/linux/spi/lms283gf05.h diff --git a/arch/arm/mach-pxa/z2.c b/arch/arm/mach-pxa/z2.c index 21fd76bb09cd..89eb5243c85f 100644 --- a/arch/arm/mach-pxa/z2.c +++ b/arch/arm/mach-pxa/z2.c @@ -20,7 +20,6 @@ #include <linux/spi/spi.h> #include <linux/spi/pxa2xx_spi.h> #include <linux/spi/libertas_spi.h> -#include <linux/spi/lms283gf05.h> #include <linux/power_supply.h> #include <linux/mtd/physmap.h> #include <linux/gpio.h> @@ -578,8 +577,13 @@ static struct pxa2xx_spi_chip lms283_chip_info = { .gpio_cs = GPIO88_ZIPITZ2_LCD_CS, }; -static const struct lms283gf05_pdata lms283_pdata = { - .reset_gpio = GPIO19_ZIPITZ2_LCD_RESET, +static struct gpiod_lookup_table lms283_gpio_table = { + .dev_id = "spi2.0", /* SPI bus 2 chip select 0 */ + .table = { + GPIO_LOOKUP("gpio-pxa", GPIO19_ZIPITZ2_LCD_RESET, + "reset", GPIO_ACTIVE_LOW), + { }, + }, }; static struct spi_board_info spi_board_info[] __initdata = { @@ -595,7 +599,6 @@ static struct spi_board_info spi_board_info[] __initdata = { { .modalias = "lms283gf05", .controller_data = &lms283_chip_info, - .platform_data = &lms283_pdata, .max_speed_hz = 400000, .bus_num = 2, .chip_select = 0, @@ -615,6 +618,7 @@ static void __init z2_spi_init(void) { pxa2xx_set_spi_info(1, &pxa_ssp1_master_info); pxa2xx_set_spi_info(2, &pxa_ssp2_master_info); + gpiod_add_lookup_table(&lms283_gpio_table); spi_register_board_info(spi_board_info, ARRAY_SIZE(spi_board_info)); } #else diff --git a/drivers/video/backlight/lms283gf05.c b/drivers/video/backlight/lms283gf05.c index 0e45685bcc1c..36856962ed83 100644 --- a/drivers/video/backlight/lms283gf05.c +++ b/drivers/video/backlight/lms283gf05.c @@ -9,16 +9,16 @@ #include <linux/kernel.h> #include <linux/delay.h> #include <linux/slab.h> -#include <linux/gpio.h> +#include <linux/gpio/consumer.h> #include <linux/lcd.h> #include <linux/spi/spi.h> -#include <linux/spi/lms283gf05.h> #include <linux/module.h> struct lms283gf05_state { struct spi_device *spi; struct lcd_device *ld; + struct gpio_desc *reset; }; struct lms283gf05_seq { @@ -90,13 +90,13 @@ static const struct lms283gf05_seq disp_pdwnseq[] = { }; -static void lms283gf05_reset(unsigned long gpio, bool inverted) +static void lms283gf05_reset(struct gpio_desc *gpiod) { - gpio_set_value(gpio, !inverted); + gpiod_set_value(gpiod, 0); /* De-asserted */ mdelay(100); - gpio_set_value(gpio, inverted); + gpiod_set_value(gpiod, 1); /* Asserted */ mdelay(20); - gpio_set_value(gpio, !inverted); + gpiod_set_value(gpiod, 0); /* De-asserted */ mdelay(20); } @@ -125,18 +125,15 @@ static int lms283gf05_power_set(struct lcd_device *ld, int power) { struct lms283gf05_state *st = lcd_get_data(ld); struct spi_device *spi = st->spi; - struct lms283gf05_pdata *pdata = dev_get_platdata(&spi->dev); if (power <= FB_BLANK_NORMAL) { - if (pdata) - lms283gf05_reset(pdata->reset_gpio, - pdata->reset_inverted); + if (st->reset) + lms283gf05_reset(st->reset); lms283gf05_toggle(spi, disp_initseq, ARRAY_SIZE(disp_initseq)); } else { lms283gf05_toggle(spi, disp_pdwnseq, ARRAY_SIZE(disp_pdwnseq)); - if (pdata) - gpio_set_value(pdata->reset_gpio, - pdata->reset_inverted); + if (st->reset) + gpiod_set_value(st->reset, 1); /* Asserted */ } return 0; @@ -150,24 +147,18 @@ static struct lcd_ops lms_ops = { static int lms283gf05_probe(struct spi_device *spi) { struct lms283gf05_state *st; - struct lms283gf05_pdata *pdata = dev_get_platdata(&spi->dev); struct lcd_device *ld; - int ret = 0; - - if (pdata != NULL) { - ret = devm_gpio_request_one(&spi->dev, pdata->reset_gpio, - GPIOF_DIR_OUT | (!pdata->reset_inverted ? - GPIOF_INIT_HIGH : GPIOF_INIT_LOW), - "LMS283GF05 RESET"); - if (ret) - return ret; - } st = devm_kzalloc(&spi->dev, sizeof(struct lms283gf05_state), GFP_KERNEL); if (st == NULL) return -ENOMEM; + st->reset = gpiod_get_optional(&spi->dev, "reset", GPIOD_OUT_LOW); + if (IS_ERR(st->reset)) + return PTR_ERR(st->reset); + gpiod_set_consumer_name(st->reset, "LMS283GF05 RESET"); + ld = devm_lcd_device_register(&spi->dev, "lms283gf05", &spi->dev, st, &lms_ops); if (IS_ERR(ld)) @@ -179,8 +170,8 @@ static int lms283gf05_probe(struct spi_device *spi) spi_set_drvdata(spi, st); /* kick in the LCD */ - if (pdata) - lms283gf05_reset(pdata->reset_gpio, pdata->reset_inverted); + if (st->reset) + lms283gf05_reset(st->reset); lms283gf05_toggle(spi, disp_initseq, ARRAY_SIZE(disp_initseq)); return 0; diff --git a/include/linux/spi/lms283gf05.h b/include/linux/spi/lms283gf05.h deleted file mode 100644 index f237b2d062e9..000000000000 --- a/include/linux/spi/lms283gf05.h +++ /dev/null @@ -1,16 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* - * lms283gf05.h - Platform glue for Samsung LMS283GF05 LCD - * - * Copyright (C) 2009 Marek Vasut <marek.vasut(a)gmail.com> -*/ - -#ifndef _INCLUDE_LINUX_SPI_LMS283GF05_H_ -#define _INCLUDE_LINUX_SPI_LMS283GF05_H_ - -struct lms283gf05_pdata { - unsigned long reset_gpio; - bool reset_inverted; -}; - -#endif /* _INCLUDE_LINUX_SPI_LMS283GF05_H_ */ -- 2.25.4

1 0

[v6 0/3] VRR capable attach prop in i915, VRR debugfs
by Bhanuprakash Modem 25 Jun '20

25 Jun '20

This is an initial set of patches for enabling VRR support in i915. This series has patches for: 1. Attach and set VRR capable connector prop for Intel DP conn 2. Expose VRR min and max through debugfs 3. Remove AMD specific logic to create debugfs Aditya Swarup (1): drm/i915/dp: Attach and set drm connector VRR property Bhanuprakash Modem (2): drm/debug: Expose connector VRR monitor range via debugfs Revert "drm/amd/display: Expose connector VRR range via debugfs" .../amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 20 -------------- drivers/gpu/drm/drm_debugfs.c | 22 +++++++++++++++ drivers/gpu/drm/i915/display/intel_dp.c | 27 +++++++++++++++++++ drivers/gpu/drm/i915/display/intel_dp.h | 2 ++ 4 files changed, 51 insertions(+), 20 deletions(-) -- 2.20.1

3 8

[radeon-alex:amd-staging-drm-next 9928/9999] drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:2522:26: sparse: sparse: incorrect type in assignment (different base types)
by kernel test robot 25 Jun '20

25 Jun '20

tree: git://people.freedesktop.org/~agd5f/linux.git amd-staging-drm-next head: cd5dd023c24f097393cd351bfaaba81284d1a15b commit: e060721131c59a375125f7e5202d8e2cd7462406 [9928/9999] drm/powerplay: label internally used symbols as static config: s390-randconfig-s032-20200624 (attached as .config) compiler: s390-linux-gcc (GCC) 9.3.0 reproduce: # apt-get install sparse # sparse version: v0.6.2-dirty git checkout e060721131c59a375125f7e5202d8e2cd7462406 # save the attached .config to linux build tree make W=1 C=1 ARCH=s390 CF='-fdiagnostic-prefix -D__CHECK_ENDIAN__' If you fix the issue, kindly add following tag as appropriate Reported-by: kernel test robot <lkp(a)intel.com> sparse warnings: (new ones prefixed by >>) drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:1479:36: sparse: expected unsigned int [usertype] McArbDramTiming drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:1479:36: sparse: got restricted __be32 [usertype] drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:1480:36: sparse: sparse: incorrect type in assignment (different base types) @@ expected unsigned int [usertype] McArbDramTiming2 @@ got restricted __be32 [usertype] @@ drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:1480:36: sparse: expected unsigned int [usertype] McArbDramTiming2 drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:1480:36: sparse: got restricted __be32 [usertype] drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:1568:9: sparse: sparse: incorrect type in assignment (different base types) @@ expected unsigned short [usertype] BootMVdd @@ got restricted __be16 [usertype] @@ drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:1568:9: sparse: expected unsigned short [usertype] BootMVdd drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:1568:9: sparse: got restricted __be16 [usertype] drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:1673:37: sparse: sparse: cast to restricted __be32 drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:1689:9: sparse: sparse: incorrect type in assignment (different base types) @@ expected unsigned short [usertype] minFreq @@ got restricted __be16 [usertype] @@ drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:1689:9: sparse: expected unsigned short [usertype] minFreq drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:1689:9: sparse: got restricted __be16 [usertype] drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:1691:9: sparse: sparse: incorrect type in assignment (different base types) @@ expected unsigned short [usertype] maxFreq @@ got restricted __be16 [usertype] @@ drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:1691:9: sparse: expected unsigned short [usertype] maxFreq drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:1691:9: sparse: got restricted __be16 [usertype] drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:1717:38: sparse: sparse: cast to restricted __be32 drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:1732:17: sparse: sparse: incorrect type in assignment (different base types) @@ expected unsigned short [usertype] setting @@ got restricted __be16 [usertype] @@ drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:1732:17: sparse: expected unsigned short [usertype] setting drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:1732:17: sparse: got restricted __be16 [usertype] drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:1838:31: sparse: sparse: incorrect type in assignment (different base types) @@ expected unsigned short [usertype] DefaultTdp @@ got restricted __be16 [usertype] @@ drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:1838:31: sparse: expected unsigned short [usertype] DefaultTdp drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:1838:31: sparse: got restricted __be16 [usertype] drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:1840:30: sparse: sparse: incorrect type in assignment (different base types) @@ expected unsigned short [usertype] TargetTdp @@ got restricted __be16 [usertype] @@ drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:1840:30: sparse: expected unsigned short [usertype] TargetTdp drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:1840:30: sparse: got restricted __be16 [usertype] drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:1852:39: sparse: sparse: incorrect type in assignment (different base types) @@ expected unsigned int [usertype] BAPM_TEMP_GRADIENT @@ got restricted __be32 [usertype] @@ drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:1852:39: sparse: expected unsigned int [usertype] BAPM_TEMP_GRADIENT drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:1852:39: sparse: got restricted __be32 [usertype] drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:1860:62: sparse: sparse: incorrect type in assignment (different base types) @@ expected unsigned short @@ got restricted __be16 [usertype] @@ drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:1860:62: sparse: expected unsigned short drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:1860:62: sparse: got restricted __be16 [usertype] drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:1862:63: sparse: sparse: incorrect type in assignment (different base types) @@ expected unsigned short @@ got restricted __be16 [usertype] @@ drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:1862:63: sparse: expected unsigned short drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:1862:63: sparse: got restricted __be16 [usertype] drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:1901:25: sparse: sparse: incorrect type in assignment (different base types) @@ expected unsigned short [assigned] [usertype] tdc_limit @@ got restricted __be16 [usertype] @@ drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:1901:25: sparse: expected unsigned short [assigned] [usertype] tdc_limit drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:1901:25: sparse: got restricted __be16 [usertype] drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:1954:57: sparse: sparse: incorrect type in assignment (different base types) @@ expected signed short [usertype] FuzzyFan_PwmSetDelta @@ got restricted __be16 [usertype] @@ drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:1954:57: sparse: expected signed short [usertype] FuzzyFan_PwmSetDelta drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:1954:57: sparse: got restricted __be16 [usertype] drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:1987:25: sparse: sparse: incorrect type in assignment (different base types) @@ expected unsigned short [assigned] [usertype] hi_sidd @@ got restricted __be16 [usertype] @@ drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:1987:25: sparse: expected unsigned short [assigned] [usertype] hi_sidd drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:1987:25: sparse: got restricted __be16 [usertype] drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:1989:25: sparse: sparse: incorrect type in assignment (different base types) @@ expected unsigned short [assigned] [usertype] lo_sidd @@ got restricted __be16 [usertype] @@ drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:1989:25: sparse: expected unsigned short [assigned] [usertype] lo_sidd drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:1989:25: sparse: got restricted __be16 [usertype] drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:2077:53: sparse: sparse: incorrect type in assignment (different base types) @@ expected unsigned short [usertype] s0 @@ got restricted __be16 [usertype] @@ drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:2077:53: sparse: expected unsigned short [usertype] s0 drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:2077:53: sparse: got restricted __be16 [usertype] drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:2079:53: sparse: sparse: incorrect type in assignment (different base types) @@ expected unsigned short [usertype] s1 @@ got restricted __be16 [usertype] @@ drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:2079:53: sparse: expected unsigned short [usertype] s1 drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:2079:53: sparse: got restricted __be16 [usertype] drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:2100:40: sparse: sparse: incorrect type in assignment (different base types) @@ expected unsigned int @@ got restricted __be32 [usertype] @@ drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:2100:40: sparse: expected unsigned int drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:2100:40: sparse: got restricted __be32 [usertype] drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:2423:32: sparse: sparse: incorrect type in assignment (different base types) @@ expected unsigned int @@ got restricted __be32 [usertype] @@ drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:2423:32: sparse: expected unsigned int drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:2423:32: sparse: got restricted __be32 [usertype] drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:2424:9: sparse: sparse: incorrect type in assignment (different base types) @@ expected unsigned int [usertype] SystemFlags @@ got restricted __be32 [usertype] @@ drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:2424:9: sparse: expected unsigned int [usertype] SystemFlags drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:2424:9: sparse: got restricted __be32 [usertype] drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:2425:9: sparse: sparse: incorrect type in assignment (different base types) @@ expected unsigned int [usertype] VRConfig @@ got restricted __be32 [usertype] @@ drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:2425:9: sparse: expected unsigned int [usertype] VRConfig drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:2425:9: sparse: got restricted __be32 [usertype] drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:2426:9: sparse: sparse: incorrect type in assignment (different base types) @@ expected unsigned int [usertype] SmioMask1 @@ got restricted __be32 [usertype] @@ drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:2426:9: sparse: expected unsigned int [usertype] SmioMask1 drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:2426:9: sparse: got restricted __be32 [usertype] drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:2427:9: sparse: sparse: incorrect type in assignment (different base types) @@ expected unsigned int [usertype] SmioMask2 @@ got restricted __be32 [usertype] @@ drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:2427:9: sparse: expected unsigned int [usertype] SmioMask2 drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:2427:9: sparse: got restricted __be32 [usertype] drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:2428:9: sparse: sparse: incorrect type in assignment (different base types) @@ expected unsigned int [usertype] SclkStepSize @@ got restricted __be32 [usertype] @@ drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:2428:9: sparse: expected unsigned int [usertype] SclkStepSize drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:2428:9: sparse: got restricted __be32 [usertype] drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:2429:9: sparse: sparse: incorrect type in assignment (different base types) @@ expected unsigned short [usertype] TemperatureLimitHigh @@ got restricted __be16 [usertype] @@ drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:2429:9: sparse: expected unsigned short [usertype] TemperatureLimitHigh drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:2429:9: sparse: got restricted __be16 [usertype] drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:2430:9: sparse: sparse: incorrect type in assignment (different base types) @@ expected unsigned short [usertype] TemperatureLimitLow @@ got restricted __be16 [usertype] @@ drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:2430:9: sparse: expected unsigned short [usertype] TemperatureLimitLow drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:2430:9: sparse: got restricted __be16 [usertype] drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:2431:9: sparse: sparse: incorrect type in assignment (different base types) @@ expected unsigned short [usertype] VoltageResponseTime @@ got restricted __be16 [usertype] @@ drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:2431:9: sparse: expected unsigned short [usertype] VoltageResponseTime drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:2431:9: sparse: got restricted __be16 [usertype] drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:2432:9: sparse: sparse: incorrect type in assignment (different base types) @@ expected unsigned short [usertype] PhaseResponseTime @@ got restricted __be16 [usertype] @@ drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:2432:9: sparse: expected unsigned short [usertype] PhaseResponseTime drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:2432:9: sparse: got restricted __be16 [usertype] drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:2515:27: sparse: sparse: incorrect type in assignment (different base types) @@ expected signed short [usertype] TempMin @@ got restricted __be16 [usertype] @@ drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:2515:27: sparse: expected signed short [usertype] TempMin drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:2515:27: sparse: got restricted __be16 [usertype] drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:2516:27: sparse: sparse: incorrect type in assignment (different base types) @@ expected signed short [usertype] TempMed @@ got restricted __be16 [usertype] @@ drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:2516:27: sparse: expected signed short [usertype] TempMed drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:2516:27: sparse: got restricted __be16 [usertype] drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:2517:27: sparse: sparse: incorrect type in assignment (different base types) @@ expected signed short [usertype] TempMax @@ got restricted __be16 [usertype] @@ drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:2517:27: sparse: expected signed short [usertype] TempMax drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:2517:27: sparse: got restricted __be16 [usertype] drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:2519:26: sparse: sparse: incorrect type in assignment (different base types) @@ expected signed short [usertype] Slope1 @@ got restricted __be16 [usertype] @@ drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:2519:26: sparse: expected signed short [usertype] Slope1 drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:2519:26: sparse: got restricted __be16 [usertype] drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:2520:26: sparse: sparse: incorrect type in assignment (different base types) @@ expected signed short [usertype] Slope2 @@ got restricted __be16 [usertype] @@ drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:2520:26: sparse: expected signed short [usertype] Slope2 drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:2520:26: sparse: got restricted __be16 [usertype] >> drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:2522:26: sparse: sparse: incorrect type in assignment (different base types) @@ expected signed short [usertype] FdoMin @@ got restricted __be16 [usertype] @@ >> drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:2522:26: sparse: expected signed short [usertype] FdoMin drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:2522:26: sparse: got restricted __be16 [usertype] drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c:2524:28: sparse: sparse: too many warnings vim +2522 drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/tonga_smumgr.c 4dddc212a354cc Rex Zhu 2017-10-09 2459 4dddc212a354cc Rex Zhu 2017-10-09 2460 static int tonga_thermal_setup_fan_table(struct pp_hwmgr *hwmgr) 4dddc212a354cc Rex Zhu 2017-10-09 2461 { 4dddc212a354cc Rex Zhu 2017-10-09 2462 struct tonga_smumgr *smu_data = 4dddc212a354cc Rex Zhu 2017-10-09 2463 (struct tonga_smumgr *)(hwmgr->smu_backend); 4dddc212a354cc Rex Zhu 2017-10-09 2464 SMU72_Discrete_FanTable fan_table = { FDO_MODE_HARDWARE }; 4dddc212a354cc Rex Zhu 2017-10-09 2465 uint32_t duty100; 4dddc212a354cc Rex Zhu 2017-10-09 2466 uint32_t t_diff1, t_diff2, pwm_diff1, pwm_diff2; 4dddc212a354cc Rex Zhu 2017-10-09 2467 uint16_t fdo_min, slope1, slope2; 4dddc212a354cc Rex Zhu 2017-10-09 2468 uint32_t reference_clock; 4dddc212a354cc Rex Zhu 2017-10-09 2469 int res; 4dddc212a354cc Rex Zhu 2017-10-09 2470 uint64_t tmp64; 4dddc212a354cc Rex Zhu 2017-10-09 2471 4dddc212a354cc Rex Zhu 2017-10-09 2472 if (!phm_cap_enabled(hwmgr->platform_descriptor.platformCaps, 4dddc212a354cc Rex Zhu 2017-10-09 2473 PHM_PlatformCaps_MicrocodeFanControl)) 4dddc212a354cc Rex Zhu 2017-10-09 2474 return 0; 4dddc212a354cc Rex Zhu 2017-10-09 2475 4dddc212a354cc Rex Zhu 2017-10-09 2476 if (hwmgr->thermal_controller.fanInfo.bNoFan) { 4dddc212a354cc Rex Zhu 2017-10-09 2477 phm_cap_unset(hwmgr->platform_descriptor.platformCaps, 4dddc212a354cc Rex Zhu 2017-10-09 2478 PHM_PlatformCaps_MicrocodeFanControl); 4dddc212a354cc Rex Zhu 2017-10-09 2479 return 0; 4dddc212a354cc Rex Zhu 2017-10-09 2480 } 4dddc212a354cc Rex Zhu 2017-10-09 2481 4dddc212a354cc Rex Zhu 2017-10-09 2482 if (0 == smu_data->smu7_data.fan_table_start) { 4dddc212a354cc Rex Zhu 2017-10-09 2483 phm_cap_unset(hwmgr->platform_descriptor.platformCaps, 4dddc212a354cc Rex Zhu 2017-10-09 2484 PHM_PlatformCaps_MicrocodeFanControl); 4dddc212a354cc Rex Zhu 2017-10-09 2485 return 0; 4dddc212a354cc Rex Zhu 2017-10-09 2486 } 4dddc212a354cc Rex Zhu 2017-10-09 2487 4dddc212a354cc Rex Zhu 2017-10-09 2488 duty100 = PHM_READ_VFPF_INDIRECT_FIELD(hwmgr->device, 4dddc212a354cc Rex Zhu 2017-10-09 2489 CGS_IND_REG__SMC, 4dddc212a354cc Rex Zhu 2017-10-09 2490 CG_FDO_CTRL1, FMAX_DUTY100); 4dddc212a354cc Rex Zhu 2017-10-09 2491 4dddc212a354cc Rex Zhu 2017-10-09 2492 if (0 == duty100) { 4dddc212a354cc Rex Zhu 2017-10-09 2493 phm_cap_unset(hwmgr->platform_descriptor.platformCaps, 4dddc212a354cc Rex Zhu 2017-10-09 2494 PHM_PlatformCaps_MicrocodeFanControl); 4dddc212a354cc Rex Zhu 2017-10-09 2495 return 0; 4dddc212a354cc Rex Zhu 2017-10-09 2496 } 4dddc212a354cc Rex Zhu 2017-10-09 2497 4dddc212a354cc Rex Zhu 2017-10-09 2498 tmp64 = hwmgr->thermal_controller.advanceFanControlParameters.usPWMMin * duty100; 4dddc212a354cc Rex Zhu 2017-10-09 2499 do_div(tmp64, 10000); 4dddc212a354cc Rex Zhu 2017-10-09 2500 fdo_min = (uint16_t)tmp64; 4dddc212a354cc Rex Zhu 2017-10-09 2501 4dddc212a354cc Rex Zhu 2017-10-09 2502 t_diff1 = hwmgr->thermal_controller.advanceFanControlParameters.usTMed - 4dddc212a354cc Rex Zhu 2017-10-09 2503 hwmgr->thermal_controller.advanceFanControlParameters.usTMin; 4dddc212a354cc Rex Zhu 2017-10-09 2504 t_diff2 = hwmgr->thermal_controller.advanceFanControlParameters.usTHigh - 4dddc212a354cc Rex Zhu 2017-10-09 2505 hwmgr->thermal_controller.advanceFanControlParameters.usTMed; 4dddc212a354cc Rex Zhu 2017-10-09 2506 4dddc212a354cc Rex Zhu 2017-10-09 2507 pwm_diff1 = hwmgr->thermal_controller.advanceFanControlParameters.usPWMMed - 4dddc212a354cc Rex Zhu 2017-10-09 2508 hwmgr->thermal_controller.advanceFanControlParameters.usPWMMin; 4dddc212a354cc Rex Zhu 2017-10-09 2509 pwm_diff2 = hwmgr->thermal_controller.advanceFanControlParameters.usPWMHigh - 4dddc212a354cc Rex Zhu 2017-10-09 2510 hwmgr->thermal_controller.advanceFanControlParameters.usPWMMed; 4dddc212a354cc Rex Zhu 2017-10-09 2511 4dddc212a354cc Rex Zhu 2017-10-09 2512 slope1 = (uint16_t)((50 + ((16 * duty100 * pwm_diff1) / t_diff1)) / 100); 4dddc212a354cc Rex Zhu 2017-10-09 2513 slope2 = (uint16_t)((50 + ((16 * duty100 * pwm_diff2) / t_diff2)) / 100); 4dddc212a354cc Rex Zhu 2017-10-09 2514 4dddc212a354cc Rex Zhu 2017-10-09 2515 fan_table.TempMin = cpu_to_be16((50 + hwmgr->thermal_controller.advanceFanControlParameters.usTMin) / 100); 4dddc212a354cc Rex Zhu 2017-10-09 2516 fan_table.TempMed = cpu_to_be16((50 + hwmgr->thermal_controller.advanceFanControlParameters.usTMed) / 100); 4dddc212a354cc Rex Zhu 2017-10-09 2517 fan_table.TempMax = cpu_to_be16((50 + hwmgr->thermal_controller.advanceFanControlParameters.usTMax) / 100); 4dddc212a354cc Rex Zhu 2017-10-09 2518 4dddc212a354cc Rex Zhu 2017-10-09 2519 fan_table.Slope1 = cpu_to_be16(slope1); 4dddc212a354cc Rex Zhu 2017-10-09 2520 fan_table.Slope2 = cpu_to_be16(slope2); 4dddc212a354cc Rex Zhu 2017-10-09 2521 4dddc212a354cc Rex Zhu 2017-10-09 @2522 fan_table.FdoMin = cpu_to_be16(fdo_min); 4dddc212a354cc Rex Zhu 2017-10-09 2523 4dddc212a354cc Rex Zhu 2017-10-09 2524 fan_table.HystDown = cpu_to_be16(hwmgr->thermal_controller.advanceFanControlParameters.ucTHyst); 4dddc212a354cc Rex Zhu 2017-10-09 2525 4dddc212a354cc Rex Zhu 2017-10-09 2526 fan_table.HystUp = cpu_to_be16(1); 4dddc212a354cc Rex Zhu 2017-10-09 2527 4dddc212a354cc Rex Zhu 2017-10-09 2528 fan_table.HystSlope = cpu_to_be16(1); 4dddc212a354cc Rex Zhu 2017-10-09 2529 4dddc212a354cc Rex Zhu 2017-10-09 2530 fan_table.TempRespLim = cpu_to_be16(5); 4dddc212a354cc Rex Zhu 2017-10-09 2531 2538090cb62ab8 Rex Zhu 2018-03-16 2532 reference_clock = amdgpu_asic_get_xclk((struct amdgpu_device *)hwmgr->adev); 4dddc212a354cc Rex Zhu 2017-10-09 2533 4dddc212a354cc Rex Zhu 2017-10-09 2534 fan_table.RefreshPeriod = cpu_to_be32((hwmgr->thermal_controller.advanceFanControlParameters.ulCycleDelay * reference_clock) / 1600); 4dddc212a354cc Rex Zhu 2017-10-09 2535 4dddc212a354cc Rex Zhu 2017-10-09 2536 fan_table.FdoMax = cpu_to_be16((uint16_t)duty100); 4dddc212a354cc Rex Zhu 2017-10-09 2537 4dddc212a354cc Rex Zhu 2017-10-09 2538 fan_table.TempSrc = (uint8_t)PHM_READ_VFPF_INDIRECT_FIELD(hwmgr->device, CGS_IND_REG__SMC, CG_MULT_THERMAL_CTRL, TEMP_SEL); 4dddc212a354cc Rex Zhu 2017-10-09 2539 4dddc212a354cc Rex Zhu 2017-10-09 2540 fan_table.FanControl_GL_Flag = 1; 4dddc212a354cc Rex Zhu 2017-10-09 2541 4dddc212a354cc Rex Zhu 2017-10-09 2542 res = smu7_copy_bytes_to_smc(hwmgr, 4dddc212a354cc Rex Zhu 2017-10-09 2543 smu_data->smu7_data.fan_table_start, 4dddc212a354cc Rex Zhu 2017-10-09 2544 (uint8_t *)&fan_table, 4dddc212a354cc Rex Zhu 2017-10-09 2545 (uint32_t)sizeof(fan_table), 4dddc212a354cc Rex Zhu 2017-10-09 2546 SMC_RAM_END); 4dddc212a354cc Rex Zhu 2017-10-09 2547 4dddc212a354cc Rex Zhu 2017-10-09 2548 return 0; 4dddc212a354cc Rex Zhu 2017-10-09 2549 } 4dddc212a354cc Rex Zhu 2017-10-09 2550 :::::: The code at line 2522 was first introduced by commit :::::: 4dddc212a354cc3924d60ca240cd338b0a3f6c49 drm/amd/pp: remove tonga_smc/smumgr split. :::::: TO: Rex Zhu <Rex.Zhu(a)amd.com> :::::: CC: Alex Deucher <alexander.deucher(a)amd.com> --- 0-DAY CI Kernel Test Service, Intel Corporation https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org

1 0

[PATCH v1] drm/amd/powerplay: Fix NULL dereference in lock_bus() on Vega20 w/o RAS
by Ivan Mironov 25 Jun '20

25 Jun '20

I updated my system with Radeon VII from kernel 5.6 to kernel 5.7, and following started to happen on each boot: ... BUG: kernel NULL pointer dereference, address: 0000000000000128 ... CPU: 9 PID: 1940 Comm: modprobe Tainted: G E 5.7.2-200.im0.fc32.x86_64 #1 Hardware name: System manufacturer System Product Name/PRIME X570-P, BIOS 1407 04/02/2020 RIP: 0010:lock_bus+0x42/0x60 [amdgpu] ... Call Trace: i2c_smbus_xfer+0x3d/0xf0 i2c_default_probe+0xf3/0x130 i2c_detect.isra.0+0xfe/0x2b0 ? kfree+0xa3/0x200 ? kobject_uevent_env+0x11f/0x6a0 ? i2c_detect.isra.0+0x2b0/0x2b0 __process_new_driver+0x1b/0x20 bus_for_each_dev+0x64/0x90 ? 0xffffffffc0f34000 i2c_register_driver+0x73/0xc0 do_one_initcall+0x46/0x200 ? _cond_resched+0x16/0x40 ? kmem_cache_alloc_trace+0x167/0x220 ? do_init_module+0x23/0x260 do_init_module+0x5c/0x260 __do_sys_init_module+0x14f/0x170 do_syscall_64+0x5b/0xf0 entry_SYSCALL_64_after_hwframe+0x44/0xa9 ... Error appears when some i2c device driver tries to probe for devices using adapter registered by `smu_v11_0_i2c_eeprom_control_init()`. Code supporting this adapter requires `adev->psp.ras.ras` to be not NULL, which is true only when `amdgpu_ras_init()` detects HW support by calling `amdgpu_ras_check_supported()`. Before 9015d60c9ee1, adapter was registered by -> amdgpu_device_ip_init() -> amdgpu_ras_recovery_init() -> amdgpu_ras_eeprom_init() -> smu_v11_0_i2c_eeprom_control_init() after verifying that `adev->psp.ras.ras` is not NULL in `amdgpu_ras_recovery_init()`. Currently it is registered unconditionally by -> amdgpu_device_ip_init() -> pp_sw_init() -> hwmgr_sw_init() -> vega20_smu_init() -> smu_v11_0_i2c_eeprom_control_init() Fix simply adds HW support check (ras == NULL => no support) before calling `smu_v11_0_i2c_eeprom_control_{init,fini}()`. Please note that there is a chance that similar fix is also required for CHIP_ARCTURUS. I do not know whether any actual Arcturus hardware without RAS exist, and whether calling `smu_i2c_eeprom_init()` makes any sense when there is no HW support. Cc: stable(a)vger.kernel.org Fixes: 9015d60c9ee1 ("drm/amdgpu: Move EEPROM I2C adapter to amdgpu_device") Signed-off-by: Ivan Mironov <mironov.ivan(a)gmail.com> Tested-by: Bjorn Nostvold <bjorn.nostvold(a)gmail.com> --- Changelog: v1: - Added "Tested-by" for another user who used this patch to fix the same issue. v0: - Patch introduced. --- drivers/gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c index 2fb97554134f..c2e0fbbccf56 100644 --- a/drivers/gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c +++ b/drivers/gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c @@ -522,9 +522,11 @@ static int vega20_smu_init(struct pp_hwmgr *hwmgr) priv->smu_tables.entry[TABLE_ACTIVITY_MONITOR_COEFF].version = 0x01; priv->smu_tables.entry[TABLE_ACTIVITY_MONITOR_COEFF].size = sizeof(DpmActivityMonitorCoeffInt_t); - ret = smu_v11_0_i2c_eeprom_control_init(&adev->pm.smu_i2c); - if (ret) - goto err4; + if (adev->psp.ras.ras) { + ret = smu_v11_0_i2c_eeprom_control_init(&adev->pm.smu_i2c); + if (ret) + goto err4; + } return 0; @@ -560,7 +562,8 @@ static int vega20_smu_fini(struct pp_hwmgr *hwmgr) (struct vega20_smumgr *)(hwmgr->smu_backend); struct amdgpu_device *adev = hwmgr->adev; - smu_v11_0_i2c_eeprom_control_fini(&adev->pm.smu_i2c); + if (adev->psp.ras.ras) + smu_v11_0_i2c_eeprom_control_fini(&adev->pm.smu_i2c); if (priv) { amdgpu_bo_free_kernel(&priv->smu_tables.entry[TABLE_PPTABLE].handle, -- 2.26.2

2 2

[PATCH 0/5] drm/etnaviv: Ignore MC bit when checking for runtime suspend
by Guido Günther 25 Jun '20

25 Jun '20

At least GC7000 fails to enter runtime suspend for long periods of time since the MC becomes busy again even when the FE is idle. The rest of the series makes detecting similar issues easier to debug in the future by checking all known bits in debugfs and also warning in the EBUSY case. Tested on GC7000 with a reduced runtime delay of 50ms. Patches are against next-20200226. Thanks to Lucas Stach for pointing me in the right direction. Guido Günther (5): drm/etnaviv: Fix typo in comment drm/etnaviv: Update idle bits drm/etnaviv: Consider all kwnown idle bits in debugfs drm/etnaviv: Ignore MC when checking runtime suspend idleness drm/etnaviv: Warn when GPU doesn't idle fast enough drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 26 ++++++++++++++++++++++---- drivers/gpu/drm/etnaviv/state_hi.xml.h | 7 +++++++ 2 files changed, 29 insertions(+), 4 deletions(-) -- 2.23.0

3 9

[PATCHv2 00/56] drm/omap: Convert DSI code to use drm_mipi_dsi and drm_panel
by Sebastian Reichel 25 Jun '20

25 Jun '20

This updates the existing omapdrm DSI code, so that it uses common drm_mipi_dsi API and drm_panel. The patchset has been tested with Droid 4 using Linux console, X.org and Weston. The patchset is based on Laurent Pinchartl's patch series [0] and removes the last custom panel driver, so quite a few cleanups on the omapdrm codebase were possible. [0] [PATCH v7 00/54] drm/omap: Replace custom display drivers with drm_bridge and drm_panel https://lore.kernel.org/dri-devel/20200222150106.22919-1-laurent.pinchart@i… git://linuxtv.org/pinchartl/media.git omapdrm/bridge/devel I pushed this patchset into the following branch: git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-n900.git omapdrm/bridge/devel-with-dsi The previous version of this patchset has been sent quite some time ago. This version has been rebased and required cleaning up most of the hacks. I do not have a detailed changelog, but quite a few things changed. I decided against doing anything special for the DT change (adding DSI channel number), since only 3 devices are affected. It is quite likely, that all developers of those devices update DT together with kernel for those devices. My suggestion is to merge the first two patches ASAP and backport to stable, since it does not affect old kernels and the change is rather small. RFCv1: https://lore.kernel.org/dri-devel/20191117023946.VjCC3yE08DMx7JIKxNagPoT5et… -- Sebastian Sebastian Reichel (56): ARM: dts: omap: add channel to DSI panels ARM: dts: omap4-droid4: add panel compatible Revert "drm/omap: dss: Remove unused omap_dss_device operations" omap/drm: drop unused dsi.configure_pins drm/omap: dsi: use MIPI_DSI_FMT_* instead of OMAP_DSS_DSI_FMT_* drm/omap: constify write buffers drm/omap: dsi: add generic transfer function drm/omap: panel-dsi-cm: convert to transfer API drm/omap: dsi: unexport specific data transfer functions drm/omap: dsi: drop virtual channel logic drm/omap: dsi: simplify write function drm/omap: dsi: simplify read functions drm/omap: dsi: switch dsi_vc_send_long/short to mipi_dsi_msg drm/omap: dsi: introduce mipi_dsi_host drm/omap: panel-dsi-cm: use DSI helpers drm/omap: dsi: request VC via mipi_dsi_attach drm/omap: panel-dsi-cm: drop hardcoded VC drm/omap: panel-dsi-cm: use common MIPI DCS 1.3 defines drm/omap: dsi: drop unused memory_read() drm/omap: dsi: drop unused get_te() drm/omap: dsi: drop unused enable_te() drm/omap: dsi: drop useless sync() drm/omap: dsi: use pixel-format and mode from attach drm/omap: panel-dsi-cm: use bulk regulator API drm/omap: dsi: lp/hs switching support for transfer() drm/omap: dsi: move TE GPIO handling into core drm/omap: dsi: drop custom enable_te() API drm/omap: dsi: do bus locking in host driver drm/omap: dsi: untangle ulps ops from enable/disable drm/dsi: add MIPI_DSI_MODE_ULPS_IDLE drm/omap: dsi: do ULPS in host driver drm/omap: dsi: move panel refresh function to host drm/omap: dsi: Reverse direction of the DSS device enable/disable operations drm/omap: dsi: drop custom panel capability support drm/omap: dsi: convert to drm_panel drm/omap: drop omapdss-boot-init drm/omap: dsi: implement check timings drm/omap: panel-dsi-cm: use DEVICE_ATTR_RO drm/omap: panel-dsi-cm: support unbinding drm/omap: panel-dsi-cm: fix remove() drm/omap: dsi: return proper error code from dsi_update_all() drm/omap: remove global dss_device variable drm/omap: bind components with drm_device argument drm/panel: Move OMAP's DSI command mode panel driver drm/omap: dsi: Register a drm_bridge drm/omap: remove legacy DSS device operations drm/omap: remove unused omap_connector drm/omap: simplify omap_display_id drm/omap: drop unused DSS next pointer drm/omap: drop empty omap_encoder helper functions drm/omap: drop DSS ops_flags drm/omap: drop dssdev display field drm/omap: simplify DSI manual update code ARM: omap2plus_defconfig: Update for moved DSI command mode panel drm/panel/panel-dsi-cm: support rotation property ARM: dts: omap4-droid4: add panel orientation .../bindings/display/panel/panel-dsi-cm.txt | 4 +- .../boot/dts/motorola-mapphone-common.dtsi | 6 +- arch/arm/boot/dts/omap3-n950.dts | 3 +- arch/arm/boot/dts/omap3.dtsi | 3 + arch/arm/boot/dts/omap4-sdp.dts | 6 +- arch/arm/boot/dts/omap4.dtsi | 6 + arch/arm/boot/dts/omap5.dtsi | 6 + arch/arm/configs/omap2plus_defconfig | 2 +- drivers/gpu/drm/omapdrm/Kconfig | 1 - drivers/gpu/drm/omapdrm/Makefile | 2 - drivers/gpu/drm/omapdrm/displays/Kconfig | 10 - drivers/gpu/drm/omapdrm/displays/Makefile | 2 - .../gpu/drm/omapdrm/displays/panel-dsi-cm.c | 1387 ----------------- drivers/gpu/drm/omapdrm/dss/Kconfig | 4 +- drivers/gpu/drm/omapdrm/dss/Makefile | 2 - drivers/gpu/drm/omapdrm/dss/base.c | 58 +- drivers/gpu/drm/omapdrm/dss/dsi.c | 1034 +++++++----- drivers/gpu/drm/omapdrm/dss/dss.c | 44 +- .../gpu/drm/omapdrm/dss/omapdss-boot-init.c | 220 --- drivers/gpu/drm/omapdrm/dss/omapdss.h | 141 +- drivers/gpu/drm/omapdrm/dss/output.c | 13 +- drivers/gpu/drm/omapdrm/dss/venc.c | 1 - drivers/gpu/drm/omapdrm/omap_connector.c | 157 -- drivers/gpu/drm/omapdrm/omap_connector.h | 28 - drivers/gpu/drm/omapdrm/omap_crtc.c | 35 +- drivers/gpu/drm/omapdrm/omap_drv.c | 49 +- drivers/gpu/drm/omapdrm/omap_drv.h | 1 - drivers/gpu/drm/omapdrm/omap_encoder.c | 59 +- drivers/gpu/drm/panel/Kconfig | 9 + drivers/gpu/drm/panel/Makefile | 1 + drivers/gpu/drm/panel/panel-dsi-cm.c | 674 ++++++++ include/drm/drm_mipi_dsi.h | 2 + 32 files changed, 1465 insertions(+), 2505 deletions(-) delete mode 100644 drivers/gpu/drm/omapdrm/displays/Kconfig delete mode 100644 drivers/gpu/drm/omapdrm/displays/Makefile delete mode 100644 drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c delete mode 100644 drivers/gpu/drm/omapdrm/dss/omapdss-boot-init.c delete mode 100644 drivers/gpu/drm/omapdrm/omap_connector.c delete mode 100644 drivers/gpu/drm/omapdrm/omap_connector.h create mode 100644 drivers/gpu/drm/panel/panel-dsi-cm.c base-commit: 54ba965bb3873eca6098ddf04e3a8d7bba1b5557 -- 2.25.0

7 112

[PATCH 1/1] drm/scheduler: improve job distribution with multiple queues
by Nirmoy Das 25 Jun '20

25 Jun '20

This patch uses score to select a new drm scheduler for better loadbalance between multiple drm schedulers instead of num_jobs. Below are test results after running amdgpu_test for ~10 times. Before this patch: sched_name num of many times it got schedule ========= ================================== sdma0 1463 sdma1 198 comp_1.0.1 280 After this patch: sched_name num of many times it got schedule ========= ================================== sdma0 925 sdma1 928 comp_1.0.1 177 comp_1.1.1 44 comp_1.2.1 43 comp_1.3.1 44 Signed-off-by: Nirmoy Das <nirmoy.das(a)amd.com> --- drivers/gpu/drm/scheduler/sched_entity.c | 2 +- drivers/gpu/drm/scheduler/sched_main.c | 14 ++++++++------ include/drm/gpu_scheduler.h | 6 +++--- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/scheduler/sched_entity.c b/drivers/gpu/drm/scheduler/sched_entity.c index c803e14eed91..146380118962 100644 --- a/drivers/gpu/drm/scheduler/sched_entity.c +++ b/drivers/gpu/drm/scheduler/sched_entity.c @@ -486,7 +486,7 @@ void drm_sched_entity_push_job(struct drm_sched_job *sched_job, bool first; trace_drm_sched_job(sched_job, entity); - atomic_inc(&entity->rq->sched->num_jobs); + atomic_inc(&entity->rq->sched->score); WRITE_ONCE(entity->last_user, current->group_leader); first = spsc_queue_push(&entity->job_queue, &sched_job->queue_node); diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/scheduler/sched_main.c index 8e731ed0d9d9..25a9e6911602 100644 --- a/drivers/gpu/drm/scheduler/sched_main.c +++ b/drivers/gpu/drm/scheduler/sched_main.c @@ -92,6 +92,7 @@ void drm_sched_rq_add_entity(struct drm_sched_rq *rq, if (!list_empty(&entity->list)) return; spin_lock(&rq->lock); + atomic_inc(&rq->sched->score); list_add_tail(&entity->list, &rq->entities); spin_unlock(&rq->lock); } @@ -110,6 +111,7 @@ void drm_sched_rq_remove_entity(struct drm_sched_rq *rq, if (list_empty(&entity->list)) return; spin_lock(&rq->lock); + atomic_dec(&rq->sched->score); list_del_init(&entity->list); if (rq->current_entity == entity) rq->current_entity = NULL; @@ -647,7 +649,7 @@ static void drm_sched_process_job(struct dma_fence *f, struct dma_fence_cb *cb) struct drm_gpu_scheduler *sched = s_fence->sched; atomic_dec(&sched->hw_rq_count); - atomic_dec(&sched->num_jobs); + atomic_dec(&sched->score); trace_drm_sched_process_job(s_fence); @@ -712,7 +714,7 @@ drm_sched_pick_best(struct drm_gpu_scheduler **sched_list, { struct drm_gpu_scheduler *sched, *picked_sched = NULL; int i; - unsigned int min_jobs = UINT_MAX, num_jobs; + unsigned int min_score = UINT_MAX, num_score; for (i = 0; i < num_sched_list; ++i) { sched = sched_list[i]; @@ -723,9 +725,9 @@ drm_sched_pick_best(struct drm_gpu_scheduler **sched_list, continue; } - num_jobs = atomic_read(&sched->num_jobs); - if (num_jobs < min_jobs) { - min_jobs = num_jobs; + num_score = atomic_read(&sched->score); + if (num_score < min_score) { + min_score = num_score; picked_sched = sched; } } @@ -860,7 +862,7 @@ int drm_sched_init(struct drm_gpu_scheduler *sched, spin_lock_init(&sched->job_list_lock); atomic_set(&sched->hw_rq_count, 0); INIT_DELAYED_WORK(&sched->work_tdr, drm_sched_job_timedout); - atomic_set(&sched->num_jobs, 0); + atomic_set(&sched->score, 0); atomic64_set(&sched->job_id_count, 0); /* Each scheduler will run on a seperate kernel thread */ diff --git a/include/drm/gpu_scheduler.h b/include/drm/gpu_scheduler.h index a21b3b92135a..b9780ae9dd26 100644 --- a/include/drm/gpu_scheduler.h +++ b/include/drm/gpu_scheduler.h @@ -263,7 +263,7 @@ struct drm_sched_backend_ops { * @job_list_lock: lock to protect the ring_mirror_list. * @hang_limit: once the hangs by a job crosses this limit then it is marked * guilty and it will be considered for scheduling further. - * @num_jobs: the number of jobs in queue in the scheduler + * @score: score to help loadbalancer pick a idle sched * @ready: marks if the underlying HW is ready to work * @free_guilty: A hit to time out handler to free the guilty job. * @@ -284,8 +284,8 @@ struct drm_gpu_scheduler { struct list_head ring_mirror_list; spinlock_t job_list_lock; int hang_limit; - atomic_t num_jobs; - bool ready; + atomic_t score; + bool ready; bool free_guilty; }; -- 2.27.0

1 0

← Newer
1
...
29
30
31
32
33
34
35
...
74
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel June 2020