| Message ID | 1470978937-16931-1-git-send-email-shawnguo@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Aug 12, 2016 at 01:15:37PM +0800, Shawn Guo wrote: > The drm driver feature flag DRIVER_HAVE_IRQ is used to indicates whether > the driver has 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. It's worth noting that DRIVER_HAVE_IRQ was required prior to: commit 4984979b9b9025a1cb9a9bea089d31a3e01ccff1 Author: Daniel Vetter <daniel.vetter@ffwll.ch> Date: Wed Aug 28 15:02:37 2013 +0200 drm/irq: simplify irq checks in drm_wait_vblank to have working vblank. As this is no longer the case, this change looks sane. > > Drop the flag for these drivers to avoid confusion. > > Signed-off-by: Shawn Guo <shawnguo@kernel.org> > --- > drivers/gpu/drm/armada/armada_drv.c | 2 +- > drivers/gpu/drm/etnaviv/etnaviv_drv.c | 3 +-- For both of these, Acked-by: Russell King <rmk+kernel@armlinux.org.uk>
On Fri, Aug 12, 2016 at 03:03:31PM +0100, Russell King - ARM Linux wrote: > On Fri, Aug 12, 2016 at 01:15:37PM +0800, Shawn Guo wrote: > > The drm driver feature flag DRIVER_HAVE_IRQ is used to indicates whether > > the driver has 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. > > It's worth noting that DRIVER_HAVE_IRQ was required prior to: > > commit 4984979b9b9025a1cb9a9bea089d31a3e01ccff1 > Author: Daniel Vetter <daniel.vetter@ffwll.ch> > Date: Wed Aug 28 15:02:37 2013 +0200 > > drm/irq: simplify irq checks in drm_wait_vblank > > to have working vblank. As this is no longer the case, this change > looks sane. Okay, I will improve the commit log and send v2 soon. > > > > > Drop the flag for these drivers to avoid confusion. > > > > Signed-off-by: Shawn Guo <shawnguo@kernel.org> > > --- > > drivers/gpu/drm/armada/armada_drv.c | 2 +- > > drivers/gpu/drm/etnaviv/etnaviv_drv.c | 3 +-- > > For both of these, > > Acked-by: Russell King <rmk+kernel@armlinux.org.uk> Thanks, Russell. Shawn
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,
The drm driver feature flag DRIVER_HAVE_IRQ is used to indicates whether the driver has 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> --- 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(-)