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=-7.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=no 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 D7412C433E2 for ; Tue, 8 Sep 2020 08:22:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 85BEA21D43 for ; Tue, 8 Sep 2020 08:22:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="LIyKGKDT" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730085AbgIHIWR (ORCPT ); Tue, 8 Sep 2020 04:22:17 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:42653 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729813AbgIHIWM (ORCPT ); Tue, 8 Sep 2020 04:22:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599553331; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wpXz+q9ud+AOPvV34hwZq6iLp3ZbJEEfJ7EHtLY6RqI=; b=LIyKGKDT/8npeWzLh4N6YG/2UE82V17YNKI9tAHQfVkqEnZ/8ktwnb39GIBJdAPVVVjN4C hlImIISNYcLP9qebUe8zjL5oc+fFr1EMkCP+r0b5cJBJjRzGkSf+G5Kl1nHHJb7lE8BVkw 36yojQWKc+eF+8cty28aVXVZ/oJm8po= Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-364--oi7rAA4Pu2IGLyHB_ZeGA-1; Tue, 08 Sep 2020 04:22:09 -0400 X-MC-Unique: -oi7rAA4Pu2IGLyHB_ZeGA-1 Received: by mail-ej1-f72.google.com with SMTP id b23so6412618ejv.2 for ; Tue, 08 Sep 2020 01:22:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=wpXz+q9ud+AOPvV34hwZq6iLp3ZbJEEfJ7EHtLY6RqI=; b=ZlXQ7sVqz1yxemzhDD+tkqYl04mvwoE+xQpptNgwaeLpvyLVpjDK25cmR1FrTFjCIa F20P7ZZVM812sfTBpbihaFzLYoO6dEtkksJGIGxmnnKv9pVMFUoRLNPN50ueC5yI2W4Z 4c69SKXBGbdplJ0MD0tbODPlRtvkHBTSrTjHXLWHubkg0aKFc5JA6UT0nAkPhS8S+Qtz lQOLaWpJ3qbFP3Pq27/byqrY60P35ok5oWJL0AvB1mq1F/qUBcWunO29y1F022zG4DlR a9BTl+hTKB2OzTAPOqjyWoDrCfagQqbrVVP+xDDdjm5VIJya1pNBeiAREtj6tmlvV+QM x0LQ== X-Gm-Message-State: AOAM532D29qGgRK0zXuRrjRD5UKQAHJ4Q/72GeOPT65DBVeT+monU7tv PolkjpbOpB6jXAHOHA81k9/i7Swfi4Ja7fzz7p9+4Bn1d9+6gsOPWmvs2TtZ2ZllURD1Z6xJXB6 p5jgqlhS8YozGMLV9uMiGVZxw X-Received: by 2002:a17:906:6a50:: with SMTP id n16mr437640ejs.107.1599553328055; Tue, 08 Sep 2020 01:22:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzSpUnMjZKtgUsJ+BcSD0zVfJfVDHsM/AFxTEzrhyw0d1WYhP2BgF9hcfPBn3/2GC9nlSOMMQ== X-Received: by 2002:a17:906:6a50:: with SMTP id n16mr437624ejs.107.1599553327903; Tue, 08 Sep 2020 01:22:07 -0700 (PDT) Received: from x1.localdomain (2001-1c00-0c0c-fe00-d2ea-f29d-118b-24dc.cable.dynamic.v6.ziggo.nl. [2001:1c00:c0c:fe00:d2ea:f29d:118b:24dc]) by smtp.gmail.com with ESMTPSA id i7sm7632087ejo.22.2020.09.08.01.22.06 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 08 Sep 2020 01:22:07 -0700 (PDT) Subject: Re: linux-next: manual merge of the drm-intel tree with Linus' tree To: Stephen Rothwell , Daniel Vetter , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Intel Graphics , DRI Cc: Guru Das Srinagesh , Thierry Reding , Linux Next Mailing List , Linux Kernel Mailing List References: <20200908140022.67dd3801@canb.auug.org.au> From: Hans de Goede Message-ID: Date: Tue, 8 Sep 2020 10:22:06 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20200908140022.67dd3801@canb.auug.org.au> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Stephen, On 9/8/20 6:00 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the drm-intel tree got a conflict in: > > drivers/gpu/drm/i915/display/intel_panel.c > > between commit: > > f8bd54d21904 ("drm/i915: panel: Use atomic PWM API for devs with an external PWM controller") > > from Linus' tree and commit: > > 6b51e7d23aa8 ("drm/i915: panel: Honor the VBT PWM frequency for devs with an external PWM controller") That doesn't sound correct, those are both commits from the drm-intel tree. > from the drm-intel tree. > > I fixed it up (I just used the latter) Just taking the drivers/gpu/drm/i915/display/intel_panel.c contents of: f8bd54d21904 ("drm/i915: panel: Use atomic PWM API for devs with an external PWM controller") Is the right thing to do, the problem is a difference in a line which gets removed in that commit. Regards, Hans 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=-6.7 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=no 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 18DEDC2BBD0 for ; Tue, 8 Sep 2020 08:22:15 +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 A16B621D43 for ; Tue, 8 Sep 2020 08:22:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="QULxbftD" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A16B621D43 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com 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 AEB5E6E198; Tue, 8 Sep 2020 08:22:13 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id ED0186E193 for ; Tue, 8 Sep 2020 08:22:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599553330; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wpXz+q9ud+AOPvV34hwZq6iLp3ZbJEEfJ7EHtLY6RqI=; b=QULxbftDwKoMNUOtm5ATCAJATAg/ZccdSaQ/2BrM8G99UfRmEPGi5h6RiqVE1P5baCK55u CczbMdr7tayIfkXF7Le3XZjtgPDYzjEfqGVjZLLUPezUcGOJk8uk9NRLsZQfC03ojRrAs7 3xuAs8qfnZaeDsX3Fn7hZ7NBSK5pUKc= Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-75-IHQEDc2zM4mnmcpMHtKmAw-1; Tue, 08 Sep 2020 04:22:09 -0400 X-MC-Unique: IHQEDc2zM4mnmcpMHtKmAw-1 Received: by mail-ej1-f71.google.com with SMTP id w17so6345373eja.10 for ; Tue, 08 Sep 2020 01:22:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=wpXz+q9ud+AOPvV34hwZq6iLp3ZbJEEfJ7EHtLY6RqI=; b=T+qg90x15Ukt9qBxS3sheofs4nCMdcawktMJazqF4sVMjbe1mmOJv1/qw9Zmq3Ajxi /rfGQ1Pv6Rf4xTNyByk02UVl2C8XbFw9K6+fNLNqDrUnxnxDu+dYZO14Rg7lLWvyFydh F0SpruUmTT/zQxIEw8c+0zpsr5H/T2DPiZfrZvX3pj3JPV0TajqsaWWu79eQNSkugLJZ mTioABSYmym5TnQ8sGmEExIu4E61bPQUss+X7gTwnUuk9dHPFa5DIVsEJ5wvsh5ykOXW qKdoJv5+8EuxRx01jUHWkucANbyKtuOyboRonu9E4hr6ALLVIzywtVR8BxbR6Okz/1dA 8RHQ== X-Gm-Message-State: AOAM531Fl3ZRnq0OfpGQNkYqtLOtmzSDMvCsJPymCO9ddT/EeVXnWgqw svU/XIB4SeYS7Y6sJq91DKoZ0S1qPK1decMnzyTgMyThusnqGxKdeWH5LfxzX7Xh61DtVhPDFkh UGbKLMJ8uM+phB6AFIxD+Pd4n+xG3 X-Received: by 2002:a17:906:6a50:: with SMTP id n16mr437635ejs.107.1599553328055; Tue, 08 Sep 2020 01:22:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzSpUnMjZKtgUsJ+BcSD0zVfJfVDHsM/AFxTEzrhyw0d1WYhP2BgF9hcfPBn3/2GC9nlSOMMQ== X-Received: by 2002:a17:906:6a50:: with SMTP id n16mr437624ejs.107.1599553327903; Tue, 08 Sep 2020 01:22:07 -0700 (PDT) Received: from x1.localdomain (2001-1c00-0c0c-fe00-d2ea-f29d-118b-24dc.cable.dynamic.v6.ziggo.nl. [2001:1c00:c0c:fe00:d2ea:f29d:118b:24dc]) by smtp.gmail.com with ESMTPSA id i7sm7632087ejo.22.2020.09.08.01.22.06 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 08 Sep 2020 01:22:07 -0700 (PDT) Subject: Re: linux-next: manual merge of the drm-intel tree with Linus' tree To: Stephen Rothwell , Daniel Vetter , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Intel Graphics , DRI References: <20200908140022.67dd3801@canb.auug.org.au> From: Hans de Goede Message-ID: Date: Tue, 8 Sep 2020 10:22:06 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20200908140022.67dd3801@canb.auug.org.au> Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=hdegoede@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Language: en-US 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: Guru Das Srinagesh , Thierry Reding , Linux Next Mailing List , Linux Kernel Mailing List Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi Stephen, On 9/8/20 6:00 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the drm-intel tree got a conflict in: > > drivers/gpu/drm/i915/display/intel_panel.c > > between commit: > > f8bd54d21904 ("drm/i915: panel: Use atomic PWM API for devs with an external PWM controller") > > from Linus' tree and commit: > > 6b51e7d23aa8 ("drm/i915: panel: Honor the VBT PWM frequency for devs with an external PWM controller") That doesn't sound correct, those are both commits from the drm-intel tree. > from the drm-intel tree. > > I fixed it up (I just used the latter) Just taking the drivers/gpu/drm/i915/display/intel_panel.c contents of: f8bd54d21904 ("drm/i915: panel: Use atomic PWM API for devs with an external PWM controller") Is the right thing to do, the problem is a difference in a line which gets removed in that commit. Regards, Hans _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel 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=-6.7 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=no 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 B497AC43461 for ; Tue, 8 Sep 2020 08:22:13 +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 3D0CB21D7B for ; Tue, 8 Sep 2020 08:22:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="QULxbftD" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3D0CB21D7B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9D2936E193; Tue, 8 Sep 2020 08:22:12 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id 068EB6E198 for ; Tue, 8 Sep 2020 08:22:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599553330; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wpXz+q9ud+AOPvV34hwZq6iLp3ZbJEEfJ7EHtLY6RqI=; b=QULxbftDwKoMNUOtm5ATCAJATAg/ZccdSaQ/2BrM8G99UfRmEPGi5h6RiqVE1P5baCK55u CczbMdr7tayIfkXF7Le3XZjtgPDYzjEfqGVjZLLUPezUcGOJk8uk9NRLsZQfC03ojRrAs7 3xuAs8qfnZaeDsX3Fn7hZ7NBSK5pUKc= Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-150-8CSqyJtEN-CyPTFx6f2raw-1; Tue, 08 Sep 2020 04:22:09 -0400 X-MC-Unique: 8CSqyJtEN-CyPTFx6f2raw-1 Received: by mail-ed1-f70.google.com with SMTP id x23so5903898eds.5 for ; Tue, 08 Sep 2020 01:22:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=wpXz+q9ud+AOPvV34hwZq6iLp3ZbJEEfJ7EHtLY6RqI=; b=Bk6TZj5t0nC9Hyjvz6yXtdXlN4mdmLPVLM4vR6QGi7GqjCzP0xHO+ene+Yeqjwcb70 ngtILz7qDEQaVP47vlZxFymUIV7aRcf8zn9LWMe/6G94gHb55sTVkADgHot2E3m/Oxh3 vtkS3BzaQjY2ar2EDKMgP6gSBmyqi+KCj+h+a0lsOwwTTlayGgnD+W7HvTRU1TAQrho1 VkQ+5AeYR/PFIe2k3QV9dTDiKe+o2eisK8SgZHEvV8co0fadLfgKB9SbCF3L0tj3AdpZ 5w1RXl7HrR8Kv5m3XElIJxT4n8JXT0ANPuD26QcDKJz+kxjG1Z4N6KIroeI4xRx5r0YZ chyg== X-Gm-Message-State: AOAM532B0SSEXRprSor1UsmVscX6sfw1GMHKDRyQ3ljxgZ3kK9c2y+iO +E34PwCdX7fN976sdDJWPrpeded7Ke/l/Hc+JhwFM0Dv/QIpSq3F6aPhrmDLqSvCFl/1YGU5Ixb 4jTGN0WLYWA61uB7yajVDSiLzxNzd X-Received: by 2002:a17:906:6a50:: with SMTP id n16mr437644ejs.107.1599553328108; Tue, 08 Sep 2020 01:22:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzSpUnMjZKtgUsJ+BcSD0zVfJfVDHsM/AFxTEzrhyw0d1WYhP2BgF9hcfPBn3/2GC9nlSOMMQ== X-Received: by 2002:a17:906:6a50:: with SMTP id n16mr437624ejs.107.1599553327903; Tue, 08 Sep 2020 01:22:07 -0700 (PDT) Received: from x1.localdomain (2001-1c00-0c0c-fe00-d2ea-f29d-118b-24dc.cable.dynamic.v6.ziggo.nl. [2001:1c00:c0c:fe00:d2ea:f29d:118b:24dc]) by smtp.gmail.com with ESMTPSA id i7sm7632087ejo.22.2020.09.08.01.22.06 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 08 Sep 2020 01:22:07 -0700 (PDT) To: Stephen Rothwell , Daniel Vetter , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Intel Graphics , DRI References: <20200908140022.67dd3801@canb.auug.org.au> From: Hans de Goede Message-ID: Date: Tue, 8 Sep 2020 10:22:06 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20200908140022.67dd3801@canb.auug.org.au> Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=hdegoede@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Language: en-US Subject: Re: [Intel-gfx] linux-next: manual merge of the drm-intel tree with Linus' tree X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Guru Das Srinagesh , Linux Next Mailing List , Linux Kernel Mailing List Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Hi Stephen, On 9/8/20 6:00 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the drm-intel tree got a conflict in: > > drivers/gpu/drm/i915/display/intel_panel.c > > between commit: > > f8bd54d21904 ("drm/i915: panel: Use atomic PWM API for devs with an external PWM controller") > > from Linus' tree and commit: > > 6b51e7d23aa8 ("drm/i915: panel: Honor the VBT PWM frequency for devs with an external PWM controller") That doesn't sound correct, those are both commits from the drm-intel tree. > from the drm-intel tree. > > I fixed it up (I just used the latter) Just taking the drivers/gpu/drm/i915/display/intel_panel.c contents of: f8bd54d21904 ("drm/i915: panel: Use atomic PWM API for devs with an external PWM controller") Is the right thing to do, the problem is a difference in a line which gets removed in that commit. Regards, Hans _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx