diff options
author | Rob Clark | 2018-02-12 14:18:27 +0100 |
---|---|---|
committer | Rob Clark | 2018-03-19 11:33:35 +0100 |
commit | 14be3200cd5f4ccece246f969c9c3645c3c12bd3 (patch) | |
tree | 1a13a558286aff37da5c87764790326d47fb3ec3 /drivers/gpu/drm/msm/mdp/mdp4/mdp4_irq.c | |
parent | drm/msm/dsi: Fix potential NULL pointer dereference in msm_dsi_modeset_init (diff) | |
download | kernel-qcow2-linux-14be3200cd5f4ccece246f969c9c3645c3c12bd3.tar.gz kernel-qcow2-linux-14be3200cd5f4ccece246f969c9c3645c3c12bd3.tar.xz kernel-qcow2-linux-14be3200cd5f4ccece246f969c9c3645c3c12bd3.zip |
drm/msm: rename mdp->disp
Since new display controller is called "dpu" instead of "mdp". Lets
make the name of the toplevel directory for the display controllers a
bit more generic.
Signed-off-by: Rob Clark <robdclark@gmail.com>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Diffstat (limited to 'drivers/gpu/drm/msm/mdp/mdp4/mdp4_irq.c')
-rw-r--r-- | drivers/gpu/drm/msm/mdp/mdp4/mdp4_irq.c | 121 |
1 files changed, 0 insertions, 121 deletions
diff --git a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_irq.c b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_irq.c deleted file mode 100644 index b764d7f10312..000000000000 --- a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_irq.c +++ /dev/null @@ -1,121 +0,0 @@ -/* - * Copyright (C) 2013 Red Hat - * Author: Rob Clark <robdclark@gmail.com> - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 as published by - * the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#include <drm/drm_print.h> - -#include "msm_drv.h" -#include "mdp4_kms.h" - -void mdp4_set_irqmask(struct mdp_kms *mdp_kms, uint32_t irqmask, - uint32_t old_irqmask) -{ - mdp4_write(to_mdp4_kms(mdp_kms), REG_MDP4_INTR_CLEAR, - irqmask ^ (irqmask & old_irqmask)); - mdp4_write(to_mdp4_kms(mdp_kms), REG_MDP4_INTR_ENABLE, irqmask); -} - -static void mdp4_irq_error_handler(struct mdp_irq *irq, uint32_t irqstatus) -{ - struct mdp4_kms *mdp4_kms = container_of(irq, struct mdp4_kms, error_handler); - static DEFINE_RATELIMIT_STATE(rs, 5*HZ, 1); - extern bool dumpstate; - - DRM_ERROR_RATELIMITED("errors: %08x\n", irqstatus); - - if (dumpstate && __ratelimit(&rs)) { - struct drm_printer p = drm_info_printer(mdp4_kms->dev->dev); - drm_state_dump(mdp4_kms->dev, &p); - } -} - -void mdp4_irq_preinstall(struct msm_kms *kms) -{ - struct mdp4_kms *mdp4_kms = to_mdp4_kms(to_mdp_kms(kms)); - mdp4_enable(mdp4_kms); - mdp4_write(mdp4_kms, REG_MDP4_INTR_CLEAR, 0xffffffff); - mdp4_write(mdp4_kms, REG_MDP4_INTR_ENABLE, 0x00000000); - mdp4_disable(mdp4_kms); -} - -int mdp4_irq_postinstall(struct msm_kms *kms) -{ - struct mdp_kms *mdp_kms = to_mdp_kms(kms); - struct mdp4_kms *mdp4_kms = to_mdp4_kms(mdp_kms); - struct mdp_irq *error_handler = &mdp4_kms->error_handler; - - error_handler->irq = mdp4_irq_error_handler; - error_handler->irqmask = MDP4_IRQ_PRIMARY_INTF_UDERRUN | - MDP4_IRQ_EXTERNAL_INTF_UDERRUN; - - mdp_irq_register(mdp_kms, error_handler); - - return 0; -} - -void mdp4_irq_uninstall(struct msm_kms *kms) -{ - struct mdp4_kms *mdp4_kms = to_mdp4_kms(to_mdp_kms(kms)); - mdp4_enable(mdp4_kms); - mdp4_write(mdp4_kms, REG_MDP4_INTR_ENABLE, 0x00000000); - mdp4_disable(mdp4_kms); -} - -irqreturn_t mdp4_irq(struct msm_kms *kms) -{ - struct mdp_kms *mdp_kms = to_mdp_kms(kms); - struct mdp4_kms *mdp4_kms = to_mdp4_kms(mdp_kms); - struct drm_device *dev = mdp4_kms->dev; - struct msm_drm_private *priv = dev->dev_private; - unsigned int id; - uint32_t status, enable; - - enable = mdp4_read(mdp4_kms, REG_MDP4_INTR_ENABLE); - status = mdp4_read(mdp4_kms, REG_MDP4_INTR_STATUS) & enable; - mdp4_write(mdp4_kms, REG_MDP4_INTR_CLEAR, status); - - VERB("status=%08x", status); - - mdp_dispatch_irqs(mdp_kms, status); - - for (id = 0; id < priv->num_crtcs; id++) - if (status & mdp4_crtc_vblank(priv->crtcs[id])) - drm_handle_vblank(dev, id); - - return IRQ_HANDLED; -} - -int mdp4_enable_vblank(struct msm_kms *kms, struct drm_crtc *crtc) -{ - struct mdp4_kms *mdp4_kms = to_mdp4_kms(to_mdp_kms(kms)); - - mdp4_enable(mdp4_kms); - mdp_update_vblank_mask(to_mdp_kms(kms), - mdp4_crtc_vblank(crtc), true); - mdp4_disable(mdp4_kms); - - return 0; -} - -void mdp4_disable_vblank(struct msm_kms *kms, struct drm_crtc *crtc) -{ - struct mdp4_kms *mdp4_kms = to_mdp4_kms(to_mdp_kms(kms)); - - mdp4_enable(mdp4_kms); - mdp_update_vblank_mask(to_mdp_kms(kms), - mdp4_crtc_vblank(crtc), false); - mdp4_disable(mdp4_kms); -} |