dri-devel February 2021

dri-devel@lists.freedesktop.org

314 participants
684 discussions

[PATCH v2] drm: DRM_FOURCC_STANDALONE macro support
by James Park 08 Feb '21

08 Feb '21

Use DRM_FOURCC_STANDALONE to include drm_fourcc.h without drm.h. Copy type definitions from drm.h to drm_fourcc.h, and wrap with DRM_BASIC_TYPED_DEFINED to avoid redundant inclusion. This will allow code to avoid unnecessary definitions. Signed-off-by: James Park <jpark37(a)lagfreegames.com> Acked-by: Simon Ser <contact(a)emersion.fr> --- Add Acked-by line to the commit description. include/uapi/drm/drm.h | 35 ++++++++++++++++++++++++++++------- include/uapi/drm/drm_fourcc.h | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 7 deletions(-) diff --git a/include/uapi/drm/drm.h b/include/uapi/drm/drm.h index 808b48a..5640062 100644 --- a/include/uapi/drm/drm.h +++ b/include/uapi/drm/drm.h @@ -36,23 +36,25 @@ #ifndef _DRM_H_ #define _DRM_H_ +/** + * DRM_BASIC_TYPES_DEFINED section exists in both drm.h and drm_fourcc.h files. + * Do not modify the section in one file without updating the other! + */ + +#ifndef DRM_BASIC_TYPES_DEFINED +#define DRM_BASIC_TYPES_DEFINED + #if defined(__KERNEL__) #include <linux/types.h> -#include <asm/ioctl.h> -typedef unsigned int drm_handle_t; #elif defined(__linux__) #include <linux/types.h> -#include <asm/ioctl.h> -typedef unsigned int drm_handle_t; -#else /* One of the BSDs */ +#else /* Not Linux */ #include <stdint.h> -#include <sys/ioccom.h> -#include <sys/types.h> typedef int8_t __s8; typedef uint8_t __u8; typedef int16_t __s16; @@ -62,6 +64,25 @@ typedef uint32_t __u32; typedef int64_t __s64; typedef uint64_t __u64; typedef size_t __kernel_size_t; + +#endif + +#endif /* DRM_BASIC_TYPES_DEFINED */ + +#if defined(__KERNEL__) + +#include <asm/ioctl.h> +typedef unsigned int drm_handle_t; + +#elif defined(__linux__) + +#include <asm/ioctl.h> +typedef unsigned int drm_handle_t; + +#else /* One of the BSDs */ + +#include <sys/ioccom.h> +#include <sys/types.h> typedef unsigned long drm_handle_t; #endif diff --git a/include/uapi/drm/drm_fourcc.h b/include/uapi/drm/drm_fourcc.h index 723c8e2..5e5f4cf 100644 --- a/include/uapi/drm/drm_fourcc.h +++ b/include/uapi/drm/drm_fourcc.h @@ -24,7 +24,42 @@ #ifndef DRM_FOURCC_H #define DRM_FOURCC_H +/** + * DRM_BASIC_TYPES_DEFINED section exists in both drm.h and drm_fourcc.h files. + * Do not modify the section in one file without updating the other! + */ + +#ifndef DRM_BASIC_TYPES_DEFINED +#define DRM_BASIC_TYPES_DEFINED + +#if defined(__KERNEL__) + +#include <linux/types.h> + +#elif defined(__linux__) + +#include <linux/types.h> + +#else /* Not Linux */ + +#include <stdint.h> +typedef int8_t __s8; +typedef uint8_t __u8; +typedef int16_t __s16; +typedef uint16_t __u16; +typedef int32_t __s32; +typedef uint32_t __u32; +typedef int64_t __s64; +typedef uint64_t __u64; +typedef size_t __kernel_size_t; + +#endif + +#endif /* DRM_BASIC_TYPES_DEFINED */ + +#ifndef DRM_FOURCC_STANDALONE #include "drm.h" +#endif #if defined(__cplusplus) extern "C" { -- 2.7.4

1 0

[PATCH] drm/amdgpu: fix potential integer overflow on shift of a int
by Colin King 08 Feb '21

08 Feb '21

From: Colin Ian King <colin.king(a)canonical.com> The left shift of int 32 bit integer constant 1 is evaluated using 32 bit arithmetic and then assigned to an unsigned 64 bit integer. In the case where *frag is 32 or more this can lead to an oveflow. Avoid this by shifting 1ULL. Addresses-Coverity: ("Unintentional integer overflow") Fixes: dfcd99f6273e ("drm/amdgpu: meld together VM fragment and huge page handling") Signed-off-by: Colin Ian King <colin.king(a)canonical.com> --- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c index 9d19078246c8..53a925600510 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c @@ -1412,7 +1412,7 @@ static void amdgpu_vm_fragment(struct amdgpu_vm_update_params *params, *frag = max_frag; *frag_end = end & ~((1ULL << max_frag) - 1); } else { - *frag_end = start + (1 << *frag); + *frag_end = start + (1ULL << *frag); } } -- 2.29.2

3 4

[PATCH 0/2] drm/amd/display: some backlight fixes
by Takashi Iwai 08 Feb '21

08 Feb '21

Hi, here are two patches handling the issues in the backlight control. The first one is to fix the sysfs brightness read for devices with the backlight controlled by aux channel. The second one is to add a new module option, aux_backlight, to forcibly enable/disable the aux channel backlight control. It's no direct solution for the bug we've hit, but it gives at least a workaround. BugLink: https://bugzilla.opensuse.org/show_bug.cgi?id=1180749 BugLink: https://gitlab.freedesktop.org/drm/amd/-/issues/1438 thanks, Takashi === Takashi Iwai (2): drm/amd/display: Fix the brightness read via aux drm/amd/display: Add aux_backlight module option drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 4 ++++ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 20 ++++++++++++++++++- 3 files changed, 24 insertions(+), 1 deletion(-) -- 2.26.2

3 7

[PATCH] drm/vboxvideo: Vmap/vunmap cursor BO in prepare_fb and cleanup_fb
by Thomas Zimmermann 08 Feb '21

08 Feb '21

Functions in the atomic commit tail are not allowed to acquire the dmabuf's reservation lock. So we cannot legally call the GEM object's vmap functionality in atomic_update. Instead vmap the cursor BO in prepare_fb and vunmap it in cleanup_fb. The cursor plane state stores the mapping's address. The pinning of the BO is implicitly done by vmap. As an extra benefit, there's no source of runtime errors left in atomic_update. Signed-off-by: Thomas Zimmermann <tzimmermann(a)suse.de> --- drivers/gpu/drm/vboxvideo/vbox_mode.c | 102 +++++++++++++++++++++----- 1 file changed, 82 insertions(+), 20 deletions(-) diff --git a/drivers/gpu/drm/vboxvideo/vbox_mode.c b/drivers/gpu/drm/vboxvideo/vbox_mode.c index dbc0dd53c69e..b5625a7d6cef 100644 --- a/drivers/gpu/drm/vboxvideo/vbox_mode.c +++ b/drivers/gpu/drm/vboxvideo/vbox_mode.c @@ -324,6 +324,19 @@ static void vbox_primary_atomic_disable(struct drm_plane *plane, old_state->src_y >> 16); } +struct vbox_cursor_plane_state { + struct drm_plane_state base; + + /* Transitional state - do not export or duplicate */ + + struct dma_buf_map map; +}; + +static struct vbox_cursor_plane_state *to_vbox_cursor_plane_state(struct drm_plane_state *state) +{ + return container_of(state, struct vbox_cursor_plane_state, base); +} + static int vbox_cursor_atomic_check(struct drm_plane *plane, struct drm_plane_state *new_state) { @@ -381,14 +394,13 @@ static void vbox_cursor_atomic_update(struct drm_plane *plane, container_of(plane->dev, struct vbox_private, ddev); struct vbox_crtc *vbox_crtc = to_vbox_crtc(plane->state->crtc); struct drm_framebuffer *fb = plane->state->fb; - struct drm_gem_vram_object *gbo = drm_gem_vram_of_gem(fb->obj[0]); u32 width = plane->state->crtc_w; u32 height = plane->state->crtc_h; + struct vbox_cursor_plane_state *vbox_state = to_vbox_cursor_plane_state(plane->state); + struct dma_buf_map map = vbox_state->map; + u8 *src = map.vaddr; /* TODO: Use mapping abstraction properly */ size_t data_size, mask_size; u32 flags; - struct dma_buf_map map; - int ret; - u8 *src; /* * VirtualBox uses the host windowing system to draw the cursor so @@ -401,17 +413,6 @@ static void vbox_cursor_atomic_update(struct drm_plane *plane, vbox_crtc->cursor_enabled = true; - ret = drm_gem_vram_vmap(gbo, &map); - if (ret) { - /* - * BUG: we should have pinned the BO in prepare_fb(). - */ - mutex_unlock(&vbox->hw_mutex); - DRM_WARN("Could not map cursor bo, skipping update\n"); - return; - } - src = map.vaddr; /* TODO: Use mapping abstraction properly */ - /* * The mask must be calculated based on the alpha * channel, one bit per ARGB word, and must be 32-bit @@ -421,7 +422,6 @@ static void vbox_cursor_atomic_update(struct drm_plane *plane, data_size = width * height * 4 + mask_size; copy_cursor_image(src, vbox->cursor_data, width, height, mask_size); - drm_gem_vram_vunmap(gbo, &map); flags = VBOX_MOUSE_POINTER_VISIBLE | VBOX_MOUSE_POINTER_SHAPE | VBOX_MOUSE_POINTER_ALPHA; @@ -458,6 +458,43 @@ static void vbox_cursor_atomic_disable(struct drm_plane *plane, mutex_unlock(&vbox->hw_mutex); } +static int vbox_cursor_prepare_fb(struct drm_plane *plane, struct drm_plane_state *new_state) +{ + struct vbox_cursor_plane_state *new_vbox_state = to_vbox_cursor_plane_state(new_state); + struct drm_framebuffer *fb = new_state->fb; + struct drm_gem_vram_object *gbo; + struct dma_buf_map map; + int ret; + + if (!fb) + return 0; + + gbo = drm_gem_vram_of_gem(fb->obj[0]); + + ret = drm_gem_vram_vmap(gbo, &map); + if (ret) + return ret; + + new_vbox_state->map = map; + + return 0; +} + +static void vbox_cursor_cleanup_fb(struct drm_plane *plane, struct drm_plane_state *old_state) +{ + struct vbox_cursor_plane_state *old_vbox_state = to_vbox_cursor_plane_state(old_state); + struct drm_framebuffer *fb = old_state->fb; + struct dma_buf_map map = old_vbox_state->map; + struct drm_gem_vram_object *gbo; + + if (!fb) + return; + + gbo = drm_gem_vram_of_gem(fb->obj[0]); + + drm_gem_vram_vunmap(gbo, &map); +} + static const u32 vbox_cursor_plane_formats[] = { DRM_FORMAT_ARGB8888, }; @@ -466,17 +503,42 @@ static const struct drm_plane_helper_funcs vbox_cursor_helper_funcs = { .atomic_check = vbox_cursor_atomic_check, .atomic_update = vbox_cursor_atomic_update, .atomic_disable = vbox_cursor_atomic_disable, - .prepare_fb = drm_gem_vram_plane_helper_prepare_fb, - .cleanup_fb = drm_gem_vram_plane_helper_cleanup_fb, + .prepare_fb = vbox_cursor_prepare_fb, + .cleanup_fb = vbox_cursor_cleanup_fb, }; +static struct drm_plane_state *vbox_cursor_atomic_duplicate_state(struct drm_plane *plane) +{ + struct vbox_cursor_plane_state *new_vbox_state; + struct drm_device *dev = plane->dev; + + if (drm_WARN_ON(dev, !plane->state)) + return NULL; + + new_vbox_state = kzalloc(sizeof(*new_vbox_state), GFP_KERNEL); + if (!new_vbox_state) + return NULL; + __drm_atomic_helper_plane_duplicate_state(plane, &new_vbox_state->base); + + return &new_vbox_state->base; +} + +static void vbox_cursor_atomic_destroy_state(struct drm_plane *plane, + struct drm_plane_state *state) +{ + struct vbox_cursor_plane_state *vbox_state = to_vbox_cursor_plane_state(state); + + __drm_atomic_helper_plane_destroy_state(&vbox_state->base); + kfree(vbox_state); +} + static const struct drm_plane_funcs vbox_cursor_plane_funcs = { .update_plane = drm_atomic_helper_update_plane, .disable_plane = drm_atomic_helper_disable_plane, .destroy = drm_primary_helper_destroy, .reset = drm_atomic_helper_plane_reset, - .atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state, - .atomic_destroy_state = drm_atomic_helper_plane_destroy_state, + .atomic_duplicate_state = vbox_cursor_atomic_duplicate_state, + .atomic_destroy_state = vbox_cursor_atomic_destroy_state, }; static const u32 vbox_primary_plane_formats[] = { base-commit: 3836b7fdfad40e2bac5dc882332f42bed6942cf4 prerequisite-patch-id: c2b2f08f0eccc9f5df0c0da49fa1d36267deb11d -- 2.30.0

3 7

linux-firmware for Qualcomm SM8250 platforms
by Dmitry Baryshkov 08 Feb '21

08 Feb '21

Hello linux-firmware maintainers, We'd like to submit firmware for Qualcomm SM8250-based platforms. Firmware successfully tested on Qualcomm Robotics RB5 platform. The following changes since commit d5288624259300c558480c21a860fcf94187d29d: brcm: Add NVRAM for Vamrs 96boards Rock960 (2021-01-09 07:31:33 -0500) are available in the Git repository at: https://github.com/lumag/linux-firmware qcom-rb5 for you to fetch changes up to df822a848cceb185d2d50a39140ba0c9cd9f33e9:: qcom: Add venus firmware files for VPU-1.0 (2021-01-23 01:10:05 +0300) ---------------------------------------------------------------- Dmitry Baryshkov (4): qcom: add firmware files for Adreno a650 qcom: Add SM8250 Audio DSP firmware qcom: Add SM8250 Compute DSP firmware qcom: Add venus firmware files for VPU-1.0 WHENCE | 26 ++++++++++++++++++++++++++ qcom/a650_gmu.bin | Bin 0 -> 41548 bytes qcom/a650_sqe.fw | Bin 0 -> 31488 bytes qcom/sm8250/a650_zap.mbn | Bin 0 -> 13964 bytes qcom/sm8250/adsp.mbn | Bin 0 -> 15515796 bytes qcom/sm8250/adspr.jsn | 21 +++++++++++++++++++++ qcom/sm8250/adspua.jsn | 27 +++++++++++++++++++++++++++ qcom/sm8250/cdsp.mbn | Bin 0 -> 5822228 bytes qcom/sm8250/cdspr.jsn | 21 +++++++++++++++++++++ qcom/vpu-1.0/venus.b00 | Bin 0 -> 692 bytes qcom/vpu-1.0/venus.b01 | Bin 0 -> 7528 bytes qcom/vpu-1.0/venus.b02 | Bin 0 -> 300 bytes qcom/vpu-1.0/venus.b03 | Bin 0 -> 20 bytes qcom/vpu-1.0/venus.b04 | Bin 0 -> 20 bytes qcom/vpu-1.0/venus.b05 | Bin 0 -> 20 bytes qcom/vpu-1.0/venus.b06 | Bin 0 -> 20 bytes qcom/vpu-1.0/venus.b07 | Bin 0 -> 24 bytes qcom/vpu-1.0/venus.b08 | Bin 0 -> 16 bytes qcom/vpu-1.0/venus.b09 | Bin 0 -> 883152 bytes qcom/vpu-1.0/venus.b10 | Bin 0 -> 41360 bytes qcom/vpu-1.0/venus.b19 | 1 + qcom/vpu-1.0/venus.mbn | Bin 0 -> 1973540 bytes qcom/vpu-1.0/venus.mdt | Bin 0 -> 8220 bytes 23 files changed, 96 insertions(+) create mode 100644 qcom/a650_gmu.bin create mode 100644 qcom/a650_sqe.fw create mode 100644 qcom/sm8250/a650_zap.mbn create mode 100644 qcom/sm8250/adsp.mbn create mode 100644 qcom/sm8250/adspr.jsn create mode 100644 qcom/sm8250/adspua.jsn create mode 100644 qcom/sm8250/cdsp.mbn create mode 100644 qcom/sm8250/cdspr.jsn create mode 100644 qcom/vpu-1.0/venus.b00 create mode 100644 qcom/vpu-1.0/venus.b01 create mode 100644 qcom/vpu-1.0/venus.b02 create mode 100644 qcom/vpu-1.0/venus.b03 create mode 100644 qcom/vpu-1.0/venus.b04 create mode 100644 qcom/vpu-1.0/venus.b05 create mode 100644 qcom/vpu-1.0/venus.b06 create mode 100644 qcom/vpu-1.0/venus.b07 create mode 100644 qcom/vpu-1.0/venus.b08 create mode 100644 qcom/vpu-1.0/venus.b09 create mode 100644 qcom/vpu-1.0/venus.b10 create mode 100644 qcom/vpu-1.0/venus.b19 create mode 100644 qcom/vpu-1.0/venus.mbn create mode 100644 qcom/vpu-1.0/venus.mdt -- With best wishes Dmitry

2 1

linux-next: build warning after merge of the drm-misc tree
by Stephen Rothwell 08 Feb '21

08 Feb '21

Hi all, After merging the drm-misc tree, today's linux-next build (htmldocs) produced this warning: include/drm/gpu_scheduler.h:304: warning: Function parameter or member '_score' not described in 'drm_gpu_scheduler' Introduced by commit f2f12eb9c32b ("drm/scheduler: provide scheduler score externally") -- Cheers, Stephen Rothwell

1 0

[PATCH v3 0/7] drm: Move vmap out of commit tail for SHMEM-based drivers
by Thomas Zimmermann 08 Feb '21

08 Feb '21

Several SHMEM-based drivers use the BO as shadow buffer for the real framebuffer memory. Damage handling requires a vmap of the BO memory. But vmap/vunmap can acquire the dma-buf reservation lock, which is not allowed in commit tails. This patchset introduces a set of helpers that implement vmap/vunmap in the plane's prepare_fb and cleanup_fb; and provide the mapping's address to commit-tail functions. Wrappers for simple KMS are provides, as all of the involved drivers are built upon simple-KMS helpers. All patches have been acked already. v3 only fixes a few typos in the documentation. Patch 1 adds the support for private plane state to the simple-KMS helper library. Patches 2 and 3 provide plane state for shadow-buffered planes. It's a DRM plane with BO mappings into kernel address space. The involved helpers take care of the details. The code is independent from GEM SHMEM and can be used with other shadow-buffered planes. I put all this in a new file. In a later patch, drm_gem_fb_prepare_fb() et al could be moved there as well. Patches 4 to 7 convert each involved driver to the new helpers. The vmap operations are being removed from commit-tail functions. An additional benefit is that vmap errors are now detected before the commit starts. The original commit-tail functions could not handle failed vmap operations. I smoke-tested the code by running fbdev, Xorg and weston with the converted mgag200 driver. v3: * documentation fixes v2: * export drm_gem_vmap()/_vunmap() (kernel test robot) * make duplicate_state interface compatible with struct drm_plane_funcs Thomas Zimmermann (7): drm/simple-kms: Add plane-state helpers drm/gem: Export drm_gem_vmap() and drm_gem_vunmap() drm: Add additional atomic helpers for shadow-buffered planes drm/mgag200: Move vmap out of commit tail drm/cirrus: Move vmap out of commit tail drm/gm12u320: Move vmap out of commit tail drm/udl: Move vmap out of commit tail Documentation/gpu/drm-kms-helpers.rst | 12 ++ drivers/gpu/drm/Makefile | 3 +- drivers/gpu/drm/drm_gem.c | 2 + drivers/gpu/drm/drm_gem_atomic_helper.c | 208 ++++++++++++++++++++++++ drivers/gpu/drm/drm_simple_kms_helper.c | 40 ++++- drivers/gpu/drm/mgag200/mgag200_mode.c | 23 +-- drivers/gpu/drm/tiny/cirrus.c | 43 ++--- drivers/gpu/drm/tiny/gm12u320.c | 28 ++-- drivers/gpu/drm/udl/udl_modeset.c | 34 ++-- include/drm/drm_gem_atomic_helper.h | 73 +++++++++ include/drm/drm_simple_kms_helper.h | 27 +++ 11 files changed, 412 insertions(+), 81 deletions(-) create mode 100644 drivers/gpu/drm/drm_gem_atomic_helper.c create mode 100644 include/drm/drm_gem_atomic_helper.h base-commit: efb1b1293b064512f7c47537e35ad14a05a05c84 prerequisite-patch-id: c2b2f08f0eccc9f5df0c0da49fa1d36267deb11d -- 2.30.0

1 7

Re: module loader dead code removal and cleanups v3
by Jessica Yu 08 Feb '21

08 Feb '21

+++ Christoph Hellwig [02/02/21 13:13 +0100]: >Hi all, > >this series removes support for long term unused export types and >cleans up various loose ends in the module loader. > >Changes since v2: > - clean up klp_find_object_symbol a bit > - remove the now unused module_assert_mutex helper > >Changes since v1: > - move struct symsearch to module.c > - rework drm to not call find_module at all > - allow RCU-sched locking for find_module > - keep find_module as a public API instead of module_loaded > - update a few comments and commit logs > >Diffstat: Queued on modules-next (along with the updated patch 10). Thanks everyone, Jessica

1 0

[PATCH] drm: DRM_FOURCC_STANDALONE macro support
by James Park 08 Feb '21

08 Feb '21

Use DRM_FOURCC_STANDALONE to include drm_fourcc.h without drm.h. Copy type definitions from drm.h to drm_fourcc.h, and wrap with DRM_BASIC_TYPED_DEFINED to avoid redundant inclusion. This will allow code to avoid unnecessary definitions. Signed-off-by: James Park <jpark37(a)lagfreegames.com> --- include/uapi/drm/drm.h | 35 ++++++++++++++++++++++++++++------- include/uapi/drm/drm_fourcc.h | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 7 deletions(-) diff --git a/include/uapi/drm/drm.h b/include/uapi/drm/drm.h index 808b48a..5640062 100644 --- a/include/uapi/drm/drm.h +++ b/include/uapi/drm/drm.h @@ -36,23 +36,25 @@ #ifndef _DRM_H_ #define _DRM_H_ +/** + * DRM_BASIC_TYPES_DEFINED section exists in both drm.h and drm_fourcc.h files. + * Do not modify the section in one file without updating the other! + */ + +#ifndef DRM_BASIC_TYPES_DEFINED +#define DRM_BASIC_TYPES_DEFINED + #if defined(__KERNEL__) #include <linux/types.h> -#include <asm/ioctl.h> -typedef unsigned int drm_handle_t; #elif defined(__linux__) #include <linux/types.h> -#include <asm/ioctl.h> -typedef unsigned int drm_handle_t; -#else /* One of the BSDs */ +#else /* Not Linux */ #include <stdint.h> -#include <sys/ioccom.h> -#include <sys/types.h> typedef int8_t __s8; typedef uint8_t __u8; typedef int16_t __s16; @@ -62,6 +64,25 @@ typedef uint32_t __u32; typedef int64_t __s64; typedef uint64_t __u64; typedef size_t __kernel_size_t; + +#endif + +#endif /* DRM_BASIC_TYPES_DEFINED */ + +#if defined(__KERNEL__) + +#include <asm/ioctl.h> +typedef unsigned int drm_handle_t; + +#elif defined(__linux__) + +#include <asm/ioctl.h> +typedef unsigned int drm_handle_t; + +#else /* One of the BSDs */ + +#include <sys/ioccom.h> +#include <sys/types.h> typedef unsigned long drm_handle_t; #endif diff --git a/include/uapi/drm/drm_fourcc.h b/include/uapi/drm/drm_fourcc.h index 723c8e2..5e5f4cf 100644 --- a/include/uapi/drm/drm_fourcc.h +++ b/include/uapi/drm/drm_fourcc.h @@ -24,7 +24,42 @@ #ifndef DRM_FOURCC_H #define DRM_FOURCC_H +/** + * DRM_BASIC_TYPES_DEFINED section exists in both drm.h and drm_fourcc.h files. + * Do not modify the section in one file without updating the other! + */ + +#ifndef DRM_BASIC_TYPES_DEFINED +#define DRM_BASIC_TYPES_DEFINED + +#if defined(__KERNEL__) + +#include <linux/types.h> + +#elif defined(__linux__) + +#include <linux/types.h> + +#else /* Not Linux */ + +#include <stdint.h> +typedef int8_t __s8; +typedef uint8_t __u8; +typedef int16_t __s16; +typedef uint16_t __u16; +typedef int32_t __s32; +typedef uint32_t __u32; +typedef int64_t __s64; +typedef uint64_t __u64; +typedef size_t __kernel_size_t; + +#endif + +#endif /* DRM_BASIC_TYPES_DEFINED */ + +#ifndef DRM_FOURCC_STANDALONE #include "drm.h" +#endif #if defined(__cplusplus) extern "C" { -- 2.7.4

3 2

Patch "drm/dp/mst: Export drm_dp_get_vc_payload_bw()" has been added to the 5.10-stable tree
by gregkh＠linuxfoundation.org 08 Feb '21

08 Feb '21

This is a note to let you know that I've just added the patch titled drm/dp/mst: Export drm_dp_get_vc_payload_bw() to the 5.10-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=sum… The filename of the patch is: drm-dp-mst-export-drm_dp_get_vc_payload_bw.patch and it can be found in the queue-5.10 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable(a)vger.kernel.org> know about it. >From 83404d581471775f37f85e5261ec0d09407d8bed Mon Sep 17 00:00:00 2001 From: Imre Deak <imre.deak(a)intel.com> Date: Mon, 25 Jan 2021 19:36:35 +0200 Subject: drm/dp/mst: Export drm_dp_get_vc_payload_bw() From: Imre Deak <imre.deak(a)intel.com> commit 83404d581471775f37f85e5261ec0d09407d8bed upstream. This function will be needed by the next patch where the driver calculates the BW based on driver specific parameters, so export it. At the same time sanitize the function params, passing the more natural link rate instead of the encoding of the same rate. v2: - Fix function documentation. (Lyude) Cc: Lyude Paul <lyude(a)redhat.com> Cc: Ville Syrjala <ville.syrjala(a)intel.com> Cc: <stable(a)vger.kernel.org> Cc: dri-devel(a)lists.freedesktop.org Signed-off-by: Imre Deak <imre.deak(a)intel.com> Reviewed-by: Lyude Paul <lyude(a)redhat.com> Link: https://patchwork.freedesktop.org/patch/msgid/20210125173636.1733812-1-imre… (cherry picked from commit a321fc2b4e60fc1b39517d26c8104351636a6062) Signed-off-by: Jani Nikula <jani.nikula(a)intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/gpu/drm/drm_dp_mst_topology.c | 24 ++++++++++++++++++------ include/drm/drm_dp_mst_helper.h | 1 + 2 files changed, 19 insertions(+), 6 deletions(-) --- a/drivers/gpu/drm/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/drm_dp_mst_topology.c @@ -3629,14 +3629,26 @@ static int drm_dp_send_up_ack_reply(stru return 0; } -static int drm_dp_get_vc_payload_bw(u8 dp_link_bw, u8 dp_link_count) +/** + * drm_dp_get_vc_payload_bw - get the VC payload BW for an MST link + * @link_rate: link rate in 10kbits/s units + * @link_lane_count: lane count + * + * Calculate the total bandwidth of a MultiStream Transport link. The returned + * value is in units of PBNs/(timeslots/1 MTP). This value can be used to + * convert the number of PBNs required for a given stream to the number of + * timeslots this stream requires in each MTP. + */ +int drm_dp_get_vc_payload_bw(int link_rate, int link_lane_count) { - if (dp_link_bw == 0 || dp_link_count == 0) - DRM_DEBUG_KMS("invalid link bandwidth in DPCD: %x (link count: %d)\n", - dp_link_bw, dp_link_count); + if (link_rate == 0 || link_lane_count == 0) + DRM_DEBUG_KMS("invalid link rate/lane count: (%d / %d)\n", + link_rate, link_lane_count); - return dp_link_bw * dp_link_count / 2; + /* See DP v2.0 2.6.4.2, VCPayload_Bandwidth_for_OneTimeSlotPer_MTP_Allocation */ + return link_rate * link_lane_count / 54000; } +EXPORT_SYMBOL(drm_dp_get_vc_payload_bw); /** * drm_dp_read_mst_cap() - check whether or not a sink supports MST @@ -3692,7 +3704,7 @@ int drm_dp_mst_topology_mgr_set_mst(stru goto out_unlock; } - mgr->pbn_div = drm_dp_get_vc_payload_bw(mgr->dpcd[1], + mgr->pbn_div = drm_dp_get_vc_payload_bw(drm_dp_bw_code_to_link_rate(mgr->dpcd[1]), mgr->dpcd[2] & DP_MAX_LANE_COUNT_MASK); if (mgr->pbn_div == 0) { ret = -EINVAL; --- a/include/drm/drm_dp_mst_helper.h +++ b/include/drm/drm_dp_mst_helper.h @@ -783,6 +783,7 @@ drm_dp_mst_detect_port(struct drm_connec struct edid *drm_dp_mst_get_edid(struct drm_connector *connector, struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port); +int drm_dp_get_vc_payload_bw(int link_rate, int link_lane_count); int drm_dp_calc_pbn_mode(int clock, int bpp, bool dsc); Patches currently in stable-queue which might be from imre.deak(a)intel.com are queue-5.10/drm-i915-power-up-combo-phy-lanes-for-for-hdmi-as-well.patch queue-5.10/drm-dp-mst-export-drm_dp_get_vc_payload_bw.patch queue-5.10/drm-i915-extract-intel_ddi_power_up_lanes.patch queue-5.10/drm-i915-fix-the-mst-pbn-divider-calculation.patch

1 0

← Newer
1
...
49
50
51
52
53
54
55
...
69
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel February 2021