evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "drm/msm: drop return from gpu->submit()"

Browse source
This commit is contained in:
Linux Build Service Account 2017-05-16 06:49:35 -07:00 • committed by Gerrit - the friendly Code Review server
commit 2fdf1c893d
5 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/gpu/drm/msm/adreno/a5xx_gpu.c
View file

@ -103,7 +103,7 @@ static void a5xx_set_pagetable(struct msm_gpu *gpu, struct msm_ringbuffer *ring,
OUT_RING(ring, 1); OUT_RING(ring, 1);
} }
static int a5xx_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit) static void a5xx_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit)
{ {
struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu); struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu);
struct a5xx_gpu *a5xx_gpu = to_a5xx_gpu(adreno_gpu); struct a5xx_gpu *a5xx_gpu = to_a5xx_gpu(adreno_gpu);
@ -273,8 +273,6 @@ static int a5xx_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit)
/* Check to see if we need to start preemption */ /* Check to see if we need to start preemption */
a5xx_preempt_trigger(gpu); a5xx_preempt_trigger(gpu);
return 0;
} }
static const struct { static const struct {

4
drivers/gpu/drm/msm/adreno/adreno_gpu.c
View file

@ -172,7 +172,7 @@ void adreno_recover(struct msm_gpu *gpu)
enable_irq(gpu->irq); enable_irq(gpu->irq);
} }
int adreno_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit) void adreno_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit)
{ {
struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu); struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu);
struct msm_ringbuffer *ring = gpu->rb[submit->ring]; struct msm_ringbuffer *ring = gpu->rb[submit->ring];
@ -248,8 +248,6 @@ int adreno_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit)
#endif #endif
gpu->funcs->flush(gpu, ring); gpu->funcs->flush(gpu, ring);
return 0;
} }
void adreno_flush(struct msm_gpu *gpu, struct msm_ringbuffer *ring) void adreno_flush(struct msm_gpu *gpu, struct msm_ringbuffer *ring)

2
drivers/gpu/drm/msm/adreno/adreno_gpu.h
View file

@ -244,7 +244,7 @@ uint32_t adreno_last_fence(struct msm_gpu *gpu, struct msm_ringbuffer *ring);
uint32_t adreno_submitted_fence(struct msm_gpu *gpu, uint32_t adreno_submitted_fence(struct msm_gpu *gpu,
struct msm_ringbuffer *ring); struct msm_ringbuffer *ring);
void adreno_recover(struct msm_gpu *gpu); void adreno_recover(struct msm_gpu *gpu);
int adreno_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit); void adreno_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit);
void adreno_flush(struct msm_gpu *gpu, struct msm_ringbuffer *ring); void adreno_flush(struct msm_gpu *gpu, struct msm_ringbuffer *ring);
bool adreno_idle(struct msm_gpu *gpu, struct msm_ringbuffer *ring); bool adreno_idle(struct msm_gpu *gpu, struct msm_ringbuffer *ring);
#ifdef CONFIG_DEBUG_FS #ifdef CONFIG_DEBUG_FS

6
drivers/gpu/drm/msm/msm_gpu.c
View file

@ -547,7 +547,7 @@ int msm_gpu_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit)
struct drm_device *dev = gpu->dev; struct drm_device *dev = gpu->dev;
struct msm_drm_private *priv = dev->dev_private; struct msm_drm_private *priv = dev->dev_private;
struct msm_ringbuffer *ring = gpu->rb[submit->ring]; struct msm_ringbuffer *ring = gpu->rb[submit->ring];
int i, ret; int i;
WARN_ON(!mutex_is_locked(&dev->struct_mutex)); WARN_ON(!mutex_is_locked(&dev->struct_mutex));
@ -590,11 +590,11 @@ int msm_gpu_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit)
msm_gem_move_to_active(&msm_obj->base, gpu, true, submit->fence); msm_gem_move_to_active(&msm_obj->base, gpu, true, submit->fence);
} }
ret = gpu->funcs->submit(gpu, submit); gpu->funcs->submit(gpu, submit);
hangcheck_timer_reset(gpu); hangcheck_timer_reset(gpu);
return ret; return 0;
} }
struct msm_context_counter { struct msm_context_counter {

2
drivers/gpu/drm/msm/msm_gpu.h
View file

@ -61,7 +61,7 @@ struct msm_gpu_funcs {
int (*hw_init)(struct msm_gpu *gpu); int (*hw_init)(struct msm_gpu *gpu);
int (*pm_suspend)(struct msm_gpu *gpu); int (*pm_suspend)(struct msm_gpu *gpu);
int (*pm_resume)(struct msm_gpu *gpu); int (*pm_resume)(struct msm_gpu *gpu);
int (*submit)(struct msm_gpu *gpu, struct msm_gem_submit *submit); void (*submit)(struct msm_gpu *gpu, struct msm_gem_submit *submit);
void (*flush)(struct msm_gpu *gpu, struct msm_ringbuffer *ring); void (*flush)(struct msm_gpu *gpu, struct msm_ringbuffer *ring);
irqreturn_t (*irq)(struct msm_gpu *irq); irqreturn_t (*irq)(struct msm_gpu *irq);
uint32_t (*last_fence)(struct msm_gpu *gpu, uint32_t (*last_fence)(struct msm_gpu *gpu,