dri-devel January 2022

dri-devel@lists.freedesktop.org

373 participants
842 discussions

Re: [PATCH 094/120] MIPS: PS2: FB: Frame buffer driver for the PlayStation 2
by Fredrik Noring 29 Jan '22

29 Jan '22

Hi Helge, Thank you for maintaining fbdev! The PlayStation 2 port makes heavy use of it and its acceleration features[1], including tiling operations: info->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_COPYAREA | FBINFO_HWACCEL_FILLRECT | FBINFO_HWACCEL_IMAGEBLIT | FBINFO_HWACCEL_XPAN | FBINFO_HWACCEL_YPAN | FBINFO_HWACCEL_YWRAP | FBINFO_PARTIAL_PAN_OK | FBINFO_READS_FAST; info->flags |= FBINFO_MISC_TILEBLITTING; info->tileops = &tileops; I attempted a DRM port[2], but my impression is that the DRM subsystem has grave problems in that - fbset command timing mode settings are ignored; - attempts to set modes with /sys/class/graphics/fb0/mode are ignored; - /sys/class/graphics/fb0/modes outputs incorrect refresh rates and types; - relevant modes are missing in /sys/class/graphics/fb0/modes; - the standard DRM video modes seem to mix up the sync and front porch timings in struct drm_display_mode but this remains to be confirmed; - the DRM seems to rely heavily on EDID to negotiate a video resolution, but EDID isn't available with vintage analogue display hardware. This is only for a (fast and efficient) text console. My impression is also that the DRM wouldn't do more than displaying a text console, and perhaps an inefficient virtual frame buffer, due to the nature of the Graphics Synthesizer hardware. The complete set of features of the Graphics Synthesizer, and related vector and image processors, seem to go beyond what the DRM subsystem can offer in its current form. I admit that there may possibilities that I haven't seen yet, though. :-) Some background on the Graphics Synthesizer can be found in [3], as well as in official documentation[4][5]. Many of its command primitives are defined in [6][7], and there is more to it with the data paths from various co-processors, etc. Note: The fbdev patch below was, at the time, submitted in a series of 18 patches related to fbdev for PlayStation 2. See the complete ps2fb.c[1]. References: [1] https://github.com/frno7/linux/blob/ps2-main/drivers/video/fbdev/ps2fb.c [2] https://github.com/frno7/linux/tree/ps2-main/drivers/gpu/drm/gs [3] https://github.com/frno7/linux/wiki/The-Graphics-Synthesizer [4] EE User's Manual, version 6.0, Sony Computer Entertainment Inc. [5] GS User's Manual, version 6.0, Sony Computer Entertainment Inc. [6] https://github.com/frno7/linux/blob/ps2-main/arch/mips/include/uapi/asm/gs.h [7] https://github.com/frno7/linux/blob/ps2-main/arch/mips/include/uapi/asm/gif… Fredrik On Sunday, 1 September 2019, Fredrik Noring wrote: > The main limitation is the lack of mmap, since the Graphics Synthesizer > has local frame buffer memory that is not directly accessible from the > main bus. The GS has 4 MiB of local memory. > > The console drawing primitives are synchronous to allow printk at any > time. This is highly useful for debugging but it is not the fastest > possible implementation. The console is nevertheless very fast and > makes use of several hardware accelerated features of the Graphics > Synthesizer. > > The maximum practical resolution is 1920x1080p at 16 bits per pixel that > requires 4147200 bytes of local memory, leaving 47104 bytes for a tiled > font, which at 8x8 pixels and a minimum 4 bits indexed texture palette is > at most 1464 characters. The indexed palette makes switching colours easy. > &struct fb_tile_ops is accelerated with GS texture sprites that are fast > (GS local copy) for the kernel via simple DMA GS commands via the GIF. > > Signed-off-by: Fredrik Noring <noring(a)nocrew.org> > --- > drivers/video/fbdev/Kconfig | 12 + > drivers/video/fbdev/Makefile | 1 + > drivers/video/fbdev/ps2fb.c | 533 +++++++++++++++++++++++++++++++++ > include/linux/console_struct.h | 2 + > include/uapi/linux/fb.h | 1 + > 5 files changed, 549 insertions(+) > create mode 100644 drivers/video/fbdev/ps2fb.c > > diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig > index 6b2de93bd302..cc93cbd67b01 100644 > --- a/drivers/video/fbdev/Kconfig > +++ b/drivers/video/fbdev/Kconfig > @@ -1999,6 +1999,18 @@ config FB_IBM_GXT4500 > doesn't use Geometry Engine GT1000. This driver also supports > AGP Fire GL2/3/4 cards on x86. > > +# FIXME FB_SYS_* > +config FB_PS2 > + tristate "Frame buffer driver for Sony Playstation 2" > + depends on FB && SONY_PS2 > + select PS2_GS > + select FB_TILEBLITTING > + default y > + help > + Frame buffer driver for the Sony Playstation 2 Graphics Synthesizer. > + Memory mapping is not supported since the frame buffer is local to > + the GS. > + > config FB_PS3 > tristate "PS3 GPU framebuffer driver" > depends on FB && PS3_PS3AV > diff --git a/drivers/video/fbdev/Makefile b/drivers/video/fbdev/Makefile > index 7dc4861a93e6..1e55fa8ca4af 100644 > --- a/drivers/video/fbdev/Makefile > +++ b/drivers/video/fbdev/Makefile > @@ -105,6 +105,7 @@ obj-$(CONFIG_FB_S3C2410) += s3c2410fb.o > obj-$(CONFIG_FB_FSL_DIU) += fsl-diu-fb.o > obj-$(CONFIG_FB_COBALT) += cobalt_lcdfb.o > obj-$(CONFIG_FB_IBM_GXT4500) += gxt4500.o > +obj-$(CONFIG_FB_PS2) += ps2fb.o > obj-$(CONFIG_FB_PS3) += ps3fb.o > obj-$(CONFIG_FB_SM501) += sm501fb.o > obj-$(CONFIG_FB_UDL) += udlfb.o > diff --git a/drivers/video/fbdev/ps2fb.c b/drivers/video/fbdev/ps2fb.c > new file mode 100644 > index 000000000000..7bfbc3c2aa4d > --- /dev/null > +++ b/drivers/video/fbdev/ps2fb.c > @@ -0,0 +1,533 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * PlayStation 2 frame buffer driver > + * > + * Copyright (C) 2019 Fredrik Noring > + */ > + > +/** > + * DOC: The PlayStation 2 frame buffer console > + * > + * The frame buffer supports a tiled frame buffer console. The main limitation > + * is the lack of memory mapping (mmap), since the Graphics Synthesizer has > + * local frame buffer memory that is not directly accessible from the main bus. > + * The GS has 4 MiB of local memory. > + * > + * The console drawing primitives are synchronous to allow printk at any time. > + * This is highly useful for debugging but it is not the fastest possible > + * implementation. The console is nevertheless very fast and makes use of > + * several hardware accelerated features of the Graphics Synthesizer. > + * > + * The maximum practical resolution is 1920x1080p at 16 bits per pixel that > + * requires 4147200 bytes of local memory, leaving 47104 bytes for a tiled > + * font, which at 8x8 pixels and a minimum 4 bits indexed texture palette is > + * at most 1464 characters. The indexed palette makes switching colours easy. > + * &struct fb_tile_ops is accelerated with GS texture sprites that are fast > + * (GS local copy) for the kernel via simple DMA GS commands via the GIF. > + * > + * The local memory is organised as follows: first comes the display buffer, > + * then one block of a palette, and finally the font installed as a texture. > + * > + * All frame buffer transmissions are done by DMA via GIF PATH3. > + */ > + > +#include <linux/bitops.h> > +#include <linux/delay.h> > +#include <linux/dma-mapping.h> > +#include <linux/interrupt.h> > +#include <linux/errno.h> > +#include <linux/fb.h> > +#include <linux/init.h> > +#include <linux/kernel.h> > +#include <linux/mm.h> > +#include <linux/module.h> > +#include <linux/of_device.h> > +#include <linux/string.h> > +#include <linux/uaccess.h> > + > +#include <asm/io.h> > + > +#include <asm/mach-ps2/dmac.h> > +#include <asm/mach-ps2/gif.h> > +#include <asm/mach-ps2/gs.h> > +#include <asm/mach-ps2/gs-registers.h> > + > +#include <uapi/asm/gif.h> > +#include <uapi/asm/gs.h> > + > +#define DEVICE_NAME "ps2fb" > + > +#define PALETTE_BLOCK_COUNT 1 /* One block is used for the indexed colors */ > + > +/* Module parameters */ > +static char *mode_option; > + > +union package { > + union gif_data gif; > + struct dma_tag dma; > +}; > + > +/** > + * struct tile_texture - texture representing a tile > + * @tbp: texture base pointer > + * @u: texel u coordinate (x coordinate) > + * @v: texel v coordinate (y coordinate) > + */ > +struct tile_texture { > + u32 tbp; > + u32 u; > + u32 v; > +}; > + > +/** > + * struct console_buffer - console buffer > + * @block_count: number of frame buffer blocks > + * @bg: background color index > + * @fg: foreground color index > + * @tile: tile dimensions > + * @tile.width: width in pixels > + * @tile.height: height in pixels > + * @tile.width2: least width in pixels, power of 2 > + * @tile.height2: least height in pixels, power of 2 > + * @tile.block: tiles are stored as textures in the PSMT4 pixel storage format > + * with both cols and rows as powers of 2 > + * @tile.block.cols: tile columns per GS block > + * @tile.block.rows: tile rows per GS block > + */ > +struct console_buffer { > + u32 block_count; > + > + u32 bg; > + u32 fg; > + > + struct cb_tile { > + u32 width; > + u32 height; > + > + u32 width2; > + u32 height2; > + > + struct { > + u32 cols; > + u32 rows; > + } block; > + } tile; > +}; > + > +/** > + * struct ps2fb_par - driver specific structure > + * @lock: spin lock to be taken for all structure operations > + * @cb: console buffer definition > + * @package: tags and datafor the GIF > + * @package.capacity: maximum number of GIF packages in 16-byte unit > + * @package.buffer: DMA buffer for GIF packages > + */ > +struct ps2fb_par { > + spinlock_t lock; > + > + struct console_buffer cb; > + > + struct { > + size_t capacity; > + union package *buffer; > + } package; > +}; > + > +/** > + * texture_least_power_of_2 - round up to a power of 2, not less than 8 > + * @n: integer to round up > + * > + * Return: least integer that is a power of 2 and not less than @n or 8 > + */ > +static u32 texture_least_power_of_2(u32 n) > +{ > + return max(1 << get_count_order(n), 8); > +} > + > +/** > + * cb_tile - create a console buffer tile object > + * @width: width of tile in pixels > + * @height: height of tile in pixels > + * > + * Return: a console buffer tile object with the given width and height > + */ > +static struct cb_tile cb_tile(u32 width, u32 height) > +{ > + const u32 width2 = texture_least_power_of_2(width); > + const u32 height2 = texture_least_power_of_2(height); > + > + return (struct cb_tile) { > + .width = width, > + .height = height, > + > + .width2 = width2, > + .height2 = height2, > + > + .block = { > + .cols = GS_PSMT4_BLOCK_WIDTH / width2, > + .rows = GS_PSMT4_BLOCK_HEIGHT / height2, > + }, > + }; > +} > + > +/** > + * display_buffer_size - display buffer size for a given video resolution > + * > + * This calculation is a lower bound estimate. A precise calculation would have > + * to take memory pages, blocks and column arrangements into account. To choose > + * the appropriate standard video mode such details can be disregarded, though. > + * > + * Return: the size in bytes of the display buffer > + */ > +static u32 display_buffer_size(const u32 xres_virtual, const u32 yres_virtual, > + const u32 bits_per_pixel) > +{ > + return (xres_virtual * yres_virtual * bits_per_pixel) / 8; > +} > + > +/** > + * ps2fb_cb_get_tilemax - maximum number of tiles > + * @info: frame buffer info object > + * > + * Return: the maximum number of tiles > + */ > +static int ps2fb_cb_get_tilemax(struct fb_info *info) > +{ > + const struct ps2fb_par *par = info->par; > + const u32 block_tile_count = > + par->cb.tile.block.cols * > + par->cb.tile.block.rows; > + const s32 blocks_available = > + GS_BLOCK_COUNT - par->cb.block_count - PALETTE_BLOCK_COUNT; > + > + return blocks_available > 0 ? blocks_available * block_tile_count : 0; > +} > + > +/** > + * bits_per_pixel_fits - does the given resolution fit the given buffer size? > + * @xres_virtual: virtual x resolution in pixels > + * @yres_virtual: virtual y resolution in pixels > + * @bits_per_pixel: number of bits per pixel > + * @buffer_size: size in bytes of display buffer > + * > + * The size calculation is approximate, but accurate enough for the standard > + * video modes. > + * > + * Return: %true if the resolution fits the given buffer size, otherwise %false > + */ > +static bool bits_per_pixel_fits(const u32 xres_virtual, const u32 yres_virtual, > + const int bits_per_pixel, const size_t buffer_size) > +{ > + return display_buffer_size(xres_virtual, yres_virtual, > + bits_per_pixel) <= buffer_size; > +} > + > +/** > + * default_bits_per_pixel - choose either 16 or 32 bits per pixel > + * @xres_virtual: virtual x resolution in pixels > + * @yres_virtual: virtual y resolution in pixels > + * @buffer_size: size in bytes of display buffer > + * > + * 32 bits per pixel is returned unless this does not fit the given buffer size. > + * > + * The size calculation is approximate, but accurate enough for the standard > + * video modes. > + * > + * Return: 16 or 32 bits per pixel > + */ > +static int default_bits_per_pixel( > + const u32 xres_virtual, const u32 yres_virtual, > + const size_t buffer_size) > +{ > + return bits_per_pixel_fits(xres_virtual, yres_virtual, > + 32, buffer_size) ? 32 : 16; > +} > + > +/** > + * filled_var_videomode - is the screen info video mode filled in? > + * @var: screen info object to check > + * > + * Return: %true if the video mode is filled in, otherwise %false > + */ > +static bool filled_var_videomode(const struct fb_var_screeninfo *var) > +{ > + return var->xres > 0 && var->hsync_len > 0 && > + var->yres > 0 && var->vsync_len > 0 && var->pixclock > 0; > +} > + > +static int ps2fb_check_var(struct fb_var_screeninfo *var, struct fb_info *info) > +{ > + /* Check whether video mode defaults are needed. */ > + if (!filled_var_videomode(var)) { > + const struct fb_videomode *vm = > + fb_find_best_mode(var, &info->modelist); > + > + if (!vm) > + return -EINVAL; > + > + fb_videomode_to_var(var, vm); > + } > + > + /* GS video register resolution is limited to 2048. */ > + if (var->xres < 1 || 2048 < var->xres || > + var->yres < 1 || 2048 < var->yres) > + return -EINVAL; > + > + var->xres_virtual = var->xres; > + var->yres_virtual = var->yres; > + var->xoffset = 0; > + var->yoffset = 0; > + > + /* Check bits per pixel. */ > + if (!var->bits_per_pixel) > + var->bits_per_pixel = default_bits_per_pixel( > + var->xres_virtual, var->yres_virtual, info->fix.smem_len); > + else if (var->bits_per_pixel != 16 && > + var->bits_per_pixel != 32) > + return -EINVAL; > + if (!bits_per_pixel_fits(var->xres_virtual, var->yres_virtual, > + var->bits_per_pixel, info->fix.smem_len)) > + var->bits_per_pixel = default_bits_per_pixel( > + var->xres_virtual, var->yres_virtual, info->fix.smem_len); > + if (!bits_per_pixel_fits(var->xres_virtual, var->yres_virtual, > + var->bits_per_pixel, info->fix.smem_len)) > + return -ENOMEM; > + if (var->bits_per_pixel == 16) { > + var->red = (struct fb_bitfield){ .offset = 0, .length = 5 }; > + var->green = (struct fb_bitfield){ .offset = 5, .length = 5 }; > + var->blue = (struct fb_bitfield){ .offset = 10, .length = 5 }; > + var->transp = (struct fb_bitfield){ .offset = 15, .length = 1 }; > + } else if (var->bits_per_pixel == 32) { > + var->red = (struct fb_bitfield){ .offset = 0, .length = 8 }; > + var->green = (struct fb_bitfield){ .offset = 8, .length = 8 }; > + var->blue = (struct fb_bitfield){ .offset = 16, .length = 8 }; > + var->transp = (struct fb_bitfield){ .offset = 24, .length = 8 }; > + } else > + return -EINVAL; /* Unsupported bits per pixel. */ > + > + /* Screen rotations are not supported. */ > + if (var->rotate) > + return -EINVAL; > + > + return 0; > +} > + > +static int ps2fb_cb_check_var( > + struct fb_var_screeninfo *var, struct fb_info *info) > +{ > + struct ps2fb_par *par = info->par; > + unsigned long flags; > + int err; > + > + spin_lock_irqsave(&par->lock, flags); > + err = ps2fb_check_var(var, info); > + spin_unlock_irqrestore(&par->lock, flags); > + > + if (!err && info->tileops) > + if (info->tileops->fb_get_tilemax(info) < 256) > + err = -ENOMEM; > + > + return err; > +} > + > +static u32 block_dimensions(u32 dim, u32 alignment) > +{ > + u32 mask = 0; > + u32 d; > + > + for (d = 1; d <= dim; d++) > + if (d % alignment == 0) > + mask |= 1 << (d - 1); > + > + return mask; > +} > + > +static int init_console_buffer(struct platform_device *pdev, > + struct fb_info *info) > +{ > + static struct fb_ops fbops = { > + .owner = THIS_MODULE, > + .fb_check_var = ps2fb_cb_check_var, > + }; > + > + static struct fb_tile_ops tileops = { > + .fb_get_tilemax = ps2fb_cb_get_tilemax > + }; > + > + struct ps2fb_par *par = info->par; > + > + fb_info(info, "Graphics Synthesizer console frame buffer device\n"); > + > + info->screen_size = 0; > + info->screen_base = NULL; /* mmap is unsupported by hardware */ > + > + info->fix.smem_start = 0; /* GS frame buffer is local memory */ > + info->fix.smem_len = GS_MEMORY_SIZE; > + > + info->fbops = &fbops; > + info->flags = FBINFO_DEFAULT | > + FBINFO_READS_FAST; > + > + info->flags |= FBINFO_MISC_TILEBLITTING; > + info->tileops = &tileops; > + > + /* > + * BITBLTBUF for pixel format CT32 requires divisibility by 2, > + * and CT16 requires divisibility by 4. So 4 is a safe choice. > + */ > + info->pixmap.blit_x = block_dimensions(GS_PSMT4_BLOCK_WIDTH, 4); > + info->pixmap.blit_y = block_dimensions(GS_PSMT4_BLOCK_HEIGHT, 1); > + > + /* 8x8 default font tile size for fb_get_tilemax */ > + par->cb.tile = cb_tile(8, 8); > + > + return 0; > +} > + > +static int ps2fb_probe(struct platform_device *pdev) > +{ > + struct ps2fb_par *par; > + struct fb_info *info; > + int err; > + > + info = framebuffer_alloc(sizeof(*par), &pdev->dev); > + if (info == NULL) { > + dev_err(&pdev->dev, "framebuffer_alloc failed\n"); > + err = -ENOMEM; > + goto err_framebuffer_alloc; > + } > + > + par = info->par; > + > + spin_lock_init(&par->lock); > + > + par->package.buffer = (union package *)__get_free_page(GFP_DMA); > + if (!par->package.buffer) { > + dev_err(&pdev->dev, "Failed to allocate package buffer\n"); > + err = -ENOMEM; > + goto err_package_buffer; > + } > + par->package.capacity = PAGE_SIZE / sizeof(union package); > + > + strlcpy(info->fix.id, "PS2 GS", ARRAY_SIZE(info->fix.id)); > + info->fix.accel = FB_ACCEL_PLAYSTATION_2; > + > + err = init_console_buffer(pdev, info); > + if (err < 0) > + goto err_init_buffer; > + > + info->mode = &par->mode; > + > + if (register_framebuffer(info) < 0) { > + fb_err(info, "register_framebuffer failed\n"); > + err = -EINVAL; > + goto err_register_framebuffer; > + } > + > + platform_set_drvdata(pdev, info); > + > + return 0; > + > +err_register_framebuffer: > +err_init_buffer: > + free_page((unsigned long)par->package.buffer); > +err_package_buffer: > + framebuffer_release(info); > +err_framebuffer_alloc: > + return err; > +} > + > +static int ps2fb_remove(struct platform_device *pdev) > +{ > + struct fb_info *info = platform_get_drvdata(pdev); > + struct ps2fb_par *par = info->par; > + int err = 0; > + > + if (info != NULL) { > + unregister_framebuffer(info); > + fb_dealloc_cmap(&info->cmap); > + > + framebuffer_release(info); > + } > + > + if (!gif_wait()) { > + fb_err(info, "Failed to complete GIF DMA transfer\n"); > + err = -EBUSY; > + } > + free_page((unsigned long)par->package.buffer); > + > + return err; > +} > + > +static struct platform_driver ps2fb_driver = { > + .probe = ps2fb_probe, > + .remove = ps2fb_remove, > + .driver = { > + .name = DEVICE_NAME, > + }, > +}; > + > +static struct platform_device *ps2fb_device; > + > +static int __init ps2fb_init(void) > +{ > + int err; > + > +#ifndef MODULE > + char *options = NULL; > + char *this_opt; > + > + if (fb_get_options(DEVICE_NAME, &options)) > + return -ENODEV; > + if (!options || !*options) > + goto no_options; > + > + while ((this_opt = strsep(&options, ",")) != NULL) { > + if (!*this_opt) > + continue; > + > + if (!strncmp(this_opt, "mode_option:", 12)) > + mode_option = &this_opt[12]; > + else if ('0' <= this_opt[0] && this_opt[0] <= '9') > + mode_option = this_opt; > + else > + pr_warn(DEVICE_NAME ": Unrecognized option \"%s\"\n", > + this_opt); > + } > + > +no_options: > +#endif /* !MODULE */ > + > + /* Default to a suitable PAL or NTSC broadcast mode. */ > + if (!mode_option) > + mode_option = gs_region_pal() ? "576x460i@50" : "576x384i@60"; > + > + ps2fb_device = platform_device_alloc("ps2fb", 0); > + if (!ps2fb_device) > + return -ENOMEM; > + > + err = platform_device_add(ps2fb_device); > + if (err < 0) { > + platform_device_put(ps2fb_device); > + return err; > + } > + > + return platform_driver_register(&ps2fb_driver); > +} > + > +static void __exit ps2fb_exit(void) > +{ > + platform_driver_unregister(&ps2fb_driver); > + platform_device_unregister(ps2fb_device); > +} > + > +module_init(ps2fb_init); > +module_exit(ps2fb_exit); > + > +module_param(mode_option, charp, 0); > +MODULE_PARM_DESC(mode_option, > + "Specify initial video mode as \"<xres>x<yres>[-<bpp>][@<refresh>]\""); > + > +MODULE_DESCRIPTION("PlayStation 2 frame buffer driver"); > +MODULE_AUTHOR("Fredrik Noring"); > +MODULE_LICENSE("GPL"); > diff --git a/include/linux/console_struct.h b/include/linux/console_struct.h > index 24d4c16e3ae0..cb562672cc3a 100644 > --- a/include/linux/console_struct.h > +++ b/include/linux/console_struct.h > @@ -13,9 +13,11 @@ > #ifndef _LINUX_CONSOLE_STRUCT_H > #define _LINUX_CONSOLE_STRUCT_H > > +#include <linux/tty.h> > #include <linux/wait.h> > #include <linux/vt.h> > #include <linux/workqueue.h> > +#include <uapi/linux/kd.h> > > struct uni_pagedir; > struct uni_screen; > diff --git a/include/uapi/linux/fb.h b/include/uapi/linux/fb.h > index b6aac7ee1f67..38d88eebf651 100644 > --- a/include/uapi/linux/fb.h > +++ b/include/uapi/linux/fb.h > @@ -149,6 +149,7 @@ > #define FB_ACCEL_SUPERSAVAGE 0x8c /* S3 Supersavage */ > #define FB_ACCEL_PROSAVAGE_DDR 0x8d /* S3 ProSavage DDR */ > #define FB_ACCEL_PROSAVAGE_DDRK 0x8e /* S3 ProSavage DDR-K */ > +#define FB_ACCEL_PLAYSTATION_2 0x8f /* PlayStation 2 */ > > #define FB_ACCEL_PUV3_UNIGFX 0xa0 /* PKUnity-v3 Unigfx */ > > -- > 2.21.0 >

1 0

[PATCH] Revert "drm/nouveau/acr: Fix undefined behavior in nvkm_acr_hsfw_load_bl()"
by Lyude Paul 29 Jan '22

29 Jan '22

This reverts commit 2343bcdb4747d4f418a4daf2e898b94f86c24a59. Unfortunately, as Greg pointed out I totally missed the fact that this patch came from a umn.edu patch. umn.edu is still banned from contributing to the Linux kernel, so let's revert this for the time being. I'll re-evaluate this fix myself later and send another fix if this ends up being valid. Signed-off-by: Lyude Paul <lyude(a)redhat.com> Cc: Greg KH <gregkh(a)linuxfoundation.org> Cc: Ben Skeggs <bskeggs(a)redhat.com> Cc: Karol Herbst <kherbst(a)redhat.com> --- drivers/gpu/drm/nouveau/nvkm/subdev/acr/hsfw.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/acr/hsfw.c b/drivers/gpu/drm/nouveau/nvkm/subdev/acr/hsfw.c index a6ea89a5d51a..667fa016496e 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/acr/hsfw.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/acr/hsfw.c @@ -142,12 +142,11 @@ nvkm_acr_hsfw_load_bl(struct nvkm_acr *acr, const char *name, int ver, hsfw->imem_size = desc->code_size; hsfw->imem_tag = desc->start_tag; - hsfw->imem = kmemdup(data + desc->code_off, desc->code_size, GFP_KERNEL); + hsfw->imem = kmalloc(desc->code_size, GFP_KERNEL); + memcpy(hsfw->imem, data + desc->code_off, desc->code_size); + nvkm_firmware_put(fw); - if (!hsfw->imem) - return -ENOMEM; - else - return 0; + return 0; } int -- 2.34.1

2 2

Add WARN_ON nested dma_fence containers
by Christian König 29 Jan '22

29 Jan '22

Hi guys, as previously discussed only dma_fence_chain with its previous fence is actually made to build up larger dma_fence structures. Everything else should either flatten all fences into a single dma_fence_array or just add each fence separately to the dma_resv object. Please review and/or comment, Christian.

5 19

[PATCH 1/9] dma-buf: consolidate dma_fence subclass checking
by Christian König 29 Jan '22

29 Jan '22

Consolidate the wrapper functions to check for dma_fence subclasses in the dma_fence header. This makes it easier to document and also check the different requirements for fence containers in the subclasses. Signed-off-by: Christian König <christian.koenig(a)amd.com> --- include/linux/dma-fence-array.h | 15 +------------ include/linux/dma-fence-chain.h | 3 +-- include/linux/dma-fence.h | 38 +++++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 16 deletions(-) diff --git a/include/linux/dma-fence-array.h b/include/linux/dma-fence-array.h index 303dd712220f..fec374f69e12 100644 --- a/include/linux/dma-fence-array.h +++ b/include/linux/dma-fence-array.h @@ -45,19 +45,6 @@ struct dma_fence_array { struct irq_work work; }; -extern const struct dma_fence_ops dma_fence_array_ops; - -/** - * dma_fence_is_array - check if a fence is from the array subsclass - * @fence: fence to test - * - * Return true if it is a dma_fence_array and false otherwise. - */ -static inline bool dma_fence_is_array(struct dma_fence *fence) -{ - return fence->ops == &dma_fence_array_ops; -} - /** * to_dma_fence_array - cast a fence to a dma_fence_array * @fence: fence to cast to a dma_fence_array @@ -68,7 +55,7 @@ static inline bool dma_fence_is_array(struct dma_fence *fence) static inline struct dma_fence_array * to_dma_fence_array(struct dma_fence *fence) { - if (fence->ops != &dma_fence_array_ops) + if (!fence || !dma_fence_is_array(fence)) return NULL; return container_of(fence, struct dma_fence_array, base); diff --git a/include/linux/dma-fence-chain.h b/include/linux/dma-fence-chain.h index 54fe3443fd2c..ee906b659694 100644 --- a/include/linux/dma-fence-chain.h +++ b/include/linux/dma-fence-chain.h @@ -49,7 +49,6 @@ struct dma_fence_chain { spinlock_t lock; }; -extern const struct dma_fence_ops dma_fence_chain_ops; /** * to_dma_fence_chain - cast a fence to a dma_fence_chain @@ -61,7 +60,7 @@ extern const struct dma_fence_ops dma_fence_chain_ops; static inline struct dma_fence_chain * to_dma_fence_chain(struct dma_fence *fence) { - if (!fence || fence->ops != &dma_fence_chain_ops) + if (!fence || !dma_fence_is_chain(fence)) return NULL; return container_of(fence, struct dma_fence_chain, base); diff --git a/include/linux/dma-fence.h b/include/linux/dma-fence.h index 1ea691753bd3..775cdc0b4f24 100644 --- a/include/linux/dma-fence.h +++ b/include/linux/dma-fence.h @@ -587,4 +587,42 @@ struct dma_fence *dma_fence_get_stub(void); struct dma_fence *dma_fence_allocate_private_stub(void); u64 dma_fence_context_alloc(unsigned num); +extern const struct dma_fence_ops dma_fence_array_ops; +extern const struct dma_fence_ops dma_fence_chain_ops; + +/** + * dma_fence_is_array - check if a fence is from the array subclass + * @fence: the fence to test + * + * Return true if it is a dma_fence_array and false otherwise. + */ +static inline bool dma_fence_is_array(struct dma_fence *fence) +{ + return fence->ops == &dma_fence_array_ops; +} + +/** + * dma_fence_is_chain - check if a fence is from the chain subclass + * @fence: the fence to test + * + * Return true if it is a dma_fence_chain and false otherwise. + */ +static inline bool dma_fence_is_chain(struct dma_fence *fence) +{ + return fence->ops == &dma_fence_chain_ops; +} + +/** + * dma_fence_is_container - check if a fence is a container for other fences + * @fence: the fence to test + * + * Return true if this fence is a container for other fences, false otherwise. + * This is important since we can't build up large fence structure or otherwise + * we run into recursion during operation on those fences. + */ +static inline bool dma_fence_is_container(struct dma_fence *fence) +{ + return dma_fence_is_array(fence) || dma_fence_is_chain(fence); +} + #endif /* __LINUX_DMA_FENCE_H */ -- 2.25.1

2 9

[PATCH v2 0/3] (Re)enable DP/HDMI audio for RK3399 Gru
by Brian Norris 28 Jan '22

28 Jan '22

This series fixes DP/HDMI audio for RK3399 Gru systems. First, there was a regression with the switch to SPDIF. Patch 1 can be taken separately as a regression fix if desired. But it's not quite so useful (at least on Chrome OS systems) without the second part. Second, jack detection was never upstreamed, because the hdmi-codec dependencies were still being worked out when this platform was first supported. Patches cover a few subsystems. Perhaps this is something for arm-soc? Changes in v2: - (Un)set pinctrl, because the default assumes we're routing out to external pins Brian Norris (3): arm64: dts: rockchip: Switch RK3399-Gru DP to SPDIF output drm/rockchip: cdn-dp: Support HDMI codec plug-change callback ASoC: rk3399_gru_sound: Wire up DP jack detection arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 17 ++++++++---- drivers/gpu/drm/rockchip/cdn-dp-core.c | 28 ++++++++++++++++++++ drivers/gpu/drm/rockchip/cdn-dp-core.h | 4 +++ sound/soc/rockchip/rk3399_gru_sound.c | 20 ++++++++++++++ 4 files changed, 64 insertions(+), 5 deletions(-) -- 2.34.1.703.g22d0c6ccf7-goog

5 11

[RFC PATCH v6 0/3] Add support modifiers for drivers whose planes only support linear layout
by Tomohito Esaki 28 Jan '22

28 Jan '22

Some drivers whose planes only support linear layout fb do not support format modifiers. These drivers should support modifiers, however the DRM core should handle this rather than open-coding in every driver. In this patch series, these drivers expose format modifiers based on the following suggestion[1]. On Thu, Nov 18, 2021 at 01:02:11PM +0000, Daniel Stone wrote: > I think the best way forward here is: > - add a new mode_config.cannot_support_modifiers flag, and enable > this in radeon (plus any other drivers in the same boat) > - change drm_universal_plane_init() to advertise the LINEAR modifier > when NULL is passed as the modifier list (including installing a > default .format_mod_supported hook) > - remove the mode_config.allow_fb_modifiers hook and always > advertise modifier support, unless > mode_config.cannot_support_modifiers is set [1] https://patchwork.kernel.org/project/linux-renesas-soc/patch/20190509054518… v6: * add Reviewed-by and Acked-by * add a changelog per-patch v5: https://www.spinics.net/lists/dri-devel/msg330860.html * rebase to the latest master branch (5.17-rc1+) + "drm/plane: Make format_mod_supported truly optional" patch [2] [2] https://patchwork.freedesktop.org/patch/467940/?series=98255&rev=3 * change default_modifiers array from non-static to static * remove terminator in default_modifiers array * use ARRAY_SIZE to get the format_modifier_count * keep a sanity check in plane init func * modify several kerneldocs v4: https://www.spinics.net/lists/dri-devel/msg329508.html * modify documentation for fb_modifiers_not_supported flag in kerneldoc v3: https://www.spinics.net/lists/dri-devel/msg329102.html * change the order as follows: 1. add fb_modifiers_not_supported flag 2. add default modifiers 3. remove allow_fb_modifiers flag * add a conditional disable in amdgpu_dm_plane_init() v2: https://www.spinics.net/lists/dri-devel/msg328939.html * rebase to the latest master branch (5.16.0+) + "drm/plane: Make format_mod_supported truly optional" patch [2] v1: https://www.spinics.net/lists/dri-devel/msg327352.html * The initial patch set Tomohito Esaki (3): drm: introduce fb_modifiers_not_supported flag in mode_config drm: add support modifiers for drivers whose planes only support linear layout drm: remove allow_fb_modifiers drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 6 ++--- drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 2 ++ drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 2 ++ drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 1 + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 2 ++ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 +++ drivers/gpu/drm/drm_framebuffer.c | 6 ++--- drivers/gpu/drm/drm_ioctl.c | 2 +- drivers/gpu/drm/drm_plane.c | 23 +++++++++++-------- drivers/gpu/drm/nouveau/nouveau_display.c | 6 +++-- drivers/gpu/drm/radeon/radeon_display.c | 2 ++ .../gpu/drm/selftests/test-drm_framebuffer.c | 1 - include/drm/drm_mode_config.h | 18 +++++---------- include/drm/drm_plane.h | 3 +++ 14 files changed, 45 insertions(+), 32 deletions(-) -- 2.25.1

2 4

[PATCH][next] drm/amd/display: fix spelling mistake: synatpics -> synaptics
by Colin Ian King 28 Jan '22

28 Jan '22

There are quite a few spelling mistakes in various function names and error messages. Fix these. Signed-off-by: Colin Ian King <colin.i.king(a)gmail.com> --- .../amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c index 75b5299b3576..db4ab01267e4 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c @@ -539,7 +539,7 @@ bool dm_helpers_submit_i2c( } #if defined(CONFIG_DRM_AMD_DC_DCN) -static bool execute_synatpics_rc_command(struct drm_dp_aux *aux, +static bool execute_synaptics_rc_command(struct drm_dp_aux *aux, bool is_write_cmd, unsigned char cmd, unsigned int length, @@ -578,7 +578,7 @@ static bool execute_synatpics_rc_command(struct drm_dp_aux *aux, ret = drm_dp_dpcd_write(aux, SYNAPTICS_RC_COMMAND, &rc_cmd, sizeof(rc_cmd)); if (ret < 0) { - DRM_ERROR(" execute_synatpics_rc_command - write cmd ..., err = %d\n", ret); + DRM_ERROR(" execute_synaptics_rc_command - write cmd ..., err = %d\n", ret); return false; } @@ -600,7 +600,7 @@ static bool execute_synatpics_rc_command(struct drm_dp_aux *aux, drm_dp_dpcd_read(aux, SYNAPTICS_RC_DATA, data, length); } - DC_LOG_DC(" execute_synatpics_rc_command - success = %d\n", success); + DC_LOG_DC(" execute_synaptics_rc_command - success = %d\n", success); return success; } @@ -618,54 +618,54 @@ static void apply_synaptics_fifo_reset_wa(struct drm_dp_aux *aux) data[3] = 'U'; data[4] = 'S'; - if (!execute_synatpics_rc_command(aux, true, 0x01, 5, 0, data)) + if (!execute_synaptics_rc_command(aux, true, 0x01, 5, 0, data)) return; // Step 3 and 4 - if (!execute_synatpics_rc_command(aux, false, 0x31, 4, 0x220998, data)) + if (!execute_synaptics_rc_command(aux, false, 0x31, 4, 0x220998, data)) return; data[0] &= (~(1 << 1)); // set bit 1 to 0 - if (!execute_synatpics_rc_command(aux, true, 0x21, 4, 0x220998, data)) + if (!execute_synaptics_rc_command(aux, true, 0x21, 4, 0x220998, data)) return; - if (!execute_synatpics_rc_command(aux, false, 0x31, 4, 0x220D98, data)) + if (!execute_synaptics_rc_command(aux, false, 0x31, 4, 0x220D98, data)) return; data[0] &= (~(1 << 1)); // set bit 1 to 0 - if (!execute_synatpics_rc_command(aux, true, 0x21, 4, 0x220D98, data)) + if (!execute_synaptics_rc_command(aux, true, 0x21, 4, 0x220D98, data)) return; - if (!execute_synatpics_rc_command(aux, false, 0x31, 4, 0x221198, data)) + if (!execute_synaptics_rc_command(aux, false, 0x31, 4, 0x221198, data)) return; data[0] &= (~(1 << 1)); // set bit 1 to 0 - if (!execute_synatpics_rc_command(aux, true, 0x21, 4, 0x221198, data)) + if (!execute_synaptics_rc_command(aux, true, 0x21, 4, 0x221198, data)) return; // Step 3 and 5 - if (!execute_synatpics_rc_command(aux, false, 0x31, 4, 0x220998, data)) + if (!execute_synaptics_rc_command(aux, false, 0x31, 4, 0x220998, data)) return; data[0] |= (1 << 1); // set bit 1 to 1 - if (!execute_synatpics_rc_command(aux, true, 0x21, 4, 0x220998, data)) + if (!execute_synaptics_rc_command(aux, true, 0x21, 4, 0x220998, data)) return; - if (!execute_synatpics_rc_command(aux, false, 0x31, 4, 0x220D98, data)) + if (!execute_synaptics_rc_command(aux, false, 0x31, 4, 0x220D98, data)) return; data[0] |= (1 << 1); // set bit 1 to 1 return; - if (!execute_synatpics_rc_command(aux, false, 0x31, 4, 0x221198, data)) + if (!execute_synaptics_rc_command(aux, false, 0x31, 4, 0x221198, data)) return; data[0] |= (1 << 1); // set bit 1 to 1 - if (!execute_synatpics_rc_command(aux, true, 0x21, 4, 0x221198, data)) + if (!execute_synaptics_rc_command(aux, true, 0x21, 4, 0x221198, data)) return; // Step 6 - if (!execute_synatpics_rc_command(aux, true, 0x02, 0, 0, NULL)) + if (!execute_synaptics_rc_command(aux, true, 0x02, 0, 0, NULL)) return; DC_LOG_DC("Done apply_synaptics_fifo_reset_wa\n"); -- 2.34.1

3 2

[PATCH] drm/amd/pm: remove duplicate include in 'arcturus_ppt.c'
by cgel.zte＠gmail.com 28 Jan '22

28 Jan '22

From: Changcheng Deng <deng.changcheng(a)zte.com.cn> 'amdgpu_dpm.h' included in 'arcturus_ppt.c' is duplicated. Reported-by: Zeal Robot <zealci(a)zte.com.cn> Signed-off-by: Changcheng Deng <deng.changcheng(a)zte.com.cn> --- drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c index ee296441c5bc..709c32063ef7 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c +++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c @@ -46,7 +46,6 @@ #include <linux/pci.h> #include "amdgpu_ras.h" #include "smu_cmn.h" -#include "amdgpu_dpm.h" /* * DO NOT use these for err/warn/info/debug messages. -- 2.25.1

2 1

[PATCH] drm/amdgpu: remove duplicate include in 'amdgpu_device.c'
by cgel.zte＠gmail.com 28 Jan '22

28 Jan '22

From: Changcheng Deng <deng.changcheng(a)zte.com.cn> 'linux/pci.h' included in 'amdgpu_device.c' is duplicated. Reported-by: Zeal Robot <zealci(a)zte.com.cn> Signed-off-by: Changcheng Deng <deng.changcheng(a)zte.com.cn> --- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index dd5979098e63..289c5c626324 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -56,7 +56,6 @@ #include "soc15.h" #include "nv.h" #include "bif/bif_4_1_d.h" -#include <linux/pci.h> #include <linux/firmware.h> #include "amdgpu_vf_error.h" -- 2.25.1

2 1

[PATCH v2 0/3] drm/i915: Fix header test and log spam on !x86
by Lucas De Marchi 28 Jan '22

28 Jan '22

Some minor fixes and changes to help porting i915 to arm64, or even anything !x86. Lucas De Marchi (3): drm: Stop spamming log with drm_cache message drm/i915: Fix header test for !CONFIG_X86 drm/i915: Do not spam log with missing arch support drivers/gpu/drm/drm_cache.c | 9 +++------ drivers/gpu/drm/i915/i915_mm.h | 4 ++-- 2 files changed, 5 insertions(+), 8 deletions(-) -- 2.35.0

1 3

← Newer
1
...
20
21
22
23
24
25
26
...
85
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel January 2022