diff --git a/msm/Makefile b/msm/Makefile
index cbaf7cdf1361..952746f5f5da 100644
--- a/msm/Makefile
+++ b/msm/Makefile
@@ -132,3 +132,5 @@ msm_drm-$(CONFIG_DRM_MSM) += \
 msm_drm-$(CONFIG_HDCP_QSEECOM) += ../hdcp/msm_hdcp.o \
 
 obj-$(CONFIG_DISPLAY_BUILD)	+= msm_drm.o
+
+obj-$(CONFIG_DRM_FBDEV_EMULATION) += msm_fbdev.o
diff --git a/msm/sde/sde_kms.c b/msm/sde/sde_kms.c
index c7ee914c7340..c770ba015b35 100644
--- a/msm/sde/sde_kms.c
+++ b/msm/sde/sde_kms.c
@@ -2944,6 +2944,8 @@ static int _sde_kms_mmu_init(struct sde_kms *sde_kms)
 		}
 	}
 
+	sde_kms->base.aspace = sde_kms->aspace[0];
+
 	return 0;
 
 early_map_fail: