[prev in list] [next in list] [prev in thread] [next in thread] 

List:       freedesktop-intel-gfx
Subject:    Re: [Intel-gfx] [PATCH] Revert "drm/i915: mark all device info struct with __initconst"
From:       Lionel Landwerlin <lionel.g.landwerlin () intel ! com>
Date:       2018-01-31 17:02:23
Message-ID: 48b8b504-2261-86be-208b-c316d83fb977 () intel ! com
[Download RAW message or body]

On 31/01/18 02:15, Rodrigo Vivi wrote:
> On Tue, Jan 30, 2018 at 08:44:46AM +0000, Jani Nikula wrote:
>> On Mon, 29 Jan 2018, Jani Nikula <jani.nikula@linux.intel.com> wrote:
>>> On Mon, 29 Jan 2018, Lionel Landwerlin <lionel.g.landwerlin@intel.com> wrote:
>>>> On 29/01/18 09:02, Chris Wilson wrote:
>>>>> Quoting Lionel Landwerlin (2018-01-29 08:33:46)
>>>>>> This reverts commit 5b54eddd3920e9f6f1a6d972454baf350cbae77e.
>>>>>>
>>>>>>    Conflicts:
>>>>>>           drivers/gpu/drm/i915/i915_pci.c
>>>>>>
>>>>>> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104805
>>>>> Fixes: 5b54eddd3920 ("drm/i915: mark all device info struct with __initconst")
>>>>>
>>>>> So it ends up in the right place.
>>>>> -Chris
>>>>>
>>>> Thanks, pushed.
>>> Please *always* wait for the full IGT results before pushing.
>>>
>>> Please *always* include a self-contained reason *why* in the commit
>>> message instead of relying on Bugzilla: link only.
>>>
>>> Please run 'dim fixes <commit>' to get the proper tags; now Cc: stable
>>> is missing. Fixes: alone doesn't cut it now that v4.15 has been
>>> released.
>> Rodrigo, please pick this up to drm-intel-next-fixes.
> This particular one conflicted with the icl ones:
>
> ++<<<<<<< HEAD
> ++=======
> + #define GEN11_FEATURES \
> +       GEN10_FEATURES, \
> +       .gen = 11, \
> +       .ddb_size = 2048, \
> +       .has_csr = 0
> +
> + static const struct intel_device_info intel_icelake_11_info = {
> +       GEN11_FEATURES,
> +       .platform = INTEL_ICELAKE,
> +       .is_alpha_support = 1,
> +       .has_resource_streamer = 0,
> + };
> +
> ++>>>>>>> 5db47e37b387... Revert "drm/i915: mark all device info struct with __initconst"
>
> So I'm assuming it is just a matter to remember to fix the next confclit removing initconst from icl?

Yep, sorry for the conflict.

>
> Thanks for this and all other heads up.
>
>> BR,
>> Jani.
>>
>>
>>> No patch needs to be merged within an hour. There's never such a
>>> rush. Please let's give more people a chance to look at the patches
>>> before they get merged.
>>>
>>>
>>> Thanks,
>>> Jani.
>>>
>>>
>>>> _______________________________________________
>>>> Intel-gfx mailing list
>>>> Intel-gfx@lists.freedesktop.org
>>>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
>> -- 
>> Jani Nikula, Intel Open Source Technology Center


_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[prev in list] [next in list] [prev in thread] [next in thread]