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

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

Merge remote branch 'korg/drm-radeon-testing' into drm-next-stage 

* korg/drm-radeon-testing: (62 commits)
  drm/radeon/kms: update new pll algo
  drm/radeon/kms: add support for square microtiles on r3xx-r5xx
  drm/radeon/kms: force pinning buffer into visible VRAM
  drm/radeon/kms/evergreen: fix typo in cursor code
  drm/radeon/kms: implement reading active PCIE lanes on R600+
  drm/radeon/kms: for downclocking non-mobility check PERFORMANCE state
  drm/radeon/kms: simplify storing current and requested PM mode
  drm/radeon: fixes for r6xx/r7xx gfx init
  drm/radeon/rv740: fix backend setup
  drm/radeon/kms: fix R3XX/R4XX memory controller initialization
  [rfc] drm/radeon/kms: pm debugging check for vbl.
  drm/radeon: Fix memory allocation failures in the preKMS command stream checking.
  drm: Add generic multipart buffer.
  drm/radeon/kms: simplify memory controller setup V2
  drm/radeon: Add asic hook for dma copy to r200 cards.
  drm/radeon/kms: Create asic structure for r300 pcie cards.
  drm/radeon/kms: remove unused r600_gart_clear_page
  drm/radeon/kms: remove HDP flushes from fence emit (v2)
  drm/radeon/kms: add LVDS pll quirk for Dell Studio 15
  drm/radeon/kms: simplify picking power state
  ...

Conflicts:
	drivers/gpu/drm/radeon/atom.c
	drivers/gpu/drm/radeon/atombios.h
	drivers/gpu/drm/radeon/atombios_dp.c
	drivers/gpu/drm/radeon/r600.c
	drivers/gpu/drm/radeon/r600_audio.c
	drivers/gpu/drm/radeon/r600_cp.c
	drivers/gpu/drm/radeon/radeon.h
	drivers/gpu/drm/radeon/radeon_connectors.c
	drivers/gpu/drm/radeon/radeon_ring.c
	drivers/gpu/drm/radeon/rv770.c
parents 30d6c72c 383be5d1

drivers/gpu/drm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


ccflags-y := -Iinclude/drm



drm-y       :=	drm_auth.o drm_bufs.o drm_cache.o \

drm-y       :=	drm_auth.o drm_buffer.o drm_bufs.o drm_cache.o \

		drm_context.o drm_dma.o drm_drawable.o \

		drm_drv.o drm_fops.o drm_gem.o drm_ioctl.o drm_irq.o \

		drm_lock.o drm_memory.o drm_proc.o drm_stub.o drm_vm.o \

drivers/gpu/drm/drm_buffer.c

0 → 100644
+184 −0
Original line number Diff line number Diff line 
/**************************************************************************

 *

 * Copyright 2010 Pauli Nieminen.

 * All Rights Reserved.

 *

 * Permission is hereby granted, free of charge, to any person obtaining a

 * copy of this software and associated documentation files (the

 * "Software"), to deal in the Software without restriction, including

 * without limitation the rights to use, copy, modify, merge, publish,

 * distribute, sub license, and/or sell copies of the Software, and to

 * permit persons to whom the Software is furnished to do so, subject to

 * the following conditions:

 *

 * The above copyright notice and this permission notice (including the

 * next paragraph) shall be included in all copies or substantial portions

 * of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL

 * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,

 * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR

 * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE

 * USE OR OTHER DEALINGS IN THE SOFTWARE.

 *

 *

 **************************************************************************/

/*

 * Multipart buffer for coping data which is larger than the page size.

 *

 * Authors:

 * Pauli Nieminen <suokkos-at-gmail-dot-com>

 */



#include "drm_buffer.h"



/**

 * Allocate the drm buffer object.

 *

 *   buf: Pointer to a pointer where the object is stored.

 *   size: The number of bytes to allocate.

 */

int drm_buffer_alloc(struct drm_buffer **buf, int size)

{

	int nr_pages = size / PAGE_SIZE + 1;

	int idx;



	/* Allocating pointer table to end of structure makes drm_buffer

	 * variable sized */

	*buf = kzalloc(sizeof(struct drm_buffer) + nr_pages*sizeof(char *),

			GFP_KERNEL);



	if (*buf == NULL) {

		DRM_ERROR("Failed to allocate drm buffer object to hold"

				" %d bytes in %d pages.\n",

				size, nr_pages);

		return -ENOMEM;

	}



	(*buf)->size = size;



	for (idx = 0; idx < nr_pages; ++idx) {



		(*buf)->data[idx] =

			kmalloc(min(PAGE_SIZE, size - idx * PAGE_SIZE),

				GFP_KERNEL);





		if ((*buf)->data[idx] == NULL) {

			DRM_ERROR("Failed to allocate %dth page for drm"

					" buffer with %d bytes and %d pages.\n",

					idx + 1, size, nr_pages);

			goto error_out;

		}



	}



	return 0;



error_out:



	/* Only last element can be null pointer so check for it first. */

	if ((*buf)->data[idx])

		kfree((*buf)->data[idx]);



	for (--idx; idx >= 0; --idx)

		kfree((*buf)->data[idx]);



	kfree(*buf);

	return -ENOMEM;

}

EXPORT_SYMBOL(drm_buffer_alloc);



/**

 * Copy the user data to the begin of the buffer and reset the processing

 * iterator.

 *

 *   user_data: A pointer the data that is copied to the buffer.

 *   size: The Number of bytes to copy.

 */

extern int drm_buffer_copy_from_user(struct drm_buffer *buf,

		void __user *user_data, int size)

{

	int nr_pages = size / PAGE_SIZE + 1;

	int idx;



	if (size > buf->size) {

		DRM_ERROR("Requesting to copy %d bytes to a drm buffer with"

				" %d bytes space\n",

				size, buf->size);

		return -EFAULT;

	}



	for (idx = 0; idx < nr_pages; ++idx) {



		if (DRM_COPY_FROM_USER(buf->data[idx],

			user_data + idx * PAGE_SIZE,

			min(PAGE_SIZE, size - idx * PAGE_SIZE))) {

			DRM_ERROR("Failed to copy user data (%p) to drm buffer"

					" (%p) %dth page.\n",

					user_data, buf, idx);

			return -EFAULT;



		}

	}

	buf->iterator = 0;

	return 0;

}

EXPORT_SYMBOL(drm_buffer_copy_from_user);



/**

 * Free the drm buffer object

 */

void drm_buffer_free(struct drm_buffer *buf)

{



	if (buf != NULL) {



		int nr_pages = buf->size / PAGE_SIZE + 1;

		int idx;

		for (idx = 0; idx < nr_pages; ++idx)

			kfree(buf->data[idx]);



		kfree(buf);

	}

}

EXPORT_SYMBOL(drm_buffer_free);



/**

 * Read an object from buffer that may be split to multiple parts. If object

 * is not split function just returns the pointer to object in buffer. But in

 * case of split object data is copied to given stack object that is suplied

 * by caller.

 *

 * The processing location of the buffer is also advanced to the next byte

 * after the object.

 *

 *   objsize: The size of the objet in bytes.

 *   stack_obj: A pointer to a memory location where object can be copied.

 */

void *drm_buffer_read_object(struct drm_buffer *buf,

		int objsize, void *stack_obj)

{

	int idx = drm_buffer_index(buf);

	int page = drm_buffer_page(buf);

	void *obj = 0;



	if (idx + objsize <= PAGE_SIZE) {

		obj = &buf->data[page][idx];

	} else {

		/* The object is split which forces copy to temporary object.*/

		int beginsz = PAGE_SIZE - idx;

		memcpy(stack_obj, &buf->data[page][idx], beginsz);



		memcpy(stack_obj + beginsz, &buf->data[page + 1][0],

				objsize - beginsz);



		obj = stack_obj;

	}



	drm_buffer_advance(buf, objsize);

	return obj;

}

EXPORT_SYMBOL(drm_buffer_read_object);

drivers/gpu/drm/drm_edid.c

+15 −15
Original line number Diff line number Diff line
@@ -60,8 +60,7 @@ 
#define EDID_QUIRK_FIRST_DETAILED_PREFERRED	(1 << 5)

/* use +hsync +vsync for detailed mode */

#define EDID_QUIRK_DETAILED_SYNC_PP		(1 << 6)

/* define the number of Extension EDID block */

#define MAX_EDID_EXT_NUM 4





#define LEVEL_DMT	0

#define LEVEL_GTF	1
@@ -114,14 +113,14 @@ static const u8 edid_header[] = { 
};



/**

 * edid_is_valid - sanity check EDID data

 * drm_edid_is_valid - sanity check EDID data

 * @edid: EDID data

 *

 * Sanity check the EDID block by looking at the header, the version number

 * and the checksum.  Return 0 if the EDID doesn't check out, or 1 if it's

 * valid.

 */

static bool edid_is_valid(struct edid *edid)

bool drm_edid_is_valid(struct edid *edid)

{

	int i, score = 0;

	u8 csum = 0;
@@ -163,6 +162,7 @@ static bool edid_is_valid(struct edid *edid) 
	}

	return 0;

}

EXPORT_SYMBOL(drm_edid_is_valid);



/**

 * edid_vendor - match a string against EDID's obfuscated vendor field
@@ -1112,8 +1112,8 @@ static int add_detailed_info_eedid(struct drm_connector *connector, 
	}



	/* Chose real EDID extension number */

	edid_ext_num = edid->extensions > MAX_EDID_EXT_NUM ?

		       MAX_EDID_EXT_NUM : edid->extensions;

	edid_ext_num = edid->extensions > DRM_MAX_EDID_EXT_NUM ?

		DRM_MAX_EDID_EXT_NUM : edid->extensions;



	/* Find CEA extension */

	for (i = 0; i < edid_ext_num; i++) {
@@ -1195,7 +1195,7 @@ static int drm_ddc_read_edid(struct drm_connector *connector, 
	for (i = 0; i < 4; i++) {

		if (drm_do_probe_ddc_edid(adapter, buf, len))

			return -1;

		if (edid_is_valid((struct edid *)buf))

		if (drm_edid_is_valid((struct edid *)buf))

			return 0;

	}
@@ -1220,7 +1220,7 @@ struct edid *drm_get_edid(struct drm_connector *connector, 
	int ret;

	struct edid *edid;



	edid = kmalloc(EDID_LENGTH * (MAX_EDID_EXT_NUM + 1),

	edid = kmalloc(EDID_LENGTH * (DRM_MAX_EDID_EXT_NUM + 1),

		       GFP_KERNEL);

	if (edid == NULL) {

		dev_warn(&connector->dev->pdev->dev,
@@ -1238,14 +1238,14 @@ struct edid *drm_get_edid(struct drm_connector *connector, 
	if (edid->extensions != 0) {

		int edid_ext_num = edid->extensions;



		if (edid_ext_num > MAX_EDID_EXT_NUM) {

		if (edid_ext_num > DRM_MAX_EDID_EXT_NUM) {

			dev_warn(&connector->dev->pdev->dev,

				 "The number of extension(%d) is "

				 "over max (%d), actually read number (%d)\n",

				 edid_ext_num, MAX_EDID_EXT_NUM,

				 MAX_EDID_EXT_NUM);

				 edid_ext_num, DRM_MAX_EDID_EXT_NUM,

				 DRM_MAX_EDID_EXT_NUM);

			/* Reset EDID extension number to be read */

			edid_ext_num = MAX_EDID_EXT_NUM;

			edid_ext_num = DRM_MAX_EDID_EXT_NUM;

		}

		/* Read EDID including extensions too */

		ret = drm_ddc_read_edid(connector, adapter, (char *)edid,
@@ -1288,8 +1288,8 @@ bool drm_detect_hdmi_monitor(struct edid *edid) 
		goto end;



	/* Chose real EDID extension number */

	edid_ext_num = edid->extensions > MAX_EDID_EXT_NUM ?

		       MAX_EDID_EXT_NUM : edid->extensions;

	edid_ext_num = edid->extensions > DRM_MAX_EDID_EXT_NUM ?

		       DRM_MAX_EDID_EXT_NUM : edid->extensions;



	/* Find CEA extension */

	for (i = 0; i < edid_ext_num; i++) {
@@ -1346,7 +1346,7 @@ int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid) 
	if (edid == NULL) {

		return 0;

	}

	if (!edid_is_valid(edid)) {

	if (!drm_edid_is_valid(edid)) {

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

			 drm_get_connector_name(connector));

		return 0;

drivers/gpu/drm/radeon/Makefile

+7 −1
Original line number Diff line number Diff line
@@ -30,6 +30,9 @@ $(obj)/r420_reg_safe.h: $(src)/reg_srcs/r420 $(obj)/mkregtable 
$(obj)/rs600_reg_safe.h: $(src)/reg_srcs/rs600 $(obj)/mkregtable

	$(call if_changed,mkregtable)



$(obj)/r600_reg_safe.h: $(src)/reg_srcs/r600 $(obj)/mkregtable

	$(call if_changed,mkregtable)



$(obj)/r100.o: $(obj)/r100_reg_safe.h $(obj)/rn50_reg_safe.h



$(obj)/r200.o: $(obj)/r200_reg_safe.h
@@ -42,6 +45,8 @@ $(obj)/r420.o: $(obj)/r420_reg_safe.h 


$(obj)/rs600.o: $(obj)/rs600_reg_safe.h



$(obj)/r600_cs.o: $(obj)/r600_reg_safe.h



radeon-y := radeon_drv.o radeon_cp.o radeon_state.o radeon_mem.o \

	radeon_irq.o r300_cmdbuf.o r600_cp.o

# add KMS driver
@@ -54,7 +59,8 @@ radeon-y += radeon_device.o radeon_kms.o \ 
	radeon_cs.o radeon_bios.o radeon_benchmark.o r100.o r300.o r420.o \

	rs400.o rs600.o rs690.o rv515.o r520.o r600.o rv770.o radeon_test.o \

	r200.o radeon_legacy_tv.o r600_cs.o r600_blit.o r600_blit_shaders.o \

	r600_blit_kms.o radeon_pm.o atombios_dp.o r600_audio.o r600_hdmi.o

	r600_blit_kms.o radeon_pm.o atombios_dp.o r600_audio.o r600_hdmi.o \

	evergreen.o



radeon-$(CONFIG_COMPAT) += radeon_ioc32.o

drivers/gpu/drm/radeon/atombios.h

+4185 −3115

File changed.

Preview size limit exceeded, changes collapsed.