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

Commit 27d60e3d authored by Andrzej Hajda's avatar Andrzej Hajda Committed by Inki Dae
Browse files

drm/exynos: remove struct exynos_drm_panel_info 



struct exynos_drm_panel_info is not used anymore, except exynos_dp,
which can integrate useful fields directly into its context.

Signed-off-by: default avatarAndrzej Hajda <a.hajda@samsung.com>
Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
parent 1feafd3a

drivers/gpu/drm/exynos/exynos7_drm_decon.c

+0 −1
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ struct decon_context { 
	wait_queue_head_t		wait_vsync_queue;

	atomic_t			wait_vsync_event;



	struct exynos_drm_panel_info panel;

	struct drm_encoder *encoder;

};

drivers/gpu/drm/exynos/exynos_dp_core.c

+2 −5
Original line number Diff line number Diff line
@@ -977,9 +977,7 @@ static int exynos_dp_get_modes(struct drm_connector *connector) 
		return 0;

	}



	drm_display_mode_from_videomode(&dp->priv.vm, mode);

	mode->width_mm = dp->priv.width_mm;

	mode->height_mm = dp->priv.height_mm;

	drm_display_mode_from_videomode(&dp->vm, mode);

	connector->display_info.width_mm = mode->width_mm;

	connector->display_info.height_mm = mode->height_mm;
@@ -1241,8 +1239,7 @@ static int exynos_dp_dt_parse_panel(struct exynos_dp_device *dp) 
{

	int ret;



	ret = of_get_videomode(dp->dev->of_node, &dp->priv.vm,

			OF_USE_NATIVE_MODE);

	ret = of_get_videomode(dp->dev->of_node, &dp->vm, OF_USE_NATIVE_MODE);

	if (ret) {

		DRM_ERROR("failed: of_get_videomode() : %d\n", ret);

		return ret;

drivers/gpu/drm/exynos/exynos_dp_core.h

+2 −2
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <drm/drm_crtc.h>

#include <drm/drm_dp_helper.h>

#include <drm/exynos_drm.h>

#include <video/videomode.h>



#include "exynos_drm_drv.h"
@@ -164,8 +165,7 @@ struct exynos_dp_device { 
	struct phy		*phy;

	int			dpms_mode;

	int			hpd_gpio;



	struct exynos_drm_panel_info priv;

	struct videomode	vm;

};



/* exynos_dp_reg.c */

drivers/gpu/drm/exynos/exynos_drm_fimd.c

+0 −1
Original line number Diff line number Diff line
@@ -182,7 +182,6 @@ struct fimd_context { 
	atomic_t			win_updated;

	atomic_t			triggering;



	struct exynos_drm_panel_info panel;

	struct fimd_driver_data *driver_data;

	struct drm_encoder *encoder;

};

include/drm/exynos_drm.h

+0 −15
Original line number Diff line number Diff line
@@ -17,28 +17,13 @@ 
#include <uapi/drm/exynos_drm.h>

#include <video/videomode.h>



/**

 * A structure for lcd panel information.

 *

 * @timing: default video mode for initializing

 * @width_mm: physical size of lcd width.

 * @height_mm: physical size of lcd height.

 */

struct exynos_drm_panel_info {

	struct videomode vm;

	u32 width_mm;

	u32 height_mm;

};



/**

 * Platform Specific Structure for DRM based FIMD.

 *

 * @panel: default panel info for initializing

 * @default_win: default window layer number to be used for UI.

 * @bpp: default bit per pixel.

 */

struct exynos_drm_fimd_pdata {

	struct exynos_drm_panel_info panel;

	u32				vidcon0;

	u32				vidcon1;

	unsigned int			default_win;