diff options
| author | Mark Brown <broonie@kernel.org> | 2018-01-08 15:54:50 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-01-08 15:54:50 +0000 |
| commit | 498495dba268b20e8eadd7fe93c140c68b6cc9d2 (patch) | |
| tree | 00d1562049d8bc2194fddd9ba0cbbe0812ad6f68 /drivers/gpu/drm/tinydrm/core/tinydrm-core.c | |
| parent | d5cc0a1fcbb5ddbef9fdd4c4a978da3254ddbf37 (diff) | |
| parent | 5c256045b87b8aa8e5bc9d2e2fdc0802351c1f99 (diff) | |
| download | linux-stable-498495dba268b20e8eadd7fe93c140c68b6cc9d2.tar.gz linux-stable-498495dba268b20e8eadd7fe93c140c68b6cc9d2.tar.bz2 linux-stable-498495dba268b20e8eadd7fe93c140c68b6cc9d2.zip | |
Merge branch 'fix/intel' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-intel
Diffstat (limited to 'drivers/gpu/drm/tinydrm/core/tinydrm-core.c')
| -rw-r--r-- | drivers/gpu/drm/tinydrm/core/tinydrm-core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/tinydrm/core/tinydrm-core.c b/drivers/gpu/drm/tinydrm/core/tinydrm-core.c index 551709e6b114..1a8a57cad431 100644 --- a/drivers/gpu/drm/tinydrm/core/tinydrm-core.c +++ b/drivers/gpu/drm/tinydrm/core/tinydrm-core.c @@ -10,6 +10,7 @@ #include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_crtc_helper.h> +#include <drm/drm_gem_framebuffer_helper.h> #include <drm/tinydrm/tinydrm.h> #include <linux/device.h> #include <linux/dma-buf.h> @@ -128,7 +129,7 @@ tinydrm_fb_create(struct drm_device *drm, struct drm_file *file_priv, { struct tinydrm_device *tdev = drm->dev_private; - return drm_fb_cma_create_with_funcs(drm, file_priv, mode_cmd, + return drm_gem_fb_create_with_funcs(drm, file_priv, mode_cmd, tdev->fb_funcs); } |