git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'drm-misc-next-2022-02-23' of git://anongit.freedesktop.org/drm/drm-misc...
[sfrench/cifs-2.6.git]
/
drivers
/
gpu
/
drm
/
ast
/
ast_drv.h
diff --git
a/drivers/gpu/drm/ast/ast_drv.h
b/drivers/gpu/drm/ast/ast_drv.h
index c3a5823726494f077b12e4a2ad78039deb4c92ec..a19315b2f7e569ad45899c00c7252ce08d3ec61e 100644
(file)
--- a/
drivers/gpu/drm/ast/ast_drv.h
+++ b/
drivers/gpu/drm/ast/ast_drv.h
@@
-106,7
+106,7
@@
struct ast_cursor_plane {
struct {
struct drm_gem_vram_object *gbo;
- struct
dma_buf
_map map;
+ struct
iosys
_map map;
u64 off;
} hwc[AST_DEFAULT_HWC_NUM];