|
@@ -18,7 +18,7 @@ static inline struct tegra_fb *to_tegra_fb(struct drm_framebuffer *fb)
|
|
|
return container_of(fb, struct tegra_fb, base);
|
|
|
}
|
|
|
|
|
|
-#ifdef CONFIG_DRM_TEGRA_FBDEV
|
|
|
+#ifdef CONFIG_DRM_FBDEV_EMULATION
|
|
|
static inline struct tegra_fbdev *to_tegra_fbdev(struct drm_fb_helper *helper)
|
|
|
{
|
|
|
return container_of(helper, struct tegra_fbdev, base);
|
|
@@ -181,7 +181,7 @@ unreference:
|
|
|
return ERR_PTR(err);
|
|
|
}
|
|
|
|
|
|
-#ifdef CONFIG_DRM_TEGRA_FBDEV
|
|
|
+#ifdef CONFIG_DRM_FBDEV_EMULATION
|
|
|
static struct fb_ops tegra_fb_ops = {
|
|
|
.owner = THIS_MODULE,
|
|
|
.fb_fillrect = drm_fb_helper_sys_fillrect,
|
|
@@ -370,7 +370,7 @@ void tegra_fb_output_poll_changed(struct drm_device *drm)
|
|
|
|
|
|
int tegra_drm_fb_prepare(struct drm_device *drm)
|
|
|
{
|
|
|
-#ifdef CONFIG_DRM_TEGRA_FBDEV
|
|
|
+#ifdef CONFIG_DRM_FBDEV_EMULATION
|
|
|
struct tegra_drm *tegra = drm->dev_private;
|
|
|
|
|
|
tegra->fbdev = tegra_fbdev_create(drm);
|
|
@@ -383,7 +383,7 @@ int tegra_drm_fb_prepare(struct drm_device *drm)
|
|
|
|
|
|
void tegra_drm_fb_free(struct drm_device *drm)
|
|
|
{
|
|
|
-#ifdef CONFIG_DRM_TEGRA_FBDEV
|
|
|
+#ifdef CONFIG_DRM_FBDEV_EMULATION
|
|
|
struct tegra_drm *tegra = drm->dev_private;
|
|
|
|
|
|
tegra_fbdev_free(tegra->fbdev);
|
|
@@ -392,7 +392,7 @@ void tegra_drm_fb_free(struct drm_device *drm)
|
|
|
|
|
|
int tegra_drm_fb_init(struct drm_device *drm)
|
|
|
{
|
|
|
-#ifdef CONFIG_DRM_TEGRA_FBDEV
|
|
|
+#ifdef CONFIG_DRM_FBDEV_EMULATION
|
|
|
struct tegra_drm *tegra = drm->dev_private;
|
|
|
int err;
|
|
|
|
|
@@ -407,7 +407,7 @@ int tegra_drm_fb_init(struct drm_device *drm)
|
|
|
|
|
|
void tegra_drm_fb_exit(struct drm_device *drm)
|
|
|
{
|
|
|
-#ifdef CONFIG_DRM_TEGRA_FBDEV
|
|
|
+#ifdef CONFIG_DRM_FBDEV_EMULATION
|
|
|
struct tegra_drm *tegra = drm->dev_private;
|
|
|
|
|
|
tegra_fbdev_exit(tegra->fbdev);
|