Thomas Zimmermann
9cf26c8968
Merge drm/drm-next into drm-misc-next
...
Backmerging to pick up fixes from amdgpu.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de >
2022-08-01 16:04:00 +02:00
Ben Skeggs
889fcbe949
drm/nouveau/disp: add common channel class handling
...
Replaces a bunch of unnecessarily duplicated boilerplate in per-chipset
code with a simpler, common, implementation.
Channel "awaken" notify code is completely gone for now. KMS has never
made use of it so far, and event notify handling is about to be changed
in general anyway.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com >
Reviewed-by: Lyude Paul <lyude@redhat.com >
Signed-off-by: Dave Airlie <airlied@redhat.com >
2022-07-27 09:05:48 +10:00
Thomas Zimmermann
cce32e4e38
drm/atomic-helper: Remove _HELPER_ infix from DRM_PLANE_HELPER_NO_SCALING
...
Rename DRM_PLANE_HELPER_NO_SCALING to DRM_PLANE_NO_SCALING. The constant
is not really a helper, but rather a characteristic of the plane itself.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de >
Reviewed-by: Sam Ravnborg <sam@ravnborg.org >
Link: https://patchwork.freedesktop.org/patch/msgid/20220720083058.15371-4-tzimmermann@suse.de
2022-07-26 18:42:00 +02:00
Thomas Zimmermann
382fc1f681
drm/atomic-helper: Move DRM_PLANE_HELPER_NO_SCALING to atomic helpers
...
The macro DRM_PLANE_HELPER_NO_SCALING is only useful with the interfaces
in drm_atomic_helper.h, but defined in drm_plane_helper.h. So half of
DRM includes the latter header file for using this macro. Move the macro
and remove the include statements.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de >
Reviewed-by: Sam Ravnborg <sam@ravnborg.org >
Link: https://patchwork.freedesktop.org/patch/msgid/20220720083058.15371-3-tzimmermann@suse.de
2022-07-26 18:41:56 +02:00
Ben Skeggs
5329dbd4a3
drm/nouveau/kms/nv50-: use NVIDIA's headers for wndw scale_set()
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com >
Reviewed-by: Lyude Paul <lyude@redhat.com >
2020-07-24 18:51:00 +10:00
Ben Skeggs
f844eb485e
drm/nouveau/kms/nv50-: use NVIDIA's headers for wndw image_set()
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com >
Reviewed-by: Lyude Paul <lyude@redhat.com >
2020-07-24 18:51:00 +10:00
Ben Skeggs
3afb4db782
drm/nouveau/kms/nv50-: convert wndw update() to new push macros
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com >
Reviewed-by: Lyude Paul <lyude@redhat.com >
2020-07-24 18:50:53 +10:00
Ben Skeggs
0a4693e80d
drm/nouveau/kms/nv50-: convert wndw scale_set() to new push macros
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com >
Reviewed-by: Lyude Paul <lyude@redhat.com >
2020-07-24 18:50:53 +10:00
Ben Skeggs
8944d8b37a
drm/nouveau/kms/nv50-: convert wndw image_clr() to new push macros
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com >
Reviewed-by: Lyude Paul <lyude@redhat.com >
2020-07-24 18:50:53 +10:00
Ben Skeggs
6d6e11e284
drm/nouveau/kms/nv50-: convert wndw image_set() to new push macros
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com >
Reviewed-by: Lyude Paul <lyude@redhat.com >
2020-07-24 18:50:53 +10:00
Ben Skeggs
bcae99c282
drm/nouveau/kms/nv50-: convert wndw ntfy_clr() to new push macros
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com >
Reviewed-by: Lyude Paul <lyude@redhat.com >
2020-07-24 18:50:52 +10:00
Ben Skeggs
fe8a2eec7d
drm/nouveau/kms/nv50-: convert wndw ntfy_set() to new push macros
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com >
Reviewed-by: Lyude Paul <lyude@redhat.com >
2020-07-24 18:50:52 +10:00
Ben Skeggs
f7a7d22ad6
drm/nouveau/nvif: give every notify object a human-readable name
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com >
Reviewed-by: Lyude Paul <lyude@redhat.com >
2020-07-24 18:50:51 +10:00
Nirmoy Das
0dc9b286b8
drm/nouveau: don't use ttm bo->offset v3
...
Store ttm bo->offset in struct nouveau_bo instead.
Signed-off-by: Nirmoy Das <nirmoy.das@amd.com >
Acked-by: Christian König <christian.koenig@amd.com >
Link: https://patchwork.freedesktop.org/patch/372932/
Signed-off-by: Christian König <christian.koenig@amd.com >
2020-06-26 14:00:41 +02:00
Ilia Mirkin
7c844e9d95
drm/nouveau/kms/nv50-: remove overlay alpha formats
...
The overlay logic can only do colorkey-based selection, not
alpha-blending.
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu >
Signed-off-by: Ben Skeggs <bskeggs@redhat.com >
2019-08-23 12:55:32 +10:00
Sam Ravnborg
c587cd6fc8
drm/nouveau: drop drmP.h from nouveau_drv.h
...
Drop the deprecated drmP.h header from nouveau_drv.h.
Fix fallout in other parts of the driver.
Build tested using allmodconfig and allyesconfig.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org >
Cc: Ben Skeggs <bskeggs@redhat.com >
Cc: nouveau@lists.freedesktop.org
Signed-off-by: Ben Skeggs <bskeggs@redhat.com >
2019-08-23 12:55:30 +10:00
Ben Skeggs
2ce7f38629
drm/nouveau/kms/nv50-: initial overlay support
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com >
2018-05-18 15:01:31 +10:00
Ben Skeggs
53e0a3e70d
drm/nouveau/kms/nv50-: simplify tracking of channel interlocks
...
Instead of windows returning their core channel interlock mask if they
know core has been modified, it's recorded unconditionally and used if
required when update methods are emitted.
This will be required to support Volta.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com >
2018-05-18 15:01:29 +10:00
Ben Skeggs
9d6c2fe191
drm/nouveau/kms/nv50-: allow specification of valid heads for a window
...
This will be required to support Volta, where window ID != head.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com >
2018-05-18 15:01:28 +10:00
Ben Skeggs
1590700d94
drm/nouveau/kms/nv50-: split each resource type into their own source files
...
There should be no code changes here, just shuffling stuff around.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com >
2018-05-18 15:01:28 +10:00