diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-08-15 21:13:05 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-08-15 21:13:05 -0400 |
| commit | fd5c20459ce4d7213ad0018a8ec42c74e2c4a9e6 (patch) | |
| tree | e6abf5a357e10cbe628cc27983e751420e4c1298 | |
| parent | 1313701ad01344ef4935784453b45103cbafd230 (diff) | |
| download | longterm-queue-4.18-fd5c20459ce4d7213ad0018a8ec42c74e2c4a9e6.tar.gz | |
drm: trivial ctxt refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/drm-v3d-Handle-errors-from-IRQ-setup.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/queue/drm-v3d-Handle-errors-from-IRQ-setup.patch b/queue/drm-v3d-Handle-errors-from-IRQ-setup.patch index c1202a7..7abff85 100644 --- a/queue/drm-v3d-Handle-errors-from-IRQ-setup.patch +++ b/queue/drm-v3d-Handle-errors-from-IRQ-setup.patch @@ -1,4 +1,4 @@ -From fc22771547e7e8a63679f0218e943d72b107de65 Mon Sep 17 00:00:00 2001 +From 8e31d2ea8c200d244d6c1ab57f09ca335d6b4d46 Mon Sep 17 00:00:00 2001 From: Eric Anholt <eric@anholt.net> Date: Fri, 8 Mar 2019 09:43:35 -0800 Subject: [PATCH] drm/v3d: Handle errors from IRQ setup. @@ -12,10 +12,10 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20190308174336.7866-1-eric@a Reviewed-by: Dave Emett <david.emett@broadcom.com> diff --git a/drivers/gpu/drm/v3d/v3d_drv.c b/drivers/gpu/drm/v3d/v3d_drv.c -index 3680ebd229f2..f9906cac7a88 100644 +index cdb582043b4f..7d3da9638cac 100644 --- a/drivers/gpu/drm/v3d/v3d_drv.c +++ b/drivers/gpu/drm/v3d/v3d_drv.c -@@ -311,14 +311,18 @@ static int v3d_platform_drm_probe(struct platform_device *pdev) +@@ -308,14 +308,18 @@ static int v3d_platform_drm_probe(struct platform_device *pdev) if (ret) goto dev_destroy; @@ -37,11 +37,11 @@ index 3680ebd229f2..f9906cac7a88 100644 v3d_gem_destroy(drm); dev_destroy: diff --git a/drivers/gpu/drm/v3d/v3d_drv.h b/drivers/gpu/drm/v3d/v3d_drv.h -index d856159bd007..bb58ecb9d9c5 100644 +index 26005abd9c5d..dbbbe1d2a496 100644 --- a/drivers/gpu/drm/v3d/v3d_drv.h +++ b/drivers/gpu/drm/v3d/v3d_drv.h -@@ -304,7 +304,7 @@ void v3d_reset(struct v3d_dev *v3d); - void v3d_invalidate_caches(struct v3d_dev *v3d); +@@ -282,7 +282,7 @@ void v3d_invalidate_caches(struct v3d_dev *v3d); + void v3d_flush_caches(struct v3d_dev *v3d); /* v3d_irq.c */ -void v3d_irq_init(struct v3d_dev *v3d); @@ -50,10 +50,10 @@ index d856159bd007..bb58ecb9d9c5 100644 void v3d_irq_disable(struct v3d_dev *v3d); void v3d_irq_reset(struct v3d_dev *v3d); diff --git a/drivers/gpu/drm/v3d/v3d_irq.c b/drivers/gpu/drm/v3d/v3d_irq.c -index 69338da70ddc..29d746cfce57 100644 +index 77e1fa046c10..63ddd0a38a4a 100644 --- a/drivers/gpu/drm/v3d/v3d_irq.c +++ b/drivers/gpu/drm/v3d/v3d_irq.c -@@ -156,7 +156,7 @@ v3d_hub_irq(int irq, void *arg) +@@ -140,7 +140,7 @@ v3d_hub_irq(int irq, void *arg) return status; } @@ -62,7 +62,7 @@ index 69338da70ddc..29d746cfce57 100644 v3d_irq_init(struct v3d_dev *v3d) { int ret, core; -@@ -173,13 +173,22 @@ v3d_irq_init(struct v3d_dev *v3d) +@@ -157,13 +157,22 @@ v3d_irq_init(struct v3d_dev *v3d) ret = devm_request_irq(v3d->dev, platform_get_irq(v3d->pdev, 0), v3d_hub_irq, IRQF_SHARED, "v3d_hub", v3d); |