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

Commit 885ae1c5 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'topic/core-stuff-2014-06-02' of git://anongit.freedesktop.org/drm-intel into drm-next 

Just flushing out my pile of random drm patches for the merge window,
nothing big. And it all hung around in drm-intel trees for a while (only
just rebased now).

* tag 'topic/core-stuff-2014-06-02' of git://anongit.freedesktop.org/drm-intel:
  imx-drm: imx-tve: remove unused variable
  drm: Missed clflushopt in drm_clflush_virt_range
  drm/plane: Fix a couple of checkpatch warnings
  drm/plane: Fix sparse warnings
  drm/exynos: Fix double locks at PM resume
  drm/ast: Fix double lock at PM resume
  drm/dp-helper: Deprecate old i2c-over-dp_aux heleprs
parents b33a51e4 46340642

drivers/gpu/drm/ast/ast_drv.c

+0 −2
Original line number Diff line number Diff line
@@ -94,9 +94,7 @@ static int ast_drm_thaw(struct drm_device *dev) 
	ast_post_gpu(dev);



	drm_mode_config_reset(dev);

	drm_modeset_lock_all(dev);

	drm_helper_resume_force_mode(dev);

	drm_modeset_unlock_all(dev);



	console_lock();

	ast_fbdev_set_suspend(dev, 0);

drivers/gpu/drm/drm_cache.c

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ drm_clflush_virt_range(void *addr, unsigned long length) 
		void *end = addr + length;

		mb();

		for (; addr < end; addr += boot_cpu_data.x86_clflush_size)

			clflush(addr);

			clflushopt(addr);

		clflushopt(end - 1);

		mb();

		return;

drivers/gpu/drm/drm_dp_helper.c

+4 −0
Original line number Diff line number Diff line
@@ -213,6 +213,10 @@ i2c_dp_aux_prepare_bus(struct i2c_adapter *adapter) 
 *

 * RETURNS:

 * 0 on success, -ERRNO on failure.

 *

 * IMPORTANT:

 * This interface is deprecated, please switch to the new dp aux helpers and

 * drm_dp_aux_register_i2c_bus().

 */

int

i2c_dp_aux_add_bus(struct i2c_adapter *adapter)

drivers/gpu/drm/drm_plane_helper.c

+4 −3
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <linux/list.h>

#include <drm/drmP.h>

#include <drm/drm_rect.h>

#include <drm/drm_plane_helper.h>



#define SUBPIXEL_MASK 0xffff
@@ -36,7 +37,7 @@ 
 * creating the primary plane.  However drivers that still call

 * drm_plane_init() will use this minimal format list as the default.

 */

const static uint32_t safe_modeset_formats[] = {

static const uint32_t safe_modeset_formats[] = {

	DRM_FORMAT_XRGB8888,

	DRM_FORMAT_ARGB8888,

};

drivers/staging/imx-drm/imx-tve.c

+0 −1
Original line number Diff line number Diff line
@@ -249,7 +249,6 @@ static int imx_tve_connector_mode_valid(struct drm_connector *connector, 
{

	struct imx_tve *tve = con_to_tve(connector);

	unsigned long rate;

	int ret;



	/* pixel clock with 2x oversampling */

	rate = clk_round_rate(tve->clk, 2000UL * mode->clock) / 2000;