[v2] drm: drop DRIVER_HAVE_IRQ flag for some drivers
diff mbox

Message ID 1471331168-5601-1-git-send-email-shawnguo@kernel.org
State New
Headers show

Commit Message

Shawn Guo Aug. 16, 2016, 7:06 a.m. UTC
Since commit 4984979b9b90 ("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: Shawn 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)
---
Changes for v2:
 - Improve commit log per Russell's suggestion
 - Add Russell's ACK tag

 drivers/gpu/drm/armada/armada_drv.c             | 2 +-
 drivers/gpu/drm/etnaviv/etnaviv_drv.c           | 3 +--
 drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 2 +-
 drivers/gpu/drm/sti/sti_drv.c                   | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

Comments

Daniel Vetter Aug. 16, 2016, 12:07 p.m. UTC | #1
On Tue, Aug 16, 2016 at 03:06:08PM +0800, Shawn Guo wrote:
> Since commit 4984979b9b90 ("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: Shawn 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)

Applied to drm-misc, thanks.
-Daniel

> ---
> Changes for v2:
>  - Improve commit log per Russell's suggestion
>  - Add Russell's ACK tag
> 
>  drivers/gpu/drm/armada/armada_drv.c             | 2 +-
>  drivers/gpu/drm/etnaviv/etnaviv_drv.c           | 3 +--
>  drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 2 +-
>  drivers/gpu/drm/sti/sti_drv.c                   | 2 +-
>  4 files changed, 4 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/gpu/drm/armada/armada_drv.c b/drivers/gpu/drm/armada/armada_drv.c
> index f5ebdd681445..1e0e68f608e4 100644
> --- a/drivers/gpu/drm/armada/armada_drv.c
> +++ b/drivers/gpu/drm/armada/armada_drv.c
> @@ -211,7 +211,7 @@ static struct drm_driver armada_drm_driver = {
>  	.desc			= "Armada SoC DRM",
>  	.date			= "20120730",
>  	.driver_features	= DRIVER_GEM | DRIVER_MODESET |
> -				  DRIVER_HAVE_IRQ | DRIVER_PRIME,
> +				  DRIVER_PRIME,
>  	.ioctls			= armada_ioctls,
>  	.fops			= &armada_drm_fops,
>  };
> diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.c b/drivers/gpu/drm/etnaviv/etnaviv_drv.c
> index ffd1b32caa8d..fd0ed61565f3 100644
> --- a/drivers/gpu/drm/etnaviv/etnaviv_drv.c
> +++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.c
> @@ -488,8 +488,7 @@ static const struct file_operations fops = {
>  };
>  
>  static struct drm_driver etnaviv_drm_driver = {
> -	.driver_features    = DRIVER_HAVE_IRQ |
> -				DRIVER_GEM |
> +	.driver_features    = DRIVER_GEM |
>  				DRIVER_PRIME |
>  				DRIVER_RENDER,
>  	.open               = etnaviv_open,
> diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c
> index 1edd9bc80294..1fc2f502d20d 100644
> --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c
> +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c
> @@ -169,7 +169,7 @@ static int kirin_gem_cma_dumb_create(struct drm_file *file,
>  
>  static struct drm_driver kirin_drm_driver = {
>  	.driver_features	= DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME |
> -				  DRIVER_ATOMIC | DRIVER_HAVE_IRQ,
> +				  DRIVER_ATOMIC,
>  	.fops			= &kirin_drm_fops,
>  
>  	.gem_free_object_unlocked = drm_gem_cma_free_object,
> diff --git a/drivers/gpu/drm/sti/sti_drv.c b/drivers/gpu/drm/sti/sti_drv.c
> index 96bd3d08b2d4..f8311b2bc84e 100644
> --- a/drivers/gpu/drm/sti/sti_drv.c
> +++ b/drivers/gpu/drm/sti/sti_drv.c
> @@ -282,7 +282,7 @@ static const struct file_operations sti_driver_fops = {
>  };
>  
>  static struct drm_driver sti_driver = {
> -	.driver_features = DRIVER_HAVE_IRQ | DRIVER_MODESET |
> +	.driver_features = DRIVER_MODESET |
>  	    DRIVER_GEM | DRIVER_PRIME | DRIVER_ATOMIC,
>  	.gem_free_object_unlocked = drm_gem_cma_free_object,
>  	.gem_vm_ops = &drm_gem_cma_vm_ops,
> -- 
> 1.9.1
>
Vincent Abriou Aug. 18, 2016, 7:28 a.m. UTC | #2
Acked-by: Vincent Abriou <vincent.abriou@st.com>

On 08/16/2016 09:06 AM, Shawn Guo wrote:
> Since commit 4984979b9b90 ("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: Shawn 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)
> ---
> Changes for v2:
>  - Improve commit log per Russell's suggestion
>  - Add Russell's ACK tag
>
>  drivers/gpu/drm/armada/armada_drv.c             | 2 +-
>  drivers/gpu/drm/etnaviv/etnaviv_drv.c           | 3 +--
>  drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 2 +-
>  drivers/gpu/drm/sti/sti_drv.c                   | 2 +-
>  4 files changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/armada/armada_drv.c b/drivers/gpu/drm/armada/armada_drv.c
> index f5ebdd681445..1e0e68f608e4 100644
> --- a/drivers/gpu/drm/armada/armada_drv.c
> +++ b/drivers/gpu/drm/armada/armada_drv.c
> @@ -211,7 +211,7 @@ static struct drm_driver armada_drm_driver = {
>  	.desc			= "Armada SoC DRM",
>  	.date			= "20120730",
>  	.driver_features	= DRIVER_GEM | DRIVER_MODESET |
> -				  DRIVER_HAVE_IRQ | DRIVER_PRIME,
> +				  DRIVER_PRIME,
>  	.ioctls			= armada_ioctls,
>  	.fops			= &armada_drm_fops,
>  };
> diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.c b/drivers/gpu/drm/etnaviv/etnaviv_drv.c
> index ffd1b32caa8d..fd0ed61565f3 100644
> --- a/drivers/gpu/drm/etnaviv/etnaviv_drv.c
> +++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.c
> @@ -488,8 +488,7 @@ static const struct file_operations fops = {
>  };
>
>  static struct drm_driver etnaviv_drm_driver = {
> -	.driver_features    = DRIVER_HAVE_IRQ |
> -				DRIVER_GEM |
> +	.driver_features    = DRIVER_GEM |
>  				DRIVER_PRIME |
>  				DRIVER_RENDER,
>  	.open               = etnaviv_open,
> diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c
> index 1edd9bc80294..1fc2f502d20d 100644
> --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c
> +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c
> @@ -169,7 +169,7 @@ static int kirin_gem_cma_dumb_create(struct drm_file *file,
>
>  static struct drm_driver kirin_drm_driver = {
>  	.driver_features	= DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME |
> -				  DRIVER_ATOMIC | DRIVER_HAVE_IRQ,
> +				  DRIVER_ATOMIC,
>  	.fops			= &kirin_drm_fops,
>
>  	.gem_free_object_unlocked = drm_gem_cma_free_object,
> diff --git a/drivers/gpu/drm/sti/sti_drv.c b/drivers/gpu/drm/sti/sti_drv.c
> index 96bd3d08b2d4..f8311b2bc84e 100644
> --- a/drivers/gpu/drm/sti/sti_drv.c
> +++ b/drivers/gpu/drm/sti/sti_drv.c
> @@ -282,7 +282,7 @@ static const struct file_operations sti_driver_fops = {
>  };
>
>  static struct drm_driver sti_driver = {
> -	.driver_features = DRIVER_HAVE_IRQ | DRIVER_MODESET |
> +	.driver_features = DRIVER_MODESET |
>  	    DRIVER_GEM | DRIVER_PRIME | DRIVER_ATOMIC,
>  	.gem_free_object_unlocked = drm_gem_cma_free_object,
>  	.gem_vm_ops = &drm_gem_cma_vm_ops,
>

Patch
diff mbox

diff --git a/drivers/gpu/drm/armada/armada_drv.c b/drivers/gpu/drm/armada/armada_drv.c
index f5ebdd681445..1e0e68f608e4 100644
--- a/drivers/gpu/drm/armada/armada_drv.c
+++ b/drivers/gpu/drm/armada/armada_drv.c
@@ -211,7 +211,7 @@  static struct drm_driver armada_drm_driver = {
 	.desc			= "Armada SoC DRM",
 	.date			= "20120730",
 	.driver_features	= DRIVER_GEM | DRIVER_MODESET |
-				  DRIVER_HAVE_IRQ | DRIVER_PRIME,
+				  DRIVER_PRIME,
 	.ioctls			= armada_ioctls,
 	.fops			= &armada_drm_fops,
 };
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.c b/drivers/gpu/drm/etnaviv/etnaviv_drv.c
index ffd1b32caa8d..fd0ed61565f3 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_drv.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.c
@@ -488,8 +488,7 @@  static const struct file_operations fops = {
 };
 
 static struct drm_driver etnaviv_drm_driver = {
-	.driver_features    = DRIVER_HAVE_IRQ |
-				DRIVER_GEM |
+	.driver_features    = DRIVER_GEM |
 				DRIVER_PRIME |
 				DRIVER_RENDER,
 	.open               = etnaviv_open,
diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c
index 1edd9bc80294..1fc2f502d20d 100644
--- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c
+++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c
@@ -169,7 +169,7 @@  static int kirin_gem_cma_dumb_create(struct drm_file *file,
 
 static struct drm_driver kirin_drm_driver = {
 	.driver_features	= DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME |
-				  DRIVER_ATOMIC | DRIVER_HAVE_IRQ,
+				  DRIVER_ATOMIC,
 	.fops			= &kirin_drm_fops,
 
 	.gem_free_object_unlocked = drm_gem_cma_free_object,
diff --git a/drivers/gpu/drm/sti/sti_drv.c b/drivers/gpu/drm/sti/sti_drv.c
index 96bd3d08b2d4..f8311b2bc84e 100644
--- a/drivers/gpu/drm/sti/sti_drv.c
+++ b/drivers/gpu/drm/sti/sti_drv.c
@@ -282,7 +282,7 @@  static const struct file_operations sti_driver_fops = {
 };
 
 static struct drm_driver sti_driver = {
-	.driver_features = DRIVER_HAVE_IRQ | DRIVER_MODESET |
+	.driver_features = DRIVER_MODESET |
 	    DRIVER_GEM | DRIVER_PRIME | DRIVER_ATOMIC,
 	.gem_free_object_unlocked = drm_gem_cma_free_object,
 	.gem_vm_ops = &drm_gem_cma_vm_ops,