From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: [PULL] drm-fixes Date: Sat, 12 Jan 2019 00:06:48 +0100 Message-ID: <20190111230648.GA18543@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-ed1-x541.google.com (mail-ed1-x541.google.com [IPv6:2a00:1450:4864:20::541]) by gabe.freedesktop.org (Postfix) with ESMTPS id 59FC26E260 for ; Fri, 11 Jan 2019 23:06:56 +0000 (UTC) Received: by mail-ed1-x541.google.com with SMTP id b3so14416261ede.1 for ; Fri, 11 Jan 2019 15:06:56 -0800 (PST) Content-Disposition: inline List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Linus Torvalds Cc: LKML , DRI Development List-Id: dri-devel@lists.freedesktop.org SGkgTGludXMsCgpEYXZlIHNlbmRzIG91dCBoaXMgcHVsbCwgZXZlcnlib2R5IHJlbWVtYmVycyBo b2xpZGF5cyBhcmUgb3ZlciA6LSkKClNpbmNlIERhdmUncyBhbHJlYWR5IGluIHcvZSBtb2RlIGFu ZCBpdCB3YXMgcXVpdGUgYSBmZXcgcGF0Y2hlcyBJIGZpZ3VyZWQKYmV0dGVyIHRvIGFwcGx5IGFs bCB0aGUgcHVsbHMgYW5kIGZvcndhcmQgdGhlbSB0byB5b3UuIEhlbmNlIGhlcmUgMm5kIHBhcnQK b2YgYnVnZml4ZXMgZm9yIC1yYzIuCgpub3V2ZWF1OgpvbmUgYmFja2xpZ2h0LCBmYWxjb24gcmVn aXN0ZXIgYWNjZXNzLCBhbmQgYSBmYW4gZml4LgoKaTkxNToKLSBEaXNhYmxlIFBTUiBmb3IgQXBw bGUgcGFuZWxzCi0gQnJveHRvbiBFUlJfUFRSIGVycm9yIHN0YXRlIGZpeAotIEthYnlsYWtlIFZF Q1Mgd29ya2Fyb3VuZCBmaXgKLSBVbndpbmQgZmFpbHVyZSBvbiBwaW5uaW5nIHRoZSBnZW43IHBw Z3R0Ci0gR1ZUIHdvcmtsb2FkIHJlcXVlc3QgYWxsb2NhdGlvbiBmaXgKCmNvcmU6Ci0gRml4IGZi LWhlbHBlciB0byB3b3JrIGNvcnJlY3RseSB3aXRoIFNETCAxLjIgYnVncy4KLSBGaXggbG9ja2Rl cCB3YXJuaW5nIGluIHRoZSBhdG9taWMgaW9jdGwgYW5kIHNldHByb3BlcnR5LgoKQ2hlZXJzLCBE YW5pZWwKClRoZSBmb2xsb3dpbmcgY2hhbmdlcyBzaW5jZSBjb21taXQgZjM0YzQ4ZTA2ZGRjYzE5 N2YyY2Y3Y2JjMDA2Y2ViNzRlMjhlMWNjZjoKCiAgTWVyZ2UgYnJhbmNoICdkcm0tZml4ZXMtNS4w JyBvZiBnaXQ6Ly9wZW9wbGUuZnJlZWRlc2t0b3Aub3JnL35hZ2Q1Zi9saW51eCBpbnRvIGRybS1m aXhlcyAoMjAxOS0wMS0xMSAwNzozODo1NiArMTAwMCkKCmFyZSBhdmFpbGFibGUgaW4gdGhlIEdp dCByZXBvc2l0b3J5IGF0OgoKICBnaXQ6Ly9hbm9uZ2l0LmZyZWVkZXNrdG9wLm9yZy9kcm0vZHJt IHRhZ3MvZHJtLWZpeGVzLTIwMTktMDEtMTEtMQoKZm9yIHlvdSB0byBmZXRjaCBjaGFuZ2VzIHVw IHRvIGUyZDNjNDE0ZWMwZjlkMTU1N2M4YzVmZjJjMzIxNjZlNjhiYmM0YWQ6CgogIE1lcmdlIHRh ZyAnZHJtLWludGVsLWZpeGVzLTIwMTktMDEtMTEnIG9mIGdpdDovL2Fub25naXQuZnJlZWRlc2t0 b3Aub3JnL2RybS9kcm0taW50ZWwgaW50byBkcm0tZml4ZXMgKDIwMTktMDEtMTEgMTA6MjY6MjEg KzAxMDApCgotLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tCmRybS1maXhlcyBmb3IgNS4wLXJjMiwgcGFydCAyCgpub3V2ZWF1Ogpv bmUgYmFja2xpZ2h0LCBmYWxjb24gcmVnaXN0ZXIgYWNjZXNzLCBhbmQgYSBmYW4gZml4LgoKaTkx NToKLSBEaXNhYmxlIFBTUiBmb3IgQXBwbGUgcGFuZWxzCi0gQnJveHRvbiBFUlJfUFRSIGVycm9y IHN0YXRlIGZpeAotIEthYnlsYWtlIFZFQ1Mgd29ya2Fyb3VuZCBmaXgKLSBVbndpbmQgZmFpbHVy ZSBvbiBwaW5uaW5nIHRoZSBnZW43IHBwZ3R0Ci0gR1ZUIHdvcmtsb2FkIHJlcXVlc3QgYWxsb2Nh dGlvbiBmaXgKCmNvcmU6Ci0gRml4IGZiLWhlbHBlciB0byB3b3JrIGNvcnJlY3RseSB3aXRoIFNE TCAxLjIgYnVncy4KLSBGaXggbG9ja2RlcCB3YXJuaW5nIGluIHRoZSBhdG9taWMgaW9jdGwgYW5k IHNldHByb3BlcnR5LgoKLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLQpCZW4gU2tlZ2dzICgxKToKICAgICAgZHJtL25vdXZlYXU6 IHJlZ2lzdGVyIGJhY2tsaWdodCBvbiBwYXNjYWwgYW5kIG5ld2VyCgpDaHJpcyBXaWxzb24gKDIp OgogICAgICBkcm0vaTkxNTogU2tpcCB0aGUgRVJSX1BUUiBlcnJvciBzdGF0ZQogICAgICBkcm0v aTkxNTogVW53aW5kIGZhaWx1cmUgb24gcGlubmluZyB0aGUgZ2VuNyBwcGd0dAoKRGFuaWVsIFZl dHRlciAoMik6CiAgICAgIE1lcmdlIHRhZyAnZHJtLW1pc2MtZml4ZXMtMjAxOS0wMS0xMC0xJyBv ZiBnaXQ6Ly9hbm9uZ2l0LmZyZWVkZXNrdG9wLm9yZy9kcm0vZHJtLW1pc2MgaW50byBkcm0tZml4 ZXMKICAgICAgTWVyZ2UgdGFnICdkcm0taW50ZWwtZml4ZXMtMjAxOS0wMS0xMScgb2YgZ2l0Oi8v YW5vbmdpdC5mcmVlZGVza3RvcC5vcmcvZHJtL2RybS1pbnRlbCBpbnRvIGRybS1maXhlcwoKRGFu aWVsZSBDZXJhb2xvIFNwdXJpbyAoMSk6CiAgICAgIGRybS9pOTE1OiBpbml0IHBlci1lbmdpbmUg V0FzIGZvciBhbGwgZW5naW5lcwoKRGF2ZSBBaXJsaWUgKDEpOgogICAgICBNZXJnZSBicmFuY2gg J2xpbnV4LTQuMjEnIG9mIGdpdDovL2dpdGh1Yi5jb20vc2tlZ2dzYi9saW51eCBpbnRvIGRybS1m aXhlcwoKSWxpYSBNaXJraW4gKDEpOgogICAgICBkcm0vbm91dmVhdS9mYWxjb246IGF2b2lkIHRv dWNoaW5nIHJlZ2lzdGVycyBpZiBlbmdpbmUgaXMgb2ZmCgpJdmFuIE1pcm9ub3YgKDIpOgogICAg ICBkcm0vZmItaGVscGVyOiBQYXJ0aWFsbHkgYnJpbmcgYmFjayB3b3JrYXJvdW5kIGZvciBidWdz IG9mIFNETCAxLjIKICAgICAgZHJtL2ZiLWhlbHBlcjogSWdub3JlIHRoZSB2YWx1ZSBvZiBmYl92 YXJfc2NyZWVuaW5mby5waXhjbG9jawoKSmFuaSBOaWt1bGEgKDEpOgogICAgICBNZXJnZSB0YWcg J2d2dC1maXhlcy0yMDE5LTAxLTA5JyBvZiBodHRwczovL2dpdGh1Yi5jb20vaW50ZWwvZ3Z0LWxp bnV4IGludG8gZHJtLWludGVsLWZpeGVzCgpKb3PDqSBSb2JlcnRvIGRlIFNvdXphICgyKToKICAg ICAgZHJtL2k5MTU6IERpc2FibGUgUFNSIGluIEFwcGxlIHBhbmVscwogICAgICBkcm06IEZpeCBk b2N1bWVudGF0aW9uIGdlbmVyYXRpb24gZm9yIERQX0RQQ0RfUVVJUktfTk9fUFNSCgpUYWthc2hp IEl3YWkgKDEpOgogICAgICBkcm0vbm91dmVhdTogRG9uJ3QgZGlzYWJsZSBwb2xsaW5nIGluIGZh bGxiYWNrIG1vZGUKClRldHN1byBIYW5kYSAoMSk6CiAgICAgIGdwdS9kcm06IEZpeCBsb2NrIGhl bGQgd2hlbiByZXR1cm5pbmcgdG8gdXNlciBzcGFjZS4KClpoZW55dSBXYW5nICgxKToKICAgICAg ZHJtL2k5MTUvZ3Z0OiBGaXggd29ya2xvYWQgcmVxdWVzdCBhbGxvY2F0aW9uIGJlZm9yZSByZXF1 ZXN0IGFkZAoKIGRyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljX3VhcGkuYyAgICAgICAgICAgICAg ICB8ICAgMyArLQogZHJpdmVycy9ncHUvZHJtL2RybV9kcF9oZWxwZXIuYyAgICAgICAgICAgICAg ICAgIHwgICAyICsKIGRyaXZlcnMvZ3B1L2RybS9kcm1fZmJfaGVscGVyLmMgICAgICAgICAgICAg ICAgICB8IDEzMyArKysrKysrKysrKysrKy0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2RybV9t b2RlX29iamVjdC5jICAgICAgICAgICAgICAgIHwgICA0ICstCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9ndnQvc2NoZWR1bGVyLmMgICAgICAgICAgICAgfCAgNjQgKysrKysrKy0tLS0KIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2d2dC9zY2hlZHVsZXIuaCAgICAgICAgICAgICB8ICAgMSArCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyAgICAgICAgICAgICAgfCAgMTIgKy0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jICAgICAgICAgICAgICB8ICAxNSArKy0KIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMgICAgICAgICAgICB8ICAyMyArKy0t CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3N5c2ZzLmMgICAgICAgICAgICAgICAgfCAgIDQg Ky0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jICAgICAgICAgICAgICAgICB8ICAg MyArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcHNyLmMgICAgICAgICAgICAgICAgIHwg ICA2ICsKIGRyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1L25vdXZlYXVfYmFja2xpZ2h0LmMgICAgICB8 ICAgMyArCiBkcml2ZXJzL2dwdS9kcm0vbm91dmVhdS9udmttL2VuZ2luZS9mYWxjb24uYyAgICAg fCAgIDcgKy0KIGRyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1L252a20vc3ViZGV2L3RoZXJtL2Jhc2Uu YyB8ICAgNyArLQogaW5jbHVkZS9kcm0vZHJtX2RwX2hlbHBlci5oICAgICAgICAgICAgICAgICAg ICAgIHwgICA3ICsrCiAxNiBmaWxlcyBjaGFuZ2VkLCAxOTIgaW5zZXJ0aW9ucygrKSwgMTAyIGRl bGV0aW9ucygtKQoKLS0gCkRhbmllbCBWZXR0ZXIKU29mdHdhcmUgRW5naW5lZXIsIEludGVsIENv cnBvcmF0aW9uCmh0dHA6Ly9ibG9nLmZmd2xsLmNoCl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxp c3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 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=-12.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PULL_REQUEST, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_PASS,URIBL_BLOCKED, USER_AGENT_MUTT 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 02341C43387 for ; Fri, 11 Jan 2019 23:06:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B249E2184A for ; Fri, 11 Jan 2019 23:06:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="U7nVVNKS" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726116AbfAKXG5 (ORCPT ); Fri, 11 Jan 2019 18:06:57 -0500 Received: from mail-ed1-f68.google.com ([209.85.208.68]:42267 "EHLO mail-ed1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725536AbfAKXG5 (ORCPT ); Fri, 11 Jan 2019 18:06:57 -0500 Received: by mail-ed1-f68.google.com with SMTP id y20so14320042edw.9 for ; Fri, 11 Jan 2019 15:06:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=date:from:to:cc:subject:message-id:mail-followup-to:mime-version :content-disposition:content-transfer-encoding:user-agent; bh=d3wFBiZQGaptddMW2YDhafQpe03j9Kwe7r0gU1Qveo8=; b=U7nVVNKSLbv90P34iqye+0tqsFBd4VZ9C3l6Hc4xXC7qPpWAoUZPkZ/qAIWohvb9RG +60T+zNQ386PFZi0+B4Qytk8rT31elM2g49aHoxAQ7EeHQskSo8swSkxuAez78q3BKZ6 0SyRuOPTYYv05OQDr+5E66ns8ZeRYTnVH3xgw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id :mail-followup-to:mime-version:content-disposition :content-transfer-encoding:user-agent; bh=d3wFBiZQGaptddMW2YDhafQpe03j9Kwe7r0gU1Qveo8=; b=UIVyZMnMyoYFGmgMQFWXMr3qwah1AVJOK0h/5Oes+budmshEgnl0kazvemOw5tm56o LLXZlfg8wa1gnoPw9bc4yV4fvyR1Xytz6nCWzj+Sv4gvt949PyFzPnvTZbLBmp+TQgMF kInD32QizAaA+mCTHMBkjFv4Lc6MBcWv6ZVATM9yctw1Jxsp5PvFZTYArQTx5k87KDkb WiKxYSCoW3REi84oyO9jcAl76FBE8m9NOD7lNeOz249jNMheV9flMlWZmKfiiP8qsuGT UPGigFTZADCeKOiyVZooA+Jye2ld8/doFgLABCmTzrIy2Px460On9QqJ0ErRPfVZkyoA 7IJA== X-Gm-Message-State: AJcUukf0c9P+aFMYRSK5c9+Sp1JOkbku+YEeSSHvNRAahYvYjl8/OTIX HOFktVAvHUAD7BmRP7X8h0d1BA== X-Google-Smtp-Source: ALg8bN7ehxK6oED9qZqAX1Vh42HFZki61Ks7hjjLssPi96iWywWQ3aWTawEUiPg70TCtUX2aE0J13w== X-Received: by 2002:a17:906:a35a:: with SMTP id bz26-v6mr9493787ejb.98.1547248014735; Fri, 11 Jan 2019 15:06:54 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:569e:0:3106:d637:d723:e855]) by smtp.gmail.com with ESMTPSA id r18-v6sm1675211eja.19.2019.01.11.15.06.53 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 11 Jan 2019 15:06:54 -0800 (PST) Date: Sat, 12 Jan 2019 00:06:48 +0100 From: Daniel Vetter To: Linus Torvalds Cc: Dave Airlie , DRI Development , LKML Subject: [PULL] drm-fixes Message-ID: <20190111230648.GA18543@phenom.ffwll.local> Mail-Followup-To: Linus Torvalds , Dave Airlie , DRI Development , LKML MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit X-Operating-System: Linux phenom 4.18.0-2-amd64 User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Linus, Dave sends out his pull, everybody remembers holidays are over :-) Since Dave's already in w/e mode and it was quite a few patches I figured better to apply all the pulls and forward them to you. Hence here 2nd part of bugfixes for -rc2. nouveau: one backlight, falcon register access, and a fan fix. i915: - Disable PSR for Apple panels - Broxton ERR_PTR error state fix - Kabylake VECS workaround fix - Unwind failure on pinning the gen7 ppgtt - GVT workload request allocation fix core: - Fix fb-helper to work correctly with SDL 1.2 bugs. - Fix lockdep warning in the atomic ioctl and setproperty. Cheers, Daniel The following changes since commit f34c48e06ddcc197f2cf7cbc006ceb74e28e1ccf: Merge branch 'drm-fixes-5.0' of git://people.freedesktop.org/~agd5f/linux into drm-fixes (2019-01-11 07:38:56 +1000) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm tags/drm-fixes-2019-01-11-1 for you to fetch changes up to e2d3c414ec0f9d1557c8c5ff2c32166e68bbc4ad: Merge tag 'drm-intel-fixes-2019-01-11' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes (2019-01-11 10:26:21 +0100) ---------------------------------------------------------------- drm-fixes for 5.0-rc2, part 2 nouveau: one backlight, falcon register access, and a fan fix. i915: - Disable PSR for Apple panels - Broxton ERR_PTR error state fix - Kabylake VECS workaround fix - Unwind failure on pinning the gen7 ppgtt - GVT workload request allocation fix core: - Fix fb-helper to work correctly with SDL 1.2 bugs. - Fix lockdep warning in the atomic ioctl and setproperty. ---------------------------------------------------------------- Ben Skeggs (1): drm/nouveau: register backlight on pascal and newer Chris Wilson (2): drm/i915: Skip the ERR_PTR error state drm/i915: Unwind failure on pinning the gen7 ppgtt Daniel Vetter (2): Merge tag 'drm-misc-fixes-2019-01-10-1' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes Merge tag 'drm-intel-fixes-2019-01-11' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes Daniele Ceraolo Spurio (1): drm/i915: init per-engine WAs for all engines Dave Airlie (1): Merge branch 'linux-4.21' of git://github.com/skeggsb/linux into drm-fixes Ilia Mirkin (1): drm/nouveau/falcon: avoid touching registers if engine is off Ivan Mironov (2): drm/fb-helper: Partially bring back workaround for bugs of SDL 1.2 drm/fb-helper: Ignore the value of fb_var_screeninfo.pixclock Jani Nikula (1): Merge tag 'gvt-fixes-2019-01-09' of https://github.com/intel/gvt-linux into drm-intel-fixes José Roberto de Souza (2): drm/i915: Disable PSR in Apple panels drm: Fix documentation generation for DP_DPCD_QUIRK_NO_PSR Takashi Iwai (1): drm/nouveau: Don't disable polling in fallback mode Tetsuo Handa (1): gpu/drm: Fix lock held when returning to user space. Zhenyu Wang (1): drm/i915/gvt: Fix workload request allocation before request add drivers/gpu/drm/drm_atomic_uapi.c | 3 +- drivers/gpu/drm/drm_dp_helper.c | 2 + drivers/gpu/drm/drm_fb_helper.c | 133 ++++++++++++++--------- drivers/gpu/drm/drm_mode_object.c | 4 +- drivers/gpu/drm/i915/gvt/scheduler.c | 64 +++++++---- drivers/gpu/drm/i915/gvt/scheduler.h | 1 + drivers/gpu/drm/i915/i915_debugfs.c | 12 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 15 ++- drivers/gpu/drm/i915/i915_gpu_error.c | 23 ++-- drivers/gpu/drm/i915/i915_sysfs.c | 4 +- drivers/gpu/drm/i915/intel_lrc.c | 3 +- drivers/gpu/drm/i915/intel_psr.c | 6 + drivers/gpu/drm/nouveau/nouveau_backlight.c | 3 + drivers/gpu/drm/nouveau/nvkm/engine/falcon.c | 7 +- drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c | 7 +- include/drm/drm_dp_helper.h | 7 ++ 16 files changed, 192 insertions(+), 102 deletions(-) -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch