Commit 42170670 authored by Thomas Zimmermann's avatar Thomas Zimmermann Committed by Dmitry Baryshkov
Browse files

drm/msm: Use video aperture helpers 



DRM's aperture functions have long been implemented as helpers
under drivers/video/ for use with fbdev. Avoid the DRM wrappers by
calling the video functions directly.

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Cc: Rob Clark <robdclark@gmail.com>
Cc: Abhinav Kumar <quic_abhinavk@quicinc.com>
Cc: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Cc: Sean Paul <sean@poorly.run>
Cc: Marijn Suijten <marijn.suijten@somainline.org>
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Acked-by: default avatarJavier Martinez Canillas <javierm@redhat.com>
Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
parent c59afe50

drivers/gpu/drm/msm/msm_kms.c

+2 −2
Original line number Diff line number Diff line
@@ -5,11 +5,11 @@ 
 * Author: Rob Clark <robdclark@gmail.com>

 */



#include <linux/aperture.h>

#include <linux/kthread.h>

#include <linux/sched/mm.h>

#include <uapi/linux/sched/types.h>



#include <drm/drm_aperture.h>

#include <drm/drm_drv.h>

#include <drm/drm_mode_config.h>

#include <drm/drm_vblank.h>
@@ -237,7 +237,7 @@ int msm_drm_kms_init(struct device *dev, const struct drm_driver *drv) 
	int ret;



	/* the fw fb could be anywhere in memory */

	ret = drm_aperture_remove_framebuffers(drv);

	ret = aperture_remove_all_conflicting_devices(drv->name);

	if (ret)

		return ret;