[Intel-gfx] [PATCH] drm/i915/dmc: Use firmware v2.06 for TGL

[Daniele Ceraolo Spurio]

On 3/3/20 1:29 AM, Jani Nikula wrote:
> On Fri, 28 Feb 2020, "Sharma, Swati2" <swati2.sharma at intel.com> wrote:
>> On 28-Feb-20 12:49 PM, Jani Nikula wrote:
>>> On Thu, 27 Feb 2020, José Roberto de Souza <jose.souza at intel.com> wrote:
>>>> New firmware contains minor fixes around context restore.
>>>
>>> Please get the firmware in linux-firmware and CI first:
>>>
>>> <7>[    6.328884] i915 0000:00:02.0: [drm:intel_csr_ucode_init [i915]] Loading i915/tgl_dmc_ver2_06.bin
>>> <4>[    6.330612] i915 0000:00:02.0: Direct firmware load for i915/tgl_dmc_ver2_06.bin failed with error -2
>>> <5>[    6.330645] i915 0000:00:02.0: [drm] Failed to load DMC firmware i915/tgl_dmc_ver2_06.bin. Disabling runtime power management.
>>> <5>[    6.330648] i915 0000:00:02.0: [drm] DMC firmware homepage: https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/tree/i915
>>>
>>> BR,
>>> Jani.
>>>
>> Update from CI team: linux-firmware updated (manually) with
>> i915/tgl_dmc_ver2_06.bin. Rerun initiated. Next run, v2_06 should be loaded.
> 
> Confirmed in the logs.
> 
> Please ensure 2.06 is in linux-firmware upstream before v5.6 kernel
> release.
> 

I've just sent the PR to linux-firmware so it shouldn't be an issue to 
get the binary upstream in time for 5.6, but isn't this patch going to 
hit 5.7?

Daniele

> BR,
> Jani.
> 
> 
> 
>>>
>>>>
>>>> Signed-off-by: José Roberto de Souza <jose.souza at intel.com>
>>>> ---
>>>>    drivers/gpu/drm/i915/display/intel_csr.c | 4 ++--
>>>>    1 file changed, 2 insertions(+), 2 deletions(-)
>>>>
>>>> diff --git a/drivers/gpu/drm/i915/display/intel_csr.c b/drivers/gpu/drm/i915/display/intel_csr.c
>>>> index 57320c12839f..3112572cfb7d 100644
>>>> --- a/drivers/gpu/drm/i915/display/intel_csr.c
>>>> +++ b/drivers/gpu/drm/i915/display/intel_csr.c
>>>> @@ -40,8 +40,8 @@
>>>>    
>>>>    #define GEN12_CSR_MAX_FW_SIZE		ICL_CSR_MAX_FW_SIZE
>>>>    
>>>> -#define TGL_CSR_PATH			"i915/tgl_dmc_ver2_04.bin"
>>>> -#define TGL_CSR_VERSION_REQUIRED	CSR_VERSION(2, 4)
>>>> +#define TGL_CSR_PATH			"i915/tgl_dmc_ver2_06.bin"
>>>> +#define TGL_CSR_VERSION_REQUIRED	CSR_VERSION(2, 6)
>>>>    #define TGL_CSR_MAX_FW_SIZE		0x6000
>>>>    MODULE_FIRMWARE(TGL_CSR_PATH);
>>>
>