Commit 7e59fad9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-next-2018-12-27' of git://anongit.freedesktop.org/drm/drm 

Pull more drm updates from Dave Airlie:
 "Daniel collected a couple of pulls after I want on holidays, back for
  a couple of days, so may as well send them out.

  This has exynos and etnaviv work for 4.21.

  exynos:
   - plane alpha and blending configurability

  etnaviv:
   - mostly cleanups in prep for new features"

* tag 'drm-next-2018-12-27' of git://anongit.freedesktop.org/drm/drm:
  drm/etnaviv: remove lastctx member from gpu struct
  drm/etnaviv: replace header include with forward declaration
  drm/etnaviv: remove unnecessary local irq disable
  drm/exynos: fimd: Make pixel blend mode configurable
  drm/exynos: fimd: Make plane alpha configurable
  drm/etnaviv: Replace drm_dev_unref with drm_dev_put
  drm/etnaviv: consolidate hardware fence handling in etnaviv_gpu
  drm/etnaviv: kill active fence tracking
parents 87540403 221b35fe

drivers/gpu/drm/etnaviv/etnaviv_buffer.c

+0 −2
Original line number Diff line number Diff line
@@ -439,6 +439,4 @@ void etnaviv_buffer_queue(struct etnaviv_gpu *gpu, u32 exec_state, 


	if (drm_debug & DRM_UT_DRIVER)

		etnaviv_buffer_dump(gpu, buffer, 0, 0x50);



	gpu->lastctx = cmdbuf->ctx;

}

drivers/gpu/drm/etnaviv/etnaviv_drv.c

+3 −9
Original line number Diff line number Diff line
@@ -72,15 +72,9 @@ static void etnaviv_postclose(struct drm_device *dev, struct drm_file *file) 
	for (i = 0; i < ETNA_MAX_PIPES; i++) {

		struct etnaviv_gpu *gpu = priv->gpu[i];



		if (gpu) {

			mutex_lock(&gpu->lock);

			if (gpu->lastctx == ctx)

				gpu->lastctx = NULL;

			mutex_unlock(&gpu->lock);



		if (gpu)

			drm_sched_entity_destroy(&ctx->sched_entity[i]);

	}

	}



	kfree(ctx);

}
@@ -523,7 +517,7 @@ static int etnaviv_bind(struct device *dev) 
	if (!priv) {

		dev_err(dev, "failed to allocate private data\n");

		ret = -ENOMEM;

		goto out_unref;

		goto out_put;

	}

	drm->dev_private = priv;
@@ -549,7 +543,7 @@ out_register: 
	component_unbind_all(dev, drm);

out_bind:

	kfree(priv);

out_unref:

out_put:

	drm_dev_put(drm);



	return ret;

drivers/gpu/drm/etnaviv/etnaviv_drv.h

+0 −11
Original line number Diff line number Diff line
@@ -107,17 +107,6 @@ static inline size_t size_vstruct(size_t nelem, size_t elem_size, size_t base) 
	return base + nelem * elem_size;

}



/* returns true if fence a comes after fence b */

static inline bool fence_after(u32 a, u32 b)

{

	return (s32)(a - b) > 0;

}



static inline bool fence_after_eq(u32 a, u32 b)

{

	return (s32)(a - b) >= 0;

}



/*

 * Etnaviv timeouts are specified wrt CLOCK_MONOTONIC, not jiffies.

 * We need to calculate the timeout in terms of number of jiffies

drivers/gpu/drm/etnaviv/etnaviv_gpu.c

+16 −21
Original line number Diff line number Diff line
@@ -3,10 +3,12 @@ 
 * Copyright (C) 2015-2018 Etnaviv Project

 */



#include <linux/clk.h>

#include <linux/component.h>

#include <linux/dma-fence.h>

#include <linux/moduleparam.h>

#include <linux/of_device.h>

#include <linux/regulator/consumer.h>

#include <linux/thermal.h>



#include "etnaviv_cmdbuf.h"
@@ -976,7 +978,6 @@ int etnaviv_gpu_debugfs(struct etnaviv_gpu *gpu, struct seq_file *m) 


void etnaviv_gpu_recover_hang(struct etnaviv_gpu *gpu)

{

	unsigned long flags;

	unsigned int i = 0;



	dev_err(gpu->dev, "recover hung GPU!\n");
@@ -989,15 +990,13 @@ void etnaviv_gpu_recover_hang(struct etnaviv_gpu *gpu) 
	etnaviv_hw_reset(gpu);



	/* complete all events, the GPU won't do it after the reset */

	spin_lock_irqsave(&gpu->event_spinlock, flags);

	spin_lock(&gpu->event_spinlock);

	for_each_set_bit_from(i, gpu->event_bitmap, ETNA_NR_EVENTS)

		complete(&gpu->event_free);

	bitmap_zero(gpu->event_bitmap, ETNA_NR_EVENTS);

	spin_unlock_irqrestore(&gpu->event_spinlock, flags);

	gpu->completed_fence = gpu->active_fence;

	spin_unlock(&gpu->event_spinlock);



	etnaviv_gpu_hw_init(gpu);

	gpu->lastctx = NULL;

	gpu->exec_state = -1;



	mutex_unlock(&gpu->lock);
@@ -1032,7 +1031,7 @@ static bool etnaviv_fence_signaled(struct dma_fence *fence) 
{

	struct etnaviv_fence *f = to_etnaviv_fence(fence);



	return fence_completed(f->gpu, f->base.seqno);

	return (s32)(f->gpu->completed_fence - f->base.seqno) >= 0;

}



static void etnaviv_fence_release(struct dma_fence *fence)
@@ -1071,6 +1070,12 @@ static struct dma_fence *etnaviv_gpu_fence_alloc(struct etnaviv_gpu *gpu) 
	return &f->base;

}



/* returns true if fence a comes after fence b */

static inline bool fence_after(u32 a, u32 b)

{

	return (s32)(a - b) > 0;

}



/*

 * event management:

 */
@@ -1078,7 +1083,7 @@ static struct dma_fence *etnaviv_gpu_fence_alloc(struct etnaviv_gpu *gpu) 
static int event_alloc(struct etnaviv_gpu *gpu, unsigned nr_events,

	unsigned int *events)

{

	unsigned long flags, timeout = msecs_to_jiffies(10 * 10000);

	unsigned long timeout = msecs_to_jiffies(10 * 10000);

	unsigned i, acquired = 0;



	for (i = 0; i < nr_events; i++) {
@@ -1095,7 +1100,7 @@ static int event_alloc(struct etnaviv_gpu *gpu, unsigned nr_events, 
		timeout = ret;

	}



	spin_lock_irqsave(&gpu->event_spinlock, flags);

	spin_lock(&gpu->event_spinlock);



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

		int event = find_first_zero_bit(gpu->event_bitmap, ETNA_NR_EVENTS);
@@ -1105,7 +1110,7 @@ static int event_alloc(struct etnaviv_gpu *gpu, unsigned nr_events, 
		set_bit(event, gpu->event_bitmap);

	}



	spin_unlock_irqrestore(&gpu->event_spinlock, flags);

	spin_unlock(&gpu->event_spinlock);



	return 0;
@@ -1118,18 +1123,11 @@ out: 


static void event_free(struct etnaviv_gpu *gpu, unsigned int event)

{

	unsigned long flags;



	spin_lock_irqsave(&gpu->event_spinlock, flags);



	if (!test_bit(event, gpu->event_bitmap)) {

		dev_warn(gpu->dev, "event %u is already marked as free",

			 event);

		spin_unlock_irqrestore(&gpu->event_spinlock, flags);

	} else {

		clear_bit(event, gpu->event_bitmap);

		spin_unlock_irqrestore(&gpu->event_spinlock, flags);



		complete(&gpu->event_free);

	}

}
@@ -1306,8 +1304,6 @@ struct dma_fence *etnaviv_gpu_submit(struct etnaviv_gem_submit *submit) 
		goto out_unlock;

	}



	gpu->active_fence = gpu_fence->seqno;



	if (submit->nr_pmrs) {

		gpu->event[event[1]].sync_point = &sync_point_perfmon_sample_pre;

		kref_get(&submit->refcount);
@@ -1549,7 +1545,6 @@ static int etnaviv_gpu_hw_resume(struct etnaviv_gpu *gpu) 
	etnaviv_gpu_update_clock(gpu);

	etnaviv_gpu_hw_init(gpu);



	gpu->lastctx = NULL;

	gpu->exec_state = -1;



	mutex_unlock(&gpu->lock);
@@ -1806,8 +1801,8 @@ static int etnaviv_gpu_rpm_suspend(struct device *dev) 
	struct etnaviv_gpu *gpu = dev_get_drvdata(dev);

	u32 idle, mask;



	/* If we have outstanding fences, we're not idle */

	if (gpu->completed_fence != gpu->active_fence)

	/* If there are any jobs in the HW queue, we're not idle */

	if (atomic_read(&gpu->sched.hw_rq_count))

		return -EBUSY;



	/* Check whether the hardware (except FE) is idle */

drivers/gpu/drm/etnaviv/etnaviv_gpu.h

+2 −10
Original line number Diff line number Diff line
@@ -6,9 +6,6 @@ 
#ifndef __ETNAVIV_GPU_H__

#define __ETNAVIV_GPU_H__



#include <linux/clk.h>

#include <linux/regulator/consumer.h>



#include "etnaviv_cmdbuf.h"

#include "etnaviv_drv.h"
@@ -88,6 +85,8 @@ struct etnaviv_event { 


struct etnaviv_cmdbuf_suballoc;

struct etnaviv_cmdbuf;

struct regulator;

struct clk;



#define ETNA_NR_EVENTS 30
@@ -98,7 +97,6 @@ struct etnaviv_gpu { 
	struct mutex lock;

	struct etnaviv_chip_identity identity;

	enum etnaviv_sec_mode sec_mode;

	struct etnaviv_file_private *lastctx;

	struct workqueue_struct *wq;

	struct drm_gpu_scheduler sched;
@@ -121,7 +119,6 @@ struct etnaviv_gpu { 
	struct mutex fence_lock;

	struct idr fence_idr;

	u32 next_fence;

	u32 active_fence;

	u32 completed_fence;

	wait_queue_head_t fence_event;

	u64 fence_context;
@@ -161,11 +158,6 @@ static inline u32 gpu_read(struct etnaviv_gpu *gpu, u32 reg) 
	return readl(gpu->mmio + reg);

}



static inline bool fence_completed(struct etnaviv_gpu *gpu, u32 fence)

{

	return fence_after_eq(gpu->completed_fence, fence);

}



int etnaviv_gpu_get_param(struct etnaviv_gpu *gpu, u32 param, u64 *value);



int etnaviv_gpu_init(struct etnaviv_gpu *gpu);

CRA Git | Maintained and supported by SUSTech CRA and CCSE