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 X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C3DC2C43218 for ; Tue, 11 Jun 2019 08:05:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9587521721 for ; Tue, 11 Jun 2019 08:05:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404574AbfFKIFJ (ORCPT ); Tue, 11 Jun 2019 04:05:09 -0400 Received: from mga02.intel.com ([134.134.136.20]:33802 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404389AbfFKIFJ (ORCPT ); Tue, 11 Jun 2019 04:05:09 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Jun 2019 01:05:08 -0700 X-ExtLoop1: 1 Received: from jnikula-mobl3.fi.intel.com (HELO localhost) ([10.237.66.150]) by fmsmga001.fm.intel.com with ESMTP; 11 Jun 2019 01:05:02 -0700 From: Jani Nikula To: Derek Basehore , linux-kernel@vger.kernel.org Cc: Thierry Reding , Sam Ravnborg , David Airlie , Daniel Vetter , Rob Herring , Mark Rutland , Maarten Lankhorst , Maxime Ripard , Sean Paul , Joonas Lahtinen , Rodrigo Vivi , CK Hu , Philipp Zabel , Matthias Brugger , dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, intel-gfx@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, Derek Basehore , Hans de Goede , Ville =?utf-8?B?U3lyasOkbMOk?= Subject: Re: [PATCH 4/5] drm/connector: Split out orientation quirk detection In-Reply-To: <20190611040350.90064-5-dbasehore@chromium.org> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20190611040350.90064-1-dbasehore@chromium.org> <20190611040350.90064-5-dbasehore@chromium.org> Date: Tue, 11 Jun 2019 11:08:03 +0300 Message-ID: <87zhmoy270.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 10 Jun 2019, Derek Basehore wrote: > This removes the orientation quirk detection from the code to add > an orientation property to a panel. This is used only for legacy x86 > systems, yet we'd like to start using this on devicetree systems where > quirk detection like this is not needed. Not needed, but no harm done either, right? I guess I'll defer judgement on this to Hans and Ville (Cc'd). Side note, I'm about to apply some (minor) conflicting changes in our -next as soon as I get CI results on it. BR, Jani. > > Signed-off-by: Derek Basehore > --- > drivers/gpu/drm/drm_connector.c | 16 ++++------------ > drivers/gpu/drm/i915/intel_dp.c | 14 +++++++++++--- > drivers/gpu/drm/i915/vlv_dsi.c | 14 ++++++++++---- > include/drm/drm_connector.h | 2 +- > 4 files changed, 26 insertions(+), 20 deletions(-) > > diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c > index e17586aaa80f..58a09b65028b 100644 > --- a/drivers/gpu/drm/drm_connector.c > +++ b/drivers/gpu/drm/drm_connector.c > @@ -1894,31 +1894,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; > diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c > index b099a9dc28fd..72ab090ea97a 100644 > --- a/drivers/gpu/drm/i915/intel_dp.c > +++ b/drivers/gpu/drm/i915/intel_dp.c > @@ -40,6 +40,7 @@ > #include > #include > #include > +#include > #include > > #include "i915_debugfs.h" > @@ -7281,9 +7282,16 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, > intel_connector->panel.backlight.power = intel_edp_backlight_power; > intel_panel_setup_backlight(connector, pipe); > > - if (fixed_mode) > - drm_connector_init_panel_orientation_property( > - connector, fixed_mode->hdisplay, fixed_mode->vdisplay); > + if (fixed_mode) { > + int orientation = drm_get_panel_orientation_quirk( > + fixed_mode->hdisplay, fixed_mode->vdisplay); > + > + if (orientation != DRM_MODE_PANEL_ORIENTATION_UNKNOWN) > + connector->display_info.panel_orientation = > + orientation; > + > + drm_connector_init_panel_orientation_property(connector); > + } > > return true; > > diff --git a/drivers/gpu/drm/i915/vlv_dsi.c b/drivers/gpu/drm/i915/vlv_dsi.c > index bfe2891eac37..27f86a787f60 100644 > --- a/drivers/gpu/drm/i915/vlv_dsi.c > +++ b/drivers/gpu/drm/i915/vlv_dsi.c > @@ -30,6 +30,7 @@ > #include > #include > #include > +#include > > #include "i915_drv.h" > #include "intel_atomic.h" > @@ -1650,6 +1651,7 @@ static void intel_dsi_add_properties(struct intel_connector *connector) > > if (connector->panel.fixed_mode) { > u32 allowed_scalers; > + int orientation; > > allowed_scalers = BIT(DRM_MODE_SCALE_ASPECT) | BIT(DRM_MODE_SCALE_FULLSCREEN); > if (!HAS_GMCH(dev_priv)) > @@ -1660,12 +1662,16 @@ static void intel_dsi_add_properties(struct intel_connector *connector) > > connector->base.state->scaling_mode = DRM_MODE_SCALE_ASPECT; > > - connector->base.display_info.panel_orientation = > - vlv_dsi_get_panel_orientation(connector); > - drm_connector_init_panel_orientation_property( > - &connector->base, > + orientation = drm_get_panel_orientation_quirk( > connector->panel.fixed_mode->hdisplay, > connector->panel.fixed_mode->vdisplay); > + if (orientation != DRM_MODE_PANEL_ORIENTATION_UNKNOWN) > + connector->base.display_info.panel_orientation = orientation; > + else > + connector->base.display_info.panel_orientation = > + vlv_dsi_get_panel_orientation(connector); > + > + drm_connector_init_panel_orientation_property(&connector->base); > } > } > > diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h > index 47e749b74e5f..c2992f7a0dd5 100644 > --- a/include/drm/drm_connector.h > +++ b/include/drm/drm_connector.h > @@ -1370,7 +1370,7 @@ 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 width, int height); > + struct drm_connector *connector); > int drm_connector_attach_max_bpc_property(struct drm_connector *connector, > int min, int max); -- Jani Nikula, Intel Open Source Graphics Center