drm-misc-next for 5.10:
UAPI Changes:
Cross-subsystem Changes:
Core Changes:
- ttm: various cleanups and reworks of the API
Driver Changes:
- ast: various cleanups
- gma500: A few fixes, conversion to GPIOd API
- hisilicon: Change of maintainer, various reworks
- ingenic: Clock handling and formats support improvements
- mcde: improvements to the DSI support
- mgag200: Support G200 desktop cards
- mxsfb: Support the i.MX7 and i.MX8M and the alpha plane
- panfrost: support devfreq
- ps8640: Retrieve the EDID from eDP control, misc improvements
- tidss: Add a workaround for AM65xx YUV formats handling
- virtio: a few cleanups, support for virtio-gpu exported resources
- bridges: Support the chained bridges on more drivers,
new bridges: Toshiba TC358762, Toshiba TC358775, Lontium LT9611
- panels: Convert to dev_ based logging, read orientation from the DT,
various fixes, new panels: Mantix MLAF057WE51-X, Chefree CH101OLHLWH-002,
Powertip PH800480T013, KingDisplay KD116N21-30NV-A010
-----BEGIN PGP SIGNATURE-----
iHUEABYIAB0WIQRcEzekXsqa64kGDp7j7w1vZxhRxQUCX0fXGwAKCRDj7w1vZxhR
xTmMAQDPmfSsBLLNnDxu4++zFrQ7OKmNSHCkVr4nAQ/yg3GVPQEAuRw6qPwPWuV3
+jEPxaQSSmHOhx/jXfolV1tJaE/FHgA=
=WYoO
-----END PGP SIGNATURE-----
Merge tag 'drm-misc-next-2020-08-27' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next for 5.10:
UAPI Changes:
Cross-subsystem Changes:
Core Changes:
- ttm: various cleanups and reworks of the API
Driver Changes:
- ast: various cleanups
- gma500: A few fixes, conversion to GPIOd API
- hisilicon: Change of maintainer, various reworks
- ingenic: Clock handling and formats support improvements
- mcde: improvements to the DSI support
- mgag200: Support G200 desktop cards
- mxsfb: Support the i.MX7 and i.MX8M and the alpha plane
- panfrost: support devfreq
- ps8640: Retrieve the EDID from eDP control, misc improvements
- tidss: Add a workaround for AM65xx YUV formats handling
- virtio: a few cleanups, support for virtio-gpu exported resources
- bridges: Support the chained bridges on more drivers,
new bridges: Toshiba TC358762, Toshiba TC358775, Lontium LT9611
- panels: Convert to dev_ based logging, read orientation from the DT,
various fixes, new panels: Mantix MLAF057WE51-X, Chefree CH101OLHLWH-002,
Powertip PH800480T013, KingDisplay KD116N21-30NV-A010
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20200827155517.do6emeacetpturli@gilmour.lan
This commit is contained in:
commit
cbc2e82932
296 changed files with 8748 additions and 4403 deletions
|
|
@ -124,7 +124,7 @@ struct fb_cursor_user {
|
|||
* Register/unregister for framebuffer events
|
||||
*/
|
||||
|
||||
/* The resolution of the passed in fb_info about to change */
|
||||
/* The resolution of the passed in fb_info about to change */
|
||||
#define FB_EVENT_MODE_CHANGE 0x01
|
||||
|
||||
#ifdef CONFIG_GUMSTIX_AM200EPD
|
||||
|
|
@ -457,12 +457,12 @@ struct fb_info {
|
|||
|
||||
#if IS_ENABLED(CONFIG_FB_BACKLIGHT)
|
||||
/* assigned backlight device */
|
||||
/* set before framebuffer registration,
|
||||
/* set before framebuffer registration,
|
||||
remove after unregister */
|
||||
struct backlight_device *bl_dev;
|
||||
|
||||
/* Backlight level curve */
|
||||
struct mutex bl_curve_mutex;
|
||||
struct mutex bl_curve_mutex;
|
||||
u8 bl_curve[FB_BACKLIGHT_LEVELS];
|
||||
#endif
|
||||
#ifdef CONFIG_FB_DEFERRED_IO
|
||||
|
|
@ -481,8 +481,8 @@ struct fb_info {
|
|||
char __iomem *screen_base; /* Virtual address */
|
||||
char *screen_buffer;
|
||||
};
|
||||
unsigned long screen_size; /* Amount of ioremapped VRAM or 0 */
|
||||
void *pseudo_palette; /* Fake palette of 16 colors */
|
||||
unsigned long screen_size; /* Amount of ioremapped VRAM or 0 */
|
||||
void *pseudo_palette; /* Fake palette of 16 colors */
|
||||
#define FBINFO_STATE_RUNNING 0
|
||||
#define FBINFO_STATE_SUSPENDED 1
|
||||
u32 state; /* Hardware state i.e suspend */
|
||||
|
|
@ -585,11 +585,11 @@ static inline struct apertures_struct *alloc_apertures(unsigned int max_num) {
|
|||
* `Generic' versions of the frame buffer device operations
|
||||
*/
|
||||
|
||||
extern int fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var);
|
||||
extern int fb_pan_display(struct fb_info *info, struct fb_var_screeninfo *var);
|
||||
extern int fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var);
|
||||
extern int fb_pan_display(struct fb_info *info, struct fb_var_screeninfo *var);
|
||||
extern int fb_blank(struct fb_info *info, int blank);
|
||||
extern void cfb_fillrect(struct fb_info *info, const struct fb_fillrect *rect);
|
||||
extern void cfb_copyarea(struct fb_info *info, const struct fb_copyarea *area);
|
||||
extern void cfb_fillrect(struct fb_info *info, const struct fb_fillrect *rect);
|
||||
extern void cfb_copyarea(struct fb_info *info, const struct fb_copyarea *area);
|
||||
extern void cfb_imageblit(struct fb_info *info, const struct fb_image *image);
|
||||
/*
|
||||
* Drawing operations where framebuffer is in system RAM
|
||||
|
|
|
|||
|
|
@ -118,7 +118,7 @@ struct kparam_array
|
|||
* you can create your own by defining those variables.
|
||||
*
|
||||
* Standard types are:
|
||||
* byte, short, ushort, int, uint, long, ulong
|
||||
* byte, hexint, short, ushort, int, uint, long, ulong
|
||||
* charp: a character pointer
|
||||
* bool: a bool, values 0/1, y/n, Y/N.
|
||||
* invbool: the above, only sense-reversed (N = true).
|
||||
|
|
@ -448,6 +448,11 @@ extern int param_set_ullong(const char *val, const struct kernel_param *kp);
|
|||
extern int param_get_ullong(char *buffer, const struct kernel_param *kp);
|
||||
#define param_check_ullong(name, p) __param_check(name, p, unsigned long long)
|
||||
|
||||
extern const struct kernel_param_ops param_ops_hexint;
|
||||
extern int param_set_hexint(const char *val, const struct kernel_param *kp);
|
||||
extern int param_get_hexint(char *buffer, const struct kernel_param *kp);
|
||||
#define param_check_hexint(name, p) param_check_uint(name, p)
|
||||
|
||||
extern const struct kernel_param_ops param_ops_charp;
|
||||
extern int param_set_charp(const char *val, const struct kernel_param *kp);
|
||||
extern int param_get_charp(char *buffer, const struct kernel_param *kp);
|
||||
|
|
|
|||
|
|
@ -127,6 +127,7 @@ static inline struct virtio_device *dev_to_virtio(struct device *_dev)
|
|||
void virtio_add_status(struct virtio_device *dev, unsigned int status);
|
||||
int register_virtio_device(struct virtio_device *dev);
|
||||
void unregister_virtio_device(struct virtio_device *dev);
|
||||
bool is_virtio_device(struct device *dev);
|
||||
|
||||
void virtio_break_device(struct virtio_device *dev);
|
||||
|
||||
|
|
|
|||
37
include/linux/virtio_dma_buf.h
Normal file
37
include/linux/virtio_dma_buf.h
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
/* SPDX-License-Identifier: GPL-2.0 */
|
||||
/*
|
||||
* dma-bufs for virtio exported objects
|
||||
*
|
||||
* Copyright (C) 2020 Google, Inc.
|
||||
*/
|
||||
|
||||
#ifndef _LINUX_VIRTIO_DMA_BUF_H
|
||||
#define _LINUX_VIRTIO_DMA_BUF_H
|
||||
|
||||
#include <linux/dma-buf.h>
|
||||
#include <linux/uuid.h>
|
||||
#include <linux/virtio.h>
|
||||
|
||||
/**
|
||||
* struct virtio_dma_buf_ops - operations possible on exported object dma-buf
|
||||
* @ops: the base dma_buf_ops. ops.attach MUST be virtio_dma_buf_attach.
|
||||
* @device_attach: [optional] callback invoked by virtio_dma_buf_attach during
|
||||
* all attach operations.
|
||||
* @get_uid: [required] callback to get the uuid of the exported object.
|
||||
*/
|
||||
struct virtio_dma_buf_ops {
|
||||
struct dma_buf_ops ops;
|
||||
int (*device_attach)(struct dma_buf *dma_buf,
|
||||
struct dma_buf_attachment *attach);
|
||||
int (*get_uuid)(struct dma_buf *dma_buf, uuid_t *uuid);
|
||||
};
|
||||
|
||||
int virtio_dma_buf_attach(struct dma_buf *dma_buf,
|
||||
struct dma_buf_attachment *attach);
|
||||
|
||||
struct dma_buf *virtio_dma_buf_export
|
||||
(const struct dma_buf_export_info *exp_info);
|
||||
bool is_virtio_dma_buf(struct dma_buf *dma_buf);
|
||||
int virtio_dma_buf_get_uuid(struct dma_buf *dma_buf, uuid_t *uuid);
|
||||
|
||||
#endif /* _LINUX_VIRTIO_DMA_BUF_H */
|
||||
Loading…
Add table
Add a link
Reference in a new issue