diff mbox

NAK: [PULL][Wily] drm/i915: Skylake fixes & enablement

Message ID 55F184AF.8080305@ubuntu.com
State New
Headers show

Commit Message

Timo Aaltonen Sept. 10, 2015, 1:25 p.m. UTC 
On 10.09.2015 16:19, Tim Gardner wrote:
> On 09/10/2015 06:58 AM, Tim Gardner wrote:
>> On 09/10/2015 03:58 AM, Timo Aaltonen wrote:
>>> git://kernel.ubuntu.com/tjaalton/ubuntu-wily.git skl
>>
>> None of these commits appear to have come from Linus' repo.
>>
> 
> Or perhaps my use of 'git describe' is hosed. Lemme recheck.

Yeah, checked them again and they're in Linus' master since last Friday.

One additional commit to fix a warning (not on the branch):

buglink http://bugs.launchpad.net/bugs/1494163

commit c30400fcffb70d17bbf33eaff5020b83111bd66c
Author: Paulo Zanoni <paulo.r.zanoni@intel.com>
Date:   Fri Jul 3 12:31:30 2015 -0300

    drm/i915: set FDI translations to NULL on SKL
    
    drivers/gpu/drm/i915/intel_ddi.c: In function ‘intel_prepare_ddi’:
    drivers/gpu/drm/i915/intel_ddi.c:517:6: warning:
    ‘ddi_translations_fdi’ may be used uninitialized in this function
    [-Wmaybe-uninitialized]
       if (ddi_translations_fdi)
          ^
    drivers/gpu/drm/i915/intel_ddi.c:446:30: note: ‘ddi_translations_fdi’
    was declared here
      const struct ddi_buf_trans *ddi_translations_fdi;
                                  ^
    
    This line used to be there, but was removed by:
    
    commit f8896f5d58e64bfd3c2b5f7c5ba5c3f3967e93c7
    Author: David Weinehall <david.weinehall@linux.intel.com>
    Date:   Thu Jun 25 11:11:03 2015 +030
        drm/i915/skl: Buffer translation improvements
    
    Cc: David Weinehall <david.weinehall@linux.intel.com>
    Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
    Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

Comments

Tim Gardner Sept. 10, 2015, 1:39 p.m. UTC | #1 
Got 'em all.
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
index db22f01..9a40bfb 100644
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@ -458,6 +458,7 @@  static void intel_prepare_ddi_buffers(struct drm_device *dev, enum port port,
                                        INTEL_OUTPUT_HDMI);
                return;
        } else if (IS_SKYLAKE(dev)) {
+               ddi_translations_fdi = NULL;
                ddi_translations_dp =
                                skl_get_buf_trans_dp(dev, &n_dp_entries);
                ddi_translations_edp =