Creating the panel orientation property first since we separate the
property creating and value setting.
Signed-off-by: Hsin-Yi Wang <[email protected]>
---
drivers/gpu/drm/i915/display/icl_dsi.c | 1 +
drivers/gpu/drm/i915/display/intel_dp.c | 1 +
drivers/gpu/drm/i915/display/vlv_dsi.c | 1 +
3 files changed, 3 insertions(+)
diff --git a/drivers/gpu/drm/i915/display/icl_dsi.c b/drivers/gpu/drm/i915/display/icl_dsi.c
index 9282978060b0..162fb3cf0f5a 100644
--- a/drivers/gpu/drm/i915/display/icl_dsi.c
+++ b/drivers/gpu/drm/i915/display/icl_dsi.c
@@ -1903,6 +1903,7 @@ static void icl_dsi_add_properties(struct intel_connector *connector)
connector->base.state->scaling_mode = DRM_MODE_SCALE_ASPECT;
+ drm_connector_attach_scaling_mode_property(&connector->base);
drm_connector_set_panel_orientation_with_quirk(&connector->base,
intel_dsi_get_panel_orientation(connector),
connector->panel.fixed_mode->hdisplay,
diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
index a5231ac3443a..f1d664e5abb2 100644
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -5263,6 +5263,7 @@ 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);
drm_connector_set_panel_orientation_with_quirk(connector,
dev_priv->vbt.orientation,
fixed_mode->hdisplay, fixed_mode->vdisplay);
diff --git a/drivers/gpu/drm/i915/display/vlv_dsi.c b/drivers/gpu/drm/i915/display/vlv_dsi.c
index 9bee99fe5495..853855482af1 100644
--- a/drivers/gpu/drm/i915/display/vlv_dsi.c
+++ b/drivers/gpu/drm/i915/display/vlv_dsi.c
@@ -1632,6 +1632,7 @@ static void vlv_dsi_add_properties(struct intel_connector *connector)
connector->base.state->scaling_mode = DRM_MODE_SCALE_ASPECT;
+ drm_connector_init_panel_orientation_property(&connector->base);
drm_connector_set_panel_orientation_with_quirk(
&connector->base,
intel_dsi_get_panel_orientation(connector),
--
2.31.1.498.g6c1eba8ee3d-goog
On Wed, Apr 28, 2021 at 1:04 PM Hsin-Yi Wang <[email protected]> wrote:
>
> Creating the panel orientation property first since we separate the
> property creating and value setting.
This should probably be included in patch 1 so you don't regress i915
in between patches.
Sean
>
> Signed-off-by: Hsin-Yi Wang <[email protected]>
> ---
> drivers/gpu/drm/i915/display/icl_dsi.c | 1 +
> drivers/gpu/drm/i915/display/intel_dp.c | 1 +
> drivers/gpu/drm/i915/display/vlv_dsi.c | 1 +
> 3 files changed, 3 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/display/icl_dsi.c b/drivers/gpu/drm/i915/display/icl_dsi.c
> index 9282978060b0..162fb3cf0f5a 100644
> --- a/drivers/gpu/drm/i915/display/icl_dsi.c
> +++ b/drivers/gpu/drm/i915/display/icl_dsi.c
> @@ -1903,6 +1903,7 @@ static void icl_dsi_add_properties(struct intel_connector *connector)
>
> connector->base.state->scaling_mode = DRM_MODE_SCALE_ASPECT;
>
> + drm_connector_attach_scaling_mode_property(&connector->base);
> drm_connector_set_panel_orientation_with_quirk(&connector->base,
> intel_dsi_get_panel_orientation(connector),
> connector->panel.fixed_mode->hdisplay,
> diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
> index a5231ac3443a..f1d664e5abb2 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp.c
> @@ -5263,6 +5263,7 @@ 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);
> drm_connector_set_panel_orientation_with_quirk(connector,
> dev_priv->vbt.orientation,
> fixed_mode->hdisplay, fixed_mode->vdisplay);
> diff --git a/drivers/gpu/drm/i915/display/vlv_dsi.c b/drivers/gpu/drm/i915/display/vlv_dsi.c
> index 9bee99fe5495..853855482af1 100644
> --- a/drivers/gpu/drm/i915/display/vlv_dsi.c
> +++ b/drivers/gpu/drm/i915/display/vlv_dsi.c
> @@ -1632,6 +1632,7 @@ static void vlv_dsi_add_properties(struct intel_connector *connector)
>
> connector->base.state->scaling_mode = DRM_MODE_SCALE_ASPECT;
>
> + drm_connector_init_panel_orientation_property(&connector->base);
> drm_connector_set_panel_orientation_with_quirk(
> &connector->base,
> intel_dsi_get_panel_orientation(connector),
> --
> 2.31.1.498.g6c1eba8ee3d-goog
>
Hi Hsin-Yi,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on drm-intel/for-linux-next]
[also build test ERROR on drm-tip/drm-tip drm-exynos/exynos-drm-next tegra-drm/drm/tegra/for-next linus/master v5.12 next-20210428]
[cannot apply to drm/drm-next]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Hsin-Yi-Wang/gpu-drm-separate-panel-orientation-property-creating-and-value-setting/20210429-010748
base: git://anongit.freedesktop.org/drm-intel for-linux-next
config: x86_64-allyesconfig (attached as .config)
compiler: gcc-9 (Debian 9.3.0-22) 9.3.0
reproduce (this is a W=1 build):
# https://github.com/0day-ci/linux/commit/c44e5201c88aadd48cd7f9b257d6df3e0c9765c7
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Hsin-Yi-Wang/gpu-drm-separate-panel-orientation-property-creating-and-value-setting/20210429-010748
git checkout c44e5201c88aadd48cd7f9b257d6df3e0c9765c7
# save the attached .config to linux build tree
make W=1 W=1 ARCH=x86_64
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <[email protected]>
All errors (new ones prefixed by >>):
drivers/gpu/drm/i915/display/icl_dsi.c: In function 'icl_dsi_add_properties':
>> drivers/gpu/drm/i915/display/icl_dsi.c:1906:2: error: too few arguments to function 'drm_connector_attach_scaling_mode_property'
1906 | drm_connector_attach_scaling_mode_property(&connector->base);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from include/drm/drm_modes.h:33,
from include/drm/drm_crtc.h:40,
from include/drm/drm_atomic_helper.h:31,
from drivers/gpu/drm/i915/display/icl_dsi.c:28:
include/drm/drm_connector.h:1670:5: note: declared here
1670 | int drm_connector_attach_scaling_mode_property(struct drm_connector *connector,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
vim +/drm_connector_attach_scaling_mode_property +1906 drivers/gpu/drm/i915/display/icl_dsi.c
1892
1893 static void icl_dsi_add_properties(struct intel_connector *connector)
1894 {
1895 u32 allowed_scalers;
1896
1897 allowed_scalers = BIT(DRM_MODE_SCALE_ASPECT) |
1898 BIT(DRM_MODE_SCALE_FULLSCREEN) |
1899 BIT(DRM_MODE_SCALE_CENTER);
1900
1901 drm_connector_attach_scaling_mode_property(&connector->base,
1902 allowed_scalers);
1903
1904 connector->base.state->scaling_mode = DRM_MODE_SCALE_ASPECT;
1905
> 1906 drm_connector_attach_scaling_mode_property(&connector->base);
1907 drm_connector_set_panel_orientation_with_quirk(&connector->base,
1908 intel_dsi_get_panel_orientation(connector),
1909 connector->panel.fixed_mode->hdisplay,
1910 connector->panel.fixed_mode->vdisplay);
1911 }
1912
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/[email protected]