diff options
Diffstat (limited to 'usr/src/uts/common/sys/gfx_private.h')
| -rw-r--r-- | usr/src/uts/common/sys/gfx_private.h | 48 |
1 files changed, 22 insertions, 26 deletions
diff --git a/usr/src/uts/common/sys/gfx_private.h b/usr/src/uts/common/sys/gfx_private.h index ddd91e5758..51a8e170de 100644 --- a/usr/src/uts/common/sys/gfx_private.h +++ b/usr/src/uts/common/sys/gfx_private.h @@ -37,12 +37,21 @@ extern "C" { #endif + +/* + * Updated "glue" for newer libdrm code. + * See: kernel/drm/src/drm_fb_helper.c + */ + +typedef char *gfxp_fb_softc_ptr_t; + /* Memory cache attributes */ #define GFXP_MEMORY_CACHED 0 #define GFXP_MEMORY_UNCACHED 1 #define GFXP_MEMORY_WRITECOMBINED 2 typedef uint64_t gfx_maddr_t; +typedef char *gfxp_acc_handle_t; extern int gfxp_ddi_segmap_setup(dev_t dev, off_t offset, struct as *as, caddr_t *addrp, off_t len, uint_t prot, uint_t maxprot, uint_t flags, @@ -57,8 +66,6 @@ extern int gfxp_devmap_umem_setup(devmap_cookie_t dhc, dev_info_t *dip, extern void gfxp_map_devmem(devmap_cookie_t dhc, gfx_maddr_t maddr, size_t length, ddi_device_acc_attr_t *attrp); - -typedef char *gfxp_acc_handle_t; extern gfxp_acc_handle_t gfxp_pci_init_handle(uint8_t bus, uint8_t slot, uint8_t function, uint16_t *vendor, uint16_t *device); extern uint8_t gfxp_pci_read_byte(gfxp_acc_handle_t handle, uint16_t offset); @@ -81,35 +88,24 @@ extern void gfxp_fix_mem_cache_attrs(caddr_t kva_start, size_t length, int cache_attr); extern gfx_maddr_t gfxp_convert_addr(paddr_t paddr); -typedef char *gfxp_vgatext_softc_ptr_t; - -extern gfxp_vgatext_softc_ptr_t gfxp_vgatext_softc_alloc(void); -extern void gfxp_vgatext_softc_free(gfxp_vgatext_softc_ptr_t ptr); -extern int gfxp_vgatext_attach(dev_info_t *devi, ddi_attach_cmd_t cmd, - gfxp_vgatext_softc_ptr_t ptr); -extern int gfxp_vgatext_detach(dev_info_t *devi, ddi_detach_cmd_t cmd, - gfxp_vgatext_softc_ptr_t ptr); -extern int gfxp_vgatext_open(dev_t *devp, int flag, int otyp, cred_t *cred, - gfxp_vgatext_softc_ptr_t ptr); -extern int gfxp_vgatext_close(dev_t devp, int flag, int otyp, cred_t *cred, - gfxp_vgatext_softc_ptr_t ptr); -extern int gfxp_vgatext_ioctl(dev_t dev, int cmd, intptr_t data, int mode, - cred_t *cred, int *rval, gfxp_vgatext_softc_ptr_t ptr); +extern gfxp_fb_softc_ptr_t gfxp_fb_softc_alloc(void); +extern void gfxp_fb_softc_free(gfxp_fb_softc_ptr_t ptr); +extern int gfxp_fb_attach(dev_info_t *devi, ddi_attach_cmd_t cmd, + gfxp_fb_softc_ptr_t ptr); +extern int gfxp_fb_detach(dev_info_t *devi, ddi_detach_cmd_t cmd, + gfxp_fb_softc_ptr_t ptr); +extern int gfxp_fb_open(dev_t *devp, int flag, int otyp, cred_t *cred, + gfxp_fb_softc_ptr_t ptr); +extern int gfxp_fb_close(dev_t devp, int flag, int otyp, cred_t *cred, + gfxp_fb_softc_ptr_t ptr); +extern int gfxp_fb_ioctl(dev_t dev, int cmd, intptr_t data, int mode, + cred_t *cred, int *rval, gfxp_fb_softc_ptr_t ptr); extern int gfxp_mlock_user_memory(caddr_t address, size_t length); extern int gfxp_munlock_user_memory(caddr_t address, size_t length); -extern int gfxp_vgatext_devmap(dev_t dev, devmap_cookie_t dhp, offset_t off, +extern int gfxp_fb_devmap(dev_t dev, devmap_cookie_t dhp, offset_t off, size_t len, size_t *maplen, uint_t model, void *ptr); - -/* - * Updated "glue" for newer libdrm code. - * See: kernel/drm/src/drm_fb_helper.c - */ - -/* Same as: gfxp_vgatext_softc_ptr_t; */ -typedef char *gfxp_fb_softc_ptr_t; - /* * Used by drm_register_fbops(). * Note: only setmode is supplied. |