dri-devel August 2021

dri-devel@lists.freedesktop.org

324 participants
762 discussions

[pull] drm/msm: drm-msm-next-2021-08-12 for v5.15
by Rob Clark 12 Aug '21

12 Aug '21

Hi Dave & Daniel, This is the main pull for v5.15, after the early pull request with drm/scheduler conversion: * New a6xx GPU support: a680 and 7c3 * dsi: 7nm phi, sc7280 support, test pattern generator support * mdp4 fixes for older hw like the nexus7 * displayport fixes There will be minor conflict, not with merging into drm-next (in it's current state) but when that gets merged with fixes from the v5.14 cycle. The resolution that Stephen Rothwell made in linux-next is correct: --------- diff --cc drivers/gpu/drm/msm/dp/dp_display.c index 867388a399ad,419fd4a14cbf..000000000000 --- a/drivers/gpu/drm/msm/dp/dp_display.c +++ b/drivers/gpu/drm/msm/dp/dp_display.c @@@ -1312,10 -1314,10 +1315,14 @@@ static int dp_pm_resume(struct device * else dp->dp_display.is_connected = false; + dp_display_handle_plugged_change(g_dp_display, + dp->dp_display.is_connected); + + + DRM_DEBUG_DP("After, sink_count=%d is_connected=%d core_inited=%d power_on=%d\n", + dp->link->sink_count, dp->dp_display.is_connected, + dp->core_initialized, dp_display->power_on); + mutex_unlock(&dp->event_mutex); return 0; --------- The following changes since commit 4541e4f2225c30b0e9442be9eb2fb8b7086cdd1f: drm/msm/gem: Mark active before pinning (2021-07-28 09:19:00 -0700) are available in the Git repository at: https://gitlab.freedesktop.org/drm/msm.git drm-msm-next-2021-08-12 for you to fetch changes up to cb0927ab80d224c9074f53d1a55b087d12ec5a85: drm/msi/mdp4: populate priv->kms in mdp4_kms_init (2021-08-11 10:57:28 -0700) ---------------------------------------------------------------- Abhinav Kumar (2): drm/msm/dsi: update dsi register header file for tpg drm/msm/dsi: add support for dsi test pattern generator Akhil P Oommen (3): drm/msm/a6xx: Fix llcc configuration for a660 gpu drm/msm/a6xx: Use rev to identify SKU drm/msm/a6xx: Add support for Adreno 7c Gen 3 gpu Baokun Li (1): drm/msm: Use list_move_tail instead of list_del/list_add_tail in msm_gem.c Bjorn Andersson (1): drm: msm: Add 680 gpu to the adreno gpu list Christophe JAILLET (1): drm/msm/dsi: Fix some reference counted resource leaks David Heidelberg (4): drm/msm/mdp4: refactor HW revision detection into read_mdp_hw_revision drm/msm/mdp4: move HW revision detection to earlier phase drm/msm: mdp4: drop vblank get/put from prepare/complete_commit drm/msi/mdp4: populate priv->kms in mdp4_kms_init Dmitry Baryshkov (14): drm/msm/dsi: drop gdsc regulator handling drm/msm/dsi: phy: use of_device_get_match_data drm/msm/dsi: drop msm_dsi_phy_get_shared_timings drm/msm/dsi: rename dual DSI to bonded DSI drm/msm/dsi: add three helper functions drm/msm/dpu: support setting up two independent DSI connectors drm/msm/mdp5: move mdp5_encoder_set_intf_mode after msm_dsi_modeset_init drm/msm/dp: stop calling set_encoder_mode callback drm/msm/dsi: stop calling set_encoder_mode callback drm/msm/kms: drop set_encoder_mode callback drm/msm/dpu: add support for alpha blending properties drm/msm/dpu: make dpu_hw_ctl_clear_all_blendstages clear necessary LMs dt-bindings: display: msm: dsi-controller-main: restore assigned-clocks drm/msm/dsi: add continuous clock support for 7nm PHY Douglas Anderson (1): drm/msm: Use nvmem_cell_read_variable_le_u32() to read speed bin Guo Zhengkui (1): drm/msm: remove a repeated including of <linux/debugfs.h> Jonathan Marek (3): dt-bindings: msm: dsi: add missing 7nm bindings dt-bindings: msm: dsi: document phy-type property for 7nm dsi phy drm/msm/dsi: support CPHY mode for 7nm pll/phy Kalyan Thota (1): drm/msm/disp/dpu1: add safe lut config in dpu driver Konrad Dybcio (1): drm/msm/dsi: Fix DSI and DSI PHY regulator config from SDM660 Kuogee Hsieh (8): drm/msm/dp: update is_connected status base on sink count at dp_pm_resume() drm/msm/dp: use dp_ctrl_off_link_stream during PHY compliance test run drm/msm/dp: reduce link rate if failed at link training 1 drm/msm/dp: reset aux controller after dp_aux_cmd_fifo_tx() failed. drm/msm/dp: replug event is converted into an unplug followed by an plug events drm/msm/dp: return correct edid checksum after corrupted edid checksum read drm/msm/dp: do not end dp link training until video is ready drm/msm/dp: add drm debug logs to dp_pm_resume/suspend Maitreyee Rao (1): drm/msm/dp: add logs across DP driver for ease of debugging Rajeev Nandan (3): dt-bindings: msm/dsi: Add sc7280 7nm dsi phy drm/msm/dsi: Add PHY configuration for SC7280 drm/msm/dsi: Add DSI support for SC7280 Rob Clark (3): drm/msm: Periodically update RPTR shadow drm/msm: Add adreno_is_a640_family() drm/msm: Rework SQE version check Souptick Joarder (1): drm/msm/dp: Remove unused variable Stephen Boyd (1): drm/msm/dpu: Add newlines to printks Thomas Zimmermann (1): drm/msm: Implement mmap as GEM object function Wei Li (1): drm/msm: Fix error return code in msm_drm_init() .../bindings/display/msm/dsi-controller-main.yaml | 17 ++ .../bindings/display/msm/dsi-phy-7nm.yaml | 72 ++++++++ drivers/gpu/drm/msm/Kconfig | 6 +- drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 29 +++- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 12 +- drivers/gpu/drm/msm/adreno/a6xx_gmu.h | 1 + drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 131 ++++++++------ drivers/gpu/drm/msm/adreno/a6xx_hfi.c | 34 +++- drivers/gpu/drm/msm/adreno/adreno_device.c | 40 ++++- drivers/gpu/drm/msm/adreno/adreno_gpu.h | 22 ++- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 43 +++-- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 12 +- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 5 + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 10 +- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 102 ++++++----- drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 10 +- drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 85 +++++---- drivers/gpu/drm/msm/disp/mdp5/mdp5_ctl.c | 2 +- drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 11 +- drivers/gpu/drm/msm/disp/msm_disp_snapshot.h | 1 - drivers/gpu/drm/msm/dp/dp_aux.c | 3 + drivers/gpu/drm/msm/dp/dp_catalog.c | 8 +- drivers/gpu/drm/msm/dp/dp_ctrl.c | 141 +++++++++------ drivers/gpu/drm/msm/dp/dp_display.c | 77 +++++---- drivers/gpu/drm/msm/dp/dp_link.c | 50 ++---- drivers/gpu/drm/msm/dp/dp_panel.c | 9 +- drivers/gpu/drm/msm/dp/dp_power.c | 3 + drivers/gpu/drm/msm/dsi/dsi.c | 15 +- drivers/gpu/drm/msm/dsi/dsi.h | 18 +- drivers/gpu/drm/msm/dsi/dsi.xml.h | 74 ++++++++ drivers/gpu/drm/msm/dsi/dsi_cfg.c | 33 +++- drivers/gpu/drm/msm/dsi/dsi_cfg.h | 3 +- drivers/gpu/drm/msm/dsi/dsi_host.c | 161 ++++++++++++----- drivers/gpu/drm/msm/dsi/dsi_manager.c | 146 ++++++++-------- drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 83 +++++++-- drivers/gpu/drm/msm/dsi/phy/dsi_phy.h | 5 + drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c | 2 +- drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c | 8 +- drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c | 190 ++++++++++++++++----- drivers/gpu/drm/msm/msm_drv.c | 15 +- drivers/gpu/drm/msm/msm_drv.h | 18 +- drivers/gpu/drm/msm/msm_fbdev.c | 12 +- drivers/gpu/drm/msm/msm_gem.c | 40 ++--- drivers/gpu/drm/msm/msm_gem.h | 3 - drivers/gpu/drm/msm/msm_gem_prime.c | 11 -- drivers/gpu/drm/msm/msm_kms.h | 3 - include/dt-bindings/phy/phy.h | 2 + 47 files changed, 1193 insertions(+), 585 deletions(-) create mode 100644 Documentation/devicetree/bindings/display/msm/dsi-phy-7nm.yaml

1 0

[PATCH v2 0/6] eDP: Support probing eDP panels dynamically instead of hardcoding
by Douglas Anderson 12 Aug '21

12 Aug '21

The goal of this patch series is to move away from hardcoding exact eDP panels in device tree files. As discussed in the various patches in this series (I'm not repeating everything here), most eDP panels are 99% probable and we can get that last 1% by allowing two "power up" delays to be specified in the device tree file and then using the panel ID (found in the EDID) to look up additional power sequencing delays for the panel. This patch series is the logical contiunation of a previous patch series where I proposed solving this problem by adding a board-specific compatible string [1]. In the discussion that followed it sounded like people were open to something like the solution proposed in this new series. In version 2 I got rid of the idea that we could have a "fallback" compatible string that we'd use if we didn't recognize the ID in the EDID. This simplifies the bindings a lot and the implementation somewhat. As a result of not having a "fallback", though, I'm not confident in transitioning any existing boards over to this since the panel will totally fail to work if we don't recognize the ID from the EDID and I can't guarantee that I've seen every panel that might have shipped on an existing product. The plan is to use "edp-panel" only on new boards or new revisions of old boards where we can guarantee that every EDID that ships out of the factory has an ID in the table. Version 2 of this series is also rebased upon my other series for the Samsung ATNA33XC20 panel [2] since they both touch the "delay" structure and it seems likely that the Samsung panel series will land first. [1] https://lore.kernel.org/r/YFKQaXOmOwYyeqvM@google.com/ [2] https://lore.kernel.org/r/20210730154605.2843418-1-dianders@chromium.org/ Changes in v2: - No longer allow fallback to panel-simple. - Add "-ms" suffix to delays. - Rebased atop revert of delays between GPIO & regulator - Don't support a "fallback" panel. Probed panels must be probed. - Not based on patch to copy "desc"--just allocate for probed panels. - Add "-ms" suffix to delays. Douglas Anderson (6): dt-bindings: drm/panel-simple: Introduce generic eDP panels drm/edid: Break out reading block 0 of the EDID drm/edid: Allow the querying/working with the panel ID from the EDID drm/panel-simple: Don't re-read the EDID every time we power off the panel drm/panel-simple: Split the delay structure out of the panel description drm/panel-simple: Implement generic "edp-panel"s probed by EDID .../bindings/display/panel/panel-edp.yaml | 188 ++++++++++ drivers/gpu/drm/drm_edid.c | 113 +++++- drivers/gpu/drm/panel/panel-simple.c | 352 +++++++++++++----- include/drm/drm_edid.h | 47 +++ 4 files changed, 586 insertions(+), 114 deletions(-) create mode 100644 Documentation/devicetree/bindings/display/panel/panel-edp.yaml -- 2.32.0.554.ge1b32706d8-goog

4 13

[PULL] drm-intel-fixes
by Rodrigo Vivi 12 Aug '21

12 Aug '21

Hi Dave and Daniel, Here goes drm-intel-fixes-2021-08-12: - GVT fix for Windows VM hang. - Display fix of 12 BPC bits for display 12 and newer. - Don't try to access some media register for fused off domains. - Fix kerneldoc build warnings. Thanks, Rodrigo. The following changes since commit 36a21d51725af2ce0700c6ebcb6b9594aac658a6: Linux 5.14-rc5 (2021-08-08 13:49:31 -0700) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-intel tags/drm-intel-fixes-2021-08-12 for you to fetch changes up to ffd5caa26f6afde0c1e3ed126806607748a83c6e: drm/doc/rfc: drop lmem uapi section (2021-08-12 06:05:45 -0400) ---------------------------------------------------------------- - GVT fix for Windows VM hang. - Display fix of 12 BPC bits for display 12 and newer. - Don't try to access some media register for fused off domains. - Fix kerneldoc build warnings. ---------------------------------------------------------------- Ankit Nautiyal (1): drm/i915/display: Fix the 12 BPC bits for PIPE_MISC reg Daniel Vetter (1): drm/doc/rfc: drop lmem uapi section Matt Roper (1): drm/i915: Only access SFC_DONE when media domain is not fused off Rodrigo Vivi (1): Merge tag 'gvt-fixes-2021-08-10' of https://github.com/intel/gvt-linux into drm-intel-fixes Zhenyu Wang (1): drm/i915/gvt: Fix cached atomics setting for Windows VM Documentation/gpu/rfc/i915_gem_lmem.rst | 109 --------------------------- drivers/gpu/drm/i915/display/intel_display.c | 34 ++++++--- drivers/gpu/drm/i915/gvt/handlers.c | 1 + drivers/gpu/drm/i915/gvt/mmio_context.c | 2 + drivers/gpu/drm/i915/i915_gpu_error.c | 19 ++++- drivers/gpu/drm/i915/i915_reg.h | 16 ++-- 6 files changed, 56 insertions(+), 125 deletions(-)

1 0

[PATCH] drm/i915: Use locked access to ctx->engines in set_priority
by Daniel Vetter 12 Aug '21

12 Aug '21

This essentially reverts commit 89ff76bf9b3b0b86e6bbe344bd6378d8661303fc Author: Chris Wilson <chris(a)chris-wilson.co.uk> Date: Thu Apr 2 13:42:18 2020 +0100 drm/i915/gem: Utilize rcu iteration of context engines Note that the other use of __context_engines_await have disappeard in the following commits: ccbc1b97948a ("drm/i915/gem: Don't allow changing the VM on running contexts (v4)") c7a71fc8ee04 ("drm/i915: Drop getparam support for I915_CONTEXT_PARAM_ENGINES") 4a766ae40ec8 ("drm/i915: Drop the CONTEXT_CLONE API (v2)") None of these have any business to optimize their engine lookup with rcu, unless extremely convincing benchmark data and a solid analysis why we can't make that workload (whatever it is that does) faster with a proper design fix. Also since there's only one caller of context_apply_all left and it's really just a loop, inline it and then inline the lopp body too. This is how all other callers that take the engine lock loop over engines, it's much simpler. Signed-off-by: Daniel Vetter <daniel.vetter(a)intel.com> Cc: Chris Wilson <chris(a)chris-wilson.co.uk> Cc: Mika Kuoppala <mika.kuoppala(a)linux.intel.com> Cc: Daniel Vetter <daniel.vetter(a)ffwll.ch> Cc: Jason Ekstrand <jason(a)jlekstrand.net> Cc: Tvrtko Ursulin <tvrtko.ursulin(a)intel.com> Cc: Joonas Lahtinen <joonas.lahtinen(a)linux.intel.com> Cc: Matthew Brost <matthew.brost(a)intel.com> --- drivers/gpu/drm/i915/gem/i915_gem_context.c | 72 ++++----------------- 1 file changed, 14 insertions(+), 58 deletions(-) diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context.c b/drivers/gpu/drm/i915/gem/i915_gem_context.c index dbaeb924a437..fd169cf2f75a 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_context.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_context.c @@ -1284,49 +1284,6 @@ static int __context_set_persistence(struct i915_gem_context *ctx, bool state) return 0; } -static inline struct i915_gem_engines * -__context_engines_await(const struct i915_gem_context *ctx, - bool *user_engines) -{ - struct i915_gem_engines *engines; - - rcu_read_lock(); - do { - engines = rcu_dereference(ctx->engines); - GEM_BUG_ON(!engines); - - if (user_engines) - *user_engines = i915_gem_context_user_engines(ctx); - - /* successful await => strong mb */ - if (unlikely(!i915_sw_fence_await(&engines->fence))) - continue; - - if (likely(engines == rcu_access_pointer(ctx->engines))) - break; - - i915_sw_fence_complete(&engines->fence); - } while (1); - rcu_read_unlock(); - - return engines; -} - -static void -context_apply_all(struct i915_gem_context *ctx, - void (*fn)(struct intel_context *ce, void *data), - void *data) -{ - struct i915_gem_engines_iter it; - struct i915_gem_engines *e; - struct intel_context *ce; - - e = __context_engines_await(ctx, NULL); - for_each_gem_engine(ce, e, it) - fn(ce, data); - i915_sw_fence_complete(&e->fence); -} - static struct i915_gem_context * i915_gem_create_context(struct drm_i915_private *i915, const struct i915_gem_proto_context *pc) @@ -1776,23 +1733,11 @@ set_persistence(struct i915_gem_context *ctx, return __context_set_persistence(ctx, args->value); } -static void __apply_priority(struct intel_context *ce, void *arg) -{ - struct i915_gem_context *ctx = arg; - - if (!intel_engine_has_timeslices(ce->engine)) - return; - - if (ctx->sched.priority >= I915_PRIORITY_NORMAL && - intel_engine_has_semaphores(ce->engine)) - intel_context_set_use_semaphores(ce); - else - intel_context_clear_use_semaphores(ce); -} - static int set_priority(struct i915_gem_context *ctx, const struct drm_i915_gem_context_param *args) { + struct i915_gem_engines_iter it; + struct intel_context *ce; int err; err = validate_priority(ctx->i915, args); @@ -1800,7 +1745,18 @@ static int set_priority(struct i915_gem_context *ctx, return err; ctx->sched.priority = args->value; - context_apply_all(ctx, __apply_priority, ctx); + + for_each_gem_engine(ce, i915_gem_context_lock_engines(ctx), it) { + if (!intel_engine_has_timeslices(ce->engine)) + continue; + + if (ctx->sched.priority >= I915_PRIORITY_NORMAL && + intel_engine_has_semaphores(ce->engine)) + intel_context_set_use_semaphores(ce); + else + intel_context_clear_use_semaphores(ce); + } + i915_gem_context_unlock_engines(ctx); return 0; } -- 2.32.0

2 2

[PATCH] drm/edid: fix edid field name
by Lucas De Marchi 12 Aug '21

12 Aug '21

Byte 26 in a edid struct is supposed to be "Blue and white least-significant 2 bits", not "black and white". Rename the field accordingly. This field is not used anywhere, so just renaming it here for correctness. Signed-off-by: Lucas De Marchi <lucas.demarchi(a)intel.com> --- include/drm/drm_edid.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h index 759328a5eeb2..deccfd39e6db 100644 --- a/include/drm/drm_edid.h +++ b/include/drm/drm_edid.h @@ -336,7 +336,7 @@ struct edid { u8 features; /* Color characteristics */ u8 red_green_lo; - u8 black_white_lo; + u8 blue_white_lo; u8 red_x; u8 red_y; u8 green_x; -- 2.31.1

2 3

[PATCH] video: fbdev: au1200fb: Make use of dma_mmap_coherent()
by Cai Huoqing 12 Aug '21

12 Aug '21

replace dma_mmap_attrs() with dma_mmap_coherent() kindly. BTW, fix indentation. Signed-off-by: Cai Huoqing <caihuoqing(a)baidu.com> --- drivers/video/fbdev/au1200fb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/video/fbdev/au1200fb.c b/drivers/video/fbdev/au1200fb.c index c00e01a17368..81c315454428 100644 --- a/drivers/video/fbdev/au1200fb.c +++ b/drivers/video/fbdev/au1200fb.c @@ -1233,8 +1233,8 @@ static int au1200fb_fb_mmap(struct fb_info *info, struct vm_area_struct *vma) { struct au1200fb_device *fbdev = info->par; - return dma_mmap_attrs(fbdev->dev, vma, fbdev->fb_mem, fbdev->fb_phys, - fbdev->fb_len, 0); + return dma_mmap_coherent(fbdev->dev, vma, + fbdev->fb_mem, fbdev->fb_phys, fbdev->fb_len); } static void set_global(u_int cmd, struct au1200_lcd_global_regs_t *pdata) -- 2.25.1

1 0

[PATCH] drm/virtio: set non-cross device blob uuid_state
by David Stevens 12 Aug '21

12 Aug '21

Blob resources without the cross device flag don't have a uuid to share with other virtio devices. When exporting such blobs, set uuid_state to STATE_ERR so that virtgpu_virtio_get_uuid doesn't hang. Signed-off-by: David Stevens <stevensd(a)chromium.org> --- drivers/gpu/drm/virtio/virtgpu_prime.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/virtio/virtgpu_prime.c b/drivers/gpu/drm/virtio/virtgpu_prime.c index 807a27a16365..e45dbf14b307 100644 --- a/drivers/gpu/drm/virtio/virtgpu_prime.c +++ b/drivers/gpu/drm/virtio/virtgpu_prime.c @@ -98,6 +98,8 @@ struct dma_buf *virtgpu_gem_prime_export(struct drm_gem_object *obj, } else { bo->uuid_state = STATE_ERR; } + } else if (!(bo->blob_flags & VIRTGPU_BLOB_FLAG_USE_CROSS_DEVICE)) { + bo->uuid_state = STATE_ERR; } exp_info.ops = &virtgpu_dmabuf_ops.ops; -- 2.32.0.605.g8dce9f2422-goog

2 1

[PATCH v4 0/4] shmem helpers for vgem
by Daniel Vetter 12 Aug '21

12 Aug '21

Hi all I've found another potential issue, so lets try this again and see what intel-gfx-ci says. Also Thomas tried to unify vgem more, which motivated me to dig this all out again. Test-with: 20210527140732.5762-1-daniel.vetter(a)ffwll.ch Review very much welcome, as always! Cheers, Daniel Daniel Vetter (4): dma-buf: Require VM_PFNMAP vma for mmap drm/shmem-helper: Switch to vmf_insert_pfn drm/shmem-helpers: Allocate wc pages on x86 drm/vgem: use shmem helpers drivers/dma-buf/dma-buf.c | 15 +- drivers/gpu/drm/Kconfig | 7 +- drivers/gpu/drm/drm_gem_shmem_helper.c | 18 +- drivers/gpu/drm/gud/Kconfig | 2 +- drivers/gpu/drm/tiny/Kconfig | 4 +- drivers/gpu/drm/udl/Kconfig | 1 + drivers/gpu/drm/vgem/vgem_drv.c | 315 +------------------------ 7 files changed, 49 insertions(+), 313 deletions(-) -- 2.32.0

4 20

[PATCH] drm/virtio: support mapping exported vram
by David Stevens 12 Aug '21

12 Aug '21

Implement virtgpu specific map_dma_buf callback to support mapping exported vram object dma-bufs. The dma-buf callback is used directly, as vram objects don't have backing pages and thus can't implement the drm_gem_object_funcs.get_sg_table callback. Signed-off-by: David Stevens <stevensd(a)chromium.org> --- drivers/gpu/drm/virtio/virtgpu_drv.h | 8 ++++ drivers/gpu/drm/virtio/virtgpu_prime.c | 30 ++++++++++++- drivers/gpu/drm/virtio/virtgpu_vram.c | 61 ++++++++++++++++++++++++++ 3 files changed, 97 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.h b/drivers/gpu/drm/virtio/virtgpu_drv.h index d4e610a44e12..0c4810982530 100644 --- a/drivers/gpu/drm/virtio/virtgpu_drv.h +++ b/drivers/gpu/drm/virtio/virtgpu_drv.h @@ -26,6 +26,7 @@ #ifndef VIRTIO_DRV_H #define VIRTIO_DRV_H +#include <linux/dma-direction.h> #include <linux/virtio.h> #include <linux/virtio_ids.h> #include <linux/virtio_config.h> @@ -459,4 +460,11 @@ bool virtio_gpu_is_vram(struct virtio_gpu_object *bo); int virtio_gpu_vram_create(struct virtio_gpu_device *vgdev, struct virtio_gpu_object_params *params, struct virtio_gpu_object **bo_ptr); +struct sg_table *virtio_gpu_vram_map_dma_buf(struct virtio_gpu_object *bo, + struct device *dev, + enum dma_data_direction dir); +void virtio_gpu_vram_unmap_dma_buf(struct device *dev, + struct sg_table *sgt, + enum dma_data_direction dir); + #endif diff --git a/drivers/gpu/drm/virtio/virtgpu_prime.c b/drivers/gpu/drm/virtio/virtgpu_prime.c index 807a27a16365..79efc878f508 100644 --- a/drivers/gpu/drm/virtio/virtgpu_prime.c +++ b/drivers/gpu/drm/virtio/virtgpu_prime.c @@ -43,13 +43,39 @@ static int virtgpu_virtio_get_uuid(struct dma_buf *buf, return 0; } +static struct sg_table *virtgpu_gem_map_dma_buf( + struct dma_buf_attachment *attach, + enum dma_data_direction dir) +{ + struct drm_gem_object *obj = attach->dmabuf->priv; + struct virtio_gpu_object *bo = gem_to_virtio_gpu_obj(obj); + + if (virtio_gpu_is_vram(bo)) + return virtio_gpu_vram_map_dma_buf(bo, attach->dev, dir); + + return drm_gem_map_dma_buf(attach, dir); +} + +static void virtgpu_gem_unmap_dma_buf(struct dma_buf_attachment *attach, + struct sg_table *sgt, + enum dma_data_direction dir) +{ + struct drm_gem_object *obj = attach->dmabuf->priv; + struct virtio_gpu_object *bo = gem_to_virtio_gpu_obj(obj); + + if (virtio_gpu_is_vram(bo)) + virtio_gpu_vram_unmap_dma_buf(attach->dev, sgt, dir); + else + drm_gem_unmap_dma_buf(attach, sgt, dir); +} + static const struct virtio_dma_buf_ops virtgpu_dmabuf_ops = { .ops = { .cache_sgt_mapping = true, .attach = virtio_dma_buf_attach, .detach = drm_gem_map_detach, - .map_dma_buf = drm_gem_map_dma_buf, - .unmap_dma_buf = drm_gem_unmap_dma_buf, + .map_dma_buf = virtgpu_gem_map_dma_buf, + .unmap_dma_buf = virtgpu_gem_unmap_dma_buf, .release = drm_gem_dmabuf_release, .mmap = drm_gem_dmabuf_mmap, .vmap = drm_gem_dmabuf_vmap, diff --git a/drivers/gpu/drm/virtio/virtgpu_vram.c b/drivers/gpu/drm/virtio/virtgpu_vram.c index 5cc34e7330fa..6b45b0429fef 100644 --- a/drivers/gpu/drm/virtio/virtgpu_vram.c +++ b/drivers/gpu/drm/virtio/virtgpu_vram.c @@ -1,6 +1,8 @@ // SPDX-License-Identifier: GPL-2.0 #include "virtgpu_drv.h" +#include <linux/dma-mapping.h> + static void virtio_gpu_vram_free(struct drm_gem_object *obj) { struct virtio_gpu_object *bo = gem_to_virtio_gpu_obj(obj); @@ -64,6 +66,65 @@ static int virtio_gpu_vram_mmap(struct drm_gem_object *obj, return ret; } +struct sg_table *virtio_gpu_vram_map_dma_buf(struct virtio_gpu_object *bo, + struct device *dev, + enum dma_data_direction dir) +{ + struct virtio_gpu_device *vgdev = bo->base.base.dev->dev_private; + struct virtio_gpu_object_vram *vram = to_virtio_gpu_vram(bo); + struct sg_table *sgt; + dma_addr_t addr; + int ret; + + sgt = kzalloc(sizeof(*sgt), GFP_KERNEL); + if (!sgt) + return ERR_PTR(-ENOMEM); + + if (!(bo->blob_flags & VIRTGPU_BLOB_FLAG_USE_MAPPABLE)) { + // Virtio devices can access the dma-buf via its UUID. Return a stub + // sg_table so the dma-buf API still works. + if (!is_virtio_device(dev) || !vgdev->has_resource_assign_uuid) { + ret = -EIO; + goto out; + } + return sgt; + } + + ret = sg_alloc_table(sgt, 1, GFP_KERNEL); + if (ret) + goto out; + + addr = dma_map_resource(dev, vram->vram_node.start, + vram->vram_node.size, dir, + DMA_ATTR_SKIP_CPU_SYNC); + ret = dma_mapping_error(dev, addr); + if (ret) + goto out; + + sg_set_page(sgt->sgl, NULL, vram->vram_node.size, 0); + sg_dma_address(sgt->sgl) = addr; + sg_dma_len(sgt->sgl) = vram->vram_node.size; + + return sgt; +out: + sg_free_table(sgt); + kfree(sgt); + return ERR_PTR(ret); +} + +void virtio_gpu_vram_unmap_dma_buf(struct device *dev, + struct sg_table *sgt, + enum dma_data_direction dir) +{ + if (sgt->nents) { + dma_unmap_resource(dev, sg_dma_address(sgt->sgl), + sg_dma_len(sgt->sgl), dir, + DMA_ATTR_SKIP_CPU_SYNC); + } + sg_free_table(sgt); + kfree(sgt); +} + static const struct drm_gem_object_funcs virtio_gpu_vram_funcs = { .open = virtio_gpu_gem_object_open, .close = virtio_gpu_gem_object_close, -- 2.32.0.402.g57bb445576-goog

2 1

[PATCH 1/3] Revert "drm/i915: allow DG1 autoprobe for CONFIG_BROKEN"
by Maarten Lankhorst 12 Aug '21

12 Aug '21

This reverts commit fae352efb12196e7110f98bc1297ce533472764d. Inside core-for-CI, reverting to make next patch apply cleanly. --- drivers/gpu/drm/i915/i915_pci.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c index 2c1cb9b6b556..1bbd09ad5287 100644 --- a/drivers/gpu/drm/i915/i915_pci.c +++ b/drivers/gpu/drm/i915/i915_pci.c @@ -1115,9 +1115,6 @@ static const struct pci_device_id pciidlist[] = { INTEL_RKL_IDS(&rkl_info), INTEL_ADLS_IDS(&adl_s_info), INTEL_ADLP_IDS(&adl_p_info), -#if IS_ENABLED(CONFIG_DRM_I915_UNSTABLE_FAKE_LMEM) - INTEL_DG1_IDS(&dg1_info), -#endif {0, 0, 0} }; MODULE_DEVICE_TABLE(pci, pciidlist); -- 2.32.0

1 2

← Newer
1
...
52
53
54
55
56
57
58
...
77
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel August 2021