dri-devel April 2021

dri-devel@lists.freedesktop.org

317 participants
715 discussions

[PATCH v1 1/7] drm/st7735r: Avoid spamming logs if probe is deferred
by Andy Shevchenko 27 Apr '21

27 Apr '21

The GPIO request can fail and probe may be deferred. Thus, the error message may be printed again and again. Avoid this by replacing DRM_DEV_ERROR() by dev_err_probe(). Signed-off-by: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> --- drivers/gpu/drm/tiny/st7735r.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/tiny/st7735r.c b/drivers/gpu/drm/tiny/st7735r.c index faaba0a033ea..e3cbaa846e2b 100644 --- a/drivers/gpu/drm/tiny/st7735r.c +++ b/drivers/gpu/drm/tiny/st7735r.c @@ -207,16 +207,12 @@ static int st7735r_probe(struct spi_device *spi) drm = &dbidev->drm; dbi->reset = devm_gpiod_get(dev, "reset", GPIOD_OUT_HIGH); - if (IS_ERR(dbi->reset)) { - DRM_DEV_ERROR(dev, "Failed to get gpio 'reset'\n"); - return PTR_ERR(dbi->reset); - } + if (IS_ERR(dbi->reset)) + return dev_err_probe(dev, PTR_ERR(dbi->reset), "Failed to get GPIO 'reset'\n"); dc = devm_gpiod_get(dev, "dc", GPIOD_OUT_LOW); - if (IS_ERR(dc)) { - DRM_DEV_ERROR(dev, "Failed to get gpio 'dc'\n"); - return PTR_ERR(dc); - } + if (IS_ERR(dc)) + return dev_err_probe(dev, PTR_ERR(dc), "Failed to get GPIO 'dc'\n"); dbidev->backlight = devm_of_find_backlight(dev); if (IS_ERR(dbidev->backlight)) -- 2.30.2

2 7

[PATCH] drm/gud: cleanup coding style a bit
by Bernard Zhao 27 Apr '21

27 Apr '21

Fix coccicheck warning: drivers/gpu/drm/gud/gud_internal.h:89:2-3: Unneeded semicolon drivers/gpu/drm/gud/gud_internal.h:107:2-3: Unneeded semicolon Signed-off-by: Bernard Zhao <bernard(a)vivo.com> --- drivers/gpu/drm/gud/gud_internal.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/gud/gud_internal.h b/drivers/gpu/drm/gud/gud_internal.h index de2f2d2dbc60..b65105585578 100644 --- a/drivers/gpu/drm/gud/gud_internal.h +++ b/drivers/gpu/drm/gud/gud_internal.h @@ -86,7 +86,7 @@ static inline u8 gud_from_fourcc(u32 fourcc) return GUD_PIXEL_FORMAT_XRGB8888; case DRM_FORMAT_ARGB8888: return GUD_PIXEL_FORMAT_ARGB8888; - }; + } return 0; } @@ -104,7 +104,7 @@ static inline u32 gud_to_fourcc(u8 format) return DRM_FORMAT_XRGB8888; case GUD_PIXEL_FORMAT_ARGB8888: return DRM_FORMAT_ARGB8888; - }; + } return 0; } -- 2.31.0

2 1

[PATCH] drm/i915: Simplify userptr locking
by Thomas Hellström 27 Apr '21

27 Apr '21

Use an rwlock instead of spinlock for the global notifier lock to reduce risk of contention in execbuf. Protect object state with the object lock whenever possible rather than with the global notifier lock Don't take an explicit page_ref in userptr_submit_init() but rather call get_pages() after obtaining the page list so that get_pages() holds the page_ref. This means we don't need to call userptr_submit_fini(), which is needed to avoid awkward locking in our upcoming VM_BIND code. Cc: Maarten Lankhorst <maarten.lankhorst(a)linux.intel.com> Cc: Daniel Vetter <daniel(a)ffwll.ch> Cc: Dave Airlie <airlied(a)gmail.com> Cc: dri-devel(a)lists.freedesktop.org Cc: Intel Graphics Development <intel-gfx(a)lists.freedesktop.org> Signed-off-by: Thomas Hellström <thomas.hellstrom(a)linux.intel.com> --- .../gpu/drm/i915/gem/i915_gem_execbuffer.c | 21 +++--- drivers/gpu/drm/i915/gem/i915_gem_object.h | 2 - drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 72 ++++++------------- drivers/gpu/drm/i915/i915_drv.h | 2 +- 4 files changed, 31 insertions(+), 66 deletions(-) diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c index 297143511f99..407ad0f223e3 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c @@ -994,7 +994,7 @@ eb_get_vma(const struct i915_execbuffer *eb, unsigned long handle) } } -static void eb_release_vmas(struct i915_execbuffer *eb, bool final, bool release_userptr) +static void eb_release_vmas(struct i915_execbuffer *eb, bool final) { const unsigned int count = eb->buffer_count; unsigned int i; @@ -1008,11 +1008,6 @@ static void eb_release_vmas(struct i915_execbuffer *eb, bool final, bool release eb_unreserve_vma(ev); - if (release_userptr && ev->flags & __EXEC_OBJECT_USERPTR_INIT) { - ev->flags &= ~__EXEC_OBJECT_USERPTR_INIT; - i915_gem_object_userptr_submit_fini(vma->obj); - } - if (final) i915_vma_put(vma); } @@ -1990,7 +1985,7 @@ static noinline int eb_relocate_parse_slow(struct i915_execbuffer *eb, } /* We may process another execbuffer during the unlock... */ - eb_release_vmas(eb, false, true); + eb_release_vmas(eb, false); i915_gem_ww_ctx_fini(&eb->ww); if (rq) { @@ -2094,7 +2089,7 @@ static noinline int eb_relocate_parse_slow(struct i915_execbuffer *eb, err: if (err == -EDEADLK) { - eb_release_vmas(eb, false, false); + eb_release_vmas(eb, false); err = i915_gem_ww_ctx_backoff(&eb->ww); if (!err) goto repeat_validate; @@ -2191,7 +2186,7 @@ static int eb_relocate_parse(struct i915_execbuffer *eb) err: if (err == -EDEADLK) { - eb_release_vmas(eb, false, false); + eb_release_vmas(eb, false); err = i915_gem_ww_ctx_backoff(&eb->ww); if (!err) goto retry; @@ -2268,7 +2263,7 @@ static int eb_move_to_gpu(struct i915_execbuffer *eb) #ifdef CONFIG_MMU_NOTIFIER if (!err && (eb->args->flags & __EXEC_USERPTR_USED)) { - spin_lock(&eb->i915->mm.notifier_lock); + read_lock(&eb->i915->mm.notifier_lock); /* * count is always at least 1, otherwise __EXEC_USERPTR_USED @@ -2286,7 +2281,7 @@ static int eb_move_to_gpu(struct i915_execbuffer *eb) break; } - spin_unlock(&eb->i915->mm.notifier_lock); + read_unlock(&eb->i915->mm.notifier_lock); } #endif @@ -3435,7 +3430,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, err = eb_lookup_vmas(&eb); if (err) { - eb_release_vmas(&eb, true, true); + eb_release_vmas(&eb, true); goto err_engine; } @@ -3528,7 +3523,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, i915_request_put(eb.request); err_vma: - eb_release_vmas(&eb, true, true); + eb_release_vmas(&eb, true); if (eb.trampoline) i915_vma_unpin(eb.trampoline); WARN_ON(err == -EDEADLK); diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.h b/drivers/gpu/drm/i915/gem/i915_gem_object.h index 4a7388ce472e..b6dbafd88a2e 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_object.h +++ b/drivers/gpu/drm/i915/gem/i915_gem_object.h @@ -606,14 +606,12 @@ i915_gem_object_is_userptr(struct drm_i915_gem_object *obj) int i915_gem_object_userptr_submit_init(struct drm_i915_gem_object *obj); int i915_gem_object_userptr_submit_done(struct drm_i915_gem_object *obj); -void i915_gem_object_userptr_submit_fini(struct drm_i915_gem_object *obj); int i915_gem_object_userptr_validate(struct drm_i915_gem_object *obj); #else static inline bool i915_gem_object_is_userptr(struct drm_i915_gem_object *obj) { return false; } static inline int i915_gem_object_userptr_submit_init(struct drm_i915_gem_object *obj) { GEM_BUG_ON(1); return -ENODEV; } static inline int i915_gem_object_userptr_submit_done(struct drm_i915_gem_object *obj) { GEM_BUG_ON(1); return -ENODEV; } -static inline void i915_gem_object_userptr_submit_fini(struct drm_i915_gem_object *obj) { GEM_BUG_ON(1); } static inline int i915_gem_object_userptr_validate(struct drm_i915_gem_object *obj) { GEM_BUG_ON(1); return -ENODEV; } #endif diff --git a/drivers/gpu/drm/i915/gem/i915_gem_userptr.c b/drivers/gpu/drm/i915/gem/i915_gem_userptr.c index a657b99ec760..c361669a5491 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_userptr.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_userptr.c @@ -67,11 +67,11 @@ static bool i915_gem_userptr_invalidate(struct mmu_interval_notifier *mni, if (!mmu_notifier_range_blockable(range)) return false; - spin_lock(&i915->mm.notifier_lock); + write_lock(&i915->mm.notifier_lock); mmu_interval_set_seq(mni, cur_seq); - spin_unlock(&i915->mm.notifier_lock); + write_unlock(&i915->mm.notifier_lock); /* * We don't wait when the process is exiting. This is valid @@ -107,16 +107,15 @@ i915_gem_userptr_init__mmu_notifier(struct drm_i915_gem_object *obj) static void i915_gem_object_userptr_drop_ref(struct drm_i915_gem_object *obj) { - struct drm_i915_private *i915 = to_i915(obj->base.dev); struct page **pvec = NULL; - spin_lock(&i915->mm.notifier_lock); + assert_object_held_shared(obj); + if (!--obj->userptr.page_ref) { pvec = obj->userptr.pvec; obj->userptr.pvec = NULL; } GEM_BUG_ON(obj->userptr.page_ref < 0); - spin_unlock(&i915->mm.notifier_lock); if (pvec) { const unsigned long num_pages = obj->base.size >> PAGE_SHIFT; @@ -128,7 +127,6 @@ static void i915_gem_object_userptr_drop_ref(struct drm_i915_gem_object *obj) static int i915_gem_userptr_get_pages(struct drm_i915_gem_object *obj) { - struct drm_i915_private *i915 = to_i915(obj->base.dev); const unsigned long num_pages = obj->base.size >> PAGE_SHIFT; unsigned int max_segment = i915_sg_segment_size(); struct sg_table *st; @@ -141,16 +139,13 @@ static int i915_gem_userptr_get_pages(struct drm_i915_gem_object *obj) if (!st) return -ENOMEM; - spin_lock(&i915->mm.notifier_lock); - if (GEM_WARN_ON(!obj->userptr.page_ref)) { - spin_unlock(&i915->mm.notifier_lock); - ret = -EFAULT; + if (!obj->userptr.page_ref) { + ret = -EAGAIN; goto err_free; } obj->userptr.page_ref++; pvec = obj->userptr.pvec; - spin_unlock(&i915->mm.notifier_lock); alloc_table: sg = __sg_alloc_table_from_pages(st, pvec, num_pages, 0, @@ -241,7 +236,7 @@ i915_gem_userptr_put_pages(struct drm_i915_gem_object *obj, i915_gem_object_userptr_drop_ref(obj); } -static int i915_gem_object_userptr_unbind(struct drm_i915_gem_object *obj, bool get_pages) +static int i915_gem_object_userptr_unbind(struct drm_i915_gem_object *obj) { struct sg_table *pages; int err; @@ -259,15 +254,11 @@ static int i915_gem_object_userptr_unbind(struct drm_i915_gem_object *obj, bool if (!IS_ERR_OR_NULL(pages)) i915_gem_userptr_put_pages(obj, pages); - if (get_pages) - err = ____i915_gem_object_get_pages(obj); - return err; } int i915_gem_object_userptr_submit_init(struct drm_i915_gem_object *obj) { - struct drm_i915_private *i915 = to_i915(obj->base.dev); const unsigned long num_pages = obj->base.size >> PAGE_SHIFT; struct page **pvec; unsigned int gup_flags = 0; @@ -277,39 +268,22 @@ int i915_gem_object_userptr_submit_init(struct drm_i915_gem_object *obj) if (obj->userptr.notifier.mm != current->mm) return -EFAULT; + notifier_seq = mmu_interval_read_begin(&obj->userptr.notifier); + ret = i915_gem_object_lock_interruptible(obj, NULL); if (ret) return ret; - /* optimistically try to preserve current pages while unlocked */ - if (i915_gem_object_has_pages(obj) && - !mmu_interval_check_retry(&obj->userptr.notifier, - obj->userptr.notifier_seq)) { - spin_lock(&i915->mm.notifier_lock); - if (obj->userptr.pvec && - !mmu_interval_read_retry(&obj->userptr.notifier, - obj->userptr.notifier_seq)) { - obj->userptr.page_ref++; - - /* We can keep using the current binding, this is the fastpath */ - ret = 1; - } - spin_unlock(&i915->mm.notifier_lock); + if (notifier_seq == obj->userptr.notifier_seq && obj->userptr.pvec) { + i915_gem_object_unlock(obj); + return 0; } - if (!ret) { - /* Make sure userptr is unbound for next attempt, so we don't use stale pages. */ - ret = i915_gem_object_userptr_unbind(obj, false); - } + ret = i915_gem_object_userptr_unbind(obj); i915_gem_object_unlock(obj); - if (ret < 0) + if (ret) return ret; - if (ret > 0) - return 0; - - notifier_seq = mmu_interval_read_begin(&obj->userptr.notifier); - pvec = kvmalloc_array(num_pages, sizeof(struct page *), GFP_KERNEL); if (!pvec) return -ENOMEM; @@ -329,7 +303,9 @@ int i915_gem_object_userptr_submit_init(struct drm_i915_gem_object *obj) } ret = 0; - spin_lock(&i915->mm.notifier_lock); + ret = i915_gem_object_lock_interruptible(obj, NULL); + if (ret) + goto out; if (mmu_interval_read_retry(&obj->userptr.notifier, !obj->userptr.page_ref ? notifier_seq : @@ -341,12 +317,14 @@ int i915_gem_object_userptr_submit_init(struct drm_i915_gem_object *obj) if (!obj->userptr.page_ref++) { obj->userptr.pvec = pvec; obj->userptr.notifier_seq = notifier_seq; - pvec = NULL; + ret = ____i915_gem_object_get_pages(obj); } + obj->userptr.page_ref--; + out_unlock: - spin_unlock(&i915->mm.notifier_lock); + i915_gem_object_unlock(obj); out: if (pvec) { @@ -369,11 +347,6 @@ int i915_gem_object_userptr_submit_done(struct drm_i915_gem_object *obj) return 0; } -void i915_gem_object_userptr_submit_fini(struct drm_i915_gem_object *obj) -{ - i915_gem_object_userptr_drop_ref(obj); -} - int i915_gem_object_userptr_validate(struct drm_i915_gem_object *obj) { int err; @@ -396,7 +369,6 @@ int i915_gem_object_userptr_validate(struct drm_i915_gem_object *obj) i915_gem_object_unlock(obj); } - i915_gem_object_userptr_submit_fini(obj); return err; } @@ -572,7 +544,7 @@ i915_gem_userptr_ioctl(struct drm_device *dev, int i915_gem_init_userptr(struct drm_i915_private *dev_priv) { #ifdef CONFIG_MMU_NOTIFIER - spin_lock_init(&dev_priv->mm.notifier_lock); + rwlock_init(&dev_priv->mm.notifier_lock); #endif return 0; diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index f5aa33a2bb70..1114a40f504e 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -562,7 +562,7 @@ struct i915_gem_mm { * notifier_lock for mmu notifiers, memory may not be allocated * while holding this lock. */ - spinlock_t notifier_lock; + rwlock_t notifier_lock; #endif /* shrinker accounting, also useful for userland debugging */ -- 2.30.2

1 0

[PATCH] drm/i9i5/gt: Fix a double free in gen8_preallocate_top_level_pdp
by Lv Yunlong 27 Apr '21

27 Apr '21

Our code analyzer reported a double free bug. In gen8_preallocate_top_level_pdp, pde and pde->pt.base are allocated via alloc_pd(vm) with one reference. If pin_pt_dma() failed, pde->pt.base is freed by i915_gem_object_put() with a reference dropped. Then free_pd calls free_px() defined in intel_ppgtt.c, which calls i915_gem_object_put() to put pde->pt.base again. As pde->pt.base is protected by refcount, so the second put will not free pde->pt.base actually. But, maybe it is better to remove the first put? Fixes: 82adf901138cc ("drm/i915/gt: Shrink i915_page_directory's slab bucket") Signed-off-by: Lv Yunlong <lyl2019(a)mail.ustc.edu.cn> --- drivers/gpu/drm/i915/gt/gen8_ppgtt.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/gpu/drm/i915/gt/gen8_ppgtt.c b/drivers/gpu/drm/i915/gt/gen8_ppgtt.c index 755522ced60d..3ae16945bd43 100644 --- a/drivers/gpu/drm/i915/gt/gen8_ppgtt.c +++ b/drivers/gpu/drm/i915/gt/gen8_ppgtt.c @@ -630,7 +630,6 @@ static int gen8_preallocate_top_level_pdp(struct i915_ppgtt *ppgtt) err = pin_pt_dma(vm, pde->pt.base); if (err) { - i915_gem_object_put(pde->pt.base); free_pd(vm, pde); return err; } -- 2.25.1

2 1

[PATCH 00/57] Rid W=1 warnings from Staging
by Lee Jones 27 Apr '21

27 Apr '21

This set is part of a larger effort attempting to clean-up W=1 kernel builds, which are currently overwhelmingly riddled with niggly little warnings. Lee Jones (57): staging: r8192U_core: Remove two unused variables 'ret' and 'reset_status' staging: android: ashmem: Supply description for 'new_range' staging: comedi_8254: Fix descriptions for 'i8254' and 'iobase' staging: r8192U_core: Do not use kernel-doc formatting for !kernel-doc headers staging: r819xU_phy: Remove some local variables from the stack staging: r819xU_cmdpkt: Remove functionless method 'cmpk_handle_query_config_rx' staging: wlan-ng: cfg80211: Move large struct onto the heap staging: rtw_ioctl_set: Move 'channel_table' to the only place it's used staging: rtl8188eu: core: rtw_ieee80211: Fix incorrectly documented function staging: rtl8723bs: core: rtw_mlme: Remove a bunch of unused variables staging: rtl8723bs: core: rtw_mlme_ext: Deal with a bunch of unused variables staging: rtl8712: rtl871x_mp_ioctl: Remove a bunch of unused tables staging: rtl8723bs: core: rtw_recv: Mark debug variable as __maybe_unused staging: rtl8188eu: core: rtw_security: Fix some formatting and misdocumentation staging: rtl8723bs: core: rtw_security: Demote non-conformant kernel-doc header staging: rtl8723bs: core: rtw_sta_mgt: Remove unused variable 'psta' staging: rtl8723bs: core: rtw_sta_mgt: Return error value directly staging: octeon: ethernet-tx: Fix formatting issue in function header staging: rtl8723bs: core: rtw_wlan_util: Remove unused variable 'start_seq' staging: rtl8712: rtl871x_mp_ioctl: Move a large data struct onto the heap staging: iio: frequency: ad9834: Provide missing description for 'devid' staging: nvec: Fix a bunch of kernel-doc issues staging: ks7010: ks_hostif: Remove a bunch of unused variables staging: fwserial: Demote a whole host of kernel-doc abuses staging: sm750fb: sm750_accel: Provide description for 'accel' and fix function naming staging: most: net: Fix some kernel-doc formatting issues staging: vt6655: upc: Suppress set but not used warning in macro staging: rtl8192u: ieee80211_softmac: Move a large data struct onto the heap staging: most: dim2: Provide missing descriptions and fix doc-rot staging: rtl8723bs: core: rtw_ieee80211: Remove seemingly pointless copy staging: rtl8723bs: core: rtw_mlme: 'retry' is only used if REJOIN is set staging: rtl8723bs: core: rtw_mlme_ext: 'evt_seq' is only used if CHECK_EVENT_SEQ is set staging: most: i2c: Fix a little doc-rot staging: most: dim2: hal: Fix one kernel-doc header and demote two non-conforming ones staging: most: dim2: hal: Demote non-conformant kernel-doc headers staging: axis-fifo: axis-fifo: Fix some formatting issues staging: rtl8188eu: os_dep: ioctl_linux: Move 2 large data buffers into the heap staging: fbtft: fb_ili9320: Remove unused variable 'ret' staging: rtl8723bs: core: rtw_ieee80211: Fix incorrectly named function staging: rtl8723bs: hal: odm_NoiseMonitor: Remove unused variable and dead code staging: rtl8188eu: os_dep: mon: Demote non-conforming kernel-doc headers staging: rtl8188eu: os_dep: rtw_android: Demote kernel-doc abuse staging: rtl8723bs: hal: rtl8723b_hal_init: Remove unused variable and dead code staging: rtl8723bs: hal: rtl8723b_phycfg: Fix a bunch of misnamed functions staging: rtl8723bs: hal: sdio_halinit: 'start' is only used if debug is enabled staging: rtl8723bs: hal: sdio_ops: Mark used 'err' as __maybe_unused and remove another staging: rtl8723bs: os_dep: ioctl_cfg80211: 'ack' is used when debug is enabled staging: comedi: drivers: jr3_pci: Remove set but unused variable 'min_full_scale' staging: comedi: drivers: ni_tio: Fix slightly broken kernel-doc and demote others staging: comedi: drivers: ni_routes: Demote non-conforming kernel-doc headers staging: axis-fifo: axis-fifo: Fix function naming in the documentation staging: rtl8723bs: hal: odm_NoiseMonitor: Remove unused variable 'func_start' staging: rtl8723bs: core: rtw_mlme_ext: Move very large data buffer onto the heap staging: rtl8723bs: hal: rtl8723b_hal_init: Mark a bunch of debug variables as __maybe_unused staging: comedi: drivers: ni_mio_common: Move 'range_ni_E_ao_ext' to where it is used staging: comedi: drivers: comedi_isadma: Fix misspelling of 'dma_chan1' staging: rtl8723bs: hal: sdio_halinit: Remove unused variable 'ret' drivers/staging/android/ashmem.c | 1 + drivers/staging/axis-fifo/axis-fifo.c | 18 +-- drivers/staging/comedi/drivers/comedi_8254.c | 3 +- .../staging/comedi/drivers/comedi_isadma.c | 2 +- drivers/staging/comedi/drivers/jr3_pci.c | 3 +- .../staging/comedi/drivers/ni_mio_common.c | 9 -- drivers/staging/comedi/drivers/ni_routes.c | 6 +- drivers/staging/comedi/drivers/ni_stc.h | 9 +- drivers/staging/comedi/drivers/ni_tio.c | 12 +- drivers/staging/fbtft/fb_ili9320.c | 3 +- drivers/staging/fwserial/fwserial.c | 46 +++---- drivers/staging/iio/frequency/ad9834.c | 5 +- drivers/staging/ks7010/ks_hostif.c | 14 +- drivers/staging/most/dim2/dim2.c | 23 ++-- drivers/staging/most/dim2/hal.c | 10 +- drivers/staging/most/i2c/i2c.c | 12 +- drivers/staging/most/net/net.c | 6 +- drivers/staging/nvec/nvec.c | 7 +- drivers/staging/octeon/ethernet-tx.c | 1 - drivers/staging/qlge/qlge_main.c | 4 +- .../staging/rtl8188eu/core/rtw_ieee80211.c | 2 +- .../staging/rtl8188eu/core/rtw_ioctl_set.c | 8 ++ drivers/staging/rtl8188eu/core/rtw_security.c | 10 +- .../staging/rtl8188eu/include/rtw_mlme_ext.h | 8 -- .../staging/rtl8188eu/os_dep/ioctl_linux.c | 12 +- drivers/staging/rtl8188eu/os_dep/mon.c | 6 +- .../staging/rtl8188eu/os_dep/rtw_android.c | 2 +- .../rtl8192u/ieee80211/ieee80211_softmac.c | 9 +- drivers/staging/rtl8192u/r8192U_core.c | 11 +- drivers/staging/rtl8192u/r819xU_cmdpkt.c | 41 ------ drivers/staging/rtl8192u/r819xU_phy.c | 48 +++++-- drivers/staging/rtl8712/rtl871x_mp_ioctl.c | 29 ++-- drivers/staging/rtl8712/rtl871x_mp_ioctl.h | 127 ------------------ .../staging/rtl8723bs/core/rtw_ieee80211.c | 6 +- drivers/staging/rtl8723bs/core/rtw_mlme.c | 17 +-- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 19 +-- drivers/staging/rtl8723bs/core/rtw_recv.c | 2 +- drivers/staging/rtl8723bs/core/rtw_security.c | 2 +- drivers/staging/rtl8723bs/core/rtw_sta_mgt.c | 10 +- .../staging/rtl8723bs/core/rtw_wlan_util.c | 4 +- .../staging/rtl8723bs/hal/odm_NoiseMonitor.c | 9 +- .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 21 +-- .../staging/rtl8723bs/hal/rtl8723b_phycfg.c | 10 +- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 8 +- drivers/staging/rtl8723bs/hal/sdio_ops.c | 7 +- .../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 2 +- drivers/staging/sm750fb/sm750_accel.c | 4 +- drivers/staging/vt6655/upc.h | 2 +- drivers/staging/wlan-ng/cfg80211.c | 30 +++-- 49 files changed, 256 insertions(+), 404 deletions(-) Cc: ac100(a)lists.launchpad.net Cc: "Alexander A. Klimov" <grandmaster(a)al2klimov.de> Cc: Allen Pais <apais(a)linux.microsoft.com> Cc: Anders Blomdell <anders.blomdell(a)control.lth.se> Cc: Andrea Merello <andrea.merello(a)gmail.com> Cc: Andres Klode <jak(a)jak-linux.org> Cc: Andrey Shvetsov <andrey.shvetsov(a)k2l.de> Cc: "Arve Hjønnevåg" <arve(a)android.com> Cc: Christian Brauner <christian(a)brauner.io> Cc: Comedi <comedi(a)comedi.org> Cc: "David A. Schleef" <ds(a)schleef.org> Cc: dri-devel(a)lists.freedesktop.org Cc: Fabio Aiuto <fabioaiuto83(a)gmail.com> Cc: Florian Schilhabel <florian.c.schilhabel(a)googlemail.com> Cc: Forest Bond <forest(a)alittletooquiet.net> Cc: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Cc: Herman.Bruyninckx(a)mech.kuleuven.ac.be Cc: H Hartley Sweeten <hsweeten(a)visionengravers.com> Cc: Hridya Valsaraju <hridya(a)google.com> Cc: Ian Abbott <abbotti(a)mev.co.uk> Cc: Ilya Petrov <ilya.muromec(a)gmail.com> Cc: Jacob Feder <jacobsfeder(a)gmail.com> Cc: Jerry chuang <wlanfae(a)realtek.com> Cc: Joel Fernandes <joel(a)joelfernandes.org> Cc: "John B. Wyatt IV" <jbwyatt4(a)gmail.com> Cc: Jonathan Cameron <jic23(a)kernel.org> Cc: "J.P. Mellor" <jpmellor(a)rose-hulman.edu> Cc: karthik alapati <mail(a)karthek.com> Cc: Kees Cook <keescook(a)chromium.org> Cc: Kernel Team <ac100(a)lists.lauchpad.net> Cc: Klaas.Gadeyne(a)mech.kuleuven.ac.be Cc: Larry Finger <Larry.Finger(a)lwfinger.net> Cc: Lars-Peter Clausen <lars(a)metafoo.de> Cc: Lee Jones <lee.jones(a)linaro.org> Cc: linux-fbdev(a)vger.kernel.org Cc: linux-iio(a)vger.kernel.org Cc: linux-pwm(a)vger.kernel.org Cc: linux-staging(a)lists.linux.dev Cc: linux-tegra(a)vger.kernel.org Cc: Marc Dietrich <marvin24(a)gmx.de> Cc: Marco Cesati <marcocesati(a)gmail.com> Cc: Martijn Coenen <maco(a)android.com> Cc: Michael Hennerich <Michael.Hennerich(a)analog.com> Cc: Michael Straube <straube.linux(a)gmail.com> Cc: Mori Hess <fmhess(a)users.sourceforge.net> Cc: "Nícolas F. R. A. Prado" <nfraprado(a)protonmail.com> Cc: Peter Hurley <peter(a)hurleysoftware.com> Cc: Philipp Zabel <p.zabel(a)pengutronix.de> Cc: Pierre-Hugues Husson <phhusson(a)free.fr> Cc: Robert Love <rlove(a)google.com> Cc: Romain Perier <romain.perier(a)gmail.com> Cc: Ross Schmidt <ross.schm.dev(a)gmail.com> Cc: "Spencer E. Olson" <olsonse(a)umich.edu> Cc: Stanley(a)BB.SD3 Cc: Sudip Mukherjee <sudipm.mukherjee(a)gmail.com> Cc: Sumera Priyadarsini <sylphrenadin(a)gmail.com> Cc: Suren Baghdasaryan <surenb(a)google.com> Cc: Teddy Wang <teddy.wang(a)siliconmotion.com> Cc: Thierry Reding <thierry.reding(a)gmail.com> Cc: Thomas Gleixner <tglx(a)linutronix.de> Cc: Todd Kjos <tkjos(a)android.com> Cc: Truxton Fulton <trux(a)truxton.com> Cc: "Uwe Kleine-König" <u.kleine-koenig(a)pengutronix.de> Cc: Wim.Meeussen(a)mech.kuleuven.ac.be Cc: WLAN FAE <wlanfae(a)realtek.com> Cc: Zhansaya Bagdauletkyzy <zhansayabagdaulet(a)gmail.com> -- 2.27.0

3 4

[PATCH v2] drm/drm_file.c: Define drm_send_event_helper() as 'static'
by Fabio M. De Francesco 27 Apr '21

27 Apr '21

drm_send_event_helper() has not prototype, it has internal linkage and therefore it should be defined with storage class 'static'. Signed-off-by: Fabio M. De Francesco <fmdefrancesco(a)gmail.com> --- Changes from v1: As suggested by Daniel Vetter, removed unnecessary kernel-doc comments. drivers/gpu/drm/drm_file.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/drm_file.c b/drivers/gpu/drm/drm_file.c index 7efbccffc2ea..a32e0d4f3604 100644 --- a/drivers/gpu/drm/drm_file.c +++ b/drivers/gpu/drm/drm_file.c @@ -774,19 +774,15 @@ void drm_event_cancel_free(struct drm_device *dev, } EXPORT_SYMBOL(drm_event_cancel_free); -/** +/* * drm_send_event_helper - send DRM event to file descriptor - * @dev: DRM device - * @e: DRM event to deliver - * @timestamp: timestamp to set for the fence event in kernel's CLOCK_MONOTONIC - * time domain * - * This helper function sends the event @e, initialized with + * This helper function sends the event e, initialized with * drm_event_reserve_init(), to its associated userspace DRM file. * The timestamp variant of dma_fence_signal is used when the caller * sends a valid timestamp. */ -void drm_send_event_helper(struct drm_device *dev, +static void drm_send_event_helper(struct drm_device *dev, struct drm_pending_event *e, ktime_t timestamp) { assert_spin_locked(&dev->event_lock); -- 2.31.1

2 1

[PATCH v4 0/4] drm/vkms: add overlay plane support
by Melissa Wen 27 Apr '21

27 Apr '21

Adding support to overlay type in addition to primary and cursor plane. The planes composition relies on the z order of the active planes and only occurs if there is a primary plane (as in the current behavior). The first patch switches the function of initializing planes from drm_universal_plane_init to drmm_universal_plane_alloc. It aims to improve aspects of allocation and cleanup operations, leaving it to the DRM infrastructure. The second patch generalizes variables and functions names to refer to any kind of plane, not only cursor. The goal is to reuse them for blending overlay and cursor planes to primary. The third patch enables the plane composition to select a pixel blend operation according to the plane format (XRGB8888 or ARGB8888). The last patch creates a module option to enable overlay, and includes overlay to supported types of plane. When the overlay option is enabled, one overlay plane is initialized (plus primary and cursor) and it is included in the planes composition. This work preserves the current results of IGT tests: kms_cursor_crc; kms_flip and kms_writeback. In addition, subtests related to overlay in kms_atomic and kms_plane_cursor start to pass (pointed out in the commit message). v2: - Drop unnecessary changes that init crtc without cursor (Daniel) - Replace function to initialize planes (Daniel) - Add proper pixel blending op according to the plane format (Daniel) v3: - Proper use of the variable funcs (kernel bot) - Adjust the patch series format v4: - use better names for functions of plane composition (Daniel) - clear alpha channel (0xff) after blend color values by pixel - improve comments on blend ops to reflect the current state - describe in the commit message future improvements for plane composition Melissa Wen (4): drm/vkms: init plane using drmm_universal_plane_alloc drm/vkms: rename cursor to plane on ops of planes composition drm/vkms: add XRGB planes composition drm/vkms: add overlay support drivers/gpu/drm/vkms/vkms_composer.c | 104 ++++++++++++++++++--------- drivers/gpu/drm/vkms/vkms_drv.c | 5 ++ drivers/gpu/drm/vkms/vkms_drv.h | 9 ++- drivers/gpu/drm/vkms/vkms_output.c | 28 ++++---- drivers/gpu/drm/vkms/vkms_plane.c | 51 ++++++------- 5 files changed, 125 insertions(+), 72 deletions(-) -- 2.30.2

3 12

[PULL] drm-intel-next-fixes for the merge window
by Jani Nikula 27 Apr '21

27 Apr '21

Hi Dave & Daniel - Some fixes to the drm-next feature pull. drm-intel-next-fixes-2021-04-27: drm/i915 fixes for v5.13-rc1: - Several fixes to GLK handling in recent display refactoring (Ville) - Rare watchdog timer race fix (Tvrtko) - Cppcheck redundant condition fix (José) - Overlay error code propagation fix (Dan Carpenter) - Documentation fix (Maarten) Seems I forgot to mention GVT fixes in the annotated tag, copy-pasting here from their pull: gvt-next-fixes-2021-04-21 - Remove one unused function warning (Jiapeng) - Fix intel_gvt_init_device() return type (Dan) - Remove one duplicated register accessible check (Zhenyu) BR, Jani. The following changes since commit af8352f1ff54c4fecf84e36315fd1928809a580b: Merge tag 'drm-msm-next-2021-04-11' of https://gitlab.freedesktop.org/drm/msm into drm-next (2021-04-13 23:35:54 +0200) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-intel tags/drm-intel-next-fixes-2021-04-27 for you to fetch changes up to 270e3cc5aa382f63ea20b93c3d20162a891dc638: drm/i915: Fix docbook descriptions for i915_gem_shrinker (2021-04-26 11:54:33 +0300) ---------------------------------------------------------------- drm/i915 fixes for v5.13-rc1: - Several fixes to GLK handling in recent display refactoring (Ville) - Rare watchdog timer race fix (Tvrtko) - Cppcheck redundant condition fix (José) - Overlay error code propagation fix (Dan Carpenter) - Documentation fix (Maarten) ---------------------------------------------------------------- Dan Carpenter (2): drm/i915/gvt: Fix error code in intel_gvt_init_device() drm/i915: fix an error code in intel_overlay_do_put_image() Jani Nikula (1): Merge tag 'gvt-next-fixes-2021-04-21' of https://github.com/intel/gvt-linux into drm-intel-next-fixes Jiapeng Chong (1): drm/i915/gvt: remove useless function José Roberto de Souza (1): drm/i915/display/psr: Fix cppcheck warnings Maarten Lankhorst (1): drm/i915: Fix docbook descriptions for i915_gem_shrinker Tvrtko Ursulin (1): drm/i915: Take request reference before arming the watchdog timer Ville Syrjälä (3): drm/i915: Restore lost glk FBC 16bpp w/a drm/i915: Restore lost glk ccs w/a drm/i915: Disable LTTPR detection on GLK once again Zhenyu Wang (1): drm/i915/gvt: Remove duplicated register accessible check drivers/gpu/drm/i915/display/intel_display.c | 3 ++- drivers/gpu/drm/i915/display/intel_dp_link_training.c | 2 +- drivers/gpu/drm/i915/display/intel_fbc.c | 2 +- drivers/gpu/drm/i915/display/intel_overlay.c | 4 +++- drivers/gpu/drm/i915/display/intel_psr.c | 3 +-- drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 1 + drivers/gpu/drm/i915/gvt/cmd_parser.c | 5 ----- drivers/gpu/drm/i915/gvt/gtt.c | 6 ------ drivers/gpu/drm/i915/gvt/gvt.c | 8 ++++---- drivers/gpu/drm/i915/i915_request.c | 3 ++- 10 files changed, 15 insertions(+), 22 deletions(-) -- Jani Nikula, Intel Open Source Graphics Center

1 0

[PATCH 1/7] drm/i915/dg1: Fix mapping type for default state object
by Matthew Auld 27 Apr '21

27 Apr '21

From: Venkata Ramana Nayana <venkata.ramana.nayana(a)intel.com> Use I915_MAP_WC when default state object is allocated in LMEM. Signed-off-by: Venkata Ramana Nayana <venkata.ramana.nayana(a)intel.com> Reviewed-by: Matthew Auld <matthew.auld(a)intel.com> Signed-off-by: Matthew Auld <matthew.auld(a)intel.com> --- drivers/gpu/drm/i915/gt/shmem_utils.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/gt/shmem_utils.c b/drivers/gpu/drm/i915/gt/shmem_utils.c index f8f02aab842b..0683b27a3890 100644 --- a/drivers/gpu/drm/i915/gt/shmem_utils.c +++ b/drivers/gpu/drm/i915/gt/shmem_utils.c @@ -8,6 +8,7 @@ #include <linux/shmem_fs.h> #include "gem/i915_gem_object.h" +#include "gem/i915_gem_lmem.h" #include "shmem_utils.h" struct file *shmem_create_from_data(const char *name, void *data, size_t len) @@ -39,7 +40,8 @@ struct file *shmem_create_from_object(struct drm_i915_gem_object *obj) return file; } - ptr = i915_gem_object_pin_map_unlocked(obj, I915_MAP_WB); + ptr = i915_gem_object_pin_map_unlocked(obj, i915_gem_object_is_lmem(obj) ? + I915_MAP_WC : I915_MAP_WB); if (IS_ERR(ptr)) return ERR_CAST(ptr); -- 2.26.3

2 11

[PATCH 1/2] drm: remove usage of drm_pci_alloc/free
by Joseph Kogut 27 Apr '21

27 Apr '21

Remove usage of legacy dma-api abstraction in preparation for removal Signed-off-by: Joseph Kogut <joseph.kogut(a)gmail.com> --- Checkpatch warns here that r128 is marked obsolete, and asks for no unnecessary modifications. This series aims to address the FIXME in drivers/gpu/drm/drm_pci.c explaining that drm_pci_alloc/free is a needless abstraction of the dma-api, and it should be removed. Unfortunately, doing this requires removing the usage from an obsolete driver as well. If this patch is rejected for modifying an obsolete driver, would it be appropriate to follow up removing the FIXME from drm_pci? drivers/gpu/drm/drm_bufs.c | 19 ++++++++++++++++--- drivers/gpu/drm/drm_dma.c | 8 +++++++- drivers/gpu/drm/r128/ati_pcigart.c | 22 ++++++++++++++++++---- 3 files changed, 41 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c index e3d77dfefb0a..94bc1f6049c9 100644 --- a/drivers/gpu/drm/drm_bufs.c +++ b/drivers/gpu/drm/drm_bufs.c @@ -674,12 +674,17 @@ int drm_legacy_rmmap_ioctl(struct drm_device *dev, void *data, static void drm_cleanup_buf_error(struct drm_device *dev, struct drm_buf_entry *entry) { + drm_dma_handle_t *dmah; int i; if (entry->seg_count) { for (i = 0; i < entry->seg_count; i++) { if (entry->seglist[i]) { - drm_pci_free(dev, entry->seglist[i]); + dmah = entry->seglist[i]; + dma_free_coherent(dev->dev, + dmah->size, + dmah->vaddr, + dmah->busaddr); } } kfree(entry->seglist); @@ -978,10 +983,18 @@ int drm_legacy_addbufs_pci(struct drm_device *dev, page_count = 0; while (entry->buf_count < count) { + dmah = kmalloc(sizeof(drm_dma_handle_t), GFP_KERNEL); + if (!dmah) + return -ENOMEM; - dmah = drm_pci_alloc(dev, PAGE_SIZE << page_order, 0x1000); + dmah->size = total; + dmah->vaddr = dma_alloc_coherent(dev->dev, + dmah->size, + &dmah->busaddr, + GFP_KERNEL); + if (!dmah->vaddr) { + kfree(dmah); - if (!dmah) { /* Set count correctly so we free the proper amount. */ entry->buf_count = count; entry->seg_count = count; diff --git a/drivers/gpu/drm/drm_dma.c b/drivers/gpu/drm/drm_dma.c index d07ba54ec945..eb6b741a6f99 100644 --- a/drivers/gpu/drm/drm_dma.c +++ b/drivers/gpu/drm/drm_dma.c @@ -81,6 +81,7 @@ int drm_legacy_dma_setup(struct drm_device *dev) void drm_legacy_dma_takedown(struct drm_device *dev) { struct drm_device_dma *dma = dev->dma; + drm_dma_handle_t *dmah; int i, j; if (!drm_core_check_feature(dev, DRIVER_HAVE_DMA) || @@ -100,7 +101,12 @@ void drm_legacy_dma_takedown(struct drm_device *dev) dma->bufs[i].seg_count); for (j = 0; j < dma->bufs[i].seg_count; j++) { if (dma->bufs[i].seglist[j]) { - drm_pci_free(dev, dma->bufs[i].seglist[j]); + dmah = dma->bufs[i].seglist[j]; + dma_free_coherent(dev->dev, + dmah->size, + dmah->vaddr, + dmah->busaddr); + kfree(dmah); } } kfree(dma->bufs[i].seglist); diff --git a/drivers/gpu/drm/r128/ati_pcigart.c b/drivers/gpu/drm/r128/ati_pcigart.c index 1234ec60c0af..fbb0cfd79758 100644 --- a/drivers/gpu/drm/r128/ati_pcigart.c +++ b/drivers/gpu/drm/r128/ati_pcigart.c @@ -45,18 +45,32 @@ static int drm_ati_alloc_pcigart_table(struct drm_device *dev, struct drm_ati_pcigart_info *gart_info) { - gart_info->table_handle = drm_pci_alloc(dev, gart_info->table_size, - PAGE_SIZE); - if (gart_info->table_handle == NULL) + drm_dma_handle_t *dmah = kmalloc(sizeof(drm_dma_handle_t), GFP_KERNEL); + + if (!dmah) + return -ENOMEM; + + dmah->size = gart_info->table_size; + dmah->vaddr = dma_alloc_coherent(dev->dev, + dmah->size, + &dmah->busaddr, + GFP_KERNEL); + + if (!dmah->vaddr) { + kfree(dmah); return -ENOMEM; + } + gart_info->table_handle = dmah; return 0; } static void drm_ati_free_pcigart_table(struct drm_device *dev, struct drm_ati_pcigart_info *gart_info) { - drm_pci_free(dev, gart_info->table_handle); + drm_dma_handle_t *dmah = gart_info->table_handle; + + dma_free_coherent(dev->dev, dmah->size, dmah->vaddr, dmah->busaddr); gart_info->table_handle = NULL; } -- 2.31.1

2 2

← Newer
1
...
25
26
27
28
29
30
31
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel April 2021