dri-devel September 2019

dri-devel@lists.freedesktop.org

315 participants
2278 discussions

[PATCH 00/19] drm/i915: Plane cdclk requirements and fp16 for gen4+
by Ville Syrjala 19 Sep '19

19 Sep '19

From: Ville Syrjälä <ville.syrjala(a)linux.intel.com> The end of the series is just a reposting of the fp16 stuff for gen4+. The start of the series is new stuff to allow planes to dictate the minimum cdclk, which is sometimes needed for downscaling or fp16 (and sometimes even for other pixel formats). Thanks to that new code the fp16 tests should now pass on bxt/glk. Ville Syrjälä (19): drm: Add drm_modeset_lock_assert_held() drm/atomic-helper: Make crtc helper funcs optional drm/i915: Remove pointless planes_changed=true assignment drm/i915: Replace is_planar_yuv_format() with drm_format_info_is_yuv_semiplanar() drm/i915: Allow downscale factor of <3.0 on glk+ for all formats drm/i915: Extract intel_modeset_calc_cdclk() drm/i915: s/pipe_config/crtc_state/ in intel_crtc_atomic_check() drm/i915: Stop using drm_atomic_helper_check_planes() drm/i915: Add debugs to distingiush a cd2x update from a full cdclk pll update drm/i915: Make .modeset_calc_cdclk() mandatory drm/i915: Rework global state locking drm/i915: Move check_digital_port_conflicts() earier drm/i915: Allow planes to declare their minimum acceptable cdclk drm/i915: Eliminate skl_check_pipe_max_pixel_rate() drm/i915: Simplify skl_max_scale() drm/i915: Add support for half float framebuffers for skl+ drm/i915: Add support for half float framebuffers for gen4+ primary planes drm/i915: Add support for half float framebuffers for ivb+ sprites drm/i915: Add support for half float framebuffers on snb sprites drivers/gpu/drm/drm_atomic_helper.c | 2 +- drivers/gpu/drm/i915/display/intel_atomic.c | 34 +- drivers/gpu/drm/i915/display/intel_atomic.h | 3 + .../gpu/drm/i915/display/intel_atomic_plane.c | 45 +- .../gpu/drm/i915/display/intel_atomic_plane.h | 4 + drivers/gpu/drm/i915/display/intel_audio.c | 10 +- drivers/gpu/drm/i915/display/intel_cdclk.c | 221 +++++++- drivers/gpu/drm/i915/display/intel_cdclk.h | 6 +- drivers/gpu/drm/i915/display/intel_display.c | 534 ++++++++++-------- drivers/gpu/drm/i915/display/intel_sprite.c | 441 ++++++++++++++- drivers/gpu/drm/i915/display/intel_sprite.h | 8 +- drivers/gpu/drm/i915/i915_drv.h | 11 +- drivers/gpu/drm/i915/intel_drv.h | 14 +- drivers/gpu/drm/i915/intel_pm.c | 116 +--- drivers/gpu/drm/i915/intel_pm.h | 2 - include/drm/drm_modeset_lock.h | 9 + 16 files changed, 1054 insertions(+), 406 deletions(-) -- 2.21.0

5 30

[PATCH] drm/amdgpu: remove excess function parameter description
by yu kuai 19 Sep '19

19 Sep '19

Fixes gcc warning: drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c:431: warning: Excess function parameter 'sw' description in 'vcn_v2_5_disable_clock_gating' drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c:550: warning: Excess function parameter 'sw' description in 'vcn_v2_5_enable_clock_gating' Fixes: cbead2bdfcf1 ("drm/amdgpu: add VCN2.5 VCPU start and stop") Signed-off-by: yu kuai <yukuai3(a)huawei.com> --- drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c b/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c index 395c225..9d778a0 100644 --- a/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c @@ -423,7 +423,6 @@ static void vcn_v2_5_mc_resume(struct amdgpu_device *adev) * vcn_v2_5_disable_clock_gating - disable VCN clock gating * * @adev: amdgpu_device pointer - * @sw: enable SW clock gating * * Disable clock gating for VCN block */ @@ -542,7 +541,6 @@ static void vcn_v2_5_disable_clock_gating(struct amdgpu_device *adev) * vcn_v2_5_enable_clock_gating - enable VCN clock gating * * @adev: amdgpu_device pointer - * @sw: enable SW clock gating * * Enable clock gating for VCN block */ -- 2.7.4

2 1

[PATCH] drm/radeon: fix a potential NULL pointer dereference
by Allen Pais 19 Sep '19

19 Sep '19

alloc_workqueue is not checked for errors and as a result, a potential NULL dereference could occur. Signed-off-by: Allen Pais <allen.pais(a)oracle.com> --- drivers/gpu/drm/radeon/radeon_display.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c index bd52f15..1a41764 100644 --- a/drivers/gpu/drm/radeon/radeon_display.c +++ b/drivers/gpu/drm/radeon/radeon_display.c @@ -683,6 +683,10 @@ static void radeon_crtc_init(struct drm_device *dev, int index) drm_mode_crtc_set_gamma_size(&radeon_crtc->base, 256); radeon_crtc->crtc_id = index; radeon_crtc->flip_queue = alloc_workqueue("radeon-crtc", WQ_HIGHPRI, 0); + if (unlikely(!radeon_crtc->flip_queue)) { + kfree(radeon_crtc); + return; + } rdev->mode_info.crtcs[index] = radeon_crtc; if (rdev->family >= CHIP_BONAIRE) { -- 1.9.1

2 1

[PATCH] drm/panfrost: Fix regulator_get_optional() misuse
by Mark Brown 19 Sep '19

19 Sep '19

The panfrost driver requests a supply using regulator_get_optional() but both the name of the supply and the usage pattern suggest that it is being used for the main power for the device and is not at all optional for the device for function, there is no meaningful handling for absent supplies. Such regulators should use the vanilla regulator_get() interface, it will ensure that even if a supply is not described in the system integration one will be provided in software. Signed-off-by: Mark Brown <broonie(a)kernel.org> --- drivers/gpu/drm/panfrost/panfrost_device.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/panfrost/panfrost_device.c b/drivers/gpu/drm/panfrost/panfrost_device.c index 46b0b02e4289..238fb6d54df4 100644 --- a/drivers/gpu/drm/panfrost/panfrost_device.c +++ b/drivers/gpu/drm/panfrost/panfrost_device.c @@ -89,12 +89,9 @@ static int panfrost_regulator_init(struct panfrost_device *pfdev) { int ret; - pfdev->regulator = devm_regulator_get_optional(pfdev->dev, "mali"); + pfdev->regulator = devm_regulator_get(pfdev->dev, "mali"); if (IS_ERR(pfdev->regulator)) { ret = PTR_ERR(pfdev->regulator); - pfdev->regulator = NULL; - if (ret == -ENODEV) - return 0; dev_err(pfdev->dev, "failed to get regulator: %d\n", ret); return ret; } @@ -110,8 +107,7 @@ static int panfrost_regulator_init(struct panfrost_device *pfdev) static void panfrost_regulator_fini(struct panfrost_device *pfdev) { - if (pfdev->regulator) - regulator_disable(pfdev->regulator); + regulator_disable(pfdev->regulator); } int panfrost_device_init(struct panfrost_device *pfdev) -- 2.20.1

4 13

[PATCH v2] drm/panfrost: Prevent race when handling page fault
by Steven Price 19 Sep '19

19 Sep '19

When handling a GPU page fault addr_to_drm_mm_node() is used to translate the GPU address to a buffer object. However it is possible for the buffer object to be freed after the function has returned resulting in a use-after-free of the BO. Change addr_to_drm_mm_node to return the panfrost_gem_object with an extra reference on it, preventing the BO from being freed until after the page fault has been handled. Signed-off-by: Steven Price <steven.price(a)arm.com> --- Changes since v1: * Hold the mm_lock around drm_mm_for_each_node() I've also posted a new IGT test for this: https://patchwork.freedesktop.org/patch/330513/ drivers/gpu/drm/panfrost/panfrost_mmu.c | 55 ++++++++++++++++--------- 1 file changed, 36 insertions(+), 19 deletions(-) diff --git a/drivers/gpu/drm/panfrost/panfrost_mmu.c b/drivers/gpu/drm/panfrost/panfrost_mmu.c index 842bdd7cf6be..b6b281896ed6 100644 --- a/drivers/gpu/drm/panfrost/panfrost_mmu.c +++ b/drivers/gpu/drm/panfrost/panfrost_mmu.c @@ -392,28 +392,40 @@ void panfrost_mmu_pgtable_free(struct panfrost_file_priv *priv) free_io_pgtable_ops(mmu->pgtbl_ops); } -static struct drm_mm_node *addr_to_drm_mm_node(struct panfrost_device *pfdev, int as, u64 addr) +static struct panfrost_gem_object * +addr_to_drm_mm_node(struct panfrost_device *pfdev, int as, u64 addr) { - struct drm_mm_node *node = NULL; + struct panfrost_gem_object *bo = NULL; + struct panfrost_file_priv *priv; + struct drm_mm_node *node; u64 offset = addr >> PAGE_SHIFT; struct panfrost_mmu *mmu; spin_lock(&pfdev->as_lock); list_for_each_entry(mmu, &pfdev->as_lru_list, list) { - struct panfrost_file_priv *priv; - if (as != mmu->as) - continue; + if (as == mmu->as) + break; + } + if (as != mmu->as) + goto out; + + priv = container_of(mmu, struct panfrost_file_priv, mmu); - priv = container_of(mmu, struct panfrost_file_priv, mmu); - drm_mm_for_each_node(node, &priv->mm) { - if (offset >= node->start && offset < (node->start + node->size)) - goto out; + spin_lock(&priv->mm_lock); + + drm_mm_for_each_node(node, &priv->mm) { + if (offset >= node->start && + offset < (node->start + node->size)) { + bo = drm_mm_node_to_panfrost_bo(node); + drm_gem_object_get(&bo->base.base); + break; } } + spin_unlock(&priv->mm_lock); out: spin_unlock(&pfdev->as_lock); - return node; + return bo; } #define NUM_FAULT_PAGES (SZ_2M / PAGE_SIZE) @@ -421,29 +433,28 @@ static struct drm_mm_node *addr_to_drm_mm_node(struct panfrost_device *pfdev, in int panfrost_mmu_map_fault_addr(struct panfrost_device *pfdev, int as, u64 addr) { int ret, i; - struct drm_mm_node *node; struct panfrost_gem_object *bo; struct address_space *mapping; pgoff_t page_offset; struct sg_table *sgt; struct page **pages; - node = addr_to_drm_mm_node(pfdev, as, addr); - if (!node) + bo = addr_to_drm_mm_node(pfdev, as, addr); + if (!bo) return -ENOENT; - bo = drm_mm_node_to_panfrost_bo(node); if (!bo->is_heap) { dev_WARN(pfdev->dev, "matching BO is not heap type (GPU VA = %llx)", - node->start << PAGE_SHIFT); - return -EINVAL; + bo->node.start << PAGE_SHIFT); + ret = -EINVAL; + goto err_bo; } WARN_ON(bo->mmu->as != as); /* Assume 2MB alignment and size multiple */ addr &= ~((u64)SZ_2M - 1); page_offset = addr >> PAGE_SHIFT; - page_offset -= node->start; + page_offset -= bo->node.start; mutex_lock(&bo->base.pages_lock); @@ -452,7 +463,8 @@ int panfrost_mmu_map_fault_addr(struct panfrost_device *pfdev, int as, u64 addr) sizeof(struct sg_table), GFP_KERNEL | __GFP_ZERO); if (!bo->sgts) { mutex_unlock(&bo->base.pages_lock); - return -ENOMEM; + ret = -ENOMEM; + goto err_bo; } pages = kvmalloc_array(bo->base.base.size >> PAGE_SHIFT, @@ -461,7 +473,8 @@ int panfrost_mmu_map_fault_addr(struct panfrost_device *pfdev, int as, u64 addr) kfree(bo->sgts); bo->sgts = NULL; mutex_unlock(&bo->base.pages_lock); - return -ENOMEM; + ret = -ENOMEM; + goto err_bo; } bo->base.pages = pages; bo->base.pages_use_count = 1; @@ -499,12 +512,16 @@ int panfrost_mmu_map_fault_addr(struct panfrost_device *pfdev, int as, u64 addr) dev_dbg(pfdev->dev, "mapped page fault @ AS%d %llx", as, addr); + drm_gem_object_put_unlocked(&bo->base.base); + return 0; err_map: sg_free_table(sgt); err_pages: drm_gem_shmem_put_pages(&bo->base); +err_bo: + drm_gem_object_put_unlocked(&bo->base.base); return ret; } -- 2.20.1

2 1

[PATCH] drm/amd/display: hide an unused variable
by Arnd Bergmann 19 Sep '19

19 Sep '19

Without CONFIG_DEBUG_FS, we get a warning for an unused variable: drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:6020:33: error: unused variable 'source' [-Werror,-Wunused-variable] Hide the variable in an #ifdef like its only users. Fixes: 14b2584636c6 ("drm/amd/display: add functionality to grab DPRX CRC entries.") Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index e1b09bb432bd..74252f57bafb 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -6017,7 +6017,9 @@ static void amdgpu_dm_enable_crtc_interrupts(struct drm_device *dev, struct drm_crtc *crtc; struct drm_crtc_state *old_crtc_state, *new_crtc_state; int i; +#ifdef CONFIG_DEBUG_FS enum amdgpu_dm_pipe_crc_source source; +#endif for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, new_crtc_state, i) { -- 2.20.0

3 2

[PATCH] dma-buf: Implement simple read/write vfs ops
by Chris Wilson 19 Sep '19

19 Sep '19

It is expected that processes will pass dma-buf fd between drivers, and only using the fd themselves for mmaping and synchronisation ioctls. However, it may be convenient for an application to read/write into the dma-buf, for instance a test case to check the internal dma_buf->ops->kmap interface. There may also be a small advantage to avoiding the mmap() for very simple/small operations. Note in particular, synchronisation with the device is left to the caller with an explicit DMA_BUF_IOCTL_SYNC, rather than done implicitly inside the read/write, so that the user can avoid synchronisation if they so choose. "It is easier to add synchronisation later, than it is to take it away." v2: Lots of little fixes, plus a real llseek() implements so that the first basic little test cases work! Testcase: igt/prime_rw Signed-off-by: Chris Wilson <chris(a)chris-wilson.co.uk> Cc: Laura Abbott <labbott(a)redhat.com> Cc: Sumit Semwal <sumit.semwal(a)linaro.org> Cc: Daniel Vetter <daniel.vetter(a)ffwll.ch> Cc: Sean Paul <seanpaul(a)chromium.org> Cc: Janusz Krzysztofik <janusz.krzysztofik(a)linux.intel.com> Tested-by: Laura Abbott <labbott(a)redhat.com> --- Dusting this off again as it would be nice as a user to operate on dmabuf agnostic to the underyling driver. We have mmap, so naturally we would like to have read/write as well! --- drivers/dma-buf/dma-buf.c | 108 ++++++++++++++++++++++++++++++++------ 1 file changed, 93 insertions(+), 15 deletions(-) diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c index 433d91d710e4..a19fc881a99c 100644 --- a/drivers/dma-buf/dma-buf.c +++ b/drivers/dma-buf/dma-buf.c @@ -135,28 +135,104 @@ static int dma_buf_mmap_internal(struct file *file, struct vm_area_struct *vma) static loff_t dma_buf_llseek(struct file *file, loff_t offset, int whence) { - struct dma_buf *dmabuf; - loff_t base; + struct dma_buf *dmabuf = file->private_data; if (!is_dma_buf_file(file)) return -EBADF; - dmabuf = file->private_data; + return fixed_size_llseek(file, offset, whence, dmabuf->size); +} - /* only support discovering the end of the buffer, - but also allow SEEK_SET to maintain the idiomatic - SEEK_END(0), SEEK_CUR(0) pattern */ - if (whence == SEEK_END) - base = dmabuf->size; - else if (whence == SEEK_SET) - base = 0; - else - return -EINVAL; +static ssize_t dma_buf_read(struct file *file, + char __user *ubuf, size_t remain, + loff_t *offset) +{ + struct dma_buf *dmabuf = file->private_data; + unsigned long idx; + unsigned int start; + size_t total; - if (offset != 0) - return -EINVAL; + if (!is_dma_buf_file(file)) + return -EBADF; + + total = 0; + idx = *offset >> PAGE_SHIFT; + start = offset_in_page(*offset); + while (remain) { + unsigned int len = min_t(size_t, remain, PAGE_SIZE - start); + unsigned int copied; + void *vaddr; + + if (*offset >= dmabuf->size) + return total; + + vaddr = dma_buf_kmap(dmabuf, idx); + if (!vaddr) + return total ?: -EIO; + + copied = copy_to_user(ubuf, vaddr + start, len); + dma_buf_kunmap(dmabuf, idx, vaddr); + + total += copied ?: len; + if (copied) { + *offset += copied; + return total ?: -EFAULT; + } + + remain -= len; + *offset += len; + ubuf += len; + start = 0; + idx++; + } + + return total; +} + +static ssize_t dma_buf_write(struct file *file, + const char __user *ubuf, size_t remain, + loff_t *offset) +{ + struct dma_buf *dmabuf = file->private_data; + unsigned long idx; + unsigned int start; + size_t total; + + if (!is_dma_buf_file(file)) + return -EBADF; + + total = 0; + idx = *offset >> PAGE_SHIFT; + start = offset_in_page(*offset); + while (remain) { + unsigned int len = min_t(size_t, remain, PAGE_SIZE - start); + unsigned int copied; + void *vaddr; + + if (*offset >= dmabuf->size) + return total; + + vaddr = dma_buf_kmap(dmabuf, idx); + if (!vaddr) + return total ?: -EIO; + + copied = copy_from_user(vaddr + start, ubuf, len); + dma_buf_kunmap(dmabuf, idx, vaddr); + + total += copied ?: len; + if (copied) { + *offset += copied; + return total ?: -EFAULT; + } + + remain -= len; + *offset += len; + ubuf += len; + start = 0; + idx++; + } - return base + offset; + return total; } /** @@ -413,6 +489,8 @@ static const struct file_operations dma_buf_fops = { .release = dma_buf_release, .mmap = dma_buf_mmap_internal, .llseek = dma_buf_llseek, + .read = dma_buf_read, + .write = dma_buf_write, .poll = dma_buf_poll, .unlocked_ioctl = dma_buf_ioctl, #ifdef CONFIG_COMPAT -- 2.23.0

2 3

[pull] amdgpu drm-fixes-5.4
by Alex Deucher 19 Sep '19

19 Sep '19

Hi Dave, Daniel, A few fixes for 5.4. The following changes since commit 945b584c94f8c665b2df3834a8a6a8faf256cd5f: Merge branch 'linux-5.4' of git://github.com/skeggsb/linux into drm-next (2019-09-17 16:31:34 +1000) are available in the Git repository at: git://people.freedesktop.org/~agd5f/linux tags/drm-fixes-5.4-2019-09-19 for you to fetch changes up to e16a7cbced7110866dcde84e504909ea85099bbd: drm/amdgpu: flag navi12 and 14 as experimental for 5.4 (2019-09-18 08:29:30 -0500) ---------------------------------------------------------------- drm-fixes-5.4-2019-09-19: amdgpu: - Add more navi12 and navi14 PCI ids - Misc fixes for renoir - Fix bandwidth issues with multiple displays on vega20 - Support for Dali - Fix a possible oops with KFD on hawaii - Fix for backlight level after resume on some APUs - Other misc fixes ---------------------------------------------------------------- Aaron Liu (3): drm/amdgpu: disable stutter mode for renoir drm/amd/display: update renoir_ip_offset.h drm/amdgpu: remove program of lbpw for renoir Alex Deucher (1): drm/amdgpu: flag navi12 and 14 as experimental for 5.4 Andrey Grodzovsky (2): drm/amdgpu: Add smu lock around in pp_smu_i2c_bus_access drm/amdgpu: Remove clock gating restore. Bhawanpreet Lakha (2): drm/amd/display: add Asic ID for Dali drm/amd/display: Implement voltage limitation for dali Charlene Liu (1): drm/amd/display: dce11.x /dce12 update formula input Felix Kuehling (1): drm/amdgpu: Fix KFD-related kernel oops on Hawaii Hans de Goede (1): drm/radeon: Bail earlier when radeon.cik_/si_support=0 is passed Jay Cornwall (1): drm/amdkfd: Swap trap temporary registers in gfx10 trap handler Kai-Heng Feng (1): drm/amd/display: Restore backlight brightness after system resume Prike Liang (2): drm/amd/amdgpu: power up sdma engine when S3 resume back drm/amd/powerplay: implement sysfs for getting dpm clock Roman Li (1): drm/amd/display: Add stereo mux and dig programming calls for dcn21 Tianci.Yin (2): drm/amdgpu: add navi14 PCI ID for work station SKU drm/amdgpu: add navi12 pci id Trek (1): drm/amdgpu: Check for valid number of registers to read Zhan Liu (1): drm/amd/display: Add missing HBM support and raise Vega20's uclk. drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 7 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 3 + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 2 - drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 10 ++-- drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c | 10 +++- drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h | 6 +- .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx10.asm | 10 ++-- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 + drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 4 ++ .../amd/display/dc/clk_mgr/dce110/dce110_clk_mgr.c | 25 ++++++-- drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c | 4 +- .../drm/amd/display/dc/dce112/dce112_resource.c | 16 +++-- .../drm/amd/display/dc/dce120/dce120_resource.c | 11 +++- .../amd/display/dc/gpio/dcn21/hw_factory_dcn21.c | 38 +++++++++++- .../amd/display/dc/gpio/dcn21/hw_translate_dcn21.c | 3 +- drivers/gpu/drm/amd/display/dc/inc/resource.h | 2 + drivers/gpu/drm/amd/display/include/dal_asic_id.h | 7 ++- drivers/gpu/drm/amd/include/renoir_ip_offset.h | 2 +- drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 7 ++- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 3 + drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 70 ++++++++++++++++++++++ drivers/gpu/drm/amd/powerplay/renoir_ppt.h | 25 ++++++++ drivers/gpu/drm/radeon/radeon_drv.c | 31 ++++++++++ drivers/gpu/drm/radeon/radeon_kms.c | 25 -------- 26 files changed, 262 insertions(+), 67 deletions(-)

1 0

[PATCH] drm/msm: include linux/sched/task.h
by Arnd Bergmann 19 Sep '19

19 Sep '19

Without this header file, compile-testing may run into a missing declaration: drivers/gpu/drm/msm/msm_gpu.c:444:4: error: implicit declaration of function 'put_task_struct' [-Werror,-Wimplicit-function-declaration] Fixes: 482f96324a4e ("drm/msm: Fix task dump in gpu recovery") Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- drivers/gpu/drm/msm/msm_gpu.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c index a052364a5d74..edd45f434ccd 100644 --- a/drivers/gpu/drm/msm/msm_gpu.c +++ b/drivers/gpu/drm/msm/msm_gpu.c @@ -16,6 +16,7 @@ #include <linux/pm_opp.h> #include <linux/devfreq.h> #include <linux/devcoredump.h> +#include <linux/sched/task.h> /* * Power Management: -- 2.20.0

2 1

[PATCH 1/3] drm/rect: Return scaling factor and error code separately
by Ville Syrjala 19 Sep '19

19 Sep '19

From: Ville Syrjälä <ville.syrjala(a)linux.intel.com> We may want to dump out the calculated scaling factor(s) when they exceed the limits. To achieve that we need to return the error code and scaling factor separately. Side note: the code in dpu_plane_validate_multirect_v2() looks rather dubious on account of it not using fixed point numbers. Not sure the rounding behaviour we have really satisfies what it's trying to do. Maybe it should just do (src_w!=dst_w || src_h!=dst_h) ? Cc: Jeykumar Sankaran <jsanka(a)codeaurora.org> Suggested-by: Sean Paul <sean(a)poorly.run> Signed-off-by: Ville Syrjälä <ville.syrjala(a)linux.intel.com> --- drivers/gpu/drm/drm_atomic_helper.c | 8 ++--- drivers/gpu/drm/drm_rect.c | 34 ++++++++++++--------- drivers/gpu/drm/i915/display/intel_sprite.c | 12 ++++---- drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 8 +++-- include/drm/drm_rect.h | 6 ++-- 5 files changed, 39 insertions(+), 29 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index c861a871299d..c60db3bf2a83 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -765,7 +765,7 @@ int drm_atomic_helper_check_plane_state(struct drm_plane_state *plane_state, struct drm_rect *dst = &plane_state->dst; unsigned int rotation = plane_state->rotation; struct drm_rect clip = {}; - int hscale, vscale; + int hscale, vscale, ret; WARN_ON(plane_state->crtc && plane_state->crtc != crtc_state->crtc); @@ -791,9 +791,9 @@ int drm_atomic_helper_check_plane_state(struct drm_plane_state *plane_state, drm_rect_rotate(src, fb->width << 16, fb->height << 16, rotation); /* Check scaling */ - hscale = drm_rect_calc_hscale(src, dst, min_scale, max_scale); - vscale = drm_rect_calc_vscale(src, dst, min_scale, max_scale); - if (hscale < 0 || vscale < 0) { + ret = drm_rect_calc_hscale(src, dst, min_scale, max_scale, &hscale); + ret |= drm_rect_calc_vscale(src, dst, min_scale, max_scale, &vscale); + if (ret) { DRM_DEBUG_KMS("Invalid scaling of plane\n"); drm_rect_debug_print("src: ", &plane_state->src, true); drm_rect_debug_print("dst: ", &plane_state->dst, false); diff --git a/drivers/gpu/drm/drm_rect.c b/drivers/gpu/drm/drm_rect.c index b8363aaa9032..f014107d11a5 100644 --- a/drivers/gpu/drm/drm_rect.c +++ b/drivers/gpu/drm/drm_rect.c @@ -145,6 +145,7 @@ static int drm_calc_scale(int src, int dst) * @dst: destination window rectangle * @min_hscale: minimum allowed horizontal scaling factor * @max_hscale: maximum allowed horizontal scaling factor + * @hscale: calculated horizontal scaling factor * * Calculate the horizontal scaling factor as * (@src width) / (@dst width). @@ -154,23 +155,25 @@ static int drm_calc_scale(int src, int dst) * pessimistic limit calculation. * * RETURNS: - * The horizontal scaling factor, or errno of out of limits. + * Zero on success, or errno on out of limits. */ int drm_rect_calc_hscale(const struct drm_rect *src, const struct drm_rect *dst, - int min_hscale, int max_hscale) + int min_hscale, int max_hscale, + int *hscale) { int src_w = drm_rect_width(src); int dst_w = drm_rect_width(dst); - int hscale = drm_calc_scale(src_w, dst_w); - if (hscale < 0 || dst_w == 0) - return hscale; + *hscale = drm_calc_scale(src_w, dst_w); - if (hscale < min_hscale || hscale > max_hscale) + if (*hscale < 0 || dst_w == 0) + return *hscale; + + if (*hscale < min_hscale || *hscale > max_hscale) return -ERANGE; - return hscale; + return 0; } EXPORT_SYMBOL(drm_rect_calc_hscale); @@ -180,6 +183,7 @@ EXPORT_SYMBOL(drm_rect_calc_hscale); * @dst: destination window rectangle * @min_vscale: minimum allowed vertical scaling factor * @max_vscale: maximum allowed vertical scaling factor + * @hscale: calculated vertical scaling factor * * Calculate the vertical scaling factor as * (@src height) / (@dst height). @@ -189,23 +193,25 @@ EXPORT_SYMBOL(drm_rect_calc_hscale); * pessimistic limit calculation. * * RETURNS: - * The vertical scaling factor, or errno of out of limits. + * Zero on success, or errno on out of limits. */ int drm_rect_calc_vscale(const struct drm_rect *src, const struct drm_rect *dst, - int min_vscale, int max_vscale) + int min_vscale, int max_vscale, + int *vscale) { int src_h = drm_rect_height(src); int dst_h = drm_rect_height(dst); - int vscale = drm_calc_scale(src_h, dst_h); - if (vscale < 0 || dst_h == 0) - return vscale; + *vscale = drm_calc_scale(src_h, dst_h); + + if (*vscale < 0 || dst_h == 0) + return *vscale; - if (vscale < min_vscale || vscale > max_vscale) + if (*vscale < min_vscale || *vscale > max_vscale) return -ERANGE; - return vscale; + return 0; } EXPORT_SYMBOL(drm_rect_calc_vscale); diff --git a/drivers/gpu/drm/i915/display/intel_sprite.c b/drivers/gpu/drm/i915/display/intel_sprite.c index 7a7078d0ba23..a854bd5194dc 100644 --- a/drivers/gpu/drm/i915/display/intel_sprite.c +++ b/drivers/gpu/drm/i915/display/intel_sprite.c @@ -361,12 +361,12 @@ skl_program_scaler(struct intel_plane *plane, u16 y_vphase, uv_rgb_vphase; int hscale, vscale; - hscale = drm_rect_calc_hscale(&plane_state->base.src, - &plane_state->base.dst, - 0, INT_MAX); - vscale = drm_rect_calc_vscale(&plane_state->base.src, - &plane_state->base.dst, - 0, INT_MAX); + drm_rect_calc_hscale(&plane_state->base.src, + &plane_state->base.dst, + 0, INT_MAX, &hscale); + drm_rect_calc_vscale(&plane_state->base.src, + &plane_state->base.dst, + 0, INT_MAX, &vscale); /* TODO: handle sub-pixel coordinates */ if (drm_format_info_is_yuv_semiplanar(fb->format) && diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c index 58d5acbcfc5c..528242052118 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c @@ -658,7 +658,7 @@ int dpu_plane_validate_multirect_v2(struct dpu_multirect_plane_states *plane) } for (i = 0; i < R_MAX; i++) { - int width_threshold; + int width_threshold, ret, hscale, vscale; pstate[i] = to_dpu_plane_state(drm_state[i]); dpu_plane[i] = to_dpu_plane(drm_state[i]->plane); @@ -676,8 +676,10 @@ int dpu_plane_validate_multirect_v2(struct dpu_multirect_plane_states *plane) dst[i] = drm_plane_state_dest(drm_state[i]); - if (drm_rect_calc_hscale(&src[i], &dst[i], 1, 1) != 1 || - drm_rect_calc_vscale(&src[i], &dst[i], 1, 1) != 1) { + ret = drm_rect_calc_hscale(&src[i], &dst[i], 1, 1, &hscale); + ret |= drm_rect_calc_vscale(&src[i], &dst[i], 1, 1, &vscale); + + if (ret || hscale != 1 || vscale != 1) { DPU_ERROR_PLANE(dpu_plane[i], "scaling is not supported in multirect mode\n"); return -EINVAL; diff --git a/include/drm/drm_rect.h b/include/drm/drm_rect.h index 6195820aa5c5..34a88ba9ca7b 100644 --- a/include/drm/drm_rect.h +++ b/include/drm/drm_rect.h @@ -178,10 +178,12 @@ bool drm_rect_clip_scaled(struct drm_rect *src, struct drm_rect *dst, const struct drm_rect *clip); int drm_rect_calc_hscale(const struct drm_rect *src, const struct drm_rect *dst, - int min_hscale, int max_hscale); + int min_hscale, int max_hscale, + int *hscale); int drm_rect_calc_vscale(const struct drm_rect *src, const struct drm_rect *dst, - int min_vscale, int max_vscale); + int min_vscale, int max_vscale, + int *vscale); void drm_rect_debug_print(const char *prefix, const struct drm_rect *r, bool fixed_point); void drm_rect_rotate(struct drm_rect *r, -- 2.21.0

1 2

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel September 2019