From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3FA97C38147 for ; Wed, 18 Jan 2023 16:10:04 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CAC5910E775; Wed, 18 Jan 2023 16:10:03 +0000 (UTC) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9B0A410E775; Wed, 18 Jan 2023 16:10:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1674058202; x=1705594202; h=date:from:to:cc:subject:message-id:references: mime-version:content-transfer-encoding:in-reply-to; bh=MicbekSzAkKBKCmnJ+cRFegRDdC8djiNY0RBY+sThng=; b=YAxdr44k3pijtPgJNqYV0dnrZWXzsSkHjfnsCHlkDiMz7hAH+EZEVR+0 ypzX/kzh9AeiOq9tloT18bvGpvXhIIknTvAeSKqya6DEwSZAhUyJE9BUh mcM/MBnCSo3eSZ7AsNxLfLZzQjiOrWZdWbV81rtDVh/1QVTXLngXBkQz3 3EjZeh7W2B/U2cn4W0XG89HhTh97T+jtivw5YBCGUyjeFgur5r4M7skwU Eu/1amWOsD9UXgDNurGbcWbr8s2cueYYG9diWUj70DkvyB2KkZy9olp7s BFaR8LaOtdeEFPChz/WB5QAFPsL5R0D1SEco3WxjPK1h4Bu9gT37MdcCB Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10594"; a="326283544" X-IronPort-AV: E=Sophos;i="5.97,226,1669104000"; d="scan'208";a="326283544" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jan 2023 08:10:02 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10594"; a="692054092" X-IronPort-AV: E=Sophos;i="5.97,226,1669104000"; d="scan'208";a="692054092" Received: from stinkpipe.fi.intel.com (HELO stinkbox) ([10.237.72.55]) by orsmga001.jf.intel.com with SMTP; 18 Jan 2023 08:09:59 -0800 Received: by stinkbox (sSMTP sendmail emulation); Wed, 18 Jan 2023 18:09:58 +0200 Date: Wed, 18 Jan 2023 18:09:58 +0200 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Jani Nikula Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Patchwork-Hint: comment Subject: Re: [Intel-gfx] [PATCH v7 13/22] drm/edid: stop passing quirks around X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Wed, Jan 04, 2023 at 12:05:28PM +0200, Jani Nikula wrote: > Now that quirks are stored in display info, we can just look them up > using the connector instead of having to pass them around. > > Cc: Ville Syrjälä > Signed-off-by: Jani Nikula Reviewed-by: Ville Syrjälä > --- > drivers/gpu/drm/drm_edid.c | 34 +++++++++++++++------------------- > 1 file changed, 15 insertions(+), 19 deletions(-) > > diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c > index fd8d056e38c1..6bc0432046c8 100644 > --- a/drivers/gpu/drm/drm_edid.c > +++ b/drivers/gpu/drm/drm_edid.c > @@ -96,7 +96,6 @@ struct detailed_mode_closure { > struct drm_connector *connector; > const struct drm_edid *drm_edid; > bool preferred; > - u32 quirks; > int modes; > }; > > @@ -2887,9 +2886,9 @@ static u32 edid_get_quirks(const struct drm_edid *drm_edid) > * Walk the mode list for connector, clearing the preferred status on existing > * modes and setting it anew for the right mode ala quirks. > */ > -static void edid_fixup_preferred(struct drm_connector *connector, > - u32 quirks) > +static void edid_fixup_preferred(struct drm_connector *connector) > { > + const struct drm_display_info *info = &connector->display_info; > struct drm_display_mode *t, *cur_mode, *preferred_mode; > int target_refresh = 0; > int cur_vrefresh, preferred_vrefresh; > @@ -2897,9 +2896,9 @@ static void edid_fixup_preferred(struct drm_connector *connector, > if (list_empty(&connector->probed_modes)) > return; > > - if (quirks & EDID_QUIRK_PREFER_LARGE_60) > + if (info->quirks & EDID_QUIRK_PREFER_LARGE_60) > target_refresh = 60; > - if (quirks & EDID_QUIRK_PREFER_LARGE_75) > + if (info->quirks & EDID_QUIRK_PREFER_LARGE_75) > target_refresh = 75; > > preferred_mode = list_first_entry(&connector->probed_modes, > @@ -3401,9 +3400,9 @@ drm_mode_do_interlace_quirk(struct drm_display_mode *mode, > */ > static struct drm_display_mode *drm_mode_detailed(struct drm_connector *connector, > const struct drm_edid *drm_edid, > - const struct detailed_timing *timing, > - u32 quirks) > + const struct detailed_timing *timing) > { > + const struct drm_display_info *info = &connector->display_info; > struct drm_device *dev = connector->dev; > struct drm_display_mode *mode; > const struct detailed_pixel_timing *pt = &timing->data.pixel_data; > @@ -3437,7 +3436,7 @@ static struct drm_display_mode *drm_mode_detailed(struct drm_connector *connecto > return NULL; > } > > - if (quirks & EDID_QUIRK_FORCE_REDUCED_BLANKING) { > + if (info->quirks & EDID_QUIRK_FORCE_REDUCED_BLANKING) { > mode = drm_cvt_mode(dev, hactive, vactive, 60, true, false, false); > if (!mode) > return NULL; > @@ -3449,7 +3448,7 @@ static struct drm_display_mode *drm_mode_detailed(struct drm_connector *connecto > if (!mode) > return NULL; > > - if (quirks & EDID_QUIRK_135_CLOCK_TOO_HIGH) > + if (info->quirks & EDID_QUIRK_135_CLOCK_TOO_HIGH) > mode->clock = 1088 * 10; > else > mode->clock = le16_to_cpu(timing->pixel_clock) * 10; > @@ -3472,7 +3471,7 @@ static struct drm_display_mode *drm_mode_detailed(struct drm_connector *connecto > > drm_mode_do_interlace_quirk(mode, pt); > > - if (quirks & EDID_QUIRK_DETAILED_SYNC_PP) { > + if (info->quirks & EDID_QUIRK_DETAILED_SYNC_PP) { > mode->flags |= DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC; > } else { > mode->flags |= (pt->misc & DRM_EDID_PT_HSYNC_POSITIVE) ? > @@ -3485,12 +3484,12 @@ static struct drm_display_mode *drm_mode_detailed(struct drm_connector *connecto > mode->width_mm = pt->width_mm_lo | (pt->width_height_mm_hi & 0xf0) << 4; > mode->height_mm = pt->height_mm_lo | (pt->width_height_mm_hi & 0xf) << 8; > > - if (quirks & EDID_QUIRK_DETAILED_IN_CM) { > + if (info->quirks & EDID_QUIRK_DETAILED_IN_CM) { > mode->width_mm *= 10; > mode->height_mm *= 10; > } > > - if (quirks & EDID_QUIRK_DETAILED_USE_MAXIMUM_SIZE) { > + if (info->quirks & EDID_QUIRK_DETAILED_USE_MAXIMUM_SIZE) { > mode->width_mm = drm_edid->edid->width_cm * 10; > mode->height_mm = drm_edid->edid->height_cm * 10; > } > @@ -4003,8 +4002,7 @@ do_detailed_mode(const struct detailed_timing *timing, void *c) > return; > > newmode = drm_mode_detailed(closure->connector, > - closure->drm_edid, timing, > - closure->quirks); > + closure->drm_edid, timing); > if (!newmode) > return; > > @@ -4027,15 +4025,13 @@ do_detailed_mode(const struct detailed_timing *timing, void *c) > * add_detailed_modes - Add modes from detailed timings > * @connector: attached connector > * @drm_edid: EDID block to scan > - * @quirks: quirks to apply > */ > static int add_detailed_modes(struct drm_connector *connector, > - const struct drm_edid *drm_edid, u32 quirks) > + const struct drm_edid *drm_edid) > { > struct detailed_mode_closure closure = { > .connector = connector, > .drm_edid = drm_edid, > - .quirks = quirks, > }; > > if (drm_edid->edid->revision >= 4) > @@ -6684,7 +6680,7 @@ static int _drm_edid_connector_update(struct drm_connector *connector, > * > * XXX order for additional mode types in extension blocks? > */ > - num_modes += add_detailed_modes(connector, drm_edid, info->quirks); > + num_modes += add_detailed_modes(connector, drm_edid); > num_modes += add_cvt_modes(connector, drm_edid); > num_modes += add_standard_modes(connector, drm_edid); > num_modes += add_established_modes(connector, drm_edid); > @@ -6695,7 +6691,7 @@ static int _drm_edid_connector_update(struct drm_connector *connector, > num_modes += add_inferred_modes(connector, drm_edid); > > if (info->quirks & (EDID_QUIRK_PREFER_LARGE_60 | EDID_QUIRK_PREFER_LARGE_75)) > - edid_fixup_preferred(connector, info->quirks); > + edid_fixup_preferred(connector); > > if (info->quirks & EDID_QUIRK_FORCE_6BPC) > info->bpc = 6; > -- > 2.34.1 -- Ville Syrjälä Intel