From patchwork Sat Apr 20 04:24:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 162543 Delivered-To: patches@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp170052jan; Fri, 19 Apr 2019 21:25:02 -0700 (PDT) X-Received: by 2002:a17:902:7d91:: with SMTP id a17mr7576552plm.338.1555734302490; Fri, 19 Apr 2019 21:25:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555734302; cv=none; d=google.com; s=arc-20160816; b=QseiHM12o2iSWPEwkAhnVmRUhqs6bZNtM73CPAnvf6YsXCC9je1TJFfZWRjdyx9o/5 GKyi9KyKDE7aumBHyURgNPSVWExynJjN7eFW5XBZkCJXppE8H6vOIF/WPg+VVRfAWGaN SYsqDd4yn1EN8DSRns2XSB3deBHpJmRORND73B51S9I/Np5YYgx6KEcM8VbVXSskCfnG DsMr2w7ihiRPO4LkO0RBCRVf4XAgsMYwYFbtAoH02y2kvA8fHUizZQnttF1H97KGaBgg rwBstsCdXeFVMnhoqy1Ado7vBlO3tlqoPeoveTIrzxjoCz5H7P7ZKEsgdEPKOqCRr8oI j12w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=8GlL8e7dydduT1qq3AnMjS2RKGc+UfMUnizCaLTad1s=; b=Di0P7Ab8j8Hh+94bYtxcwoK1qfQwn278shA0MI3mzQinv8rGtZ+q3bLWyglWF7Zcvi ANcCle/QrTo4Z1fnrIVVdI82a1zWKtgPsu/I8gAm31SMbdduvAfRJZwd+pwQccjYY3tQ Ugf3/x3JPmPk4pLyYALWeR1FnPBWOefBAg2xbiImAmt76XVzpk2TMEngN/peFZWVodi7 BFJSaZEA3xGZAUCp0E4D2jSRzHDqUJsliAOFE7ZepPLaMbtzjO/dQTfi4HdR/b8Mo0oT V9gnP9ocxlyt8JKof8D9UuaDQEjlmvG2ogtZvsw5RLL5uu97Xw8uAPjsOf4b1ssyVsaX K56g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Yjm1qHnL; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id a12sor7181896pgw.35.2019.04.19.21.25.02 for (Google Transport Security); Fri, 19 Apr 2019 21:25:02 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Yjm1qHnL; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8GlL8e7dydduT1qq3AnMjS2RKGc+UfMUnizCaLTad1s=; b=Yjm1qHnLZ9RFX7UJ7bDH/v43stBnD9hvseu3lguDQGuQy5Knw4tIepOwhlNNlP0nRu Nh+Wk6orD92XJ3bR4NktfvBn4ASRljk7rBaupj3ejCjpnD529ONyP2c7rQNM7ccFD97a mjITWWc7uPjrrUYLXPSlioJN5Y0iznPt2t9+aQ2VIEBvVBzqcfnFwyN4JinMjwgucS90 6NfVgTOrHFFoZtEvAFdh3EZGS+1MBHF1uvBkgopB6rb0k9qIuXljZVCeteVDb8HxMeeP rWYqoH5mkp1WNf2GLUSh1TjsIizhUt9Zn5yJKdFSM6Uf4TxSzp97U4n8jfWa6aa/o+Bw VJAQ== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=8GlL8e7dydduT1qq3AnMjS2RKGc+UfMUnizCaLTad1s=; b=SXCIP1C/Lix/vtd+09m/W0r5RqEsIj7NJLJtcP64AJzLr5wxYN9ZLH5GagU+2PENQi 9vqby+SzfAM0fgGuyq8tSgCAkXUl2K02NgSo1yfbNaHLIOBe8EKevc+EemM+3HJojzxK qbSQeTSR6uSXYsD7c6apaBqPMweSy0BFIklR3juhya2H67OFNQv56XvVlMW04z6kSg9b EPYWh4Ox9DMVrq4yRGiCBwXRY3yXE6rUSG1ch09Gut4kqzAd1TaIhqo0574Xrr2mNzyw 4xqMUnd34dn+paJ0mMDV0Wh3FLp8zUswsfl01MIBSwYNd2Uph+pAJ+sSpae86zHfCkBc 10Fw== X-Gm-Message-State: APjAAAWFO0hEoME0lvxJHGhBzu/pa0LaZc9XOFIg4HRh2e9ZZol2hinf Jcv1G1AqYW2nNFnh28mj45LAtODG X-Google-Smtp-Source: APXvYqy8aFkZeFV/M4PHlMRXVlYrPI3Ajpeftkj0AZU7bhp0qbZzLSAaqooBTwWBANoH31r0ibOM8Q== X-Received: by 2002:a63:1852:: with SMTP id 18mr3458321pgy.283.1555734302058; Fri, 19 Apr 2019 21:25:02 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id i1sm15578372pgc.63.2019.04.19.21.25.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 19 Apr 2019 21:25:01 -0700 (PDT) From: John Stultz To: dri-devel Cc: Sean Paul , Emil Velikov , Alistair Strachan , Marissa Wall , John Stultz Subject: [RFC][PATCH 1/5] libdrm: Use mmap64 instead of __mmap2 Date: Fri, 19 Apr 2019 21:24:51 -0700 Message-Id: <1555734295-31015-2-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1555734295-31015-1-git-send-email-john.stultz@linaro.org> References: <1555734295-31015-1-git-send-email-john.stultz@linaro.org> MIME-Version: 1.0 From: Sean Paul __mmap2 isn't supported on all platforms, mmap64 is the right way to do this in android. Also folds in a fix from Stéphane Marchesin to use an offset in bytes not pages, as that's what mmap64 takes. Cc: Emil Velikov Cc: Sean Paul Cc: Alistair Strachan Cc: Marissa Wall Signed-off-by: Sean Paul Signed-off-by: John Stultz --- libdrm_macros.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -- 2.7.4 Acked-by: Alex Deucher Reviewed-by: Emil Velikov diff --git a/libdrm_macros.h b/libdrm_macros.h index 95f0ef5..0dca827 100644 --- a/libdrm_macros.h +++ b/libdrm_macros.h @@ -48,8 +48,6 @@ #if defined(ANDROID) && !defined(__LP64__) #include /* for EINVAL */ -extern void *__mmap2(void *, size_t, int, int, int, size_t); - static inline void *drm_mmap(void *addr, size_t length, int prot, int flags, int fd, loff_t offset) { @@ -59,7 +57,7 @@ static inline void *drm_mmap(void *addr, size_t length, int prot, int flags, return MAP_FAILED; } - return __mmap2(addr, length, prot, flags, fd, (size_t) (offset >> 12)); + return mmap64(addr, length, prot, flags, fd, offset); } # define drm_munmap(addr, length) \