lkml.org 
[lkml]   [2016]   [Mar]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 208/342] drm/radeon: clean up fujitsu quirks
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Alex Deucher <alexander.deucher@amd.com>

    commit 0eb1c3d4084eeb6fb3a703f88d6ce1521f8fcdd1 upstream.

    Combine the two quirks.

    bug:
    https://bugzilla.kernel.org/show_bug.cgi?id=109481

    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/gpu/drm/radeon/radeon_atombios.c | 12 +++---------
    1 file changed, 3 insertions(+), 9 deletions(-)

    --- a/drivers/gpu/drm/radeon/radeon_atombios.c
    +++ b/drivers/gpu/drm/radeon/radeon_atombios.c
    @@ -437,7 +437,9 @@ static bool radeon_atom_apply_quirks(str
    }

    /* Fujitsu D3003-S2 board lists DVI-I as DVI-D and VGA */
    - if (((dev->pdev->device == 0x9802) || (dev->pdev->device == 0x9806)) &&
    + if (((dev->pdev->device == 0x9802) ||
    + (dev->pdev->device == 0x9805) ||
    + (dev->pdev->device == 0x9806)) &&
    (dev->pdev->subsystem_vendor == 0x1734) &&
    (dev->pdev->subsystem_device == 0x11bd)) {
    if (*connector_type == DRM_MODE_CONNECTOR_VGA) {
    @@ -448,14 +450,6 @@ static bool radeon_atom_apply_quirks(str
    }
    }

    - /* Fujitsu D3003-S2 board lists DVI-I as DVI-I and VGA */
    - if ((dev->pdev->device == 0x9805) &&
    - (dev->pdev->subsystem_vendor == 0x1734) &&
    - (dev->pdev->subsystem_device == 0x11bd)) {
    - if (*connector_type == DRM_MODE_CONNECTOR_VGA)
    - return false;
    - }
    -
    return true;
    }
    \
     
     \ /
      Last update: 2016-03-02 02:21    [W:2.946 / U:0.224 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site