Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c89c0ea6 authored by Arto Merilainen's avatar Arto Merilainen Committed by Thierry Reding
Browse files

gpu: host1x: drm: Rename host1x to host1x_drm 



Both host1x and drm drivers have host1x structures. This patch
renames the host1x structure under drm to follow name host1x_drm.

Signed-off-by: default avatarArto Merilainen <amerilainen@nvidia.com>
Signed-off-by: default avatarTerje Bergstrom <tbergstrom@nvidia.com>
Reviewed-by: default avatarThierry Reding <thierry.reding@avionic-design.de>
Tested-by: default avatarThierry Reding <thierry.reding@avionic-design.de>
Tested-by: default avatarErik Faye-Lund <kusmabite@gmail.com>
Signed-off-by: default avatarThierry Reding <thierry.reding@avionic-design.de>
parent 4231c6b0

drivers/gpu/host1x/drm/dc.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1097,7 +1097,7 @@ static const struct host1x_client_ops dc_client_ops = { 




static int tegra_dc_probe(struct platform_device *pdev)

static int tegra_dc_probe(struct platform_device *pdev)

{

{

	struct host1x *host1x = dev_get_drvdata(pdev->dev.parent);

	struct host1x_drm *host1x = dev_get_drvdata(pdev->dev.parent);

	struct resource *regs;

	struct resource *regs;

	struct tegra_dc *dc;

	struct tegra_dc *dc;

	int err;

	int err;
@@ -1160,7 +1160,7 @@ static int tegra_dc_probe(struct platform_device *pdev) 




static int tegra_dc_remove(struct platform_device *pdev)

static int tegra_dc_remove(struct platform_device *pdev)

{

{

	struct host1x *host1x = dev_get_drvdata(pdev->dev.parent);

	struct host1x_drm *host1x = dev_get_drvdata(pdev->dev.parent);

	struct tegra_dc *dc = platform_get_drvdata(pdev);

	struct tegra_dc *dc = platform_get_drvdata(pdev);

	int err;

	int err;

drivers/gpu/host1x/drm/drm.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -26,7 +26,7 @@ 
static int tegra_drm_load(struct drm_device *drm, unsigned long flags)

static int tegra_drm_load(struct drm_device *drm, unsigned long flags)

{

{

	struct device *dev = drm->dev;

	struct device *dev = drm->dev;

	struct host1x *host1x;

	struct host1x_drm *host1x;

	int err;

	int err;





	host1x = dev_get_drvdata(dev);

	host1x = dev_get_drvdata(dev);
@@ -69,7 +69,7 @@ static int tegra_drm_open(struct drm_device *drm, struct drm_file *filp) 




static void tegra_drm_lastclose(struct drm_device *drm)

static void tegra_drm_lastclose(struct drm_device *drm)

{

{

	struct host1x *host1x = drm->dev_private;

	struct host1x_drm *host1x = drm->dev_private;





	drm_fbdev_cma_restore_mode(host1x->fbdev);

	drm_fbdev_cma_restore_mode(host1x->fbdev);

}

}

drivers/gpu/host1x/drm/drm.h

+7 −7
Original line number Original line Diff line number Diff line
@@ -18,7 +18,7 @@ 
#include <drm/drm_fb_cma_helper.h>

#include <drm/drm_fb_cma_helper.h>

#include <drm/drm_fixed.h>

#include <drm/drm_fixed.h>





struct host1x {

struct host1x_drm {

	struct drm_device *drm;

	struct drm_device *drm;

	struct device *dev;

	struct device *dev;

	void __iomem *regs;

	void __iomem *regs;
@@ -44,7 +44,7 @@ struct host1x_client_ops { 
};

};





struct host1x_client {

struct host1x_client {

	struct host1x *host1x;

	struct host1x_drm *host1x;

	struct device *dev;

	struct device *dev;





	const struct host1x_client_ops *ops;

	const struct host1x_client_ops *ops;
@@ -52,12 +52,12 @@ struct host1x_client { 
	struct list_head list;

	struct list_head list;

};

};





extern int host1x_drm_init(struct host1x *host1x, struct drm_device *drm);

extern int host1x_drm_init(struct host1x_drm *host1x, struct drm_device *drm);

extern int host1x_drm_exit(struct host1x *host1x);

extern int host1x_drm_exit(struct host1x_drm *host1x);





extern int host1x_register_client(struct host1x *host1x,

extern int host1x_register_client(struct host1x_drm *host1x,

				  struct host1x_client *client);

				  struct host1x_client *client);

extern int host1x_unregister_client(struct host1x *host1x,

extern int host1x_unregister_client(struct host1x_drm *host1x,

				    struct host1x_client *client);

				    struct host1x_client *client);





struct tegra_output;

struct tegra_output;
@@ -66,7 +66,7 @@ struct tegra_dc { 
	struct host1x_client client;

	struct host1x_client client;

	spinlock_t lock;

	spinlock_t lock;





	struct host1x *host1x;

	struct host1x_drm *host1x;

	struct device *dev;

	struct device *dev;





	struct drm_crtc base;

	struct drm_crtc base;

drivers/gpu/host1x/drm/fb.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -11,7 +11,7 @@ 




static void tegra_drm_fb_output_poll_changed(struct drm_device *drm)

static void tegra_drm_fb_output_poll_changed(struct drm_device *drm)

{

{

	struct host1x *host1x = drm->dev_private;

	struct host1x_drm *host1x = drm->dev_private;





	drm_fbdev_cma_hotplug_event(host1x->fbdev);

	drm_fbdev_cma_hotplug_event(host1x->fbdev);

}

}
@@ -23,7 +23,7 @@ static const struct drm_mode_config_funcs tegra_drm_mode_funcs = { 




int tegra_drm_fb_init(struct drm_device *drm)

int tegra_drm_fb_init(struct drm_device *drm)

{

{

	struct host1x *host1x = drm->dev_private;

	struct host1x_drm *host1x = drm->dev_private;

	struct drm_fbdev_cma *fbdev;

	struct drm_fbdev_cma *fbdev;





	drm->mode_config.min_width = 0;

	drm->mode_config.min_width = 0;
@@ -46,7 +46,7 @@ int tegra_drm_fb_init(struct drm_device *drm) 




void tegra_drm_fb_exit(struct drm_device *drm)

void tegra_drm_fb_exit(struct drm_device *drm)

{

{

	struct host1x *host1x = drm->dev_private;

	struct host1x_drm *host1x = drm->dev_private;





	drm_fbdev_cma_fini(host1x->fbdev);

	drm_fbdev_cma_fini(host1x->fbdev);

}
 
}

drivers/gpu/host1x/drm/hdmi.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1189,7 +1189,7 @@ static const struct host1x_client_ops hdmi_client_ops = { 




static int tegra_hdmi_probe(struct platform_device *pdev)

static int tegra_hdmi_probe(struct platform_device *pdev)

{

{

	struct host1x *host1x = dev_get_drvdata(pdev->dev.parent);

	struct host1x_drm *host1x = dev_get_drvdata(pdev->dev.parent);

	struct tegra_hdmi *hdmi;

	struct tegra_hdmi *hdmi;

	struct resource *regs;

	struct resource *regs;

	int err;

	int err;
@@ -1278,7 +1278,7 @@ static int tegra_hdmi_probe(struct platform_device *pdev) 




static int tegra_hdmi_remove(struct platform_device *pdev)

static int tegra_hdmi_remove(struct platform_device *pdev)

{

{

	struct host1x *host1x = dev_get_drvdata(pdev->dev.parent);

	struct host1x_drm *host1x = dev_get_drvdata(pdev->dev.parent);

	struct tegra_hdmi *hdmi = platform_get_drvdata(pdev);

	struct tegra_hdmi *hdmi = platform_get_drvdata(pdev);

	int err;

	int err;