Commit 5c1e34b5 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-2019-10-17' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes 



-dma-resv: Change shared_count to post-increment to fix lima crash (Qiang)
-ttm: A couple fixes related to lifetime and restore prefault behavior
 (Christian & Thomas)
-panfrost: Fill in missing feature reg values and fix stoppedjob timeouts
 (Steven)

Cc: Qiang Yu <yuq825@gmail.com>
Cc: Thomas Hellstrom <thellstrom@vmware.com>
Cc: Christian König <christian.koenig@amd.com>
Cc: Steven Price <steven.price@arm.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Sean Paul <sean@poorly.run>
Link: https://patchwork.freedesktop.org/patch/msgid/20191017203419.GA142909@art_vandelay
parents 7557d278 5b3ec813

drivers/dma-buf/dma-resv.c

+1 −1
Original line number Diff line number Diff line
@@ -471,7 +471,7 @@ unlock: 
	if (pfence_excl)

		*pfence_excl = fence_excl;

	else if (fence_excl)

		shared[++shared_count] = fence_excl;

		shared[shared_count++] = fence_excl;



	if (!shared_count) {

		kfree(shared);

drivers/gpu/drm/drm_edid.c

+3 −0
Original line number Diff line number Diff line
@@ -159,6 +159,9 @@ static const struct edid_quirk { 
	/* Medion MD 30217 PG */

	{ "MED", 0x7b8, EDID_QUIRK_PREFER_LARGE_75 },



	/* Lenovo G50 */

	{ "SDC", 18514, EDID_QUIRK_FORCE_6BPC },



	/* Panel in Samsung NP700G7A-S01PL notebook reports 6bpc */

	{ "SEC", 0xd033, EDID_QUIRK_FORCE_8BPC },

drivers/gpu/drm/msm/dsi/dsi_host.c

+4 −2
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ 
#include "dsi_cfg.h"

#include "msm_kms.h"



#define DSI_RESET_TOGGLE_DELAY_MS 20



static int dsi_get_version(const void __iomem *base, u32 *major, u32 *minor)

{

	u32 ver;
@@ -986,7 +988,7 @@ static void dsi_sw_reset(struct msm_dsi_host *msm_host) 
	wmb(); /* clocks need to be enabled before reset */



	dsi_write(msm_host, REG_DSI_RESET, 1);

	wmb(); /* make sure reset happen */

	msleep(DSI_RESET_TOGGLE_DELAY_MS); /* make sure reset happen */

	dsi_write(msm_host, REG_DSI_RESET, 0);

}
@@ -1396,7 +1398,7 @@ static void dsi_sw_reset_restore(struct msm_dsi_host *msm_host) 


	/* dsi controller can only be reset while clocks are running */

	dsi_write(msm_host, REG_DSI_RESET, 1);

	wmb();	/* make sure reset happen */

	msleep(DSI_RESET_TOGGLE_DELAY_MS); /* make sure reset happen */

	dsi_write(msm_host, REG_DSI_RESET, 0);

	wmb();	/* controller out of reset */

	dsi_write(msm_host, REG_DSI_CTRL, data0);

drivers/gpu/drm/panfrost/panfrost_gpu.c

+3 −0
Original line number Diff line number Diff line
@@ -208,6 +208,9 @@ static void panfrost_gpu_init_features(struct panfrost_device *pfdev) 
	pfdev->features.mem_features = gpu_read(pfdev, GPU_MEM_FEATURES);

	pfdev->features.mmu_features = gpu_read(pfdev, GPU_MMU_FEATURES);

	pfdev->features.thread_features = gpu_read(pfdev, GPU_THREAD_FEATURES);

	pfdev->features.max_threads = gpu_read(pfdev, GPU_THREAD_MAX_THREADS);

	pfdev->features.thread_max_workgroup_sz = gpu_read(pfdev, GPU_THREAD_MAX_WORKGROUP_SIZE);

	pfdev->features.thread_max_barrier_sz = gpu_read(pfdev, GPU_THREAD_MAX_BARRIER_SIZE);

	pfdev->features.coherency_features = gpu_read(pfdev, GPU_COHERENCY_FEATURES);

	for (i = 0; i < 4; i++)

		pfdev->features.texture_features[i] = gpu_read(pfdev, GPU_TEXTURE_FEATURES(i));

drivers/gpu/drm/panfrost/panfrost_job.c

+11 −5
Original line number Diff line number Diff line
@@ -381,12 +381,18 @@ static void panfrost_job_timedout(struct drm_sched_job *sched_job) 
		job_read(pfdev, JS_TAIL_LO(js)),

		sched_job);



	mutex_lock(&pfdev->reset_lock);

	if (!mutex_trylock(&pfdev->reset_lock))

		return;



	for (i = 0; i < NUM_JOB_SLOTS; i++)

		drm_sched_stop(&pfdev->js->queue[i].sched, sched_job);

	for (i = 0; i < NUM_JOB_SLOTS; i++) {

		struct drm_gpu_scheduler *sched = &pfdev->js->queue[i].sched;



		drm_sched_stop(sched, sched_job);

		if (js != i)

			/* Ensure any timeouts on other slots have finished */

			cancel_delayed_work_sync(&sched->work_tdr);

	}



	if (sched_job)

	drm_sched_increase_karma(sched_job);



	spin_lock_irqsave(&pfdev->js->job_lock, flags);

CRA Git | Maintained and supported by SUSTech CRA and CCSE