Merge branch 'drm-etnaviv-next' of git://git.pengutronix.de/git/lst/linux into drm...

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

diff --combined drivers/gpu/drm/etnaviv/etnaviv_drv.c
index 340d390,7c5a4b4..ffd1b32
--- 1/drivers/gpu/drm/etnaviv/etnaviv_drv.c
--- 2/drivers/gpu/drm/etnaviv/etnaviv_drv.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.c
@@@ -91,10 -91,8 +91,8 @@@ static void load_gpu(struct drm_device 
                        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;
-                       }
                }
        }
  }
@@@ -496,6 -494,7 +494,6 @@@ static struct drm_driver etnaviv_drm_dr
                                DRIVER_RENDER,
        .open               = etnaviv_open,
        .preclose           = etnaviv_preclose,
 -      .set_busid          = drm_platform_set_busid,
        .gem_free_object_unlocked = etnaviv_gem_free_object,
        .gem_vm_ops         = &vm_ops,
        .prime_handle_to_fd = drm_gem_prime_handle_to_fd,