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

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

Merge branch 'exynos-drm-fixes' of... 

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

* 'exynos-drm-fixes' of git://git.infradead.org/users/kmpark/linux-samsung:
  drm exynos: use drm_fb_helper_set_par directly
  drm/exynos: Fix fb_videomode <-> drm_mode_modeinfo conversion
  drm/exynos: fix runtime_pm fimd device state on probe
  drm/exynos: use correct 'exynos-drm' name for platform device
parents 57387177 34418c25

drivers/gpu/drm/exynos/exynos_drm_connector.c

+8 −8
Original line number Diff line number Diff line
@@ -54,14 +54,14 @@ convert_to_display_mode(struct drm_display_mode *mode, 
	mode->vrefresh = timing->refresh;



	mode->hdisplay = timing->xres;

	mode->hsync_start = mode->hdisplay + timing->left_margin;

	mode->hsync_start = mode->hdisplay + timing->right_margin;

	mode->hsync_end = mode->hsync_start + timing->hsync_len;

	mode->htotal = mode->hsync_end + timing->right_margin;

	mode->htotal = mode->hsync_end + timing->left_margin;



	mode->vdisplay = timing->yres;

	mode->vsync_start = mode->vdisplay + timing->upper_margin;

	mode->vsync_start = mode->vdisplay + timing->lower_margin;

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

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

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

	mode->width_mm = panel->width_mm;

	mode->height_mm = panel->height_mm;
@@ -85,14 +85,14 @@ convert_to_video_timing(struct fb_videomode *timing, 
	timing->refresh = drm_mode_vrefresh(mode);



	timing->xres = mode->hdisplay;

	timing->left_margin = mode->hsync_start - mode->hdisplay;

	timing->right_margin = mode->hsync_start - mode->hdisplay;

	timing->hsync_len = mode->hsync_end - mode->hsync_start;

	timing->right_margin = mode->htotal - mode->hsync_end;

	timing->left_margin = mode->htotal - mode->hsync_end;



	timing->yres = mode->vdisplay;

	timing->upper_margin = mode->vsync_start - mode->vdisplay;

	timing->lower_margin = mode->vsync_start - mode->vdisplay;

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

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

	timing->upper_margin = mode->vtotal - mode->vsync_end;



	if (mode->flags & DRM_MODE_FLAG_INTERLACE)

		timing->vmode = FB_VMODE_INTERLACED;

drivers/gpu/drm/exynos/exynos_drm_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ static struct platform_driver exynos_drm_platform_driver = { 
	.remove		= __devexit_p(exynos_drm_platform_remove),

	.driver		= {

		.owner	= THIS_MODULE,

		.name	= DRIVER_NAME,

		.name	= "exynos-drm",

	},

};

drivers/gpu/drm/exynos/exynos_drm_fbdev.c

+1 −27
Original line number Diff line number Diff line
@@ -46,39 +46,13 @@ struct exynos_drm_fbdev { 
	struct exynos_drm_gem_obj	*exynos_gem_obj;

};



static int exynos_drm_fbdev_set_par(struct fb_info *info)

{

	struct fb_var_screeninfo *var = &info->var;



	switch (var->bits_per_pixel) {

	case 32:

	case 24:

	case 18:

	case 16:

	case 12:

		info->fix.visual = FB_VISUAL_TRUECOLOR;

		break;

	case 1:

		info->fix.visual = FB_VISUAL_MONO01;

		break;

	default:

		info->fix.visual = FB_VISUAL_PSEUDOCOLOR;

		break;

	}



	info->fix.line_length = (var->xres_virtual * var->bits_per_pixel) / 8;



	return drm_fb_helper_set_par(info);

}





static struct fb_ops exynos_drm_fb_ops = {

	.owner		= THIS_MODULE,

	.fb_fillrect	= cfb_fillrect,

	.fb_copyarea	= cfb_copyarea,

	.fb_imageblit	= cfb_imageblit,

	.fb_check_var	= drm_fb_helper_check_var,

	.fb_set_par	= exynos_drm_fbdev_set_par,

	.fb_set_par	= drm_fb_helper_set_par,

	.fb_blank	= drm_fb_helper_blank,

	.fb_pan_display	= drm_fb_helper_pan_display,

	.fb_setcmap	= drm_fb_helper_setcmap,

drivers/gpu/drm/exynos/exynos_drm_fimd.c

+6 −11
Original line number Diff line number Diff line
@@ -817,8 +817,6 @@ static int __devinit fimd_probe(struct platform_device *pdev) 
		goto err_clk_get;

	}



	clk_enable(ctx->bus_clk);



	ctx->lcd_clk = clk_get(dev, "sclk_fimd");

	if (IS_ERR(ctx->lcd_clk)) {

		dev_err(dev, "failed to get lcd clock\n");
@@ -826,8 +824,6 @@ static int __devinit fimd_probe(struct platform_device *pdev) 
		goto err_bus_clk;

	}



	clk_enable(ctx->lcd_clk);



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!res) {

		dev_err(dev, "failed to find registers\n");
@@ -864,17 +860,11 @@ static int __devinit fimd_probe(struct platform_device *pdev) 
		goto err_req_irq;

	}



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

	ctx->vidcon0 = pdata->vidcon0;

	ctx->vidcon1 = pdata->vidcon1;

	ctx->default_win = pdata->default_win;

	ctx->panel = panel;



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



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

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



	subdrv = &ctx->subdrv;



	subdrv->probe = fimd_subdrv_probe;
@@ -889,10 +879,15 @@ static int __devinit fimd_probe(struct platform_device *pdev) 


	platform_set_drvdata(pdev, ctx);



	pm_runtime_set_active(dev);

	pm_runtime_enable(dev);

	pm_runtime_get_sync(dev);



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

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



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

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



	for (win = 0; win < WINDOWS_NR; win++)

		fimd_clear_win(ctx, win);