diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2018-07-30 11:52:34 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2018-07-30 11:52:34 +0100 |
| commit | 3382a6b999415d1f78cee3f483957651d7e1f8a4 (patch) | |
| tree | 820fc5c4f45a17b2fa790681ccc3b9a8012bd83b /drivers/gpu/drm/armada/armada_drv.c | |
| parent | c29277d4e56388e805acc3ba428c9cff7df99fa7 (diff) | |
| download | linux-3382a6b999415d1f78cee3f483957651d7e1f8a4.tar.gz linux-3382a6b999415d1f78cee3f483957651d7e1f8a4.tar.bz2 linux-3382a6b999415d1f78cee3f483957651d7e1f8a4.zip | |
drm/armada: move armada_drm_mode_config_funcs to armada_drv.c
Move the armada_drm_mode_config_funcs to armada_drv.c, since this now
has less to do with FBs than it does with general mode configuration.
In doing so, we need to make armada_fb_create() visible to armada_drv.c,
which reveals a function name clash with armada_fbdev.c. Rename the
version in armada_fbdev.c.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Diffstat (limited to 'drivers/gpu/drm/armada/armada_drv.c')
| -rw-r--r-- | drivers/gpu/drm/armada/armada_drv.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/armada/armada_drv.c b/drivers/gpu/drm/armada/armada_drv.c index e47b995b4ce6..7517f23bb9cd 100644 --- a/drivers/gpu/drm/armada/armada_drv.c +++ b/drivers/gpu/drm/armada/armada_drv.c @@ -15,6 +15,7 @@ #include "armada_crtc.h" #include "armada_drm.h" #include "armada_gem.h" +#include "armada_fb.h" #include "armada_hw.h" #include <drm/armada_drm.h> #include "armada_ioctlP.h" @@ -77,6 +78,11 @@ static struct drm_driver armada_drm_driver = { .fops = &armada_drm_fops, }; +static const struct drm_mode_config_funcs armada_drm_mode_config_funcs = { + .fb_create = armada_fb_create, + .output_poll_changed = drm_fb_helper_output_poll_changed, +}; + static int armada_drm_bind(struct device *dev) { struct armada_private *priv; |