Commit d601cc93 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'mediatek-drm-next-6.1' of... 

Merge tag 'mediatek-drm-next-6.1' of https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux

 into drm-next

Mediatek DRM Next for Linux 6.1

1. Drop of_gpio header
2. Remove the unneeded result

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Chun-Kuang Hu <chunkuang.hu@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20220922234804.18557-1-chunkuang.hu@kernel.org
parents 8ffb78f3 9d3feb63

drivers/gpu/drm/mediatek/mtk_dpi.c

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
#include <linux/media-bus-format.h>

#include <linux/of.h>

#include <linux/of_device.h>

#include <linux/of_gpio.h>

#include <linux/of_graph.h>

#include <linux/pinctrl/consumer.h>

#include <linux/platform_device.h>

drivers/gpu/drm/mediatek/mtk_drm_drv.c

+1 −4
Original line number Diff line number Diff line
@@ -833,11 +833,8 @@ static int mtk_drm_sys_prepare(struct device *dev) 
{

	struct mtk_drm_private *private = dev_get_drvdata(dev);

	struct drm_device *drm = private->drm;

	int ret;



	ret = drm_mode_config_helper_suspend(drm);



	return ret;

	return drm_mode_config_helper_suspend(drm);

}



static void mtk_drm_sys_complete(struct device *dev)

drivers/gpu/drm/mediatek/mtk_hdmi.c

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
#include <linux/mutex.h>

#include <linux/of_platform.h>

#include <linux/of.h>

#include <linux/of_gpio.h>

#include <linux/of_graph.h>

#include <linux/phy/phy.h>

#include <linux/platform_device.h>