Commit c3605dfc authored by Shawn Guo's avatar Shawn Guo

drm: rockchip: remove struct rockchip_crtc_funcs

With the vblank hooks in struct drm_crtc_funcs, we do not need to
maintain struct rockchip_crtc_funcs and the related registration
functions.  Remove them.
Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
Cc: Mark Yao <mark.yao@rock-chips.com>
Reviewed-by: default avatarSean Paul <seanpaul@chromium.org>
Link: http://patchwork.freedesktop.org/patch/msgid/1486458995-31018-18-git-send-email-shawnguo@kernel.org
parent 20c8a288
...@@ -74,55 +74,6 @@ void rockchip_drm_dma_detach_device(struct drm_device *drm_dev, ...@@ -74,55 +74,6 @@ void rockchip_drm_dma_detach_device(struct drm_device *drm_dev,
arm_iommu_detach_device(dev); arm_iommu_detach_device(dev);
} }
int rockchip_register_crtc_funcs(struct drm_crtc *crtc,
const struct rockchip_crtc_funcs *crtc_funcs)
{
int pipe = drm_crtc_index(crtc);
struct rockchip_drm_private *priv = crtc->dev->dev_private;
if (pipe >= ROCKCHIP_MAX_CRTC)
return -EINVAL;
priv->crtc_funcs[pipe] = crtc_funcs;
return 0;
}
void rockchip_unregister_crtc_funcs(struct drm_crtc *crtc)
{
int pipe = drm_crtc_index(crtc);
struct rockchip_drm_private *priv = crtc->dev->dev_private;
if (pipe >= ROCKCHIP_MAX_CRTC)
return;
priv->crtc_funcs[pipe] = NULL;
}
static int rockchip_drm_crtc_enable_vblank(struct drm_device *dev,
unsigned int pipe)
{
struct rockchip_drm_private *priv = dev->dev_private;
struct drm_crtc *crtc = drm_crtc_from_index(dev, pipe);
if (crtc && priv->crtc_funcs[pipe] &&
priv->crtc_funcs[pipe]->enable_vblank)
return priv->crtc_funcs[pipe]->enable_vblank(crtc);
return 0;
}
static void rockchip_drm_crtc_disable_vblank(struct drm_device *dev,
unsigned int pipe)
{
struct rockchip_drm_private *priv = dev->dev_private;
struct drm_crtc *crtc = drm_crtc_from_index(dev, pipe);
if (crtc && priv->crtc_funcs[pipe] &&
priv->crtc_funcs[pipe]->enable_vblank)
priv->crtc_funcs[pipe]->disable_vblank(crtc);
}
static int rockchip_drm_bind(struct device *dev) static int rockchip_drm_bind(struct device *dev)
{ {
struct drm_device *drm_dev; struct drm_device *drm_dev;
...@@ -270,8 +221,6 @@ static struct drm_driver rockchip_drm_driver = { ...@@ -270,8 +221,6 @@ static struct drm_driver rockchip_drm_driver = {
.driver_features = DRIVER_MODESET | DRIVER_GEM | .driver_features = DRIVER_MODESET | DRIVER_GEM |
DRIVER_PRIME | DRIVER_ATOMIC, DRIVER_PRIME | DRIVER_ATOMIC,
.lastclose = rockchip_drm_lastclose, .lastclose = rockchip_drm_lastclose,
.enable_vblank = rockchip_drm_crtc_enable_vblank,
.disable_vblank = rockchip_drm_crtc_disable_vblank,
.gem_vm_ops = &drm_gem_cma_vm_ops, .gem_vm_ops = &drm_gem_cma_vm_ops,
.gem_free_object_unlocked = rockchip_gem_free_object, .gem_free_object_unlocked = rockchip_gem_free_object,
.dumb_create = rockchip_gem_dumb_create, .dumb_create = rockchip_gem_dumb_create,
......
...@@ -31,16 +31,6 @@ ...@@ -31,16 +31,6 @@
struct drm_device; struct drm_device;
struct drm_connector; struct drm_connector;
/*
* Rockchip drm private crtc funcs.
* @enable_vblank: enable crtc vblank irq.
* @disable_vblank: disable crtc vblank irq.
*/
struct rockchip_crtc_funcs {
int (*enable_vblank)(struct drm_crtc *crtc);
void (*disable_vblank)(struct drm_crtc *crtc);
};
struct rockchip_crtc_state { struct rockchip_crtc_state {
struct drm_crtc_state base; struct drm_crtc_state base;
int output_type; int output_type;
...@@ -58,16 +48,12 @@ struct rockchip_crtc_state { ...@@ -58,16 +48,12 @@ struct rockchip_crtc_state {
struct rockchip_drm_private { struct rockchip_drm_private {
struct drm_fb_helper fbdev_helper; struct drm_fb_helper fbdev_helper;
struct drm_gem_object *fbdev_bo; struct drm_gem_object *fbdev_bo;
const struct rockchip_crtc_funcs *crtc_funcs[ROCKCHIP_MAX_CRTC];
struct drm_atomic_state *state; struct drm_atomic_state *state;
struct list_head psr_list; struct list_head psr_list;
spinlock_t psr_list_lock; spinlock_t psr_list_lock;
}; };
int rockchip_register_crtc_funcs(struct drm_crtc *crtc,
const struct rockchip_crtc_funcs *crtc_funcs);
void rockchip_unregister_crtc_funcs(struct drm_crtc *crtc);
int rockchip_drm_dma_attach_device(struct drm_device *drm_dev, int rockchip_drm_dma_attach_device(struct drm_device *drm_dev,
struct device *dev); struct device *dev);
void rockchip_drm_dma_detach_device(struct drm_device *drm_dev, void rockchip_drm_dma_detach_device(struct drm_device *drm_dev,
......
...@@ -853,11 +853,6 @@ static void vop_crtc_disable_vblank(struct drm_crtc *crtc) ...@@ -853,11 +853,6 @@ static void vop_crtc_disable_vblank(struct drm_crtc *crtc)
spin_unlock_irqrestore(&vop->irq_lock, flags); spin_unlock_irqrestore(&vop->irq_lock, flags);
} }
static const struct rockchip_crtc_funcs private_crtc_funcs = {
.enable_vblank = vop_crtc_enable_vblank,
.disable_vblank = vop_crtc_disable_vblank,
};
static bool vop_crtc_mode_fixup(struct drm_crtc *crtc, static bool vop_crtc_mode_fixup(struct drm_crtc *crtc,
const struct drm_display_mode *mode, const struct drm_display_mode *mode,
struct drm_display_mode *adjusted_mode) struct drm_display_mode *adjusted_mode)
...@@ -1112,6 +1107,8 @@ static const struct drm_crtc_funcs vop_crtc_funcs = { ...@@ -1112,6 +1107,8 @@ static const struct drm_crtc_funcs vop_crtc_funcs = {
.reset = vop_crtc_reset, .reset = vop_crtc_reset,
.atomic_duplicate_state = vop_crtc_duplicate_state, .atomic_duplicate_state = vop_crtc_duplicate_state,
.atomic_destroy_state = vop_crtc_destroy_state, .atomic_destroy_state = vop_crtc_destroy_state,
.enable_vblank = vop_crtc_enable_vblank,
.disable_vblank = vop_crtc_disable_vblank,
}; };
static void vop_fb_unref_worker(struct drm_flip_work *work, void *val) static void vop_fb_unref_worker(struct drm_flip_work *work, void *val)
...@@ -1283,7 +1280,6 @@ static int vop_create_crtc(struct vop *vop) ...@@ -1283,7 +1280,6 @@ static int vop_create_crtc(struct vop *vop)
init_completion(&vop->dsp_hold_completion); init_completion(&vop->dsp_hold_completion);
init_completion(&vop->line_flag_completion); init_completion(&vop->line_flag_completion);
crtc->port = port; crtc->port = port;
rockchip_register_crtc_funcs(crtc, &private_crtc_funcs);
return 0; return 0;
...@@ -1302,7 +1298,6 @@ static void vop_destroy_crtc(struct vop *vop) ...@@ -1302,7 +1298,6 @@ static void vop_destroy_crtc(struct vop *vop)
struct drm_device *drm_dev = vop->drm_dev; struct drm_device *drm_dev = vop->drm_dev;
struct drm_plane *plane, *tmp; struct drm_plane *plane, *tmp;
rockchip_unregister_crtc_funcs(crtc);
of_node_put(crtc->port); of_node_put(crtc->port);
/* /*
......
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