Re: [ 00/82] 3.2.20-stable review

Maarten Lankhorst
2012-06-10T16:54:47Z

Hey,

Op 09-06-12 00:54, Ben Hutchings schreef:
> On Fri, 2012-06-08 at 15:04 +0100, Ben Hutchings wrote:
>> On Fri, 2012-06-08 at 15:42 +0200, Maarten Lankhorst wrote:
>>> Hey,
>>>
>>> Op 08-06-12 06:18, Ben Hutchings schreef:
>>>> This is the start of the stable review cycle for the 3.2.20 release.
>>>> There are 82 patches in this series, which will be posted as responses
>>>> to this one. If anyone has any issues with these being applied, please
>>>> let me know.
>>>>
>>>> Responses should be made by Sun Jun 10 13:00:00 UTC 2012.
>>>> Anything received after that time might be too late.
>>>>
>>>> A combined patch relative to 3.2.19 will be posted as an additional
>>>> response to this, and the diffstat can be found below.
>>> Is it too late to nominate patches?
>> [...]
>>
>> It's too late for this time, unless there's something really urgent or
>> needed to avoid some other change in the rc causing a regression.
>>
>> I'll queue these up after 3.2.20.
> I'm sorry, I see you already requested these earlier. So I should have
> queued them, but anyway it turns out that the last one (commit
> a6a17859f1bdf607650ee055101f54c5f207762b, 'drm/nouveau/disp: fix
> dithering not being enabled on some eDP macbooks') breaks the build:
>
> CC [M] drivers/gpu/drm/nouveau/nouveau_connector.o
> drivers/gpu/drm/nouveau/nouveau_connector.c: In function ‘nouveau_connector_detect_depth’:
> drivers/gpu/drm/nouveau/nouveau_connector.c:620:18: error: ‘struct nouveau_connector’ has no member named ‘type’
>
> So you'll need to provide a backported version of that.
>
You're right, with some digging it seems to have been renamed between 3.2
and 3.4, I'm sorry for the inconvenience.
Changing nv_connector->type to nv_connector->dcb->type fixes things,
it seems nouveau_connector and nouveau_encoder both have that same
member with different meaning on older versions until a rework,
so here's it fixed:

diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c
index eeaa8ca..1e72db5 100644
--- a/drivers/gpu/drm/nouveau/nouveau_connector.c
+++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
@@ -616,7 +616,13 @@ nouveau_connector_detect_depth(struct drm_connector *connector)
if (nv_connector->edid && connector->display_info.bpc)
return;

- /* if not, we're out of options unless we're LVDS, default to 8bpc */
+ /* EDID 1.4 is *supposed* to be supported on eDP, but, Apple... */
+ if (nv_connector->dcb->type == DCB_CONNECTOR_eDP) {
+ connector->display_info.bpc = 6;
+ return;
+ }
+
+ /* we're out of options unless we're LVDS, default to 8bpc */
if (nv_encoder->dcb->type != OUTPUT_LVDS) {
connector->display_info.bpc = 8;
return;