| Message ID | 20240104160301.185915-8-jfalempe@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/panic: Add a drm panic handler | expand |
Hi Am 04.01.24 um 17:00 schrieb Jocelyn Falempe: > Add support for the drm_panic module, which displays a message to > the screen when a kernel panic occurs. > > v5: > * Also check that the plane is visible and primary. (Thomas Zimmermann) > > v7: > * use drm_for_each_primary_visible_plane() > > Signed-off-by: Jocelyn Falempe <jfalempe@redhat.com> > --- > drivers/gpu/drm/mgag200/mgag200_drv.c | 22 ++++++++++++++++++++++ > 1 file changed, 22 insertions(+) > > diff --git a/drivers/gpu/drm/mgag200/mgag200_drv.c b/drivers/gpu/drm/mgag200/mgag200_drv.c > index 2fb18b782b05..2bf5918eadc5 100644 > --- a/drivers/gpu/drm/mgag200/mgag200_drv.c > +++ b/drivers/gpu/drm/mgag200/mgag200_drv.c > @@ -13,10 +13,12 @@ > #include <drm/drm_atomic_helper.h> > #include <drm/drm_drv.h> > #include <drm/drm_fbdev_generic.h> > +#include <drm/drm_framebuffer.h> Needs to go below drm_file.h With that fixed: Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de> > #include <drm/drm_file.h> > #include <drm/drm_ioctl.h> > #include <drm/drm_managed.h> > #include <drm/drm_module.h> > +#include <drm/drm_panic.h> > #include <drm/drm_pciids.h> > > #include "mgag200_drv.h" > @@ -84,6 +86,25 @@ resource_size_t mgag200_probe_vram(void __iomem *mem, resource_size_t size) > return offset - 65536; > } > > +static int mgag200_get_scanout_buffer(struct drm_device *dev, > + struct drm_scanout_buffer *sb) > +{ > + struct drm_plane *plane; > + struct mga_device *mdev = to_mga_device(dev); > + struct iosys_map map = IOSYS_MAP_INIT_VADDR_IOMEM(mdev->vram); > + > + /* find the primary and visible plane */ > + drm_for_each_primary_visible_plane(plane, dev) { > + sb->format = plane->state->fb->format; > + sb->width = plane->state->fb->width; > + sb->height = plane->state->fb->height; > + sb->pitch = plane->state->fb->pitches[0]; > + sb->map = map; > + return 0; > + } > + return -ENODEV; > +} > + > /* > * DRM driver > */ > @@ -99,6 +120,7 @@ static const struct drm_driver mgag200_driver = { > .major = DRIVER_MAJOR, > .minor = DRIVER_MINOR, > .patchlevel = DRIVER_PATCHLEVEL, > + .get_scanout_buffer = mgag200_get_scanout_buffer, > DRM_GEM_SHMEM_DRIVER_OPS, > }; >
diff --git a/drivers/gpu/drm/mgag200/mgag200_drv.c b/drivers/gpu/drm/mgag200/mgag200_drv.c index 2fb18b782b05..2bf5918eadc5 100644 --- a/drivers/gpu/drm/mgag200/mgag200_drv.c +++ b/drivers/gpu/drm/mgag200/mgag200_drv.c @@ -13,10 +13,12 @@ #include <drm/drm_atomic_helper.h> #include <drm/drm_drv.h> #include <drm/drm_fbdev_generic.h> +#include <drm/drm_framebuffer.h> #include <drm/drm_file.h> #include <drm/drm_ioctl.h> #include <drm/drm_managed.h> #include <drm/drm_module.h> +#include <drm/drm_panic.h> #include <drm/drm_pciids.h> #include "mgag200_drv.h" @@ -84,6 +86,25 @@ resource_size_t mgag200_probe_vram(void __iomem *mem, resource_size_t size) return offset - 65536; } +static int mgag200_get_scanout_buffer(struct drm_device *dev, + struct drm_scanout_buffer *sb) +{ + struct drm_plane *plane; + struct mga_device *mdev = to_mga_device(dev); + struct iosys_map map = IOSYS_MAP_INIT_VADDR_IOMEM(mdev->vram); + + /* find the primary and visible plane */ + drm_for_each_primary_visible_plane(plane, dev) { + sb->format = plane->state->fb->format; + sb->width = plane->state->fb->width; + sb->height = plane->state->fb->height; + sb->pitch = plane->state->fb->pitches[0]; + sb->map = map; + return 0; + } + return -ENODEV; +} + /* * DRM driver */ @@ -99,6 +120,7 @@ static const struct drm_driver mgag200_driver = { .major = DRIVER_MAJOR, .minor = DRIVER_MINOR, .patchlevel = DRIVER_PATCHLEVEL, + .get_scanout_buffer = mgag200_get_scanout_buffer, DRM_GEM_SHMEM_DRIVER_OPS, };
Add support for the drm_panic module, which displays a message to the screen when a kernel panic occurs. v5: * Also check that the plane is visible and primary. (Thomas Zimmermann) v7: * use drm_for_each_primary_visible_plane() Signed-off-by: Jocelyn Falempe <jfalempe@redhat.com> --- drivers/gpu/drm/mgag200/mgag200_drv.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)