diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-07-08 13:30:22 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-07-08 13:30:22 +1000 |
| commit | 429a9ccdf24a38ed8a64d6d9c07ade59f0157bef (patch) | |
| tree | 1a380e0eefe5d134d15968fc491463b888a2f022 /drivers/gpu/drm/etnaviv/etnaviv_drv.c | |
| parent | ccd0e7887b7920e5c8a198eb9600ae26f13d631a (diff) | |
| parent | c1c77b0e07dc6231db3c2c7b847c514849d53b99 (diff) | |
Merge branch 'drm-etnaviv-next' of git://git.pengutronix.de/git/lst/linux into drm-next
etnaviv-next only contains two patches to get rid of a confusing error
message and finally one patch to enable the autonomous GPU clock gating.
* 'drm-etnaviv-next' of git://git.pengutronix.de/git/lst/linux:
drm/etnaviv: remove generic GPU init failure reporting
drm/etnaviv: improve error reporting in GPU init path
drm/etnaviv: enable GPU module level clock gating support
Diffstat (limited to 'drivers/gpu/drm/etnaviv/etnaviv_drv.c')
| -rw-r--r-- | drivers/gpu/drm/etnaviv/etnaviv_drv.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.c b/drivers/gpu/drm/etnaviv/etnaviv_drv.c index 340d390306d8..ffd1b32caa8d 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_drv.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.c @@ -91,10 +91,8 @@ static void load_gpu(struct drm_device *dev) int ret; ret = etnaviv_gpu_init(g); - if (ret) { - dev_err(g->dev, "hw init failed: %d\n", ret); + if (ret) priv->gpu[i] = NULL; - } } } } |