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

Merge branch 'drm-lcdc' of git://linuxtv.org/pinchartl/fbdev into drm-next 

Laurent writes:

The SH Mobile DRM driver is now (in my opinion) ready for mainline. It
requires GEM and KMS/FB helpers that have been reviewed on the list and
tested. Sascha is waiting for them to reach your tree to send a pull request
for another new driver.

* 'drm-lcdc' of git://linuxtv.org/pinchartl/fbdev:
  drm: Renesas SH Mobile DRM driver
  drm: Add NV24 and NV42 pixel formats
  DRM: Add DRM KMS/FB CMA helper
  DRM: Add DRM GEM CMA helper
  drm/edid: limit printk when facing bad edid
parents 09e7dcf0 51c13278

drivers/gpu/drm/Kconfig

+17 −0
Original line number Diff line number Diff line
@@ -54,6 +54,21 @@ config DRM_TTM 
	  GPU memory types. Will be enabled automatically if a device driver

	  uses it.



config DRM_GEM_CMA_HELPER

	bool

	depends on DRM

	help

	  Choose this if you need the GEM CMA helper functions



config DRM_KMS_CMA_HELPER

	bool

	select DRM_GEM_CMA_HELPER

	select FB_SYS_FILLRECT

	select FB_SYS_COPYAREA

	select FB_SYS_IMAGEBLIT

	help

	  Choose this if you need the KMS CMA helper functions



config DRM_TDFX

	tristate "3dfx Banshee/Voodoo3+"

	depends on DRM && PCI
@@ -193,3 +208,5 @@ source "drivers/gpu/drm/ast/Kconfig" 
source "drivers/gpu/drm/mgag200/Kconfig"



source "drivers/gpu/drm/cirrus/Kconfig"



source "drivers/gpu/drm/shmobile/Kconfig"

drivers/gpu/drm/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -15,11 +15,13 @@ drm-y := drm_auth.o drm_buffer.o drm_bufs.o drm_cache.o \ 
		drm_trace_points.o drm_global.o drm_prime.o



drm-$(CONFIG_COMPAT) += drm_ioc32.o

drm-$(CONFIG_DRM_GEM_CMA_HELPER) += drm_gem_cma_helper.o



drm-usb-y   := drm_usb.o



drm_kms_helper-y := drm_fb_helper.o drm_crtc_helper.o drm_dp_i2c_helper.o

drm_kms_helper-$(CONFIG_DRM_LOAD_EDID_FIRMWARE) += drm_edid_load.o

drm_kms_helper-$(CONFIG_DRM_KMS_CMA_HELPER) += drm_fb_cma_helper.o



obj-$(CONFIG_DRM_KMS_HELPER) += drm_kms_helper.o
@@ -45,4 +47,5 @@ obj-$(CONFIG_DRM_EXYNOS) +=exynos/ 
obj-$(CONFIG_DRM_GMA500) += gma500/

obj-$(CONFIG_DRM_UDL) += udl/

obj-$(CONFIG_DRM_AST) += ast/

obj-$(CONFIG_DRM_SHMOBILE) +=shmobile/

obj-y			+= i2c/

drivers/gpu/drm/drm_crtc.c

+6 −0
Original line number Diff line number Diff line
@@ -2169,6 +2169,8 @@ static int format_check(const struct drm_mode_fb_cmd2 *r) 
	case DRM_FORMAT_NV21:

	case DRM_FORMAT_NV16:

	case DRM_FORMAT_NV61:

	case DRM_FORMAT_NV24:

	case DRM_FORMAT_NV42:

	case DRM_FORMAT_YUV410:

	case DRM_FORMAT_YVU410:

	case DRM_FORMAT_YUV411:
@@ -3718,6 +3720,8 @@ int drm_format_num_planes(uint32_t format) 
	case DRM_FORMAT_NV21:

	case DRM_FORMAT_NV16:

	case DRM_FORMAT_NV61:

	case DRM_FORMAT_NV24:

	case DRM_FORMAT_NV42:

		return 2;

	default:

		return 1;
@@ -3751,6 +3755,8 @@ int drm_format_plane_cpp(uint32_t format, int plane) 
	case DRM_FORMAT_NV21:

	case DRM_FORMAT_NV16:

	case DRM_FORMAT_NV61:

	case DRM_FORMAT_NV24:

	case DRM_FORMAT_NV42:

		return plane ? 2 : 1;

	case DRM_FORMAT_YUV410:

	case DRM_FORMAT_YVU410:

drivers/gpu/drm/drm_edid.c

+14 −8
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ MODULE_PARM_DESC(edid_fixup, 
 * Sanity check the EDID block (base or extension).  Return 0 if the block

 * doesn't check out, or 1 if it's valid.

 */

bool drm_edid_block_valid(u8 *raw_edid, int block)

bool drm_edid_block_valid(u8 *raw_edid, int block, bool print_bad_edid)

{

	int i;

	u8 csum = 0;
@@ -181,7 +181,9 @@ bool drm_edid_block_valid(u8 *raw_edid, int block) 
	for (i = 0; i < EDID_LENGTH; i++)

		csum += raw_edid[i];

	if (csum) {

		if (print_bad_edid) {

			DRM_ERROR("EDID checksum is invalid, remainder is %d\n", csum);

		}



		/* allow CEA to slide through, switches mangle this */

		if (raw_edid[0] != 0x02)
@@ -207,7 +209,7 @@ bool drm_edid_block_valid(u8 *raw_edid, int block) 
	return 1;



bad:

	if (raw_edid) {

	if (raw_edid && print_bad_edid) {

		printk(KERN_ERR "Raw EDID:\n");

		print_hex_dump(KERN_ERR, " \t", DUMP_PREFIX_NONE, 16, 1,

			       raw_edid, EDID_LENGTH, false);
@@ -231,7 +233,7 @@ bool drm_edid_is_valid(struct edid *edid) 
		return false;



	for (i = 0; i <= edid->extensions; i++)

		if (!drm_edid_block_valid(raw + i * EDID_LENGTH, i))

		if (!drm_edid_block_valid(raw + i * EDID_LENGTH, i, true))

			return false;



	return true;
@@ -316,6 +318,7 @@ drm_do_get_edid(struct drm_connector *connector, struct i2c_adapter *adapter) 
{

	int i, j = 0, valid_extensions = 0;

	u8 *block, *new;

	bool print_bad_edid = !connector->bad_edid_counter || (drm_debug & DRM_UT_KMS);



	if ((block = kmalloc(EDID_LENGTH, GFP_KERNEL)) == NULL)

		return NULL;
@@ -324,7 +327,7 @@ drm_do_get_edid(struct drm_connector *connector, struct i2c_adapter *adapter) 
	for (i = 0; i < 4; i++) {

		if (drm_do_probe_ddc_edid(adapter, block, 0, EDID_LENGTH))

			goto out;

		if (drm_edid_block_valid(block, 0))

		if (drm_edid_block_valid(block, 0, print_bad_edid))

			break;

		if (i == 0 && drm_edid_is_zero(block, EDID_LENGTH)) {

			connector->null_edid_counter++;
@@ -349,7 +352,7 @@ drm_do_get_edid(struct drm_connector *connector, struct i2c_adapter *adapter) 
				  block + (valid_extensions + 1) * EDID_LENGTH,

				  j, EDID_LENGTH))

				goto out;

			if (drm_edid_block_valid(block + (valid_extensions + 1) * EDID_LENGTH, j)) {

			if (drm_edid_block_valid(block + (valid_extensions + 1) * EDID_LENGTH, j, print_bad_edid)) {

				valid_extensions++;

				break;

			}
@@ -372,8 +375,11 @@ drm_do_get_edid(struct drm_connector *connector, struct i2c_adapter *adapter) 
	return block;



carp:

	if (print_bad_edid) {

		dev_warn(connector->dev->dev, "%s: EDID block %d invalid.\n",

			 drm_get_connector_name(connector), j);

	}

	connector->bad_edid_counter++;



out:

	kfree(block);

drivers/gpu/drm/drm_edid_load.c

+4 −2
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ static u8 *edid_load(struct drm_connector *connector, char *name, 
	int fwsize, expected;

	int builtin = 0, err = 0;

	int i, valid_extensions = 0;

	bool print_bad_edid = !connector->bad_edid_counter || (drm_debug & DRM_UT_KMS);



	pdev = platform_device_register_simple(connector_name, -1, NULL, 0);

	if (IS_ERR(pdev)) {
@@ -173,7 +174,8 @@ static u8 *edid_load(struct drm_connector *connector, char *name, 
	}

	memcpy(edid, fwdata, fwsize);



	if (!drm_edid_block_valid(edid, 0)) {

	if (!drm_edid_block_valid(edid, 0, print_bad_edid)) {

		connector->bad_edid_counter++;

		DRM_ERROR("Base block of EDID firmware \"%s\" is invalid ",

		    name);

		kfree(edid);
@@ -185,7 +187,7 @@ static u8 *edid_load(struct drm_connector *connector, char *name, 
		if (i != valid_extensions + 1)

			memcpy(edid + (valid_extensions + 1) * EDID_LENGTH,

			    edid + i * EDID_LENGTH, EDID_LENGTH);

		if (drm_edid_block_valid(edid + i * EDID_LENGTH, i))

		if (drm_edid_block_valid(edid + i * EDID_LENGTH, i, print_bad_edid))

			valid_extensions++;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE