Commit 0424fdaf authored by Daniel Vetter's avatar Daniel Vetter

drm/prime: Actually remove DRIVER_PRIME everywhere

Split out to make the functional changes stick out more.

All places where DRIVER_PRIME was used have been removed in previous
patches already.

v2: amdgpu gained DRIVER_SYNCOBJ_TIMELINE.

v3: amdgpu lost DRIVER_SYNCOBJ_TIMELINE.

v4: Don't add a space in i915_drv.c (Sam)

v5: Add note that previous patches removed all the DRIVER_PRIME users
already (Emil).

v6: Fixupe ingenic (new driver) while applying.

Cc: Sam Ravnborg <sam@ravnborg.org>
Reviewed-by: default avatarEmil Velikov <emil.velikov@collabora.com>
Reviewed-by: default avatarEric Anholt <eric@anholt.net>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Cc: amd-gfx@lists.freedesktop.org
Cc: etnaviv@lists.freedesktop.org
Cc: freedreno@lists.freedesktop.org
Cc: intel-gfx@lists.freedesktop.org
Cc: lima@lists.freedesktop.org
Cc: linux-amlogic@lists.infradead.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-arm-msm@vger.kernel.org
Cc: linux-aspeed@lists.ozlabs.org
Cc: linux-renesas-soc@vger.kernel.org
Cc: linux-rockchip@lists.infradead.org
Cc: linux-samsung-soc@vger.kernel.org
Cc: linux-stm32@st-md-mailman.stormreply.com
Cc: linux-tegra@vger.kernel.org
Cc: nouveau@lists.freedesktop.org
Cc: NXP Linux Team <linux-imx@nxp.com>
Cc: spice-devel@lists.freedesktop.org
Cc: virtualization@lists.linux-foundation.org
Cc: VMware Graphics <linux-graphics-maintainer@vmware.com>
Cc: xen-devel@lists.xenproject.org
Link: https://patchwork.freedesktop.org/patch/msgid/20190617153924.414-1-daniel.vetter@ffwll.ch
parent ee8375d5
...@@ -1309,7 +1309,7 @@ static struct drm_driver kms_driver = { ...@@ -1309,7 +1309,7 @@ static struct drm_driver kms_driver = {
.driver_features = .driver_features =
DRIVER_USE_AGP | DRIVER_ATOMIC | DRIVER_USE_AGP | DRIVER_ATOMIC |
DRIVER_GEM | DRIVER_GEM |
DRIVER_PRIME | DRIVER_RENDER | DRIVER_MODESET | DRIVER_SYNCOBJ, DRIVER_RENDER | DRIVER_MODESET | DRIVER_SYNCOBJ,
.load = amdgpu_driver_load_kms, .load = amdgpu_driver_load_kms,
.open = amdgpu_driver_open_kms, .open = amdgpu_driver_open_kms,
.postclose = amdgpu_driver_postclose_kms, .postclose = amdgpu_driver_postclose_kms,
......
...@@ -135,8 +135,7 @@ static int arcpgu_debugfs_init(struct drm_minor *minor) ...@@ -135,8 +135,7 @@ static int arcpgu_debugfs_init(struct drm_minor *minor)
#endif #endif
static struct drm_driver arcpgu_drm_driver = { static struct drm_driver arcpgu_drm_driver = {
.driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME | .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC,
DRIVER_ATOMIC,
.name = "arcpgu", .name = "arcpgu",
.desc = "ARC PGU Controller", .desc = "ARC PGU Controller",
.date = "20160219", .date = "20160219",
......
...@@ -56,7 +56,7 @@ static irqreturn_t komeda_kms_irq_handler(int irq, void *data) ...@@ -56,7 +56,7 @@ static irqreturn_t komeda_kms_irq_handler(int irq, void *data)
static struct drm_driver komeda_kms_driver = { static struct drm_driver komeda_kms_driver = {
.driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC | .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC |
DRIVER_PRIME | DRIVER_HAVE_IRQ, DRIVER_HAVE_IRQ,
.lastclose = drm_fb_helper_lastclose, .lastclose = drm_fb_helper_lastclose,
.irq_handler = komeda_kms_irq_handler, .irq_handler = komeda_kms_irq_handler,
.gem_free_object_unlocked = drm_gem_cma_free_object, .gem_free_object_unlocked = drm_gem_cma_free_object,
......
...@@ -229,9 +229,7 @@ static int hdlcd_debugfs_init(struct drm_minor *minor) ...@@ -229,9 +229,7 @@ static int hdlcd_debugfs_init(struct drm_minor *minor)
DEFINE_DRM_GEM_CMA_FOPS(fops); DEFINE_DRM_GEM_CMA_FOPS(fops);
static struct drm_driver hdlcd_driver = { static struct drm_driver hdlcd_driver = {
.driver_features = DRIVER_GEM | .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC,
DRIVER_MODESET | DRIVER_PRIME |
DRIVER_ATOMIC,
.irq_handler = hdlcd_irq, .irq_handler = hdlcd_irq,
.irq_preinstall = hdlcd_irq_preinstall, .irq_preinstall = hdlcd_irq_preinstall,
.irq_postinstall = hdlcd_irq_postinstall, .irq_postinstall = hdlcd_irq_postinstall,
......
...@@ -568,8 +568,7 @@ static int malidp_debugfs_init(struct drm_minor *minor) ...@@ -568,8 +568,7 @@ static int malidp_debugfs_init(struct drm_minor *minor)
#endif //CONFIG_DEBUG_FS #endif //CONFIG_DEBUG_FS
static struct drm_driver malidp_driver = { static struct drm_driver malidp_driver = {
.driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC | .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC,
DRIVER_PRIME,
.gem_free_object_unlocked = drm_gem_cma_free_object, .gem_free_object_unlocked = drm_gem_cma_free_object,
.gem_vm_ops = &drm_gem_cma_vm_ops, .gem_vm_ops = &drm_gem_cma_vm_ops,
.dumb_create = malidp_dumb_create, .dumb_create = malidp_dumb_create,
......
...@@ -43,8 +43,7 @@ static struct drm_driver armada_drm_driver = { ...@@ -43,8 +43,7 @@ static struct drm_driver armada_drm_driver = {
.name = "armada-drm", .name = "armada-drm",
.desc = "Armada SoC DRM", .desc = "Armada SoC DRM",
.date = "20120730", .date = "20120730",
.driver_features = DRIVER_GEM | DRIVER_MODESET | .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC,
DRIVER_PRIME | DRIVER_ATOMIC,
.ioctls = armada_ioctls, .ioctls = armada_ioctls,
.fops = &armada_drm_fops, .fops = &armada_drm_fops,
}; };
......
...@@ -194,8 +194,7 @@ static void aspeed_gfx_unload(struct drm_device *drm) ...@@ -194,8 +194,7 @@ static void aspeed_gfx_unload(struct drm_device *drm)
DEFINE_DRM_GEM_CMA_FOPS(fops); DEFINE_DRM_GEM_CMA_FOPS(fops);
static struct drm_driver aspeed_gfx_driver = { static struct drm_driver aspeed_gfx_driver = {
.driver_features = DRIVER_GEM | DRIVER_MODESET | .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC,
DRIVER_PRIME | DRIVER_ATOMIC,
.gem_create_object = drm_cma_gem_create_object_default_funcs, .gem_create_object = drm_cma_gem_create_object_default_funcs,
.dumb_create = drm_gem_cma_dumb_create, .dumb_create = drm_gem_cma_dumb_create,
.prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_handle_to_fd = drm_gem_prime_handle_to_fd,
......
...@@ -834,9 +834,7 @@ static void atmel_hlcdc_dc_irq_uninstall(struct drm_device *dev) ...@@ -834,9 +834,7 @@ static void atmel_hlcdc_dc_irq_uninstall(struct drm_device *dev)
DEFINE_DRM_GEM_CMA_FOPS(fops); DEFINE_DRM_GEM_CMA_FOPS(fops);
static struct drm_driver atmel_hlcdc_dc_driver = { static struct drm_driver atmel_hlcdc_dc_driver = {
.driver_features = DRIVER_GEM | .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC,
DRIVER_MODESET | DRIVER_PRIME |
DRIVER_ATOMIC,
.irq_handler = atmel_hlcdc_dc_irq_handler, .irq_handler = atmel_hlcdc_dc_irq_handler,
.irq_preinstall = atmel_hlcdc_dc_irq_uninstall, .irq_preinstall = atmel_hlcdc_dc_irq_uninstall,
.irq_postinstall = atmel_hlcdc_dc_irq_postinstall, .irq_postinstall = atmel_hlcdc_dc_irq_postinstall,
......
...@@ -65,8 +65,7 @@ static const struct file_operations bochs_fops = { ...@@ -65,8 +65,7 @@ static const struct file_operations bochs_fops = {
}; };
static struct drm_driver bochs_driver = { static struct drm_driver bochs_driver = {
.driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC | .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC,
DRIVER_PRIME,
.fops = &bochs_fops, .fops = &bochs_fops,
.name = "bochs-drm", .name = "bochs-drm",
.desc = "bochs dispi vga interface (qemu stdvga)", .desc = "bochs dispi vga interface (qemu stdvga)",
......
...@@ -513,7 +513,7 @@ static void cirrus_mode_config_init(struct cirrus_device *cirrus) ...@@ -513,7 +513,7 @@ static void cirrus_mode_config_init(struct cirrus_device *cirrus)
DEFINE_DRM_GEM_SHMEM_FOPS(cirrus_fops); DEFINE_DRM_GEM_SHMEM_FOPS(cirrus_fops);
static struct drm_driver cirrus_driver = { static struct drm_driver cirrus_driver = {
.driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC | DRIVER_PRIME, .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC,
.name = DRIVER_NAME, .name = DRIVER_NAME,
.desc = DRIVER_DESC, .desc = DRIVER_DESC,
......
...@@ -462,9 +462,7 @@ static const struct file_operations fops = { ...@@ -462,9 +462,7 @@ static const struct file_operations fops = {
}; };
static struct drm_driver etnaviv_drm_driver = { static struct drm_driver etnaviv_drm_driver = {
.driver_features = DRIVER_GEM | .driver_features = DRIVER_GEM | DRIVER_RENDER,
DRIVER_PRIME |
DRIVER_RENDER,
.open = etnaviv_open, .open = etnaviv_open,
.postclose = etnaviv_postclose, .postclose = etnaviv_postclose,
.gem_free_object_unlocked = etnaviv_gem_free_object, .gem_free_object_unlocked = etnaviv_gem_free_object,
......
...@@ -114,7 +114,7 @@ static const struct file_operations exynos_drm_driver_fops = { ...@@ -114,7 +114,7 @@ static const struct file_operations exynos_drm_driver_fops = {
}; };
static struct drm_driver exynos_drm_driver = { static struct drm_driver exynos_drm_driver = {
.driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME .driver_features = DRIVER_MODESET | DRIVER_GEM
| DRIVER_ATOMIC | DRIVER_RENDER, | DRIVER_ATOMIC | DRIVER_RENDER,
.open = exynos_drm_open, .open = exynos_drm_open,
.lastclose = drm_fb_helper_lastclose, .lastclose = drm_fb_helper_lastclose,
......
...@@ -133,8 +133,7 @@ static irqreturn_t fsl_dcu_drm_irq(int irq, void *arg) ...@@ -133,8 +133,7 @@ static irqreturn_t fsl_dcu_drm_irq(int irq, void *arg)
DEFINE_DRM_GEM_CMA_FOPS(fsl_dcu_drm_fops); DEFINE_DRM_GEM_CMA_FOPS(fsl_dcu_drm_fops);
static struct drm_driver fsl_dcu_drm_driver = { static struct drm_driver fsl_dcu_drm_driver = {
.driver_features = DRIVER_GEM | DRIVER_MODESET .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC,
| DRIVER_PRIME | DRIVER_ATOMIC,
.load = fsl_dcu_load, .load = fsl_dcu_load,
.unload = fsl_dcu_unload, .unload = fsl_dcu_unload,
.irq_handler = fsl_dcu_drm_irq, .irq_handler = fsl_dcu_drm_irq,
......
...@@ -117,8 +117,7 @@ static int kirin_gem_cma_dumb_create(struct drm_file *file, ...@@ -117,8 +117,7 @@ static int kirin_gem_cma_dumb_create(struct drm_file *file,
} }
static struct drm_driver kirin_drm_driver = { static struct drm_driver kirin_drm_driver = {
.driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC,
DRIVER_ATOMIC,
.fops = &kirin_drm_fops, .fops = &kirin_drm_fops,
.gem_free_object_unlocked = drm_gem_cma_free_object, .gem_free_object_unlocked = drm_gem_cma_free_object,
......
...@@ -3174,7 +3174,7 @@ static struct drm_driver driver = { ...@@ -3174,7 +3174,7 @@ static struct drm_driver driver = {
* deal with them for Intel hardware. * deal with them for Intel hardware.
*/ */
.driver_features = .driver_features =
DRIVER_GEM | DRIVER_PRIME | DRIVER_GEM |
DRIVER_RENDER | DRIVER_MODESET | DRIVER_ATOMIC | DRIVER_SYNCOBJ, DRIVER_RENDER | DRIVER_MODESET | DRIVER_ATOMIC | DRIVER_SYNCOBJ,
.release = i915_driver_release, .release = i915_driver_release,
.open = i915_driver_open, .open = i915_driver_open,
......
...@@ -147,8 +147,7 @@ static const struct drm_ioctl_desc imx_drm_ioctls[] = { ...@@ -147,8 +147,7 @@ static const struct drm_ioctl_desc imx_drm_ioctls[] = {
}; };
static struct drm_driver imx_drm_driver = { static struct drm_driver imx_drm_driver = {
.driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME | .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC,
DRIVER_ATOMIC,
.gem_free_object_unlocked = drm_gem_cma_free_object, .gem_free_object_unlocked = drm_gem_cma_free_object,
.gem_vm_ops = &drm_gem_cma_vm_ops, .gem_vm_ops = &drm_gem_cma_vm_ops,
.dumb_create = drm_gem_cma_dumb_create, .dumb_create = drm_gem_cma_dumb_create,
......
...@@ -484,8 +484,7 @@ static void ingenic_drm_disable_vblank(struct drm_crtc *crtc) ...@@ -484,8 +484,7 @@ static void ingenic_drm_disable_vblank(struct drm_crtc *crtc)
DEFINE_DRM_GEM_CMA_FOPS(ingenic_drm_fops); DEFINE_DRM_GEM_CMA_FOPS(ingenic_drm_fops);
static struct drm_driver ingenic_drm_driver_data = { static struct drm_driver ingenic_drm_driver_data = {
.driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC,
| DRIVER_ATOMIC,
.name = "ingenic-drm", .name = "ingenic-drm",
.desc = "DRM module for Ingenic SoCs", .desc = "DRM module for Ingenic SoCs",
.date = "20190422", .date = "20190422",
......
...@@ -252,7 +252,7 @@ static const struct file_operations lima_drm_driver_fops = { ...@@ -252,7 +252,7 @@ static const struct file_operations lima_drm_driver_fops = {
}; };
static struct drm_driver lima_drm_driver = { static struct drm_driver lima_drm_driver = {
.driver_features = DRIVER_RENDER | DRIVER_GEM | DRIVER_PRIME | DRIVER_SYNCOBJ, .driver_features = DRIVER_RENDER | DRIVER_GEM | DRIVER_SYNCOBJ,
.open = lima_drm_driver_open, .open = lima_drm_driver_open,
.postclose = lima_drm_driver_postclose, .postclose = lima_drm_driver_postclose,
.ioctls = lima_drm_driver_ioctls, .ioctls = lima_drm_driver_ioctls,
......
...@@ -237,7 +237,7 @@ DEFINE_DRM_GEM_CMA_FOPS(drm_fops); ...@@ -237,7 +237,7 @@ DEFINE_DRM_GEM_CMA_FOPS(drm_fops);
static struct drm_driver mcde_drm_driver = { static struct drm_driver mcde_drm_driver = {
.driver_features = .driver_features =
DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME | DRIVER_ATOMIC, DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC,
.release = mcde_release, .release = mcde_release,
.lastclose = drm_fb_helper_lastclose, .lastclose = drm_fb_helper_lastclose,
.ioctls = NULL, .ioctls = NULL,
......
...@@ -321,8 +321,7 @@ static const struct file_operations mtk_drm_fops = { ...@@ -321,8 +321,7 @@ static const struct file_operations mtk_drm_fops = {
}; };
static struct drm_driver mtk_drm_driver = { static struct drm_driver mtk_drm_driver = {
.driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME | .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC,
DRIVER_ATOMIC,
.gem_free_object_unlocked = mtk_drm_gem_free_object, .gem_free_object_unlocked = mtk_drm_gem_free_object,
.gem_vm_ops = &drm_gem_cma_vm_ops, .gem_vm_ops = &drm_gem_cma_vm_ops,
......
...@@ -93,9 +93,7 @@ static int meson_dumb_create(struct drm_file *file, struct drm_device *dev, ...@@ -93,9 +93,7 @@ static int meson_dumb_create(struct drm_file *file, struct drm_device *dev,
DEFINE_DRM_GEM_CMA_FOPS(fops); DEFINE_DRM_GEM_CMA_FOPS(fops);
static struct drm_driver meson_driver = { static struct drm_driver meson_driver = {
.driver_features = DRIVER_GEM | .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC,
DRIVER_MODESET | DRIVER_PRIME |
DRIVER_ATOMIC,
/* IRQ */ /* IRQ */
.irq_handler = meson_irq, .irq_handler = meson_irq,
......
...@@ -1016,7 +1016,6 @@ static const struct file_operations fops = { ...@@ -1016,7 +1016,6 @@ static const struct file_operations fops = {
static struct drm_driver msm_driver = { static struct drm_driver msm_driver = {
.driver_features = DRIVER_GEM | .driver_features = DRIVER_GEM |
DRIVER_PRIME |
DRIVER_RENDER | DRIVER_RENDER |
DRIVER_ATOMIC | DRIVER_ATOMIC |
DRIVER_MODESET, DRIVER_MODESET,
......
...@@ -313,8 +313,7 @@ static irqreturn_t mxsfb_irq_handler(int irq, void *data) ...@@ -313,8 +313,7 @@ static irqreturn_t mxsfb_irq_handler(int irq, void *data)
DEFINE_DRM_GEM_CMA_FOPS(fops); DEFINE_DRM_GEM_CMA_FOPS(fops);
static struct drm_driver mxsfb_driver = { static struct drm_driver mxsfb_driver = {
.driver_features = DRIVER_GEM | DRIVER_MODESET | .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC,
DRIVER_PRIME | DRIVER_ATOMIC,
.irq_handler = mxsfb_irq_handler, .irq_handler = mxsfb_irq_handler,
.irq_preinstall = mxsfb_irq_preinstall, .irq_preinstall = mxsfb_irq_preinstall,
.irq_uninstall = mxsfb_irq_preinstall, .irq_uninstall = mxsfb_irq_preinstall,
......
...@@ -1105,7 +1105,7 @@ nouveau_driver_fops = { ...@@ -1105,7 +1105,7 @@ nouveau_driver_fops = {
static struct drm_driver static struct drm_driver
driver_stub = { driver_stub = {
.driver_features = .driver_features =
DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | DRIVER_RENDER DRIVER_GEM | DRIVER_MODESET | DRIVER_RENDER
#if defined(CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT) #if defined(CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT)
| DRIVER_KMS_LEGACY_CONTEXT | DRIVER_KMS_LEGACY_CONTEXT
#endif #endif
......
...@@ -524,7 +524,7 @@ static const struct file_operations omapdriver_fops = { ...@@ -524,7 +524,7 @@ static const struct file_operations omapdriver_fops = {
}; };
static struct drm_driver omap_drm_driver = { static struct drm_driver omap_drm_driver = {
.driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME | .driver_features = DRIVER_MODESET | DRIVER_GEM |
DRIVER_ATOMIC | DRIVER_RENDER, DRIVER_ATOMIC | DRIVER_RENDER,
.open = dev_open, .open = dev_open,
.lastclose = drm_fb_helper_lastclose, .lastclose = drm_fb_helper_lastclose,
......
...@@ -357,8 +357,7 @@ static const struct drm_ioctl_desc panfrost_drm_driver_ioctls[] = { ...@@ -357,8 +357,7 @@ static const struct drm_ioctl_desc panfrost_drm_driver_ioctls[] = {
DEFINE_DRM_GEM_SHMEM_FOPS(panfrost_drm_driver_fops); DEFINE_DRM_GEM_SHMEM_FOPS(panfrost_drm_driver_fops);
static struct drm_driver panfrost_drm_driver = { static struct drm_driver panfrost_drm_driver = {
.driver_features = DRIVER_RENDER | DRIVER_GEM | DRIVER_PRIME | .driver_features = DRIVER_RENDER | DRIVER_GEM | DRIVER_SYNCOBJ,
DRIVER_SYNCOBJ,
.open = panfrost_open, .open = panfrost_open,
.postclose = panfrost_postclose, .postclose = panfrost_postclose,
.ioctls = panfrost_drm_driver_ioctls, .ioctls = panfrost_drm_driver_ioctls,
......
...@@ -224,7 +224,7 @@ DEFINE_DRM_GEM_CMA_FOPS(drm_fops); ...@@ -224,7 +224,7 @@ DEFINE_DRM_GEM_CMA_FOPS(drm_fops);
static struct drm_driver pl111_drm_driver = { static struct drm_driver pl111_drm_driver = {
.driver_features = .driver_features =
DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME | DRIVER_ATOMIC, DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC,
.ioctls = NULL, .ioctls = NULL,
.fops = &drm_fops, .fops = &drm_fops,
.name = "pl111", .name = "pl111",
......
...@@ -247,8 +247,7 @@ static struct pci_driver qxl_pci_driver = { ...@@ -247,8 +247,7 @@ static struct pci_driver qxl_pci_driver = {
}; };
static struct drm_driver qxl_driver = { static struct drm_driver qxl_driver = {
.driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC,
DRIVER_ATOMIC,
.dumb_create = qxl_mode_dumb_create, .dumb_create = qxl_mode_dumb_create,
.dumb_map_offset = qxl_mode_dumb_mmap, .dumb_map_offset = qxl_mode_dumb_mmap,
......
...@@ -539,7 +539,7 @@ radeon_get_crtc_scanout_position(struct drm_device *dev, unsigned int pipe, ...@@ -539,7 +539,7 @@ radeon_get_crtc_scanout_position(struct drm_device *dev, unsigned int pipe,
static struct drm_driver kms_driver = { static struct drm_driver kms_driver = {
.driver_features = .driver_features =
DRIVER_USE_AGP | DRIVER_GEM | DRIVER_PRIME | DRIVER_RENDER, DRIVER_USE_AGP | DRIVER_GEM | DRIVER_RENDER,
.load = radeon_driver_load_kms, .load = radeon_driver_load_kms,
.open = radeon_driver_open_kms, .open = radeon_driver_open_kms,
.postclose = radeon_driver_postclose_kms, .postclose = radeon_driver_postclose_kms,
......
...@@ -441,8 +441,7 @@ MODULE_DEVICE_TABLE(of, rcar_du_of_table); ...@@ -441,8 +441,7 @@ MODULE_DEVICE_TABLE(of, rcar_du_of_table);
DEFINE_DRM_GEM_CMA_FOPS(rcar_du_fops); DEFINE_DRM_GEM_CMA_FOPS(rcar_du_fops);
static struct drm_driver rcar_du_driver = { static struct drm_driver rcar_du_driver = {
.driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC,
| DRIVER_ATOMIC,
.gem_free_object_unlocked = drm_gem_cma_free_object, .gem_free_object_unlocked = drm_gem_cma_free_object,
.gem_vm_ops = &drm_gem_cma_vm_ops, .gem_vm_ops = &drm_gem_cma_vm_ops,
.prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_handle_to_fd = drm_gem_prime_handle_to_fd,
......
...@@ -212,8 +212,7 @@ static const struct file_operations rockchip_drm_driver_fops = { ...@@ -212,8 +212,7 @@ static const struct file_operations rockchip_drm_driver_fops = {
}; };
static struct drm_driver rockchip_drm_driver = { static struct drm_driver rockchip_drm_driver = {
.driver_features = DRIVER_MODESET | DRIVER_GEM | .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC,
DRIVER_PRIME | DRIVER_ATOMIC,
.lastclose = drm_fb_helper_lastclose, .lastclose = drm_fb_helper_lastclose,
.gem_vm_ops = &drm_gem_cma_vm_ops, .gem_vm_ops = &drm_gem_cma_vm_ops,
.gem_free_object_unlocked = rockchip_gem_free_object, .gem_free_object_unlocked = rockchip_gem_free_object,
......
...@@ -127,8 +127,7 @@ static irqreturn_t shmob_drm_irq(int irq, void *arg) ...@@ -127,8 +127,7 @@ static irqreturn_t shmob_drm_irq(int irq, void *arg)
DEFINE_DRM_GEM_CMA_FOPS(shmob_drm_fops); DEFINE_DRM_GEM_CMA_FOPS(shmob_drm_fops);
static struct drm_driver shmob_drm_driver = { static struct drm_driver shmob_drm_driver = {
.driver_features = DRIVER_GEM | DRIVER_MODESET .driver_features = DRIVER_GEM | DRIVER_MODESET,
| DRIVER_PRIME,
.irq_handler = shmob_drm_irq, .irq_handler = shmob_drm_irq,
.gem_free_object_unlocked = drm_gem_cma_free_object, .gem_free_object_unlocked = drm_gem_cma_free_object,
.gem_vm_ops = &drm_gem_cma_vm_ops, .gem_vm_ops = &drm_gem_cma_vm_ops,
......
...@@ -140,8 +140,7 @@ static void sti_mode_config_init(struct drm_device *dev) ...@@ -140,8 +140,7 @@ static void sti_mode_config_init(struct drm_device *dev)
DEFINE_DRM_GEM_CMA_FOPS(sti_driver_fops); DEFINE_DRM_GEM_CMA_FOPS(sti_driver_fops);
static struct drm_driver sti_driver = { static struct drm_driver sti_driver = {
.driver_features = DRIVER_MODESET | .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC,
DRIVER_GEM | DRIVER_PRIME | DRIVER_ATOMIC,
.gem_free_object_unlocked = drm_gem_cma_free_object, .gem_free_object_unlocked = drm_gem_cma_free_object,
.gem_vm_ops = &drm_gem_cma_vm_ops, .gem_vm_ops = &drm_gem_cma_vm_ops,
.dumb_create = drm_gem_cma_dumb_create, .dumb_create = drm_gem_cma_dumb_create,
......
...@@ -54,8 +54,7 @@ static int stm_gem_cma_dumb_create(struct drm_file *file, ...@@ -54,8 +54,7 @@ static int stm_gem_cma_dumb_create(struct drm_file *file,
DEFINE_DRM_GEM_CMA_FOPS(drv_driver_fops); DEFINE_DRM_GEM_CMA_FOPS(drv_driver_fops);
static struct drm_driver drv_driver = { static struct drm_driver drv_driver = {
.driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME | .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC,
DRIVER_ATOMIC,
.name = "stm", .name = "stm",
.desc = "STMicroelectronics SoC DRM", .desc = "STMicroelectronics SoC DRM",
.date = "20170330", .date = "20170330",
......
...@@ -38,7 +38,7 @@ static int drm_sun4i_gem_dumb_create(struct drm_file *file_priv, ...@@ -38,7 +38,7 @@ static int drm_sun4i_gem_dumb_create(struct drm_file *file_priv,
DEFINE_DRM_GEM_CMA_FOPS(sun4i_drv_fops); DEFINE_DRM_GEM_CMA_FOPS(sun4i_drv_fops);
static struct drm_driver sun4i_drv_driver = { static struct drm_driver sun4i_drv_driver = {
.driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | DRIVER_ATOMIC, .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC,
/* Generic Operations */ /* Generic Operations */
.fops = &sun4i_drv_fops, .fops = &sun4i_drv_fops,
......
...@@ -1007,7 +1007,7 @@ static int tegra_debugfs_init(struct drm_minor *minor) ...@@ -1007,7 +1007,7 @@ static int tegra_debugfs_init(struct drm_minor *minor)
#endif #endif
static struct drm_driver tegra_drm_driver = { static struct drm_driver tegra_drm_driver = {
.driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME | .driver_features = DRIVER_MODESET | DRIVER_GEM |
DRIVER_ATOMIC | DRIVER_RENDER, DRIVER_ATOMIC | DRIVER_RENDER,
.load = tegra_drm_load, .load = tegra_drm_load,
.unload = tegra_drm_unload, .unload = tegra_drm_unload,
......
...@@ -512,8 +512,7 @@ static int tilcdc_debugfs_init(struct drm_minor *minor) ...@@ -512,8 +512,7 @@ static int tilcdc_debugfs_init(struct drm_minor *minor)
DEFINE_DRM_GEM_CMA_FOPS(fops); DEFINE_DRM_GEM_CMA_FOPS(fops);
static struct drm_driver tilcdc_driver = { static struct drm_driver tilcdc_driver = {
.driver_features = (DRIVER_GEM | DRIVER_MODESET | .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC,
DRIVER_PRIME | DRIVER_ATOMIC),
.irq_handler = tilcdc_irq, .irq_handler = tilcdc_irq,
.gem_free_object_unlocked = drm_gem_cma_free_object, .gem_free_object_unlocked = drm_gem_cma_free_object,
.gem_print_info = drm_gem_cma_print_info, .gem_print_info = drm_gem_cma_print_info,
......
...@@ -193,7 +193,7 @@ static const struct drm_display_mode yx350hv15_mode = { ...@@ -193,7 +193,7 @@ static const struct drm_display_mode yx350hv15_mode = {
DEFINE_DRM_GEM_CMA_FOPS(hx8357d_fops); DEFINE_DRM_GEM_CMA_FOPS(hx8357d_fops);
static struct drm_driver hx8357d_driver = { static struct drm_driver hx8357d_driver = {
.driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | DRIVER_ATOMIC, .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC,
.fops = &hx8357d_fops, .fops = &hx8357d_fops,
.release = mipi_dbi_release, .release = mipi_dbi_release,
DRM_GEM_CMA_VMAP_DRIVER_OPS, DRM_GEM_CMA_VMAP_DRIVER_OPS,
......
...@@ -350,8 +350,7 @@ static const struct drm_display_mode ili9225_mode = { ...@@ -350,8 +350,7 @@ static const struct drm_display_mode ili9225_mode = {
DEFINE_DRM_GEM_CMA_FOPS(ili9225_fops); DEFINE_DRM_GEM_CMA_FOPS(ili9225_fops);
static struct drm_driver ili9225_driver = { static struct drm_driver ili9225_driver = {
.driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC,
DRIVER_ATOMIC,
.fops = &ili9225_fops, .fops = &ili9225_fops,
.release = mipi_dbi_release, .release = mipi_dbi_release,
DRM_GEM_CMA_VMAP_DRIVER_OPS, DRM_GEM_CMA_VMAP_DRIVER_OPS,
......
...@@ -149,7 +149,7 @@ static const struct drm_display_mode yx240qv29_mode = { ...@@ -149,7 +149,7 @@ static const struct drm_display_mode yx240qv29_mode = {
DEFINE_DRM_GEM_CMA_FOPS(ili9341_fops); DEFINE_DRM_GEM_CMA_FOPS(ili9341_fops);
static struct drm_driver ili9341_driver = { static struct drm_driver ili9341_driver = {
.driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | DRIVER_ATOMIC, .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC,
.fops = &ili9341_fops, .fops = &ili9341_fops,
.release = mipi_dbi_release, .release = mipi_dbi_release,
DRM_GEM_CMA_VMAP_DRIVER_OPS, DRM_GEM_CMA_VMAP_DRIVER_OPS,
......
...@@ -153,8 +153,7 @@ static const struct drm_display_mode mi0283qt_mode = { ...@@ -153,8 +153,7 @@ static const struct drm_display_mode mi0283qt_mode = {
DEFINE_DRM_GEM_CMA_FOPS(mi0283qt_fops); DEFINE_DRM_GEM_CMA_FOPS(mi0283qt_fops);
static struct drm_driver mi0283qt_driver = { static struct drm_driver mi0283qt_driver = {
.driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC,
DRIVER_ATOMIC,
.fops = &mi0283qt_fops, .fops = &mi0283qt_fops,
.release = mipi_dbi_release, .release = mipi_dbi_release,
DRM_GEM_CMA_VMAP_DRIVER_OPS, DRM_GEM_CMA_VMAP_DRIVER_OPS,
......
...@@ -925,8 +925,7 @@ static const u8 repaper_e2271cs021_cs[] = { 0x00, 0x00, 0x00, 0x7f, ...@@ -925,8 +925,7 @@ static const u8 repaper_e2271cs021_cs[] = { 0x00, 0x00, 0x00, 0x7f,
DEFINE_DRM_GEM_CMA_FOPS(repaper_fops); DEFINE_DRM_GEM_CMA_FOPS(repaper_fops);
static struct drm_driver repaper_driver = { static struct drm_driver repaper_driver = {
.driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC,
DRIVER_ATOMIC,
.fops = &repaper_fops, .fops = &repaper_fops,
.release = repaper_release, .release = repaper_release,
DRM_GEM_CMA_VMAP_DRIVER_OPS, DRM_GEM_CMA_VMAP_DRIVER_OPS,
......
...@@ -296,8 +296,7 @@ static const struct drm_display_mode st7586_mode = { ...@@ -296,8 +296,7 @@ static const struct drm_display_mode st7586_mode = {
DEFINE_DRM_GEM_CMA_FOPS(st7586_fops); DEFINE_DRM_GEM_CMA_FOPS(st7586_fops);
static struct drm_driver st7586_driver = { static struct drm_driver st7586_driver = {
.driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC,
DRIVER_ATOMIC,
.fops = &st7586_fops, .fops = &st7586_fops,
.release = mipi_dbi_release, .release = mipi_dbi_release,
DRM_GEM_CMA_VMAP_DRIVER_OPS, DRM_GEM_CMA_VMAP_DRIVER_OPS,
......
...@@ -123,8 +123,7 @@ static const struct drm_display_mode jd_t18003_t01_mode = { ...@@ -123,8 +123,7 @@ static const struct drm_display_mode jd_t18003_t01_mode = {
DEFINE_DRM_GEM_CMA_FOPS(st7735r_fops); DEFINE_DRM_GEM_CMA_FOPS(st7735r_fops);
static struct drm_driver st7735r_driver = { static struct drm_driver st7735r_driver = {
.driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC,
DRIVER_ATOMIC,
.fops = &st7735r_fops, .fops = &st7735r_fops,
.release = mipi_dbi_release, .release = mipi_dbi_release,
DRM_GEM_CMA_VMAP_DRIVER_OPS, DRM_GEM_CMA_VMAP_DRIVER_OPS,
......
...@@ -137,8 +137,7 @@ static int tve200_modeset_init(struct drm_device *dev) ...@@ -137,8 +137,7 @@ static int tve200_modeset_init(struct drm_device *dev)
DEFINE_DRM_GEM_CMA_FOPS(drm_fops); DEFINE_DRM_GEM_CMA_FOPS(drm_fops);
static struct drm_driver tve200_drm_driver = { static struct drm_driver tve200_drm_driver = {
.driver_features = .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC,
DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME | DRIVER_ATOMIC,
.ioctls = NULL, .ioctls = NULL,
.fops = &drm_fops, .fops = &drm_fops,
.name = "tve200", .name = "tve200",
......
...@@ -54,7 +54,7 @@ static void udl_driver_release(struct drm_device *dev) ...@@ -54,7 +54,7 @@ static void udl_driver_release(struct drm_device *dev)
} }
static struct drm_driver driver = { static struct drm_driver driver = {
.driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME, .driver_features = DRIVER_MODESET | DRIVER_GEM,
.release = udl_driver_release, .release = udl_driver_release,
/* gem hooks */ /* gem hooks */
......
...@@ -188,7 +188,6 @@ static const struct drm_ioctl_desc v3d_drm_ioctls[] = { ...@@ -188,7 +188,6 @@ static const struct drm_ioctl_desc v3d_drm_ioctls[] = {
static struct drm_driver v3d_drm_driver = { static struct drm_driver v3d_drm_driver = {
.driver_features = (DRIVER_GEM | .driver_features = (DRIVER_GEM |
DRIVER_RENDER | DRIVER_RENDER |
DRIVER_PRIME |
DRIVER_SYNCOBJ), DRIVER_SYNCOBJ),
.open = v3d_open, .open = v3d_open,
......
...@@ -196,7 +196,7 @@ static const struct file_operations vbox_fops = { ...@@ -196,7 +196,7 @@ static const struct file_operations vbox_fops = {
static struct drm_driver driver = { static struct drm_driver driver = {
.driver_features = .driver_features =
DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME | DRIVER_ATOMIC, DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC,
.lastclose = drm_fb_helper_lastclose, .lastclose = drm_fb_helper_lastclose,
......
...@@ -180,7 +180,6 @@ static struct drm_driver vc4_drm_driver = { ...@@ -180,7 +180,6 @@ static struct drm_driver vc4_drm_driver = {
DRIVER_ATOMIC | DRIVER_ATOMIC |
DRIVER_GEM | DRIVER_GEM |
DRIVER_RENDER | DRIVER_RENDER |
DRIVER_PRIME |
DRIVER_SYNCOBJ), DRIVER_SYNCOBJ),
.open = vc4_open, .open = vc4_open,
.postclose = vc4_close, .postclose = vc4_close,
......
...@@ -427,8 +427,7 @@ static void vgem_release(struct drm_device *dev) ...@@ -427,8 +427,7 @@ static void vgem_release(struct drm_device *dev)
} }
static struct drm_driver vgem_driver = { static struct drm_driver vgem_driver = {
.driver_features = DRIVER_GEM | DRIVER_PRIME | .driver_features = DRIVER_GEM | DRIVER_RENDER,
DRIVER_RENDER,
.release = vgem_release, .release = vgem_release,
.open = vgem_open, .open = vgem_open,
.postclose = vgem_postclose, .postclose = vgem_postclose,
......
...@@ -195,7 +195,7 @@ static const struct file_operations virtio_gpu_driver_fops = { ...@@ -195,7 +195,7 @@ static const struct file_operations virtio_gpu_driver_fops = {
}; };
static struct drm_driver driver = { static struct drm_driver driver = {
.driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME | DRIVER_RENDER | DRIVER_ATOMIC, .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_RENDER | DRIVER_ATOMIC,
.open = virtio_gpu_driver_open, .open = virtio_gpu_driver_open,
.postclose = virtio_gpu_driver_postclose, .postclose = virtio_gpu_driver_postclose,
......
...@@ -1548,7 +1548,7 @@ static const struct file_operations vmwgfx_driver_fops = { ...@@ -1548,7 +1548,7 @@ static const struct file_operations vmwgfx_driver_fops = {
static struct drm_driver driver = { static struct drm_driver driver = {
.driver_features = .driver_features =
DRIVER_MODESET | DRIVER_PRIME | DRIVER_RENDER | DRIVER_ATOMIC, DRIVER_MODESET | DRIVER_RENDER | DRIVER_ATOMIC,
.load = vmw_driver_load, .load = vmw_driver_load,
.unload = vmw_driver_unload, .unload = vmw_driver_unload,
.lastclose = vmw_lastclose, .lastclose = vmw_lastclose,
......
...@@ -485,8 +485,7 @@ static const struct vm_operations_struct xen_drm_drv_vm_ops = { ...@@ -485,8 +485,7 @@ static const struct vm_operations_struct xen_drm_drv_vm_ops = {
}; };
static struct drm_driver xen_drm_driver = { static struct drm_driver xen_drm_driver = {
.driver_features = DRIVER_GEM | DRIVER_MODESET | .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC,
DRIVER_PRIME | DRIVER_ATOMIC,
.release = xen_drm_drv_release, .release = xen_drm_drv_release,
.gem_vm_ops = &xen_drm_drv_vm_ops, .gem_vm_ops = &xen_drm_drv_vm_ops,
.gem_free_object_unlocked = xen_drm_drv_free_object_unlocked, .gem_free_object_unlocked = xen_drm_drv_free_object_unlocked,
......
...@@ -38,8 +38,7 @@ static const struct drm_mode_config_funcs zx_drm_mode_config_funcs = { ...@@ -38,8 +38,7 @@ static const struct drm_mode_config_funcs zx_drm_mode_config_funcs = {
DEFINE_DRM_GEM_CMA_FOPS(zx_drm_fops); DEFINE_DRM_GEM_CMA_FOPS(zx_drm_fops);
static struct drm_driver zx_drm_driver = { static struct drm_driver zx_drm_driver = {
.driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC,
DRIVER_ATOMIC,
.gem_free_object_unlocked = drm_gem_cma_free_object, .gem_free_object_unlocked = drm_gem_cma_free_object,
.gem_vm_ops = &drm_gem_cma_vm_ops, .gem_vm_ops = &drm_gem_cma_vm_ops,
.dumb_create = drm_gem_cma_dumb_create, .dumb_create = drm_gem_cma_dumb_create,
......
...@@ -61,12 +61,6 @@ enum drm_driver_feature { ...@@ -61,12 +61,6 @@ enum drm_driver_feature {
* Driver supports mode setting interfaces (KMS). * Driver supports mode setting interfaces (KMS).
*/ */
DRIVER_MODESET = BIT(1), DRIVER_MODESET = BIT(1),
/**
* @DRIVER_PRIME:
*
* Driver implements DRM PRIME buffer sharing.
*/
DRIVER_PRIME = BIT(2),
/** /**
* @DRIVER_RENDER: * @DRIVER_RENDER:
* *
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment