From patchwork Wed Mar 30 09:45:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 8694611 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 892DBC0554 for ; Wed, 30 Mar 2016 09:46:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B2DCB20379 for ; Wed, 30 Mar 2016 09:46:52 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id C67282035D for ; Wed, 30 Mar 2016 09:46:51 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A0B786E750; Wed, 30 Mar 2016 09:46:46 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x234.google.com (mail-wm0-x234.google.com [IPv6:2a00:1450:400c:c09::234]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6C5336E747 for ; Wed, 30 Mar 2016 09:45:25 +0000 (UTC) Received: by mail-wm0-x234.google.com with SMTP id r72so91291540wmg.0 for ; Wed, 30 Mar 2016 02:45:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=bH66AGqBtHnUsvMlIvnErmuN8gjjrLNkrsWoRXXM7Tk=; b=hzdmevDfWr3XnWIORAMTYWHESYSDm77WxsHjK0EEp8n0ovlnC4EvyIlJY7iG/yiVQI VnhZFTRDc0RXvacZedv8Id+JYagEKi0opmIV25hUaK6ZgnZxmY8wX2Kl7c7GrGo3IzoU NleUvNHldS2aoNaZ7fL1dvsbR/nkQDiOhdJ70= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=bH66AGqBtHnUsvMlIvnErmuN8gjjrLNkrsWoRXXM7Tk=; b=B6sC712Kd881T9JHFZjJadOVhsbtnQTqzk54cjXlhTLczVe9m2MXHaoj2mYIiFP492 2EzOfM6nm5Ca1i3eouUAcd/MkTdPP43zloYLFQL4esUaIv7VVEyhXwokbMAwAMm2xLln vAjsDIvSLMrcyIegbsI32uM3ztETyFb/joYcf/mHLlBEwOKLoMv2j2Kxp6fFCuVHjaNB 6JWWaQuuLiq6/igru44CevUYQBSimlzSwkp+CrKzXC91F15VsSXip7kjog2XoV5lRqY0 PvOaQ6gDitNkZRfrdFIL3STHQ8tsbXHy7/PhtxfFTU0uz5nOEAqbEPfRX8AQz9uDYg2Y rGmg== X-Gm-Message-State: AD7BkJKIMu7GwLzSuQhr7toymf6hqtCgp0nBafGPYgRlSBXDX0RbqI4YmyekVOcm9kD0Lw== X-Received: by 10.28.146.202 with SMTP id u193mr22627976wmd.82.1459331122834; Wed, 30 Mar 2016 02:45:22 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:56b5:0:ac27:b86c:7764:9429]) by smtp.gmail.com with ESMTPSA id m130sm1905493wmf.10.2016.03.30.02.45.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 30 Mar 2016 02:45:22 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 02/10] drm: Use dev->name as fallback for dev->unique Date: Wed, 30 Mar 2016 11:45:12 +0200 Message-Id: <1459331120-27864-3-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.8.0.rc3 In-Reply-To: <1459331120-27864-1-git-send-email-daniel.vetter@ffwll.ch> References: <1459331120-27864-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Intel Graphics Development , Daniel Vetter X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Lots of arm drivers get this wrong and for most arm boards this is the right thing actually. And anyway with most loaders you want to chase sysfs links anyway to figure out which dri device you want. This will fix dmesg noise for rockchip and sti. Cc: Ilia Mirkin Reported-by: Ilia Mirkin Signed-off-by: Daniel Vetter --- drivers/gpu/drm/drm_ioctl.c | 12 +++++------- drivers/gpu/drm/vgem/vgem_drv.c | 2 -- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c index 8ce2a0c59116..3ecd1368c23a 100644 --- a/drivers/gpu/drm/drm_ioctl.c +++ b/drivers/gpu/drm/drm_ioctl.c @@ -134,16 +134,14 @@ static int drm_set_busid(struct drm_device *dev, struct drm_file *file_priv) drm_unset_busid(dev, master); return ret; } - } else { - if (WARN(dev->unique == NULL, - "No drm_driver.set_busid() implementation provided by " - "%ps. Use drm_dev_set_unique() to set the unique " - "name explicitly.", dev->driver)) - return -EINVAL; - + } else if (dev->unique) { master->unique = kstrdup(dev->unique, GFP_KERNEL); if (master->unique) master->unique_len = strlen(dev->unique); + } else { + master->unique = kstrdup(dev->driver->name, GFP_KERNEL); + if (master->unique) + master->unique_len = strlen(dev->driver->name); } return 0; diff --git a/drivers/gpu/drm/vgem/vgem_drv.c b/drivers/gpu/drm/vgem/vgem_drv.c index ae4de36d1d83..d61a547fa3c9 100644 --- a/drivers/gpu/drm/vgem/vgem_drv.c +++ b/drivers/gpu/drm/vgem/vgem_drv.c @@ -260,8 +260,6 @@ static int __init vgem_init(void) goto out; } - drm_dev_set_unique(vgem_device, "vgem"); - ret = drm_dev_register(vgem_device, 0); if (ret)