From mboxrd@z Thu Jan 1 00:00:00 1970 From: Archit Taneja Subject: Re: [RFC 3/6] drm/i915: Remove local fbdev emulation Kconfig option Date: Tue, 10 Mar 2015 15:40:56 +0530 Message-ID: <54FEC330.4050005@codeaurora.org> References: <1425980493-27533-1-git-send-email-architt@codeaurora.org> <1425980493-27533-4-git-send-email-architt@codeaurora.org> <20150310100126.GF3800@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20150310100126.GF3800@phenom.ffwll.local> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: robdclark@gmail.com, airlied@linux.ie, treding@nvidia.com, p.zabel@pengutronix.de, benjamin.gaignard@linaro.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, daniel@ffwll.ch List-Id: linux-arm-msm@vger.kernel.org CgpPbiAwMy8xMC8yMDE1IDAzOjMxIFBNLCBEYW5pZWwgVmV0dGVyIHdyb3RlOgo+IE9uIFR1ZSwg TWFyIDEwLCAyMDE1IGF0IDAzOjExOjMwUE0gKzA1MzAsIEFyY2hpdCBUYW5lamEgd3JvdGU6Cj4+ IERSTV9JOTE1X0ZCREVWIGNvbmZpZyBpcyBjdXJyZW50bHkgdXNlZCB0byBlbmFibGUvZGlzYWJs ZSBmYmRldiBlbXVsYXRpb24gZm9yCj4+IHRoZSBpOTE1IGttcyBkcml2ZXIuCj4+Cj4+IFJlcGxh Y2UgdGhpcyB3aXRoIHRoZSB0b3AgbGV2ZWwgRFJNX0ZCREVWX0VNVUxBVElPTiBjb25maWcgb3B0 aW9uLiBVc2luZyB0aGlzCj4+IGNvbmZpZyBsZXRzIHVzIGFsc28gcHJldmVudCB3cmFwcGluZyBh cm91bmQgZHJtX2ZiX2hlbHBlcl8qIGNhbGxzIHdpdGggI2lmZGVmcwo+PiBpbiBjZXJ0YWluIHBs YWNlcy4KPj4KPj4gVGhlICNpZmRlZiBpbiBkcm1faTkxNV9wcml2YXRlIHN0cnVjdCBhZGRpbmcv cmVtb3ZpbmcgbWVtYmVycyBpbnRlbF9mYmRldiBhbmQKPj4gZmJkZXZfc3VzcGVuZF93b3JrIGhh cyBiZWVuIHJlbW92ZWQuIFRoaXMgaGVscHMgdXMgdXNlIHN0dWIgZHJtIGhlbHBlciBmdW5jdGlv bnMKPj4gYXQgbm90IG11Y2ggY29zdC4KPj4KPj4gU2lnbmVkLW9mZi1ieTogQXJjaGl0IFRhbmVq YSA8YXJjaGl0dEBjb2RlYXVyb3JhLm9yZz4KPj4gLS0tCj4+ICAgZHJpdmVycy9ncHUvZHJtL2k5 MTUvS2NvbmZpZyAgICAgICAgIHwgMTUgLS0tLS0tLS0tLS0tLS0tCj4+ICAgZHJpdmVycy9ncHUv ZHJtL2k5MTUvTWFrZWZpbGUgICAgICAgIHwgIDQgKystLQo+PiAgIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZGVidWdmcy5jICB8ICAyICstCj4+ICAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9kcnYuaCAgICAgIHwgIDIgLS0KPj4gICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNw bGF5LmMgfCAxMCArKysrLS0tLS0tCj4+ICAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHBf bXN0LmMgIHwgMTQgKysrKysrKystLS0tLS0KPj4gICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kcnYuaCAgICAgfCAgMyArLS0KPj4gICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmRl di5jICAgfCAgNyAtLS0tLS0tCj4+ICAgOCBmaWxlcyBjaGFuZ2VkLCAxNiBpbnNlcnRpb25zKCsp LCA0MSBkZWxldGlvbnMoLSkKPj4KPj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L0tjb25maWcgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9LY29uZmlnCj4+IGluZGV4IDc0YWNjYTku LmJkOWNjZmMgMTAwNjQ0Cj4+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L0tjb25maWcKPj4g KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvS2NvbmZpZwo+PiBAQCAtNDUsMjEgKzQ1LDYgQEAg Y29uZmlnIERSTV9JOTE1X0tNUwo+Pgo+PiAgIAkgIElmIGluIGRvdWJ0LCBzYXkgIlkiLgo+Pgo+ PiAtY29uZmlnIERSTV9JOTE1X0ZCREVWCj4+IC0JYm9vbCAiRW5hYmxlIGxlZ2FjeSBmYmRldiBz dXBwb3J0IGZvciB0aGUgbW9kZXNldHRpbmcgaW50ZWwgZHJpdmVyIgo+PiAtCWRlcGVuZHMgb24g RFJNX0k5MTUKPj4gLQlzZWxlY3QgRFJNX0tNU19GQl9IRUxQRVIKPj4gLQlzZWxlY3QgRkJfQ0ZC X0ZJTExSRUNUCj4+IC0Jc2VsZWN0IEZCX0NGQl9DT1BZQVJFQQo+PiAtCXNlbGVjdCBGQl9DRkJf SU1BR0VCTElUCj4+IC0JZGVmYXVsdCB5Cj4+IC0JaGVscAo+PiAtCSAgQ2hvb3NlIHRoaXMgb3B0 aW9uIGlmIHlvdSBoYXZlIGEgbmVlZCBmb3IgdGhlIGxlZ2FjeSBmYmRldgo+PiAtCSAgc3VwcG9y dC4gTm90ZSB0aGF0IHRoaXMgc3VwcG9ydCBhbHNvIHByb3ZpZGUgdGhlIGxpbnV4IGNvbnNvbGUK Pj4gLQkgIHN1cHBvcnQgb24gdG9wIG9mIHRoZSBpbnRlbCBtb2Rlc2V0dGluZyBkcml2ZXIuCj4+ IC0KPj4gLQkgIElmIGluIGRvdWJ0LCBzYXkgIlkiLgo+PiAtCj4+ICAgY29uZmlnIERSTV9JOTE1 X1BSRUxJTUlOQVJZX0hXX1NVUFBPUlQKPj4gICAJYm9vbCAiRW5hYmxlIHByZWxpbWluYXJ5IHN1 cHBvcnQgZm9yIHByZXJlbGVhc2UgSW50ZWwgaGFyZHdhcmUgYnkgZGVmYXVsdCIKPj4gICAJZGVw ZW5kcyBvbiBEUk1fSTkxNQo+PiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvTWFr ZWZpbGUgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9NYWtlZmlsZQo+PiBpbmRleCBmMDE5MjI1Li4z YjMzMjVkIDEwMDY0NAo+PiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9NYWtlZmlsZQo+PiAr KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9NYWtlZmlsZQo+PiBAQCAtNTYsOCArNTYsOCBAQCBp OTE1LXkgKz0gaW50ZWxfYXVkaW8ubyBcCj4+ICAgCSAgaW50ZWxfcHNyLm8gXAo+PiAgIAkgIGlu dGVsX3NpZGViYW5kLm8gXAo+PiAgIAkgIGludGVsX3Nwcml0ZS5vCj4+IC1pOTE1LSQoQ09ORklH X0FDUEkpCQkrPSBpbnRlbF9hY3BpLm8gaW50ZWxfb3ByZWdpb24ubwo+PiAtaTkxNS0kKENPTkZJ R19EUk1fSTkxNV9GQkRFVikJKz0gaW50ZWxfZmJkZXYubwo+PiAraTkxNS0kKENPTkZJR19BQ1BJ KQkJCSs9IGludGVsX2FjcGkubyBpbnRlbF9vcHJlZ2lvbi5vCj4+ICtpOTE1LSQoQ09ORklHX0RS TV9GQkRFVl9FTVVMQVRJT04pCSs9IGludGVsX2ZiZGV2Lm8KPj4KPj4gICAjIG1vZGVzZXR0aW5n IG91dHB1dC9lbmNvZGVyIGNvZGUKPj4gICBpOTE1LXkgKz0gZHZvX2NoNzAxNy5vIFwKPj4gZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKPj4gaW5kZXggZThiMThlNS4uMGM4YmNkNyAxMDA2 NDQKPj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKPj4gKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKPj4gQEAgLTE3NzIsNyArMTc3Miw3 IEBAIHN0YXRpYyBpbnQgaTkxNV9nZW1fZnJhbWVidWZmZXJfaW5mbyhzdHJ1Y3Qgc2VxX2ZpbGUg Km0sIHZvaWQgKmRhdGEpCj4+ICAgCXN0cnVjdCBpbnRlbF9mYmRldiAqaWZiZGV2ID0gTlVMTDsK Pj4gICAJc3RydWN0IGludGVsX2ZyYW1lYnVmZmVyICpmYjsKPj4KPj4gLSNpZmRlZiBDT05GSUdf RFJNX0k5MTVfRkJERVYKPj4gKyNpZmRlZiBDT05GSUdfRFJNX0ZCREVWX0VNVUxBVElPTgo+PiAg IAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwo+ Pgo+PiAgIAlpZmJkZXYgPSBkZXZfcHJpdi0+ZmJkZXY7Cj4+IGRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYu aAo+PiBpbmRleCA4NzI3MDg2Li5lNTExZmE0IDEwMDY0NAo+PiAtLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2Rydi5oCj4+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2 LmgKPj4gQEAgLTE4MTksMTEgKzE4MTksOSBAQCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSB7Cj4+ Cj4+ICAgCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICp2bHZfcGN0eDsKPj4KPj4gLSNpZmRl ZiBDT05GSUdfRFJNX0k5MTVfRkJERVYKPj4gICAJLyogbGlzdCBvZiBmYmRldiByZWdpc3RlciBv biB0aGlzIGRldmljZSAqLwo+PiAgIAlzdHJ1Y3QgaW50ZWxfZmJkZXYgKmZiZGV2Owo+PiAgIAlz dHJ1Y3Qgd29ya19zdHJ1Y3QgZmJkZXZfc3VzcGVuZF93b3JrOwo+PiAtI2VuZGlmCj4+Cj4+ICAg CXN0cnVjdCBkcm1fcHJvcGVydHkgKmJyb2FkY2FzdF9yZ2JfcHJvcGVydHk7Cj4+ICAgCXN0cnVj dCBkcm1fcHJvcGVydHkgKmZvcmNlX2F1ZGlvX3Byb3BlcnR5Owo+PiBkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZGlzcGxheS5jCj4+IGluZGV4IGU3MzA3ODkuLjljZjEzZTYgMTAwNjQ0Cj4+IC0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwo+PiArKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKPj4gQEAgLTg1NjIsNyArODU2Miw2IEBAIHN0YXRp YyBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICoKPj4gICBtb2RlX2ZpdHNfaW5fZmJkZXYoc3RydWN0 IGRybV9kZXZpY2UgKmRldiwKPj4gICAJCSAgIHN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICptb2Rl KQo+PiAgIHsKPj4gLSNpZmRlZiBDT05GSUdfRFJNX0k5MTVfRkJERVYKPj4gICAJc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKPj4gICAJc3RydWN0 IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iajsKPj4gICAJc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAq ZmI7Cj4+IEBAIC04NTg1LDkgKzg1ODQsNiBAQCBtb2RlX2ZpdHNfaW5fZmJkZXYoc3RydWN0IGRy bV9kZXZpY2UgKmRldiwKPj4gICAJCXJldHVybiBOVUxMOwo+Pgo+PiAgIAlyZXR1cm4gZmI7Cj4+ IC0jZWxzZQo+PiAtCXJldHVybiBOVUxMOwo+PiAtI2VuZGlmCj4KPiBXb24ndCB0aGlzIG5vdyBi bG93IHVwIGlmIHRoZXJlJ3Mgbm8gZmJkZXY/IFRiaCBJIHByZWZlciBhIHBhdGNoIHRvIGp1c3QK PiByZXBsYWNlIHRoZSBDT05GSUdfICNkZWZpbmUgYW5kIHRoZW4gbWF5YmUgYSAybmQgb25lIG9u IHRvcCB0byBjbGVhbgo+IHRoaW5ncyB1cCBpZiB5b3UgZmVlbCBsaWtlLiBTYW1lIGZvciB0aGUg b3RoZXIgY2hhbmdlcyBpbiB0aGlzIHBhdGNoLgoKVGhlcmUgYXJlIGNoZWNrcyBmb3IgZGV2X3By aXYtPmZiZGV2IGFuZCBkZXZfcHJpdi0+ZmJkZXYtPmZiIGJlaW5nIG5vbiAKTlVMTCBhdCB0aGUg c3RhcnQgb2YgdGhlIGZ1bmN0aW9uIHdoaWNoIHdvdWxkIHByZXZlbnQgdGhhdC4gQnV0IHlvdSdy ZSAKcmlnaHQsIHRoZSBmaXJzdCBwYXRjaCBmb3IgZWFjaCBkZXZpY2UgY2FuIHJlcGxhY2UgdGhl IGNvbmZpZywgdGhlIGxhdGVyIApvbmVzIGNhbiB0YWtlIGFkdmFudGFnZSBvZiB0aGUgc3R1YiBm dW5jdGlvbnMuCgpBcmNoaXQKCi0tIApRdWFsY29tbSBJbm5vdmF0aW9uIENlbnRlciwgSW5jLiBp cyBhIG1lbWJlciBvZiBDb2RlIEF1cm9yYSBGb3J1bSwKYSBMaW51eCBGb3VuZGF0aW9uIENvbGxh Ym9yYXRpdmUgUHJvamVjdApfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1k ZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752460AbbCJKLJ (ORCPT ); Tue, 10 Mar 2015 06:11:09 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:32855 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751438AbbCJKLH (ORCPT ); Tue, 10 Mar 2015 06:11:07 -0400 Message-ID: <54FEC330.4050005@codeaurora.org> Date: Tue, 10 Mar 2015 15:40:56 +0530 From: Archit Taneja User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 MIME-Version: 1.0 To: robdclark@gmail.com, airlied@linux.ie, treding@nvidia.com, p.zabel@pengutronix.de, benjamin.gaignard@linaro.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, daniel@ffwll.ch Subject: Re: [RFC 3/6] drm/i915: Remove local fbdev emulation Kconfig option References: <1425980493-27533-1-git-send-email-architt@codeaurora.org> <1425980493-27533-4-git-send-email-architt@codeaurora.org> <20150310100126.GF3800@phenom.ffwll.local> In-Reply-To: <20150310100126.GF3800@phenom.ffwll.local> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 03/10/2015 03:31 PM, Daniel Vetter wrote: > On Tue, Mar 10, 2015 at 03:11:30PM +0530, Archit Taneja wrote: >> DRM_I915_FBDEV config is currently used to enable/disable fbdev emulation for >> the i915 kms driver. >> >> Replace this with the top level DRM_FBDEV_EMULATION config option. Using this >> config lets us also prevent wrapping around drm_fb_helper_* calls with #ifdefs >> in certain places. >> >> The #ifdef in drm_i915_private struct adding/removing members intel_fbdev and >> fbdev_suspend_work has been removed. This helps us use stub drm helper functions >> at not much cost. >> >> Signed-off-by: Archit Taneja >> --- >> drivers/gpu/drm/i915/Kconfig | 15 --------------- >> drivers/gpu/drm/i915/Makefile | 4 ++-- >> drivers/gpu/drm/i915/i915_debugfs.c | 2 +- >> drivers/gpu/drm/i915/i915_drv.h | 2 -- >> drivers/gpu/drm/i915/intel_display.c | 10 ++++------ >> drivers/gpu/drm/i915/intel_dp_mst.c | 14 ++++++++------ >> drivers/gpu/drm/i915/intel_drv.h | 3 +-- >> drivers/gpu/drm/i915/intel_fbdev.c | 7 ------- >> 8 files changed, 16 insertions(+), 41 deletions(-) >> >> diff --git a/drivers/gpu/drm/i915/Kconfig b/drivers/gpu/drm/i915/Kconfig >> index 74acca9..bd9ccfc 100644 >> --- a/drivers/gpu/drm/i915/Kconfig >> +++ b/drivers/gpu/drm/i915/Kconfig >> @@ -45,21 +45,6 @@ config DRM_I915_KMS >> >> If in doubt, say "Y". >> >> -config DRM_I915_FBDEV >> - bool "Enable legacy fbdev support for the modesetting intel driver" >> - depends on DRM_I915 >> - select DRM_KMS_FB_HELPER >> - select FB_CFB_FILLRECT >> - select FB_CFB_COPYAREA >> - select FB_CFB_IMAGEBLIT >> - default y >> - help >> - Choose this option if you have a need for the legacy fbdev >> - support. Note that this support also provide the linux console >> - support on top of the intel modesetting driver. >> - >> - If in doubt, say "Y". >> - >> config DRM_I915_PRELIMINARY_HW_SUPPORT >> bool "Enable preliminary support for prerelease Intel hardware by default" >> depends on DRM_I915 >> diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile >> index f019225..3b3325d 100644 >> --- a/drivers/gpu/drm/i915/Makefile >> +++ b/drivers/gpu/drm/i915/Makefile >> @@ -56,8 +56,8 @@ i915-y += intel_audio.o \ >> intel_psr.o \ >> intel_sideband.o \ >> intel_sprite.o >> -i915-$(CONFIG_ACPI) += intel_acpi.o intel_opregion.o >> -i915-$(CONFIG_DRM_I915_FBDEV) += intel_fbdev.o >> +i915-$(CONFIG_ACPI) += intel_acpi.o intel_opregion.o >> +i915-$(CONFIG_DRM_FBDEV_EMULATION) += intel_fbdev.o >> >> # modesetting output/encoder code >> i915-y += dvo_ch7017.o \ >> diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c >> index e8b18e5..0c8bcd7 100644 >> --- a/drivers/gpu/drm/i915/i915_debugfs.c >> +++ b/drivers/gpu/drm/i915/i915_debugfs.c >> @@ -1772,7 +1772,7 @@ static int i915_gem_framebuffer_info(struct seq_file *m, void *data) >> struct intel_fbdev *ifbdev = NULL; >> struct intel_framebuffer *fb; >> >> -#ifdef CONFIG_DRM_I915_FBDEV >> +#ifdef CONFIG_DRM_FBDEV_EMULATION >> struct drm_i915_private *dev_priv = dev->dev_private; >> >> ifbdev = dev_priv->fbdev; >> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h >> index 8727086..e511fa4 100644 >> --- a/drivers/gpu/drm/i915/i915_drv.h >> +++ b/drivers/gpu/drm/i915/i915_drv.h >> @@ -1819,11 +1819,9 @@ struct drm_i915_private { >> >> struct drm_i915_gem_object *vlv_pctx; >> >> -#ifdef CONFIG_DRM_I915_FBDEV >> /* list of fbdev register on this device */ >> struct intel_fbdev *fbdev; >> struct work_struct fbdev_suspend_work; >> -#endif >> >> struct drm_property *broadcast_rgb_property; >> struct drm_property *force_audio_property; >> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c >> index e730789..9cf13e6 100644 >> --- a/drivers/gpu/drm/i915/intel_display.c >> +++ b/drivers/gpu/drm/i915/intel_display.c >> @@ -8562,7 +8562,6 @@ static struct drm_framebuffer * >> mode_fits_in_fbdev(struct drm_device *dev, >> struct drm_display_mode *mode) >> { >> -#ifdef CONFIG_DRM_I915_FBDEV >> struct drm_i915_private *dev_priv = dev->dev_private; >> struct drm_i915_gem_object *obj; >> struct drm_framebuffer *fb; >> @@ -8585,9 +8584,6 @@ mode_fits_in_fbdev(struct drm_device *dev, >> return NULL; >> >> return fb; >> -#else >> - return NULL; >> -#endif > > Won't this now blow up if there's no fbdev? Tbh I prefer a patch to just > replace the CONFIG_ #define and then maybe a 2nd one on top to clean > things up if you feel like. Same for the other changes in this patch. There are checks for dev_priv->fbdev and dev_priv->fbdev->fb being non NULL at the start of the function which would prevent that. But you're right, the first patch for each device can replace the config, the later ones can take advantage of the stub functions. Archit -- Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project