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

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

Merge branch 'exynos-drm-fixes' of git://git.infradead.org/users/kmpark/linux-2.6-samsung into HEAD 

* 'exynos-drm-fixes' of git://git.infradead.org/users/kmpark/linux-2.6-samsung:
  drm/exynos: exynos_drm.h header file fixes
  drm/exynos: added panel physical size.
  drm/exynos: added postclose to release resource.
  drm/exynos: removed exynos_drm_fbdev_recreate function.
  drm/exynos: fixed page flip issue.
  drm/exynos: added possible_clones setup function.
  drm/exynos: removed pageflip_event_list init code when closed.
  drm/exynos: changed priority of mixer layers.
  drm/exynos: Fix typo in exynos_mixer.c
parents 2b69ffb9 265da78a

drivers/gpu/drm/exynos/exynos_drm_connector.c

+11 −5
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include "drmP.h"

#include "drm_crtc_helper.h"



#include <drm/exynos_drm.h>

#include "exynos_drm_drv.h"

#include "exynos_drm_encoder.h"
@@ -44,8 +45,9 @@ struct exynos_drm_connector { 
/* convert exynos_video_timings to drm_display_mode */

static inline void

convert_to_display_mode(struct drm_display_mode *mode,

			struct fb_videomode *timing)

			struct exynos_drm_panel_info *panel)

{

	struct fb_videomode *timing = &panel->timing;

	DRM_DEBUG_KMS("%s\n", __FILE__);



	mode->clock = timing->pixclock / 1000;
@@ -60,6 +62,8 @@ convert_to_display_mode(struct drm_display_mode *mode, 
	mode->vsync_start = mode->vdisplay + timing->upper_margin;

	mode->vsync_end = mode->vsync_start + timing->vsync_len;

	mode->vtotal = mode->vsync_end + timing->lower_margin;

	mode->width_mm = panel->width_mm;

	mode->height_mm = panel->height_mm;



	if (timing->vmode & FB_VMODE_INTERLACED)

		mode->flags |= DRM_MODE_FLAG_INTERLACE;
@@ -148,16 +152,18 @@ static int exynos_drm_connector_get_modes(struct drm_connector *connector) 
		connector->display_info.raw_edid = edid;

	} else {

		struct drm_display_mode *mode = drm_mode_create(connector->dev);

		struct fb_videomode *timing;

		struct exynos_drm_panel_info *panel;



		if (display_ops->get_timing)

			timing = display_ops->get_timing(manager->dev);

		if (display_ops->get_panel)

			panel = display_ops->get_panel(manager->dev);

		else {

			drm_mode_destroy(connector->dev, mode);

			return 0;

		}



		convert_to_display_mode(mode, timing);

		convert_to_display_mode(mode, panel);

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

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



		mode->type = DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED;

		drm_mode_set_name(mode);

drivers/gpu/drm/exynos/exynos_drm_drv.h

+2 −2
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ struct exynos_drm_overlay { 
 * @type: one of EXYNOS_DISPLAY_TYPE_LCD and HDMI.

 * @is_connected: check for that display is connected or not.

 * @get_edid: get edid modes from display driver.

 * @get_timing: get timing object from display driver.

 * @get_panel: get panel object from display driver.

 * @check_timing: check if timing is valid or not.

 * @power_on: display device on or off.

 */
@@ -145,7 +145,7 @@ struct exynos_drm_display_ops { 
	bool (*is_connected)(struct device *dev);

	int (*get_edid)(struct device *dev, struct drm_connector *connector,

				u8 *edid, int len);

	void *(*get_timing)(struct device *dev);

	void *(*get_panel)(struct device *dev);

	int (*check_timing)(struct device *dev, void *timing);

	int (*power_on)(struct device *dev, int mode);

};

drivers/gpu/drm/exynos/exynos_drm_fimd.c

+14 −13
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ struct fimd_context { 
	bool				suspended;

	struct mutex			lock;



	struct fb_videomode		*timing;

	struct exynos_drm_panel_info *panel;

};



static bool fimd_display_is_connected(struct device *dev)
@@ -101,13 +101,13 @@ static bool fimd_display_is_connected(struct device *dev) 
	return true;

}



static void *fimd_get_timing(struct device *dev)

static void *fimd_get_panel(struct device *dev)

{

	struct fimd_context *ctx = get_fimd_context(dev);



	DRM_DEBUG_KMS("%s\n", __FILE__);



	return ctx->timing;

	return ctx->panel;

}



static int fimd_check_timing(struct device *dev, void *timing)
@@ -131,7 +131,7 @@ static int fimd_display_power_on(struct device *dev, int mode) 
static struct exynos_drm_display_ops fimd_display_ops = {

	.type = EXYNOS_DISPLAY_TYPE_LCD,

	.is_connected = fimd_display_is_connected,

	.get_timing = fimd_get_timing,

	.get_panel = fimd_get_panel,

	.check_timing = fimd_check_timing,

	.power_on = fimd_display_power_on,

};
@@ -193,7 +193,8 @@ static void fimd_apply(struct device *subdrv_dev) 
static void fimd_commit(struct device *dev)

{

	struct fimd_context *ctx = get_fimd_context(dev);

	struct fb_videomode *timing = ctx->timing;

	struct exynos_drm_panel_info *panel = ctx->panel;

	struct fb_videomode *timing = &panel->timing;

	u32 val;



	if (ctx->suspended)
@@ -786,7 +787,7 @@ static int __devinit fimd_probe(struct platform_device *pdev) 
	struct fimd_context *ctx;

	struct exynos_drm_subdrv *subdrv;

	struct exynos_drm_fimd_pdata *pdata;

	struct fb_videomode *timing;

	struct exynos_drm_panel_info *panel;

	struct resource *res;

	int win;

	int ret = -EINVAL;
@@ -799,9 +800,9 @@ static int __devinit fimd_probe(struct platform_device *pdev) 
		return -EINVAL;

	}



	timing = &pdata->timing;

	if (!timing) {

		dev_err(dev, "timing is null.\n");

	panel = &pdata->panel;

	if (!panel) {

		dev_err(dev, "panel is null.\n");

		return -EINVAL;

	}
@@ -863,16 +864,16 @@ static int __devinit fimd_probe(struct platform_device *pdev) 
		goto err_req_irq;

	}



	ctx->clkdiv = fimd_calc_clkdiv(ctx, timing);

	ctx->clkdiv = fimd_calc_clkdiv(ctx, &panel->timing);

	ctx->vidcon0 = pdata->vidcon0;

	ctx->vidcon1 = pdata->vidcon1;

	ctx->default_win = pdata->default_win;

	ctx->timing = timing;

	ctx->panel = panel;



	timing->pixclock = clk_get_rate(ctx->lcd_clk) / ctx->clkdiv;

	panel->timing.pixclock = clk_get_rate(ctx->lcd_clk) / ctx->clkdiv;



	DRM_DEBUG_KMS("pixel clock = %d, clkdiv = %d\n",

			timing->pixclock, ctx->clkdiv);

			panel->timing.pixclock, ctx->clkdiv);



	subdrv = &ctx->subdrv;

include/drm/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ header-y += drm.h 
header-y += drm_fourcc.h

header-y += drm_mode.h

header-y += drm_sarea.h

header-y += exynos_drm.h

header-y += i810_drm.h

header-y += i915_drm.h

header-y += mga_drm.h

include/drm/exynos_drm.h

+19 −3
Original line number Diff line number Diff line
@@ -97,15 +97,30 @@ struct drm_exynos_plane_set_zpos { 
#define DRM_IOCTL_EXYNOS_PLANE_SET_ZPOS	DRM_IOWR(DRM_COMMAND_BASE + \

		DRM_EXYNOS_PLANE_SET_ZPOS, struct drm_exynos_plane_set_zpos)



#ifdef __KERNEL__



/**

 * Platform Specific Structure for DRM based FIMD.

 * 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 fb_videomode timing;

	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 fb_videomode		timing;

	struct exynos_drm_panel_info panel;

	u32				vidcon0;

	u32				vidcon1;

	unsigned int			default_win;
@@ -139,4 +154,5 @@ struct exynos_drm_hdmi_pdata { 
	unsigned int			bpp;

};



#endif
 
#endif	/* __KERNEL__ */

#endif	/* _EXYNOS_DRM_H_ */