Commit e1f96ef4 authored by Shawn Guo's avatar Shawn Guo Committed by Daniel Vetter

drm: drop DRIVER_HAVE_IRQ flag for some drivers

Since commit 4984979b ("drm/irq: simplify irq checks in
drm_wait_vblank"), the drm driver feature flag DRIVER_HAVE_IRQ is only
required for drivers that have an IRQ handler managed by the DRM core.
Some drivers, armada, etnaviv, kirin and sti, set this flag without
.irq_handler setup in drm_driver.  These drivers manage IRQ handler
by themselves and the flag DRIVER_HAVE_IRQ makes no sense there.

Drop the flag for these drivers to avoid confusion.
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
Cc: Vincent Abriou <vincent.abriou@st.com>
Cc: Xinliang Liu <z.liuxinliang@hisilicon.com>
Acked-by: Russell King <rmk+kernel@armlinux.org.uk> (for armada and etnaviv)
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1471331168-5601-1-git-send-email-shawnguo@kernel.org
parent d3828147
...@@ -211,7 +211,7 @@ static struct drm_driver armada_drm_driver = { ...@@ -211,7 +211,7 @@ static struct drm_driver armada_drm_driver = {
.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_HAVE_IRQ | DRIVER_PRIME, DRIVER_PRIME,
.ioctls = armada_ioctls, .ioctls = armada_ioctls,
.fops = &armada_drm_fops, .fops = &armada_drm_fops,
}; };
......
...@@ -488,8 +488,7 @@ static const struct file_operations fops = { ...@@ -488,8 +488,7 @@ static const struct file_operations fops = {
}; };
static struct drm_driver etnaviv_drm_driver = { static struct drm_driver etnaviv_drm_driver = {
.driver_features = DRIVER_HAVE_IRQ | .driver_features = DRIVER_GEM |
DRIVER_GEM |
DRIVER_PRIME | DRIVER_PRIME |
DRIVER_RENDER, DRIVER_RENDER,
.open = etnaviv_open, .open = etnaviv_open,
......
...@@ -169,7 +169,7 @@ static int kirin_gem_cma_dumb_create(struct drm_file *file, ...@@ -169,7 +169,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_PRIME |
DRIVER_ATOMIC | DRIVER_HAVE_IRQ, 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,
......
...@@ -282,7 +282,7 @@ static const struct file_operations sti_driver_fops = { ...@@ -282,7 +282,7 @@ static const struct file_operations sti_driver_fops = {
}; };
static struct drm_driver sti_driver = { static struct drm_driver sti_driver = {
.driver_features = DRIVER_HAVE_IRQ | DRIVER_MODESET | .driver_features = DRIVER_MODESET |
DRIVER_GEM | DRIVER_PRIME | 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,
......
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