Received: by 2002:a5b:505:0:0:0:0:0 with SMTP id o5csp4530244ybp; Mon, 7 Oct 2019 09:46:54 -0700 (PDT) X-Google-Smtp-Source: APXvYqz3b9heQUQWoZKrgY0G2XXkCkKLjFXNLwCbbndKe31dDjfEcSxvOItKYvOvsFOF35XXK+el X-Received: by 2002:a17:906:6c8:: with SMTP id v8mr25237527ejb.252.1570466814455; Mon, 07 Oct 2019 09:46:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570466814; cv=none; d=google.com; s=arc-20160816; b=OQBASxngAMM6ZLre0EyhVwWr1HG1OIyXh4vr2g1idqMzQcxBMbjt8RK2IEJFxnewG/ /Q8RZCzTaV2mOpuY6ur6ib2jgs1Z87U1oaCHimp3RLb2JxmlN7QpdNEl7P53krSH1ANT 92/txYTEcB6JNFCqqR1+wHO6rHMDob8eyQ6NaGvUmQxiQ1t54PEuRp0vTCmmWnyiQ8tW aL0Uiog5W4blMe3A7Oev8T3O+sLvMUVXak9LWKtIdZddW58iB+idz2+UdxFR3joDi2pm 9tG6DOOE+9iINX6G/I2Vs961zMVJMuUZ88n2FCPtqQi54C16qy6nwysQsVUF3qEWfyUR ricw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:in-reply-to :content-disposition:mime-version:references:message-id:subject:cc :to:from:date:dkim-signature; bh=uEyShXTm+JB/9yQz06mq2i1GCRkvjAHHbIYroAF3Vr0=; b=Ol35ipc3BY0x4ktoraKawBblRrsNc/8hS8My5IXD0x8TC5gsPUExku0Tef9YPLLrmK WdRBN/ih50ftARLou4mOs/7lfoVYRWRAjfmpzdEhqNnKi3LYQs82Xswhym6faG6O5Hb4 OpOrL/dzdSOl6j3Z0OymeKlbCj/lijc8Ml8YZlWYF8zEU1p2tRAdd5ViKPPk9GbU4fqZ P2dGlLcfPsCHVNwsldE6H6J3mAtOrWxusQzsMu3nzsGTaz3lDzclTDllbObGhJr7kO+6 jpAhQYpVcpjGId92v7S2E7uNZ14xK8U7eCo4BSfo54y7ww6v4Brhl6f3HIwjgy7blQEk kvmg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@poorly.run header.s=google header.b=Tk5DQyTR; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i34si9631376ede.37.2019.10.07.09.46.30; Mon, 07 Oct 2019 09:46:54 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@poorly.run header.s=google header.b=Tk5DQyTR; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728528AbfJGQpx (ORCPT + 99 others); Mon, 7 Oct 2019 12:45:53 -0400 Received: from mail-yw1-f67.google.com ([209.85.161.67]:44716 "EHLO mail-yw1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727801AbfJGQpx (ORCPT ); Mon, 7 Oct 2019 12:45:53 -0400 Received: by mail-yw1-f67.google.com with SMTP id m13so5347871ywa.11 for ; Mon, 07 Oct 2019 09:45:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=poorly.run; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=uEyShXTm+JB/9yQz06mq2i1GCRkvjAHHbIYroAF3Vr0=; b=Tk5DQyTRms31VYqgiblUm3XBadR+cInO4hstTpWWznvGEhyMDevpPGQMjKyumlw69b 9jpcL/P8lseJkQuJd31PZ15bFTzbsRCuw/eEYKrUWHcLJyJYwne6cc06GDvjHQTJWiQ0 RviTBIL/8SB90UPyTdnJUJcfqfA2Hc50CxITCPPF7ftBI8eCKooT/lEs76OOabmC512H 6pleyCDi/nG9STxP4KFNi0XhXIBgvlLpGD6wwkdjrztDaOMgMIJRxTpfvHGFhc9zaA8y dygwEkT2aHOY8LvO0ztCqW0LZrR+YfCMwYb02vQckOACq45Bsi+XwIhOU4Q76grOv/HL etCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=uEyShXTm+JB/9yQz06mq2i1GCRkvjAHHbIYroAF3Vr0=; b=aPYfRnJttJbF5E5fti2FfkE62xglsFICbEoC8HNdFn1Shse2WsEMKvqApDRczdNy9x 285msx1jCfZLw3/6kZnChzQoD2TtSJKgZXOtWsMURFDkdu8sjkiPLIsKlWUs3U8pnEKC TLI4J/ZRbsPfSZOUVdiXS6BoEvlBUbtLfIFRiKASBcCvbZK97E15aoWMgfVwCMJ6Y0EJ Cu4h0znFcETJPv9DIFpoL4TuTHia6YBCpE3B1qlGAsPOzhyZ08tSubf2PYZ0fPj/5tgf r9Bfka0mHfR+dOezpFh4fQxPLfgOIK0nlPcxVUekG086Hmoa+/X3h9cNDAztwv94Vv8W qlBA== X-Gm-Message-State: APjAAAXkKUkMKy7maorVFUq8k83s5bs+hq0GzGtI+/1x8b+hdC4sNeIB D9TtUpBzo5tlANXienw2DoZLFw== X-Received: by 2002:a81:6589:: with SMTP id z131mr19011625ywb.262.1570466752240; Mon, 07 Oct 2019 09:45:52 -0700 (PDT) Received: from localhost ([2620:0:1013:11:89c6:2139:5435:371d]) by smtp.gmail.com with ESMTPSA id k6sm4135994ywh.60.2019.10.07.09.45.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Oct 2019 09:45:51 -0700 (PDT) Date: Mon, 7 Oct 2019 12:45:51 -0400 From: Sean Paul To: Derek Basehore Cc: linux-kernel@vger.kernel.org, Maarten Lankhorst , Maxime Ripard , Sean Paul , David Airlie , Daniel Vetter , Thierry Reding , Sam Ravnborg , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , CK Hu , Philipp Zabel , Matthias Brugger , dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Subject: Re: [PATCH v8 3/4] drm/connector: Split out orientation quirk detection Message-ID: <20191007164551.GC126146@art_vandelay> References: <20190925225833.7310-1-dbasehore@chromium.org> <20190925225833.7310-4-dbasehore@chromium.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190925225833.7310-4-dbasehore@chromium.org> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Sep 25, 2019 at 03:58:32PM -0700, Derek Basehore wrote: > Not every platform needs quirk detection for panel orientation, so > split the drm_connector_init_panel_orientation_property into two > functions. One for platforms without the need for quirks, and the > other for platforms that need quirks. > > Signed-off-by: Derek Basehore > Acked-by: Sam Ravnborg Reviewed-by: Sean Paul > --- > drivers/gpu/drm/drm_connector.c | 45 ++++++++++++++++++------- > drivers/gpu/drm/i915/display/icl_dsi.c | 2 +- > drivers/gpu/drm/i915/display/intel_dp.c | 4 +-- > drivers/gpu/drm/i915/display/vlv_dsi.c | 2 +- > include/drm/drm_connector.h | 2 ++ > 5 files changed, 39 insertions(+), 16 deletions(-) > > diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c > index 4c766624b20d..faef25683faf 100644 > --- a/drivers/gpu/drm/drm_connector.c > +++ b/drivers/gpu/drm/drm_connector.c > @@ -1989,31 +1989,23 @@ EXPORT_SYMBOL(drm_connector_set_vrr_capable_property); > * drm_connector_init_panel_orientation_property - > * initialize the connecters panel_orientation property > * @connector: connector for which to init the panel-orientation property. > - * @width: width in pixels of the panel, used for panel quirk detection > - * @height: height in pixels of the panel, used for panel quirk detection > * > * This function should only be called for built-in panels, after setting > * connector->display_info.panel_orientation first (if known). > * > - * This function will check for platform specific (e.g. DMI based) quirks > - * overriding display_info.panel_orientation first, then if panel_orientation > - * is not DRM_MODE_PANEL_ORIENTATION_UNKNOWN it will attach the > - * "panel orientation" property to the connector. > + * This function will check if the panel_orientation is not > + * DRM_MODE_PANEL_ORIENTATION_UNKNOWN. If not, it will attach the "panel > + * orientation" property to the connector. > * > * Returns: > * Zero on success, negative errno on failure. > */ > int drm_connector_init_panel_orientation_property( > - struct drm_connector *connector, int width, int height) > + struct drm_connector *connector) > { > struct drm_device *dev = connector->dev; > struct drm_display_info *info = &connector->display_info; > struct drm_property *prop; > - int orientation_quirk; > - > - orientation_quirk = drm_get_panel_orientation_quirk(width, height); > - if (orientation_quirk != DRM_MODE_PANEL_ORIENTATION_UNKNOWN) > - info->panel_orientation = orientation_quirk; > > if (info->panel_orientation == DRM_MODE_PANEL_ORIENTATION_UNKNOWN) > return 0; > @@ -2036,6 +2028,35 @@ int drm_connector_init_panel_orientation_property( > } > EXPORT_SYMBOL(drm_connector_init_panel_orientation_property); > > +/** > + * drm_connector_init_panel_orientation_property_quirk - > + * initialize the connecters panel_orientation property with a quirk > + * override > + * @connector: connector for which to init the panel-orientation property. > + * @width: width in pixels of the panel, used for panel quirk detection > + * @height: height in pixels of the panel, used for panel quirk detection > + * > + * This function will check for platform specific (e.g. DMI based) quirks > + * overriding display_info.panel_orientation first, then if panel_orientation > + * is not DRM_MODE_PANEL_ORIENTATION_UNKNOWN it will attach the > + * "panel orientation" property to the connector. > + * > + * Returns: > + * Zero on success, negative errno on failure. > + */ > +int drm_connector_init_panel_orientation_property_quirk( > + struct drm_connector *connector, int width, int height) > +{ > + int orientation_quirk; > + > + orientation_quirk = drm_get_panel_orientation_quirk(width, height); > + if (orientation_quirk != DRM_MODE_PANEL_ORIENTATION_UNKNOWN) > + connector->display_info.panel_orientation = orientation_quirk; > + > + return drm_connector_init_panel_orientation_property(connector); > +} > +EXPORT_SYMBOL(drm_connector_init_panel_orientation_property_quirk); > + > int drm_connector_set_obj_prop(struct drm_mode_object *obj, > struct drm_property *property, > uint64_t value) > diff --git a/drivers/gpu/drm/i915/display/icl_dsi.c b/drivers/gpu/drm/i915/display/icl_dsi.c > index 6e398c33a524..483287984090 100644 > --- a/drivers/gpu/drm/i915/display/icl_dsi.c > +++ b/drivers/gpu/drm/i915/display/icl_dsi.c > @@ -1538,7 +1538,7 @@ static void icl_dsi_add_properties(struct intel_connector *connector) > > connector->base.display_info.panel_orientation = > intel_dsi_get_panel_orientation(connector); > - drm_connector_init_panel_orientation_property(&connector->base, > + drm_connector_init_panel_orientation_property_quirk(&connector->base, > connector->panel.fixed_mode->hdisplay, > connector->panel.fixed_mode->vdisplay); > } > diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c > index 921ad0a2f7ba..419413fa8165 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp.c > +++ b/drivers/gpu/drm/i915/display/intel_dp.c > @@ -7076,8 +7076,8 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, > intel_panel_setup_backlight(connector, pipe); > > if (fixed_mode) > - drm_connector_init_panel_orientation_property( > - connector, fixed_mode->hdisplay, fixed_mode->vdisplay); > + drm_connector_init_panel_orientation_property_quirk(connector, > + fixed_mode->hdisplay, fixed_mode->vdisplay); > > return true; > > diff --git a/drivers/gpu/drm/i915/display/vlv_dsi.c b/drivers/gpu/drm/i915/display/vlv_dsi.c > index a71b22bdd95b..46cfb0821c17 100644 > --- a/drivers/gpu/drm/i915/display/vlv_dsi.c > +++ b/drivers/gpu/drm/i915/display/vlv_dsi.c > @@ -1634,7 +1634,7 @@ static void vlv_dsi_add_properties(struct intel_connector *connector) > > connector->base.display_info.panel_orientation = > vlv_dsi_get_panel_orientation(connector); > - drm_connector_init_panel_orientation_property( > + drm_connector_init_panel_orientation_property_quirk( > &connector->base, > connector->panel.fixed_mode->hdisplay, > connector->panel.fixed_mode->vdisplay); > diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h > index 681cb590f952..e3416ac11478 100644 > --- a/include/drm/drm_connector.h > +++ b/include/drm/drm_connector.h > @@ -1540,6 +1540,8 @@ void drm_connector_set_link_status_property(struct drm_connector *connector, > void drm_connector_set_vrr_capable_property( > struct drm_connector *connector, bool capable); > int drm_connector_init_panel_orientation_property( > + struct drm_connector *connector); > +int drm_connector_init_panel_orientation_property_quirk( > struct drm_connector *connector, int width, int height); > int drm_connector_attach_max_bpc_property(struct drm_connector *connector, > int min, int max); > -- > 2.23.0.351.gc4317032e6-goog > -- Sean Paul, Software Engineer, Google / Chromium OS