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

Commit b6e78a6f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-for-v4.14-rc2' of git://people.freedesktop.org/~airlied/linux 

Pull drm fixes from Dave Airlie:
 "amdkfd, i915 and exynos fixes.

  I've ended up on unplanned + planned leave this week, but there were
  some fixes I decided to dequeue, some amdkfd bits missed the next pull
  but they are pretty trivial, so I included them.

  I'm not sure I'll see much else for rc2, lots of people are at XDC"

* tag 'drm-fixes-for-v4.14-rc2' of git://people.freedesktop.org/~airlied/linux:
  drm/exynos/hdmi: Fix unsafe list iteration
  drm: exynos: include linux/irq.h
  drm/exynos: Fix suspend/resume support
  drm/exynos: Fix locking in the suspend/resume paths
  drm/i915: Remove unused 'in_vbl' from i915_get_crtc_scanoutpos()
  drm/i915/cnp: set min brightness from VBT
  Revert "drm/i915/bxt: Disable device ready before shutdown command"
  drm/i915/bxt: set min brightness from VBT
  drm/i915: Fix an error handling in 'intel_framebuffer_init()'
  drm/i915/gvt: Fix incorrect PCI BARs reporting
  drm/amdkfd: pass queue's mqd when destroying mqd
  drm/amdkfd: remove memset before memcpy
  uapi linux/kfd_ioctl.h: only use __u32 and __u64
parents 20c29a97 56eac98b

drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c

+1 −1
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ static void uninitialize(struct kernel_queue *kq) 
{

	if (kq->queue->properties.type == KFD_QUEUE_TYPE_HIQ)

		kq->mqd->destroy_mqd(kq->mqd,

					NULL,

					kq->queue->mqd,

					false,

					QUEUE_PREEMPT_DEFAULT_TIMEOUT_MS,

					kq->queue->pipe,

drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c

+0 −1
Original line number Diff line number Diff line
@@ -143,7 +143,6 @@ int pqm_create_queue(struct process_queue_manager *pqm, 
	int num_queues = 0;

	struct queue *cur;



	memset(&q_properties, 0, sizeof(struct queue_properties));

	memcpy(&q_properties, properties, sizeof(struct queue_properties));

	q = NULL;

	kq = NULL;

drivers/gpu/drm/exynos/exynos5433_drm_decon.c

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/clk.h>

#include <linux/component.h>

#include <linux/iopoll.h>

#include <linux/irq.h>

#include <linux/mfd/syscon.h>

#include <linux/of_device.h>

#include <linux/of_gpio.h>

drivers/gpu/drm/exynos/exynos_drm_drv.c

+12 −24
Original line number Diff line number Diff line
@@ -168,23 +168,19 @@ static struct drm_driver exynos_drm_driver = { 
static int exynos_drm_suspend(struct device *dev)

{

	struct drm_device *drm_dev = dev_get_drvdata(dev);

	struct drm_connector *connector;

	struct drm_connector_list_iter conn_iter;

	struct exynos_drm_private *private = drm_dev->dev_private;



	if (pm_runtime_suspended(dev) || !drm_dev)

		return 0;



	drm_connector_list_iter_begin(drm_dev, &conn_iter);

	drm_for_each_connector_iter(connector, &conn_iter) {

		int old_dpms = connector->dpms;



		if (connector->funcs->dpms)

			connector->funcs->dpms(connector, DRM_MODE_DPMS_OFF);



		/* Set the old mode back to the connector for resume */

		connector->dpms = old_dpms;

	drm_kms_helper_poll_disable(drm_dev);

	exynos_drm_fbdev_suspend(drm_dev);

	private->suspend_state = drm_atomic_helper_suspend(drm_dev);

	if (IS_ERR(private->suspend_state)) {

		exynos_drm_fbdev_resume(drm_dev);

		drm_kms_helper_poll_enable(drm_dev);

		return PTR_ERR(private->suspend_state);

	}

	drm_connector_list_iter_end(&conn_iter);



	return 0;

}
@@ -192,22 +188,14 @@ static int exynos_drm_suspend(struct device *dev) 
static int exynos_drm_resume(struct device *dev)

{

	struct drm_device *drm_dev = dev_get_drvdata(dev);

	struct drm_connector *connector;

	struct drm_connector_list_iter conn_iter;

	struct exynos_drm_private *private = drm_dev->dev_private;



	if (pm_runtime_suspended(dev) || !drm_dev)

		return 0;



	drm_connector_list_iter_begin(drm_dev, &conn_iter);

	drm_for_each_connector_iter(connector, &conn_iter) {

		if (connector->funcs->dpms) {

			int dpms = connector->dpms;



			connector->dpms = DRM_MODE_DPMS_OFF;

			connector->funcs->dpms(connector, dpms);

		}

	}

	drm_connector_list_iter_end(&conn_iter);

	drm_atomic_helper_resume(drm_dev, private->suspend_state);

	exynos_drm_fbdev_resume(drm_dev);

	drm_kms_helper_poll_enable(drm_dev);



	return 0;

}

drivers/gpu/drm/exynos/exynos_drm_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -202,6 +202,7 @@ struct drm_exynos_file_private { 
 */

struct exynos_drm_private {

	struct drm_fb_helper *fb_helper;

	struct drm_atomic_state *suspend_state;



	struct device *dma_dev;

	void *mapping;