diff options
author | Thomas Hellstrom <thellstrom@vmware.com> | 2017-08-24 08:06:27 +0200 |
---|---|---|
committer | Sinclair Yeh <syeh@vmware.com> | 2017-08-28 17:40:40 +0200 |
commit | e300173f06160d65d383d54fdd48027ecd052af3 (patch) | |
tree | 0859b97da1dd00e43da3e9b4b13a0875acca92ea /drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | |
parent | 7c0059dd832cc686bf0febefdcf8295cdd93007f (diff) | |
download | blackbird-obmc-linux-e300173f06160d65d383d54fdd48027ecd052af3.tar.gz blackbird-obmc-linux-e300173f06160d65d383d54fdd48027ecd052af3.zip |
drm/vmwgfx: Don't use drm_irq_[un]install
We're not allowed to change the upstream version of the drm_irq_install
function to be able to incorporate threaded irqs. So roll our own irq
install- and uninstall functions instead of relying on the drm core ones.
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Diffstat (limited to 'drivers/gpu/drm/vmwgfx/vmwgfx_drv.h')
-rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h index 4b948fba9eec..5e7e8a3df7c3 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h @@ -41,6 +41,7 @@ #include <drm/ttm/ttm_module.h> #include "vmwgfx_fence.h" +#define VMWGFX_DRIVER_NAME "vmwgfx" #define VMWGFX_DRIVER_DATE "20170607" #define VMWGFX_DRIVER_MAJOR 2 #define VMWGFX_DRIVER_MINOR 13 @@ -847,12 +848,10 @@ extern int vmw_validate_single_buffer(struct vmw_private *dev_priv, * IRQs and wating - vmwgfx_irq.c */ -extern irqreturn_t vmw_irq_handler(int irq, void *arg); extern int vmw_wait_seqno(struct vmw_private *dev_priv, bool lazy, uint32_t seqno, bool interruptible, unsigned long timeout); -extern void vmw_irq_preinstall(struct drm_device *dev); -extern int vmw_irq_postinstall(struct drm_device *dev); +extern int vmw_irq_install(struct drm_device *dev, int irq); extern void vmw_irq_uninstall(struct drm_device *dev); extern bool vmw_seqno_passed(struct vmw_private *dev_priv, uint32_t seqno); |