From patchwork Wed Jun 16 09:03:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 12324559 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E031CC48BE5 for ; Wed, 16 Jun 2021 09:04:09 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5FBD561241 for ; Wed, 16 Jun 2021 09:04:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5FBD561241 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B244D6E558; Wed, 16 Jun 2021 09:04:06 +0000 (UTC) Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [IPv6:2a00:1450:4864:20::62a]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0F02E6E544 for ; Wed, 16 Jun 2021 09:04:05 +0000 (UTC) Received: by mail-ej1-x62a.google.com with SMTP id nd37so2691556ejc.3 for ; Wed, 16 Jun 2021 02:04:04 -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:mime-version :content-transfer-encoding; bh=JYuIIbXfwqTKRHCtxi7am5Rqgi3VUZZ18KA/nS6CXaI=; b=fU2MgphJmbJAsONz/6XivWvOf9c+EyQJDZnDjzCwdMvAaKL0P9EEpmC00iL6MRs9SI w43VjdICer3hRmvqGMsz8syl87ovUcojanp0TCMo3gHDA8cPtNjnrCnHF5y7PAutPMCG 9RpXIkVf8gH5wFuRbmaGsd4JgYtaipMTcKw1Q= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=JYuIIbXfwqTKRHCtxi7am5Rqgi3VUZZ18KA/nS6CXaI=; b=RfQqd7EJ07ZvAehV6VmLzktvzDdOSykQJ8gLfENG9VLytZgk89NdgDrV3FxFfcXhq9 Y2gSfOr/QhYprJipeAdojEcsFXUuduStqDoyK69Ylk5gNZ3FSokeSxFrDECoc8QzhxdZ RNHl83drLUwBFBGq6RCOxCY9s471pitutvgQW05ZEVUhtRQmJdg8yFdBpgRRsvzIFszy 6pHxVjui/Hd+6hOeeEGnIAxDN7gYzBgqtpUoGVaXUPq1JvvnZBR2sTHy8IuAizKfjDQw piZKkZtn2V4G5FJiZ4C17aANZmFSESKy6BA6Vacj47QeSNkz8j25q3oHo8N5zbaGRhcm mhAQ== X-Gm-Message-State: AOAM532epOUFgLt9CDGhBeNH504tl6tsDq6C1aFsY5hhjoqZJAwsb3vS WkbFowiIoDezHSx9v5030zyCb5ncHnlpAA== X-Google-Smtp-Source: ABdhPJwgREutuAgBMvdgGoeqVFfJe0z2T2m/qt5GnFZES4zDiRlbpRv/y8tWGq3ZeCJXZYwfZiYAJw== X-Received: by 2002:a17:906:3884:: with SMTP id q4mr4354554ejd.66.1623834243743; Wed, 16 Jun 2021 02:04:03 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id q16sm1246710edt.26.2021.06.16.02.04.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Jun 2021 02:04:03 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH] drm/i915/gem: Remove duplicated call to ops->pread Date: Wed, 16 Jun 2021 11:03:50 +0200 Message-Id: <20210616090350.828696-1-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.32.0.rc2 MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter , Daniel Vetter , Intel Graphics Development , Jason Ekstrand , =?utf-8?q?Thomas_Hellstr=C3=B6m?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Between commit ae30af84edb5b7cc95485922e43afd909a892e1b Author: Maarten Lankhorst Date: Tue Mar 23 16:50:00 2021 +0100 drm/i915: Disable userptr pread/pwrite support. and commit 0049b688459b846f819b6e51c24cd0781fcfde41 Author: Matthew Auld Date: Thu Nov 5 15:49:33 2020 +0000 drm/i915/gem: Allow backends to override pread implementation this accidentally landed twice. Cc: Matthew Auld Cc: Jason Ekstrand Cc: Daniel Vetter Signed-off-by: Daniel Vetter Reviewed-by: Matthew Auld ops->pread) - ret = obj->ops->pread(obj, args); - if (ret != -ENODEV) - goto out; - ret = i915_gem_object_wait(obj, I915_WAIT_INTERRUPTIBLE, MAX_SCHEDULE_TIMEOUT);