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

Commit 562ff059 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'omapdrm-4.13-v2' of... 

Merge tag 'omapdrm-4.13-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux into drm-next

omapdrm changes for v4.13

* dmabuf fence support
* TILER rotation fixes
* big pile of various cleanups and refactorings

* tag 'omapdrm-4.13-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux: (64 commits)
  drm/omap: fix tiled buffer stride calculations
  drm/omap: fix YUV422 90/270 rotation with mirroring
  drm/omap: fix YUV422 rotation with TILER
  drm/omap: pass rotation to dispc
  drm/omap: DRM_MODE_REFLECT_* instead of mirror boolean
  drm/omap: use DRM_MODE_ROTATE_* instead of OMAP_DSS_ROT_*
  drm/omap: remove omap_drm_win
  drm/omap: add drm_rotation_to_tiler helper()
  drm/omap: rename color_mode to fourcc
  drm/omap: cleanup formats array
  drm/omap: remove omap_framebuffer_get_formats()
  drm/omap: use DRM_FORMAT_* instead of OMAP_DSS_COLOR_*
  drm/omap: use u32 instead of enum omap_color_mode
  drm/omap: change supported_modes to an array
  drm/omap: remove unneeded prototypes
  drm/omap: add format_is_yuv() helper
  drm/omap: cleanup offset calculation
  drm/omap: remove dma & vrfb rotation
  drm/omap: ratelimit OCP error
  drm/omap: remove CLUT
  ...
parents 2a172037 cc8dd766

drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c

+3 −48
Original line number Diff line number Diff line
@@ -14,8 +14,6 @@ 
#include <linux/platform_device.h>

#include <linux/of.h>



#include <video/omap-panel-data.h>



#include "../dss/omapdss.h"



struct panel_drv_data {
@@ -25,8 +23,6 @@ struct panel_drv_data { 
	struct device *dev;



	struct videomode vm;



	bool invert_polarity;

};



static const struct videomode tvc_pal_vm = {
@@ -95,13 +91,6 @@ static int tvc_enable(struct omap_dss_device *dssdev) 


	in->ops.atv->set_timings(in, &ddata->vm);



	if (!ddata->dev->of_node) {

		in->ops.atv->set_type(in, OMAP_DSS_VENC_TYPE_COMPOSITE);



		in->ops.atv->invert_vid_out_polarity(in,

			ddata->invert_polarity);

	}



	r = in->ops.atv->enable(in);

	if (r)

		return r;
@@ -182,36 +171,10 @@ static struct omap_dss_driver tvc_driver = { 
	.get_timings		= tvc_get_timings,

	.check_timings		= tvc_check_timings,



	.get_resolution		= omapdss_default_get_resolution,



	.get_wss		= tvc_get_wss,

	.set_wss		= tvc_set_wss,

};



static int tvc_probe_pdata(struct platform_device *pdev)

{

	struct panel_drv_data *ddata = platform_get_drvdata(pdev);

	struct connector_atv_platform_data *pdata;

	struct omap_dss_device *in, *dssdev;



	pdata = dev_get_platdata(&pdev->dev);



	in = omap_dss_find_output(pdata->source);

	if (in == NULL) {

		dev_err(&pdev->dev, "Failed to find video source\n");

		return -EPROBE_DEFER;

	}



	ddata->in = in;



	ddata->invert_polarity = pdata->invert_polarity;



	dssdev = &ddata->dssdev;

	dssdev->name = pdata->name;



	return 0;

}



static int tvc_probe_of(struct platform_device *pdev)

{

	struct panel_drv_data *ddata = platform_get_drvdata(pdev);
@@ -242,17 +205,9 @@ static int tvc_probe(struct platform_device *pdev) 
	platform_set_drvdata(pdev, ddata);

	ddata->dev = &pdev->dev;



	if (dev_get_platdata(&pdev->dev)) {

		r = tvc_probe_pdata(pdev);

		if (r)

			return r;

	} else if (pdev->dev.of_node) {

	r = tvc_probe_of(pdev);

	if (r)

		return r;

	} else {

		return -ENODEV;

	}



	ddata->vm = tvc_pal_vm;

drivers/gpu/drm/omapdrm/displays/connector-dvi.c

+0 −3
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#include <linux/slab.h>



#include <drm/drm_edid.h>

#include <video/omap-panel-data.h>



#include "../dss/omapdss.h"
@@ -228,8 +227,6 @@ static struct omap_dss_driver dvic_driver = { 
	.get_timings	= dvic_get_timings,

	.check_timings	= dvic_check_timings,



	.get_resolution	= omapdss_default_get_resolution,



	.read_edid	= dvic_read_edid,

	.detect		= dvic_detect,

};

drivers/gpu/drm/omapdrm/displays/connector-hdmi.c

+0 −3
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
#include <linux/of_gpio.h>



#include <drm/drm_edid.h>

#include <video/omap-panel-data.h>



#include "../dss/omapdss.h"
@@ -196,8 +195,6 @@ static struct omap_dss_driver hdmic_driver = { 
	.get_timings		= hdmic_get_timings,

	.check_timings		= hdmic_check_timings,



	.get_resolution		= omapdss_default_get_resolution,



	.read_edid		= hdmic_read_edid,

	.detect			= hdmic_detect,

	.set_hdmi_mode		= hdmic_set_hdmi_mode,

drivers/gpu/drm/omapdrm/displays/encoder-opa362.c

+0 −10
Original line number Diff line number Diff line
@@ -157,14 +157,6 @@ static int opa362_check_timings(struct omap_dss_device *dssdev, 
	return in->ops.atv->check_timings(in, vm);

}



static void opa362_set_type(struct omap_dss_device *dssdev,

		enum omap_dss_venc_type type)

{

	/* we can only drive a COMPOSITE output */

	WARN_ON(type != OMAP_DSS_VENC_TYPE_COMPOSITE);



}



static const struct omapdss_atv_ops opa362_atv_ops = {

	.connect	= opa362_connect,

	.disconnect	= opa362_disconnect,
@@ -175,8 +167,6 @@ static const struct omapdss_atv_ops opa362_atv_ops = { 
	.check_timings	= opa362_check_timings,

	.set_timings	= opa362_set_timings,

	.get_timings	= opa362_get_timings,



	.set_type	= opa362_set_type,

};



static int opa362_probe(struct platform_device *pdev)

drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c

+0 −4
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ struct panel_drv_data { 
	struct omap_dss_device *in;



	int pd_gpio;

	int data_lines;



	struct videomode vm;

};
@@ -82,8 +81,6 @@ static int tfp410_enable(struct omap_dss_device *dssdev) 
		return 0;



	in->ops.dpi->set_timings(in, &ddata->vm);

	if (ddata->data_lines)

		in->ops.dpi->set_data_lines(in, ddata->data_lines);



	r = in->ops.dpi->enable(in);

	if (r)
@@ -226,7 +223,6 @@ static int tfp410_probe(struct platform_device *pdev) 
	dssdev->type = OMAP_DISPLAY_TYPE_DPI;

	dssdev->output_type = OMAP_DISPLAY_TYPE_DVI;

	dssdev->owner = THIS_MODULE;

	dssdev->phy.dpi.data_lines = ddata->data_lines;

	dssdev->port_num = 1;



	r = omapdss_register_output(dssdev);