mirror of
https://github.com/linux-msm/laptops-kernel.git
synced 2026-08-13 14:19:53 -07:00
drm/simpledrm: 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: Thomas Zimmermann <tzimmermann@suse.de> Cc: Javier Martinez Canillas <javierm@redhat.com> Acked-by: Javier Martinez Canillas <javierm@redhat.com> Acked-by: Alex Deucher <alexander.deucher@amd.com> Link: https://patchwork.freedesktop.org/patch/msgid/20240930130921.689876-18-tzimmermann@suse.de
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-only
|
||||
|
||||
#include <linux/aperture.h>
|
||||
#include <linux/clk.h>
|
||||
#include <linux/of_clk.h>
|
||||
#include <linux/minmax.h>
|
||||
@@ -9,7 +10,6 @@
|
||||
#include <linux/pm_domain.h>
|
||||
#include <linux/regulator/consumer.h>
|
||||
|
||||
#include <drm/drm_aperture.h>
|
||||
#include <drm/drm_atomic.h>
|
||||
#include <drm/drm_atomic_state_helper.h>
|
||||
#include <drm/drm_client_setup.h>
|
||||
@@ -883,7 +883,8 @@ static struct simpledrm_device *simpledrm_device_create(struct drm_driver *drv,
|
||||
if (mem) {
|
||||
void *screen_base;
|
||||
|
||||
ret = devm_aperture_acquire_from_firmware(dev, mem->start, resource_size(mem));
|
||||
ret = devm_aperture_acquire_for_platform_device(pdev, mem->start,
|
||||
resource_size(mem));
|
||||
if (ret) {
|
||||
drm_err(dev, "could not acquire memory range %pr: %d\n", mem, ret);
|
||||
return ERR_PTR(ret);
|
||||
@@ -903,7 +904,8 @@ static struct simpledrm_device *simpledrm_device_create(struct drm_driver *drv,
|
||||
if (!res)
|
||||
return ERR_PTR(-EINVAL);
|
||||
|
||||
ret = devm_aperture_acquire_from_firmware(dev, res->start, resource_size(res));
|
||||
ret = devm_aperture_acquire_for_platform_device(pdev, res->start,
|
||||
resource_size(res));
|
||||
if (ret) {
|
||||
drm_err(dev, "could not acquire memory range %pr: %d\n", res, ret);
|
||||
return ERR_PTR(ret);
|
||||
|
||||
Reference in New Issue
Block a user