diff mbox

Revert "drm/i915: Restore lost "Initialized i915" welcome message"

Message ID 20170517131557.7836-1-daniel.vetter@ffwll.ch (mailing list archive)
State New, archived
Headers show

Commit Message

Daniel Vetter May 17, 2017, 1:15 p.m. UTC
This reverts commit bc5ca47c0af4f949ba889e666b7da65569e36093.

Gabriel put this back into generic code with

commit 75f6dfe3e652e1adef8cc1b073c89f3e22103a8f
Author: Gabriel Krisman Bertazi <krisman@collabora.co.uk>
Date:   Wed Dec 28 12:32:11 2016 -0200

    drm: Deduplicate driver initialization message

but somehow he missed Chris' patch to add the message meanwhile.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=101025
Fixes: 75f6dfe3e652 ("drm: Deduplicate driver initialization message")
Cc: Gabriel Krisman Bertazi <krisman@collabora.co.uk>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: <stable@vger.kernel.org> # v4.11+
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
 drivers/gpu/drm/i915/i915_drv.c | 4 ----
 1 file changed, 4 deletions(-)

Comments

Chris Wilson May 17, 2017, 1:22 p.m. UTC | #1
On Wed, May 17, 2017 at 03:15:57PM +0200, Daniel Vetter wrote:
> This reverts commit bc5ca47c0af4f949ba889e666b7da65569e36093.
> 
> Gabriel put this back into generic code with
> 
> commit 75f6dfe3e652e1adef8cc1b073c89f3e22103a8f
> Author: Gabriel Krisman Bertazi <krisman@collabora.co.uk>
> Date:   Wed Dec 28 12:32:11 2016 -0200
> 
>     drm: Deduplicate driver initialization message
> 
> but somehow he missed Chris' patch to add the message meanwhile.
> 
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=101025
> Fixes: 75f6dfe3e652 ("drm: Deduplicate driver initialization message")
> Cc: Gabriel Krisman Bertazi <krisman@collabora.co.uk>
> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> Cc: Jani Nikula <jani.nikula@linux.intel.com>
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: <stable@vger.kernel.org> # v4.11+
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

/me waves goodbye to amusing comment.
-Chris
Gabriel Krisman Bertazi May 17, 2017, 2:12 p.m. UTC | #2
Daniel Vetter <daniel.vetter@ffwll.ch> writes:

> This reverts commit bc5ca47c0af4f949ba889e666b7da65569e36093.
>
> Gabriel put this back into generic code with
>
> commit 75f6dfe3e652e1adef8cc1b073c89f3e22103a8f
> Author: Gabriel Krisman Bertazi <krisman@collabora.co.uk>
> Date:   Wed Dec 28 12:32:11 2016 -0200
>
>     drm: Deduplicate driver initialization message
>
> but somehow he missed Chris' patch to add the message meanwhile.

Hmmm.  In the commit message, I even mentioned that i915 was an exception because it
used its own registration handle, so I'm pretty sure I didn't miss that
commit.  Not that this is supposed to make it any better... what the
heck happened back then?? :(

This is

Reviewed-by: Gabriel Krisman Bertazi <krisman@collabora.co.uk>
Daniel Vetter May 22, 2017, 8:56 a.m. UTC | #3
On Wed, May 17, 2017 at 11:12:28AM -0300, Gabriel Krisman Bertazi wrote:
> Daniel Vetter <daniel.vetter@ffwll.ch> writes:
> 
> > This reverts commit bc5ca47c0af4f949ba889e666b7da65569e36093.
> >
> > Gabriel put this back into generic code with
> >
> > commit 75f6dfe3e652e1adef8cc1b073c89f3e22103a8f
> > Author: Gabriel Krisman Bertazi <krisman@collabora.co.uk>
> > Date:   Wed Dec 28 12:32:11 2016 -0200
> >
> >     drm: Deduplicate driver initialization message
> >
> > but somehow he missed Chris' patch to add the message meanwhile.
> 
> Hmmm.  In the commit message, I even mentioned that i915 was an exception because it
> used its own registration handle, so I'm pretty sure I didn't miss that
> commit.  Not that this is supposed to make it any better... what the
> heck happened back then?? :(
> 
> This is
> 
> Reviewed-by: Gabriel Krisman Bertazi <krisman@collabora.co.uk>

Applied, thanks for the review.
-Daniel
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index b0c003498b6b..6052798bb626 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -1286,10 +1286,6 @@  int i915_driver_load(struct pci_dev *pdev, const struct pci_device_id *ent)
 
 	dev_priv->ipc_enabled = false;
 
-	/* Everything is in place, we can now relax! */
-	DRM_INFO("Initialized %s %d.%d.%d %s for %s on minor %d\n",
-		 driver.name, driver.major, driver.minor, driver.patchlevel,
-		 driver.date, pci_name(pdev), dev_priv->drm.primary->index);
 	if (IS_ENABLED(CONFIG_DRM_I915_DEBUG))
 		DRM_INFO("DRM_I915_DEBUG enabled\n");
 	if (IS_ENABLED(CONFIG_DRM_I915_DEBUG_GEM))