diff options
| author | Dave Airlie <airlied@redhat.com> | 2024-04-19 10:22:22 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2024-04-19 10:22:28 +1000 |
| commit | 5493bf2d0f4a1e6dcad9267bc989229d60c93e76 (patch) | |
| tree | 57ad98f85a6250010bd50593f6a07fd199da1585 /drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | |
| parent | 58292f516b1d700d4310ec51ea33fb501170da1c (diff) | |
| parent | 941c0bdbc176df825adf77052263b2d63db6fef7 (diff) | |
| download | linux-stable-5493bf2d0f4a1e6dcad9267bc989229d60c93e76.tar.gz linux-stable-5493bf2d0f4a1e6dcad9267bc989229d60c93e76.tar.bz2 linux-stable-5493bf2d0f4a1e6dcad9267bc989229d60c93e76.zip | |
Merge tag 'drm-misc-fixes-2024-04-18' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-fixes
Short summary of fixes pull:
nouveau:
- dp: Don't probe DP ports twice
- nv04: Fix OOB access
- nv50: Disable AUX bus for disconnected DP ports
- nvkm: Fix race condition
panel:
- Don't unregister DSI devices in several drivers
ttm:
- Stop pooling cached NUMA pages
v3d:
- Fix enabled_ns increment
vmwgfx:
- Fix PRIME import/export
- Fix CRTC's atomic check for primary planes
- Sort plane formats by preference
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20240418072229.GA8983@localhost.localdomain
Diffstat (limited to 'drivers/gpu/drm/vmwgfx/vmwgfx_kms.h')
| -rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h index a94947b588e8..19a843da87b7 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h @@ -243,10 +243,10 @@ struct vmw_framebuffer_bo { static const uint32_t __maybe_unused vmw_primary_plane_formats[] = { - DRM_FORMAT_XRGB1555, - DRM_FORMAT_RGB565, DRM_FORMAT_XRGB8888, DRM_FORMAT_ARGB8888, + DRM_FORMAT_RGB565, + DRM_FORMAT_XRGB1555, }; static const uint32_t __maybe_unused vmw_cursor_plane_formats[] = { |